USB HID: Use different context for each mode; Use constant for each action;

Rework keymaps

This commit makes the code neater and more readable. It makes it easier to
modify keymap assignments and new keypad modes.
Some platforms had their keypad mappings reworked.
The manual is updated to reflect all these changes.
H10 remote control mapping dropped.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23219 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 110 insertions, 54 deletions

diff --git a/apps/keymaps/keymap-hdd1630.c b/apps/keymaps/keymap-hdd1630.c
index 404d7ecf14..f6f9ab9c8c 100644
--- a/apps/keymaps/keymap-hdd1630.c
+++ b/apps/keymaps/keymap-hdd1630.c
@@ -286,66 +286,116 @@ static const struct button_mapping button_context_radio[]  = {
 
 #ifdef USB_ENABLE_HID
 static const struct button_mapping button_context_usb_hid[] = {
-    { ACTION_USB_HID_INC,         BUTTON_VOL_UP,                 BUTTON_NONE },
-    { ACTION_USB_HID_INC,         BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_USB_HID_DEC,         BUTTON_VOL_DOWN,               BUTTON_NONE },
-    { ACTION_USB_HID_DEC,         BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_USB_HID_START,       BUTTON_UP|BUTTON_REL,          BUTTON_UP },
-    { ACTION_USB_HID_START_LONG,  BUTTON_UP|BUTTON_REPEAT,       BUTTON_UP },
-    { ACTION_USB_HID_QUIT,        BUTTON_POWER|BUTTON_REL,       BUTTON_POWER },
-    { ACTION_USB_HID_QUIT_LONG,   BUTTON_POWER|BUTTON_REPEAT,    BUTTON_POWER },
-    { ACTION_USB_HID_LEFT,        BUTTON_LEFT|BUTTON_REL,        BUTTON_LEFT },
-    { ACTION_USB_HID_LEFT_LONG,   BUTTON_LEFT|BUTTON_REPEAT,     BUTTON_LEFT },
-    { ACTION_USB_HID_RIGHT,       BUTTON_RIGHT|BUTTON_REL,       BUTTON_RIGHT },
-    { ACTION_USB_HID_RIGHT_LONG,  BUTTON_RIGHT|BUTTON_REPEAT,    BUTTON_RIGHT },
-    { ACTION_USB_HID_SELECT,      BUTTON_SELECT|BUTTON_REL,      BUTTON_SELECT },
-    { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT,   BUTTON_SELECT },
-    { ACTION_USB_HID_MENU,        BUTTON_MENU|BUTTON_REL,        BUTTON_MENU },
-    { ACTION_USB_HID_MENU_LONG,   BUTTON_MENU|BUTTON_REPEAT,     BUTTON_MENU },
-    { ACTION_USB_HID_MODE,        BUTTON_VIEW|BUTTON_REL,        BUTTON_VIEW },
-    { ACTION_USB_HID_MODE_LONG,   BUTTON_VIEW|BUTTON_REPEAT,     BUTTON_VIEW },
+    { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_POWER|BUTTON_REL,    BUTTON_POWER },
+    { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_usb_hid */
 
+static const struct button_mapping button_context_usb_hid_mode_multimedia[] = {
+    { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN,         BUTTON_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN,         BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP,           BUTTON_VOL_UP,                 BUTTON_NONE },
+    { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP,           BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE,         BUTTON_MENU|BUTTON_REL,        BUTTON_MENU },
+    { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_PLAY_PAUSE, BUTTON_SELECT|BUTTON_REL,      BUTTON_SELECT },
+    { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP,       BUTTON_SELECT|BUTTON_REPEAT,   BUTTON_SELECT },
+    { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP,       BUTTON_PLAYLIST|BUTTON_REL,    BUTTON_PLAYLIST },
+    { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_PREV, BUTTON_LEFT|BUTTON_REL,        BUTTON_LEFT },
+    { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_NEXT, BUTTON_RIGHT|BUTTON_REL,       BUTTON_RIGHT },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
+}; /* button_context_usb_hid_mode_multimedia */
+
+static const struct button_mapping button_context_usb_hid_mode_presentation[] = {
+    { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START, BUTTON_SELECT|BUTTON_REL,      BUTTON_SELECT },
+    { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START, BUTTON_VIEW|BUTTON_REL,        BUTTON_VIEW },
+    { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_SELECT|BUTTON_REPEAT,   BUTTON_SELECT },
+    { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_VIEW|BUTTON_REPEAT,     BUTTON_VIEW },
+    { ACTION_USB_HID_PRESENTATION_SLIDE_PREV,      BUTTON_LEFT|BUTTON_REL,        BUTTON_LEFT },
+    { ACTION_USB_HID_PRESENTATION_SLIDE_NEXT,      BUTTON_RIGHT|BUTTON_REL,       BUTTON_RIGHT },
+    { ACTION_USB_HID_PRESENTATION_SLIDE_FIRST,     BUTTON_LEFT|BUTTON_REPEAT,     BUTTON_LEFT },
+    { ACTION_USB_HID_PRESENTATION_SLIDE_LAST,      BUTTON_RIGHT|BUTTON_REPEAT,    BUTTON_RIGHT },
+    { ACTION_USB_HID_PRESENTATION_SCREEN_BLACK,    BUTTON_PLAYLIST|BUTTON_REL,    BUTTON_PLAYLIST },
+    { ACTION_USB_HID_PRESENTATION_SCREEN_WHITE,    BUTTON_PLAYLIST|BUTTON_REPEAT, BUTTON_PLAYLIST },
+    { ACTION_USB_HID_PRESENTATION_LINK_PREV,       BUTTON_VOL_UP|BUTTON_REL,      BUTTON_VOL_UP },
+    { ACTION_USB_HID_PRESENTATION_LINK_PREV,       BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_VOL_UP },
+    { ACTION_USB_HID_PRESENTATION_LINK_NEXT,       BUTTON_VOL_DOWN|BUTTON_REL,    BUTTON_VOL_DOWN },
+    { ACTION_USB_HID_PRESENTATION_LINK_NEXT,       BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_VOL_DOWN },
+    { ACTION_USB_HID_PRESENTATION_MOUSE_CLICK,     BUTTON_MENU|BUTTON_REL,        BUTTON_MENU },
+    { ACTION_USB_HID_PRESENTATION_MOUSE_OVER,      BUTTON_MENU|BUTTON_REPEAT,     BUTTON_MENU },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
+}; /* button_context_usb_hid_mode_presentation */
+
+static const struct button_mapping button_context_usb_hid_mode_browser[] = {
+    { ACTION_USB_HID_BROWSER_SCROLL_UP,        BUTTON_UP,                     BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_SCROLL_UP,        BUTTON_UP|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_SCROLL_DOWN,      BUTTON_DOWN,                   BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_SCROLL_DOWN,      BUTTON_DOWN|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_SCROLL_PAGE_UP,   BUTTON_VOL_UP|BUTTON_REL,      BUTTON_VOL_UP },
+    { ACTION_USB_HID_BROWSER_SCROLL_PAGE_DOWN, BUTTON_VOL_DOWN|BUTTON_REL,    BUTTON_VOL_DOWN },
+    { ACTION_USB_HID_BROWSER_ZOOM_IN,          BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_VOL_UP },
+    { ACTION_USB_HID_BROWSER_ZOOM_OUT,         BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_VOL_DOWN },
+    { ACTION_USB_HID_BROWSER_ZOOM_RESET,       BUTTON_MENU|BUTTON_REPEAT,     BUTTON_MENU },
+    { ACTION_USB_HID_BROWSER_TAB_PREV,         BUTTON_LEFT|BUTTON_REL,        BUTTON_LEFT },
+    { ACTION_USB_HID_BROWSER_TAB_NEXT,         BUTTON_RIGHT|BUTTON_REL,       BUTTON_RIGHT },
+    { ACTION_USB_HID_BROWSER_TAB_CLOSE,        BUTTON_PLAYLIST|BUTTON_REPEAT, BUTTON_PLAYLIST },
+    { ACTION_USB_HID_BROWSER_HISTORY_BACK,     BUTTON_LEFT|BUTTON_REPEAT,     BUTTON_LEFT },
+    { ACTION_USB_HID_BROWSER_HISTORY_FORWARD,  BUTTON_RIGHT|BUTTON_REPEAT,    BUTTON_RIGHT },
+    { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_VIEW|BUTTON_REL,        BUTTON_VIEW },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
+}; /* button_context_usb_hid_mode_browser */
+
 #ifdef HAVE_USB_HID_MOUSE
-static const struct button_mapping button_context_usb_hid_mouse[] = {
-    { ACTION_USB_HID_MOUSE_UP,                BUTTON_UP,                                BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_UP_REP,            BUTTON_UP|BUTTON_REPEAT,                  BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_DOWN,              BUTTON_DOWN,                              BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_DOWN_REP,          BUTTON_DOWN|BUTTON_REPEAT,                BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LEFT,              BUTTON_LEFT,                              BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LEFT_REP,          BUTTON_LEFT|BUTTON_REPEAT,                BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RIGHT,             BUTTON_RIGHT,                             BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RIGHT_REP,         BUTTON_RIGHT|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_BUTTON_LEFT,       BUTTON_SELECT,                            BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL,   BUTTON_SELECT|BUTTON_REL,                 BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_UP,          BUTTON_SELECT|BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_UP_REP,      BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_DOWN,        BUTTON_SELECT|BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP,    BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_LEFT,        BUTTON_SELECT|BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP,    BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_RIGHT,       BUTTON_SELECT|BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP,   BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_BUTTON_RIGHT,      BUTTON_POWER,                             BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL,  BUTTON_POWER|BUTTON_REL,                  BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RDRAG_UP,          BUTTON_POWER|BUTTON_UP,                   BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RDRAG_UP_REP,      BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RDRAG_DOWN,        BUTTON_POWER|BUTTON_DOWN,                 BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP,    BUTTON_POWER|BUTTON_DOWN|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RDRAG_LEFT,        BUTTON_POWER|BUTTON_LEFT,                 BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP,    BUTTON_POWER|BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RDRAG_RIGHT,       BUTTON_POWER|BUTTON_RIGHT,                BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP,   BUTTON_POWER|BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP,   BUTTON_VOL_UP,                            BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP,   BUTTON_VOL_UP|BUTTON_REPEAT,              BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_VOL_DOWN,                          BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT,            BUTTON_NONE },
+static const struct button_mapping button_context_usb_hid_mode_mouse[] = {
+    { ACTION_USB_HID_MOUSE_UP,                BUTTON_UP,                                  BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_UP_REP,            BUTTON_UP|BUTTON_REPEAT,                    BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_DOWN,              BUTTON_DOWN,                                BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_DOWN_REP,          BUTTON_DOWN|BUTTON_REPEAT,                  BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LEFT,              BUTTON_LEFT,                                BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LEFT_REP,          BUTTON_LEFT|BUTTON_REPEAT,                  BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RIGHT,             BUTTON_RIGHT,                               BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RIGHT_REP,         BUTTON_RIGHT|BUTTON_REPEAT,                 BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_BUTTON_LEFT,       BUTTON_SELECT,                              BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL,   BUTTON_SELECT|BUTTON_REL,                   BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_UP,          BUTTON_SELECT|BUTTON_UP,                    BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_UP_REP,      BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_DOWN,        BUTTON_SELECT|BUTTON_DOWN,                  BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP,    BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_LEFT,        BUTTON_SELECT|BUTTON_LEFT,                  BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP,    BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_RIGHT,       BUTTON_SELECT|BUTTON_RIGHT,                 BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP,   BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_BUTTON_LEFT,       BUTTON_PLAYLIST,                            BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL,   BUTTON_PLAYLIST|BUTTON_REL,                 BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_UP,          BUTTON_PLAYLIST|BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_UP_REP,      BUTTON_PLAYLIST|BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_DOWN,        BUTTON_PLAYLIST|BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP,    BUTTON_PLAYLIST|BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_LEFT,        BUTTON_PLAYLIST|BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP,    BUTTON_PLAYLIST|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_RIGHT,       BUTTON_PLAYLIST|BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP,   BUTTON_PLAYLIST|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_BUTTON_RIGHT,      BUTTON_VIEW,                                BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL,  BUTTON_VIEW|BUTTON_REL,                     BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RDRAG_UP,          BUTTON_VIEW|BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RDRAG_UP_REP,      BUTTON_VIEW|BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RDRAG_DOWN,        BUTTON_VIEW|BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP,    BUTTON_VIEW|BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RDRAG_LEFT,        BUTTON_VIEW|BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP,    BUTTON_VIEW|BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RDRAG_RIGHT,       BUTTON_VIEW|BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP,   BUTTON_VIEW|BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP,   BUTTON_VOL_UP,                              BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP,   BUTTON_VOL_UP|BUTTON_REPEAT,                BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_VOL_DOWN,                            BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT,              BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
 
-}; /* button_context_usb_hid_mouse */
+}; /* button_context_usb_hid_mode_mouse */
 #endif
 #endif
 
@@ -399,9 +449,15 @@ const struct button_mapping* get_context_mapping(int context)
 #ifdef USB_ENABLE_HID
         case CONTEXT_USB_HID:
             return button_context_usb_hid;
+        case CONTEXT_USB_HID_MODE_MULTIMEDIA:
+            return button_context_usb_hid_mode_multimedia;
+        case CONTEXT_USB_HID_MODE_PRESENTATION:
+            return button_context_usb_hid_mode_presentation;
+        case CONTEXT_USB_HID_MODE_BROWSER:
+            return button_context_usb_hid_mode_browser;
 #ifdef HAVE_USB_HID_MOUSE
-        case CONTEXT_USB_HID_MOUSE:
-            return button_context_usb_hid_mouse;
+        case CONTEXT_USB_HID_MODE_MOUSE:
+            return button_context_usb_hid_mode_mouse;
 #endif
 #endif
     }