diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2009-09-30 10:06:04 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2009-09-30 10:06:04 +0000 |
commit | 8c5141b32ea74a3093073d9bb11205acb7640233 (patch) | |
tree | 486f8e4f94053a389d840b04724567a524b9b4ea /apps/keymaps/keymap-clip.c | |
parent | d7f4f9ff750872a9eb570409966e500099d84d7d (diff) | |
download | rockbox-8c5141b32ea74a3093073d9bb11205acb7640233.tar.gz rockbox-8c5141b32ea74a3093073d9bb11205acb7640233.zip |
Commit "FS#10468 - USB HID: Show keypad mode on screen"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22852 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps/keymap-clip.c')
-rw-r--r-- | apps/keymaps/keymap-clip.c | 67 |
1 files changed, 55 insertions, 12 deletions
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c index 5b45f4fb3d..21728db7fb 100644 --- a/apps/keymaps/keymap-clip.c +++ b/apps/keymaps/keymap-clip.c | |||
@@ -273,21 +273,62 @@ static const struct button_mapping button_context_bmark[] = { | |||
273 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 273 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
274 | }; /* button_context_bmark */ | 274 | }; /* button_context_bmark */ |
275 | 275 | ||
276 | #ifdef HAVE_USBSTACK | 276 | #ifdef USB_ENABLE_HID |
277 | static const struct button_mapping button_context_usb_hid[] = { | 277 | static const struct button_mapping button_context_usb_hid[] = { |
278 | { ACTION_USB_HID_PLAY, BUTTON_UP, BUTTON_NONE }, | 278 | { ACTION_USB_HID_INC, BUTTON_VOL_UP, BUTTON_NONE }, |
279 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, | 279 | { ACTION_USB_HID_INC, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
280 | { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 280 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, |
281 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 281 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
282 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 282 | { ACTION_USB_HID_START, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
283 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 283 | { ACTION_USB_HID_START_LONG, BUTTON_UP|BOTTOM_REPEAT, BUTTON_UP }, |
284 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 284 | { ACTION_USB_HID_QUIT, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
285 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 285 | { ACTION_USB_HID_QUIT_LONG, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, |
286 | { ACTION_USB_HID_MUTE, BUTTON_SELECT, BUTTON_NONE }, | 286 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
287 | { ACTION_USB_HID_MENU, BUTTON_DOWN, BUTTON_NONE }, | 287 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
288 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
289 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | ||
290 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
291 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
292 | { ACTION_USB_HID_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | ||
293 | { ACTION_USB_HID_MENU_LONG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | ||
294 | { ACTION_USB_HID_MODE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
295 | { ACTION_USB_HID_MODE_LONG, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, | ||
288 | 296 | ||
289 | LAST_ITEM_IN_LIST | 297 | LAST_ITEM_IN_LIST |
290 | }; /* button_context_usb_hid */ | 298 | }; /* button_context_usb_hid */ |
299 | |||
300 | static const struct button_mapping button_context_usb_hid_mouse[] = { | ||
301 | { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE }, | ||
302 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
303 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
304 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
305 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
306 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
307 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
308 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
309 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_UP, BUTTON_NONE }, | ||
310 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
311 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, | ||
312 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
313 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, | ||
314 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
315 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, | ||
316 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
317 | { ACTION_USB_HID_MOUSE_RDRAG_UP, BUTTON_HOME|BUTTON_UP, BUTTON_NONE }, | ||
318 | { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, BUTTON_HOME|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
319 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN, BUTTON_HOME|BUTTON_DOWN, BUTTON_NONE }, | ||
320 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, BUTTON_HOME|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
321 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT, BUTTON_HOME|BUTTON_LEFT, BUTTON_NONE }, | ||
322 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, BUTTON_HOME|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
323 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, BUTTON_HOME|BUTTON_RIGHT, BUTTON_NONE }, | ||
324 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, BUTTON_HOME|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
325 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, | ||
326 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
327 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_HOME, BUTTON_NONE }, | ||
328 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_HOME|BUTTON_REL, BUTTON_NONE }, | ||
329 | |||
330 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
331 | }; /* button_context_usb_hid_mouse */ | ||
291 | #endif | 332 | #endif |
292 | 333 | ||
293 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 334 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
@@ -337,9 +378,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
337 | #endif | 378 | #endif |
338 | case CONTEXT_KEYBOARD: | 379 | case CONTEXT_KEYBOARD: |
339 | return button_context_keyboard; | 380 | return button_context_keyboard; |
340 | #ifdef HAVE_USBSTACK | 381 | #ifdef USB_ENABLE_HID |
341 | case CONTEXT_USB_HID: | 382 | case CONTEXT_USB_HID: |
342 | return button_context_usb_hid; | 383 | return button_context_usb_hid; |
384 | case CONTEXT_USB_HID_MOUSE: | ||
385 | return button_context_usb_hid_mouse; | ||
343 | #endif | 386 | #endif |
344 | default: | 387 | default: |
345 | return button_context_standard; | 388 | return button_context_standard; |