diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-11-02 04:37:57 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-11-02 04:37:57 +0000 |
commit | 02385cb5b02ecd13ee63fb636a8ed65071407b01 (patch) | |
tree | b8d1a58c7676ec0ff6d989f2b6990b6a7dea0a17 /apps/keymaps | |
parent | 451f9d58f35a2372a119caa4d9ca56879d8aae4c (diff) | |
download | rockbox-02385cb5b02ecd13ee63fb636a8ed65071407b01.tar.gz rockbox-02385cb5b02ecd13ee63fb636a8ed65071407b01.zip |
M:Robe 500/M66591 USB improvements: Interrupts now work, a bug in odd-length transfers has been fixed. Buffers that are not initially short aligned are also now supported. Enable USB HID mouse mode.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23483 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index 74673ccb20..e7cf87a7a1 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -310,6 +310,27 @@ static const struct button_mapping button_context_usb_hid_mode_browser[] = { | |||
310 | 310 | ||
311 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | 311 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) |
312 | }; /* button_context_usb_hid_mode_browser */ | 312 | }; /* button_context_usb_hid_mode_browser */ |
313 | |||
314 | #ifdef HAVE_USB_HID_MOUSE | ||
315 | static const struct button_mapping button_context_usb_hid_mode_mouse[] = { | ||
316 | { ACTION_USB_HID_MOUSE_UP, BUTTON_TOPMIDDLE, BUTTON_NONE }, | ||
317 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | ||
318 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_BOTTOMMIDDLE, BUTTON_NONE }, | ||
319 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT,BUTTON_NONE }, | ||
320 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_MIDLEFT, BUTTON_NONE }, | ||
321 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
322 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_MIDRIGHT, BUTTON_NONE }, | ||
323 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
324 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_CENTER, BUTTON_NONE }, | ||
325 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_CENTER|BUTTON_REL, BUTTON_NONE }, | ||
326 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_TOPRIGHT, BUTTON_NONE }, | ||
327 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_TOPRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
328 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, | ||
329 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
330 | |||
331 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
332 | }; /* button_context_usb_hid_mode_mouse */ | ||
333 | #endif | ||
313 | #endif | 334 | #endif |
314 | 335 | ||
315 | const struct button_mapping* get_context_mapping(int context) | 336 | const struct button_mapping* get_context_mapping(int context) |
@@ -373,8 +394,13 @@ const struct button_mapping* get_context_mapping(int context) | |||
373 | return button_context_usb_hid_mode_presentation; | 394 | return button_context_usb_hid_mode_presentation; |
374 | case CONTEXT_USB_HID_MODE_BROWSER: | 395 | case CONTEXT_USB_HID_MODE_BROWSER: |
375 | return button_context_usb_hid_mode_browser; | 396 | return button_context_usb_hid_mode_browser; |
397 | #ifdef HAVE_USB_HID_MOUSE | ||
398 | case CONTEXT_USB_HID_MODE_MOUSE: | ||
399 | return button_context_usb_hid_mode_mouse; | ||
376 | #endif | 400 | #endif |
377 | 401 | #endif | |
402 | default: | ||
403 | return button_context_standard; | ||
378 | } | 404 | } |
379 | return button_context_standard; | 405 | return button_context_standard; |
380 | } | 406 | } |