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-h10.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-h10.c')
-rw-r--r-- | apps/keymaps/keymap-h10.c | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index ad1ed64c5a..81673397c3 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c | |||
@@ -337,30 +337,37 @@ static const struct button_mapping button_context_radio[] = { | |||
337 | 337 | ||
338 | }; | 338 | }; |
339 | 339 | ||
340 | #ifdef HAVE_USBSTACK | 340 | #ifdef USB_ENABLE_HID |
341 | static const struct button_mapping button_context_usb_hid[] = { | 341 | static const struct button_mapping button_context_usb_hid[] = { |
342 | { ACTION_USB_HID_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 342 | { ACTION_USB_HID_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, |
343 | { ACTION_USB_HID_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 343 | { ACTION_USB_HID_INC, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
344 | { ACTION_USB_HID_SKIPPREV, BUTTON_REW, BUTTON_NONE }, | 344 | { ACTION_USB_HID_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, |
345 | { ACTION_USB_HID_SKIPNEXT, BUTTON_FF, BUTTON_NONE }, | 345 | { ACTION_USB_HID_DEC, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
346 | { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_UP, BUTTON_NONE }, | 346 | { ACTION_USB_HID_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
347 | { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 347 | { ACTION_USB_HID_START_LONG, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
348 | { ACTION_USB_HID_VOLDOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 348 | { ACTION_USB_HID_QUIT, BUTTON_REW|BUTTON_REL, BUTTON_REW }, |
349 | { ACTION_USB_HID_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 349 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
350 | { ACTION_USB_HID_MENU, BUTTON_POWER, BUTTON_NONE }, | 350 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
351 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
352 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | ||
353 | { ACTION_USB_HID_SELECT, BUTTON_FF|BUTTON_REL, BUTTON_FF }, | ||
354 | { ACTION_USB_HID_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
355 | { ACTION_USB_HID_MODE, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, | ||
351 | 356 | ||
352 | LAST_ITEM_IN_LIST | 357 | LAST_ITEM_IN_LIST |
353 | }; /* button_context_usb_hid */ | 358 | }; /* button_context_usb_hid */ |
354 | 359 | ||
355 | static const struct button_mapping remote_button_context_usb_hid[] = { | 360 | static const struct button_mapping remote_button_context_usb_hid[] = { |
356 | { ACTION_USB_HID_PLAY, BUTTON_RC_PLAY, BUTTON_NONE }, | 361 | { ACTION_USB_HID_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
357 | { ACTION_USB_HID_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 362 | { ACTION_USB_HID_INC, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
358 | { ACTION_USB_HID_SKIPPREV, BUTTON_RC_REW, BUTTON_NONE }, | 363 | { ACTION_USB_HID_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
359 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_FF, BUTTON_NONE }, | 364 | { ACTION_USB_HID_DEC, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
360 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | 365 | { ACTION_USB_HID_START, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, |
361 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 366 | { ACTION_USB_HID_QUIT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, |
362 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 367 | { ACTION_USB_HID_LEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, |
363 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 368 | { ACTION_USB_HID_LEFT_LONG, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW }, |
369 | { ACTION_USB_HID_RIGHT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | ||
370 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_RC_FF }, | ||
364 | 371 | ||
365 | LAST_ITEM_IN_LIST | 372 | LAST_ITEM_IN_LIST |
366 | }; /* remote_button_context_usb_hid */ | 373 | }; /* remote_button_context_usb_hid */ |
@@ -395,7 +402,7 @@ static const struct button_mapping* get_context_mapping_remote( int context ) | |||
395 | return remote_button_context_pitchscreen; | 402 | return remote_button_context_pitchscreen; |
396 | case CONTEXT_RECSCREEN: | 403 | case CONTEXT_RECSCREEN: |
397 | return button_context_recscreen; | 404 | return button_context_recscreen; |
398 | #ifdef HAVE_USBSTACK | 405 | #ifdef USB_ENABLE_HID |
399 | case CONTEXT_USB_HID: | 406 | case CONTEXT_USB_HID: |
400 | return remote_button_context_usb_hid; | 407 | return remote_button_context_usb_hid; |
401 | #endif | 408 | #endif |
@@ -453,7 +460,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
453 | return button_context_recscreen; | 460 | return button_context_recscreen; |
454 | case CONTEXT_FM: | 461 | case CONTEXT_FM: |
455 | return button_context_radio; | 462 | return button_context_radio; |
456 | #ifdef HAVE_USBSTACK | 463 | #ifdef USB_ENABLE_HID |
457 | case CONTEXT_USB_HID: | 464 | case CONTEXT_USB_HID: |
458 | return button_context_usb_hid; | 465 | return button_context_usb_hid; |
459 | #endif | 466 | #endif |