Gigabeat S: Get remote keymaps up to snuff and working. Do a couple tweaks on main unit ones. Cleanup keymap file a bit. Fix main button scanner to not clobber remote button. Fix a bug in actions.c where 'LAST_ITEM_IN_LIST' didn't really terminate scanning immediately. It would do an additional call into get_context_map and silently pick up ACTION_STD.

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

6 files changed, 382 insertions, 206 deletions

diff --git a/apps/action.c b/apps/action.c
index d98bf13cf3..8a72dcdce7 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -63,8 +63,6 @@ static inline int do_button_check(const struct button_mapping *items,
 {
     int i = 0;
     int ret = ACTION_UNKNOWN;
-    if (items == NULL)
-        return ACTION_UNKNOWN;
 
     while (items[i].button_code != BUTTON_NONE)
     {
@@ -192,7 +190,7 @@ static int get_action_worker(int context, int timeout,
 #endif /* HAS_BUTTON_HOLD */
 
     /*   logf("%x,%x",last_button,button); */
-    do
+    while (1)
     {
         /*     logf("context = %x",context); */
 #if (BUTTON_REMOTE != 0)
@@ -204,19 +202,25 @@ static int get_action_worker(int context, int timeout,
         else
             items = get_context_mapping(context);
 
-        ret = do_button_check(items,button,last_button,&i);
-
-        if ((context ==(int)CONTEXT_STOPSEARCHING) ||
-             items == NULL )
+        if (items == NULL)
             break;
 
-        if (ret == ACTION_UNKNOWN )
+        ret = do_button_check(items,button,last_button,&i);
+
+        if (ret == ACTION_UNKNOWN)
         {
             context = get_next_context(items,i);
-            i = 0;
+
+            if (context != (int)CONTEXT_STOPSEARCHING)
+            {
+                i = 0;
+                continue;
+            }
         }
-        else break;
-    } while (1);
+
+        /* Action was found or STOPSEARCHING was specified */
+        break;
+    }
     /* DEBUGF("ret = %x\n",ret); */
 #ifndef HAS_BUTTON_HOLD
     if (screen_has_lock && (ret == ACTION_STD_KEYLOCK))
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c
index d32177ea90..c6c7ddbf40 100644
--- a/apps/keymaps/keymap-gigabeat-s.c
+++ b/apps/keymaps/keymap-gigabeat-s.c
@@ -47,206 +47,211 @@ CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker scree
 
 
 static const struct button_mapping button_context_standard[]  = {
-    { ACTION_STD_PREV,          BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,          BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_PREV,        BUTTON_UP,                   BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,  BUTTON_UP|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_STD_NEXT,        BUTTON_DOWN,                 BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,  BUTTON_DOWN|BUTTON_REPEAT,   BUTTON_NONE },
 
-    { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_POWER,               BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_BACK,                BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_LEFT,                 BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_POWER,                BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_BACK,                 BUTTON_NONE },
 
-    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
+    { ACTION_STD_CONTEXT,     BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
 
-    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },
-    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
+    { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT,   BUTTON_MENU },
+    { ACTION_STD_MENU,        BUTTON_MENU|BUTTON_REL,      BUTTON_MENU },
 
-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT },
-    { ACTION_STD_OK,            BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_STD_OK,          BUTTON_SELECT|BUTTON_REL,    BUTTON_SELECT },
+    { ACTION_STD_OK,          BUTTON_RIGHT,                BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
 
 
 static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
-    { ACTION_WPS_STOP,          BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
-
-    { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
-    { ACTION_WPS_SKIPNEXT,      BUTTON_NEXT|BUTTON_REL,         BUTTON_NEXT },
-    { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
-    { ACTION_WPS_SKIPPREV,      BUTTON_PREV|BUTTON_REL,         BUTTON_PREV },
-
-    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_SEEKBACK,      BUTTON_PREV|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_WPS_SEEKFWD,       BUTTON_NEXT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,      BUTTON_PREV|BUTTON_REL,         BUTTON_PREV|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,      BUTTON_NEXT|BUTTON_REL,         BUTTON_NEXT|BUTTON_REPEAT },
-
-    { ACTION_WPS_ABSETB_NEXTDIR,       BUTTON_BACK|BUTTON_RIGHT,         BUTTON_BACK },
-    { ACTION_WPS_ABSETA_PREVDIR,       BUTTON_BACK|BUTTON_LEFT,          BUTTON_BACK },
-    { ACTION_WPS_ABRESET,       BUTTON_BACK|BUTTON_SELECT,        BUTTON_BACK },
-
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,       BUTTON_VOL_DOWN,                BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,       BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_VOL_UP,                  BUTTON_NONE },
-
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_UP,          BUTTON_BACK },
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_DOWN,        BUTTON_BACK },
-
-    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
-    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
-    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
-
-    { ACTION_WPS_ID3SCREEN,     BUTTON_BACK|BUTTON_MENU,        BUTTON_NONE },
-    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
+    { ACTION_WPS_PLAY,           BUTTON_PLAY|BUTTON_REL,       BUTTON_PLAY },
+    { ACTION_WPS_STOP,           BUTTON_POWER|BUTTON_REL,      BUTTON_POWER },
+
+    { ACTION_WPS_SKIPNEXT,       BUTTON_RIGHT|BUTTON_REL,       BUTTON_RIGHT },
+    { ACTION_WPS_SKIPNEXT,       BUTTON_NEXT|BUTTON_REL,        BUTTON_NEXT },
+    { ACTION_WPS_SKIPPREV,       BUTTON_LEFT|BUTTON_REL,        BUTTON_LEFT },
+    { ACTION_WPS_SKIPPREV,       BUTTON_PREV|BUTTON_REL,        BUTTON_PREV },
+
+    { ACTION_WPS_SEEKBACK,       BUTTON_LEFT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_SEEKBACK,       BUTTON_PREV|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,        BUTTON_RIGHT|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,        BUTTON_NEXT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,       BUTTON_LEFT|BUTTON_REL,        BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,       BUTTON_PREV|BUTTON_REL,        BUTTON_PREV|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,       BUTTON_RIGHT|BUTTON_REL,       BUTTON_RIGHT|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,       BUTTON_NEXT|BUTTON_REL,        BUTTON_NEXT|BUTTON_REPEAT },
+
+    { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_BACK|BUTTON_RIGHT,      BUTTON_BACK },
+    { ACTION_WPS_ABSETA_PREVDIR, BUTTON_BACK|BUTTON_LEFT,       BUTTON_BACK },
+    { ACTION_WPS_ABRESET,        BUTTON_BACK|BUTTON_SELECT,     BUTTON_BACK },
+
+    { ACTION_WPS_VOLDOWN,        BUTTON_DOWN|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,        BUTTON_DOWN,                   BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,        BUTTON_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,        BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_WPS_VOLUP,          BUTTON_UP|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_WPS_VOLUP,          BUTTON_UP,                     BUTTON_NONE },
+    { ACTION_WPS_VOLUP,          BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_WPS_VOLUP,          BUTTON_VOL_UP,                 BUTTON_NONE },
+
+    { ACTION_WPS_PITCHSCREEN,    BUTTON_BACK|BUTTON_UP,         BUTTON_BACK },
+    { ACTION_WPS_PITCHSCREEN,    BUTTON_BACK|BUTTON_DOWN,       BUTTON_BACK },
+
+    { ACTION_WPS_QUICKSCREEN,    BUTTON_MENU|BUTTON_REPEAT,     BUTTON_MENU },
+    { ACTION_WPS_MENU,           BUTTON_MENU|BUTTON_REL,        BUTTON_MENU },
+    { ACTION_WPS_CONTEXT,        BUTTON_SELECT|BUTTON_REPEAT,   BUTTON_SELECT },
+
+    { ACTION_WPS_ID3SCREEN,      BUTTON_BACK|BUTTON_MENU,       BUTTON_NONE },
+    { ACTION_WPS_BROWSE,         BUTTON_SELECT|BUTTON_REL,      BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
 
 static const struct button_mapping button_context_list[]  = {
-    { ACTION_LISTTREE_PGUP,         BUTTON_BACK|BUTTON_UP,                    BUTTON_BACK },
-    { ACTION_LISTTREE_PGUP,         BUTTON_UP|BUTTON_REL,                   BUTTON_BACK|BUTTON_UP },
-    { ACTION_LISTTREE_PGUP,         BUTTON_BACK|BUTTON_UP|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_BACK|BUTTON_DOWN,                  BUTTON_BACK },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_DOWN|BUTTON_REL,                 BUTTON_BACK|BUTTON_DOWN },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_BACK|BUTTON_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_LISTTREE_PGUP,   BUTTON_BACK|BUTTON_UP,                 BUTTON_BACK },
+    { ACTION_LISTTREE_PGUP,   BUTTON_UP|BUTTON_REL,                  BUTTON_BACK|BUTTON_UP },
+    { ACTION_LISTTREE_PGUP,   BUTTON_BACK|BUTTON_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN, BUTTON_BACK|BUTTON_DOWN,               BUTTON_BACK },
+    { ACTION_LISTTREE_PGDOWN, BUTTON_DOWN|BUTTON_REL,                BUTTON_BACK|BUTTON_DOWN },
+    { ACTION_LISTTREE_PGDOWN, BUTTON_BACK|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
 #ifdef HAVE_VOLUME_IN_LIST
-    { ACTION_LIST_VOLUP,         BUTTON_VOL_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_LIST_VOLUP,         BUTTON_VOL_UP,                      BUTTON_NONE },
-    { ACTION_LIST_VOLDOWN,       BUTTON_VOL_DOWN,                    BUTTON_NONE },
-    { ACTION_LIST_VOLDOWN,       BUTTON_VOL_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_LIST_VOLUP,   BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_LIST_VOLUP,   BUTTON_VOL_UP,                 BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
 #endif
     
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_list */
 
 static const struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
-    { ACTION_TREE_STOP,   BUTTON_POWER,                   BUTTON_NONE },
-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_TREE_WPS,  BUTTON_PLAY|BUTTON_REL,     BUTTON_PLAY },
+    { ACTION_TREE_STOP, BUTTON_POWER,               BUTTON_NONE },
+    { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL,    BUTTON_POWER },
+    { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
 
 static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
-    { ACTION_NONE,              BUTTON_BACK,                              BUTTON_NONE },
-    { ACTION_TREE_PGLEFT,       BUTTON_BACK|BUTTON_LEFT,                  BUTTON_BACK },
-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,                 BUTTON_BACK|BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       BUTTON_BACK|BUTTON_LEFT,                  BUTTON_LEFT|BUTTON_REL },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_BACK|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_BACK|BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       BUTTON_BACK|BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_TREE_PGRIGHT,      BUTTON_BACK|BUTTON_RIGHT,                 BUTTON_BACK },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,                BUTTON_BACK|BUTTON_RIGHT },
-    { ACTION_TREE_PGRIGHT,      BUTTON_BACK|BUTTON_RIGHT,                 BUTTON_RIGHT|BUTTON_REL },
-    { ACTION_TREE_PGRIGHT,      BUTTON_BACK|BUTTON_RIGHT|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_NONE,           BUTTON_BACK,                            BUTTON_NONE },
+    { ACTION_TREE_PGLEFT,    BUTTON_BACK|BUTTON_LEFT,                BUTTON_BACK },
+    { ACTION_TREE_PGLEFT,    BUTTON_LEFT|BUTTON_REL,                 BUTTON_BACK|BUTTON_LEFT },
+    { ACTION_TREE_PGLEFT,    BUTTON_BACK|BUTTON_LEFT,                BUTTON_LEFT|BUTTON_REL },
+    { ACTION_TREE_ROOT_INIT, BUTTON_BACK|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_BACK|BUTTON_LEFT },
+    { ACTION_TREE_PGLEFT,    BUTTON_BACK|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_TREE_PGRIGHT,   BUTTON_BACK|BUTTON_RIGHT,               BUTTON_BACK },
+    { ACTION_TREE_PGRIGHT,   BUTTON_RIGHT|BUTTON_REL,                BUTTON_BACK|BUTTON_RIGHT },
+    { ACTION_TREE_PGRIGHT,   BUTTON_BACK|BUTTON_RIGHT,               BUTTON_RIGHT|BUTTON_REL },
+    { ACTION_TREE_PGRIGHT,   BUTTON_BACK|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-};
+}; /* button_context_listtree_scroll_with_combo */
 
 static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
-    { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT|BUTTON_REPEAT },
-    { ACTION_NONE,              BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },
+    { ACTION_NONE,           BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_STD_CANCEL,     BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
+    { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
+    { ACTION_TREE_PGLEFT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_TREE_PGLEFT,    BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_NONE,           BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_STD_OK,         BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
+    { ACTION_TREE_PGRIGHT,   BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_TREE_PGRIGHT,   BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-};
+}; /* button_context_listtree_scroll_without_combo */
 
 static const struct button_mapping button_context_settings[]  = {
-    { ACTION_SETTINGS_INC,          BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_STD_PREV,              BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_SETTINGS_RESET,        BUTTON_BACK,                      BUTTON_NONE },
+    { ACTION_SETTINGS_INC,       BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,       BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_PREV,           BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,     BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_NEXT,           BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,     BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_SETTINGS_RESET,     BUTTON_BACK,                BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings */
 
 static const struct button_mapping button_context_settings_right_is_inc[]  = {
-    { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_SETTINGS_RESET,        BUTTON_BACK,                  BUTTON_NONE },
+    { ACTION_SETTINGS_INC,       BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,       BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_PREV,           BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,     BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_STD_NEXT,           BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,     BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_SETTINGS_RESET,     BUTTON_BACK,                BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settingsgraphical */
 
 static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,                  BUTTON_NONE },
+    { ACTION_YESNO_ACCEPT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
+
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings_yesno */
 
 static const struct button_mapping button_context_colorchooser[]  = {
-    { ACTION_STD_OK,            BUTTON_BACK|BUTTON_REL,   BUTTON_NONE },
+    { ACTION_STD_OK,     BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
+    { ACTION_STD_CANCEL, BUTTON_BACK,              BUTTON_NONE   },
+
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
 }; /* button_context_colorchooser */
 
 static const struct button_mapping button_context_eq[]  = {
-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },
+    { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
+
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
 }; /* button_context_eq */
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_BACK, BUTTON_NONE },
+    { ACTION_BMS_DELETE, BUTTON_BACK|BUTTON_SELECT, BUTTON_BACK },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
 static const struct button_mapping button_context_time[]  = {
-    { ACTION_STD_CANCEL,       BUTTON_BACK,  BUTTON_NONE },
-    { ACTION_STD_OK,           BUTTON_PLAY,   BUTTON_NONE },
+    { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE },
+    { ACTION_STD_OK,     BUTTON_PLAY, BUTTON_NONE },
+
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
 }; /* button_context_time */
 
 static const struct button_mapping button_context_quickscreen[]  = {
-    { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },
+    { ACTION_QS_DOWNINV, BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_QS_DOWN,    BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_QS_DOWN,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_QS_LEFT,    BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_QS_LEFT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_QS_RIGHT,   BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_QS_RIGHT,   BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_STD_CANCEL, BUTTON_MENU,                BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_quickscreen */
 
 static const struct button_mapping button_context_pitchscreen[]  = {
-    { ACTION_PS_INC_SMALL,      BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_PS_INC_BIG,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_PS_DEC_SMALL,      BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_PS_DEC_BIG,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,     BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
-    { ACTION_PS_TOGGLE_MODE,    BUTTON_MENU,                BUTTON_NONE },
-    { ACTION_PS_RESET,          BUTTON_PLAY,                BUTTON_NONE },
-    { ACTION_PS_EXIT,           BUTTON_BACK,                BUTTON_NONE },
+    { ACTION_PS_INC_SMALL,      BUTTON_UP,                 BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_PS_DEC_SMALL,      BUTTON_DOWN,               BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,        BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,               BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,              BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,   BUTTON_NONE },
+    { ACTION_PS_TOGGLE_MODE,    BUTTON_MENU,               BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_PLAY,               BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_BACK,               BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_pitchcreen */
@@ -265,49 +270,49 @@ static const struct button_mapping button_context_recscreen[]  = {
     { ACTION_STD_PREV,           BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_STD_NEXT,           BUTTON_DOWN,                BUTTON_NONE },
     { ACTION_STD_NEXT,           BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_recscreen */
 
 static const struct button_mapping button_context_keyboard[]  = {
-    { ACTION_KBD_LEFT,         BUTTON_LEFT,                             BUTTON_NONE },
-    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_PREV,                             BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_PREV|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_NEXT,                             BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_NEXT|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },
-    { ACTION_KBD_PAGE_FLIP,    BUTTON_BACK|BUTTON_MENU,                 BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_PLAY|BUTTON_REL,                  BUTTON_PLAY },
-    { ACTION_KBD_ABORT,        BUTTON_BACK|BUTTON_REL,                  BUTTON_BACK },
-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },
-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,                 BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_DOWN,                             BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_MORSE_INPUT,  BUTTON_BACK|BUTTON_VOL_UP,               BUTTON_NONE },
-    { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,                BUTTON_NONE },
+    { ACTION_KBD_LEFT,         BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_PREV,                BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_PREV|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_NEXT,                BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_NEXT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_KBD_SELECT,       BUTTON_SELECT,              BUTTON_NONE },
+    { ACTION_KBD_PAGE_FLIP,    BUTTON_BACK|BUTTON_MENU,    BUTTON_NONE },
+    { ACTION_KBD_DONE,         BUTTON_PLAY|BUTTON_REL,     BUTTON_PLAY },
+    { ACTION_KBD_ABORT,        BUTTON_BACK|BUTTON_REL,     BUTTON_BACK },
+    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_KBD_MORSE_INPUT,  BUTTON_BACK|BUTTON_VOL_UP,  BUTTON_NONE },
+    { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_radio[]  = {
-    { ACTION_FM_MENU,            BUTTON_SELECT | BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_FM_PRESET,          BUTTON_SELECT | BUTTON_REL,     BUTTON_SELECT },
-    { ACTION_FM_STOP,            BUTTON_POWER,                   BUTTON_NONE },
-    { ACTION_FM_MODE,            BUTTON_MENU,                    BUTTON_NONE },
-    { ACTION_FM_EXIT,            BUTTON_BACK,                    BUTTON_NONE },
-    { ACTION_FM_PLAY,            BUTTON_PLAY,                    BUTTON_NONE },
-    { ACTION_SETTINGS_INC,       BUTTON_VOL_UP,                  BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,       BUTTON_VOL_DOWN,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-
+    { ACTION_FM_MENU,            BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_FM_PRESET,          BUTTON_SELECT | BUTTON_REL,    BUTTON_SELECT },
+    { ACTION_FM_STOP,            BUTTON_POWER,                  BUTTON_NONE },
+    { ACTION_FM_MODE,            BUTTON_MENU,                   BUTTON_NONE },
+    { ACTION_FM_EXIT,            BUTTON_BACK,                   BUTTON_NONE },
+    { ACTION_FM_PLAY,            BUTTON_PLAY,                   BUTTON_NONE },
+    { ACTION_SETTINGS_INC,       BUTTON_VOL_UP,                 BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,       BUTTON_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
-};
+}; /* button_context_radio */
 
 /*****************************************************************************
  *    Remote control mappings
@@ -317,89 +322,227 @@ static const struct button_mapping remote_button_context_standard[]  = {
     { ACTION_STD_PREVREPEAT,  BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_STD_NEXT,        BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
     { ACTION_STD_NEXTREPEAT,  BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_STD_CANCEL,      BUTTON_RC_REW,                    BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_RC_REW|BUTTON_REL,         BUTTON_RC_DSP },
+    { ACTION_STD_QUICKSCREEN, BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_RC_REW },
     { ACTION_STD_OK,          BUTTON_RC_FF|BUTTON_REL,          BUTTON_RC_FF },
-    { ACTION_STD_CONTEXT,     BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_RC_FF },
-    { ACTION_STD_MENU,        BUTTON_RC_DSP,                    BUTTON_NONE },
+    { ACTION_STD_MENU,        BUTTON_RC_DSP|BUTTON_REL,         BUTTON_RC_DSP },
+    { ACTION_STD_CONTEXT,     BUTTON_RC_DSP|BUTTON_REPEAT,      BUTTON_RC_DSP },
 
     LAST_ITEM_IN_LIST
-};
+}; /* remote_button_context_standard */
 
 static const struct button_mapping remote_button_context_wps[]  = {
-    { ACTION_WPS_PLAY,      BUTTON_RC_PLAY,                    BUTTON_NONE },
+    { ACTION_WPS_PLAY,     BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_RC_PLAY },
+    { ACTION_WPS_STOP,     BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_RC_PLAY },
+    { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL,         BUTTON_RC_REW },
+    { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL,         BUTTON_RC_REW|BUTTON_REPEAT },
+    { ACTION_WPS_SEEKFWD,  BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL,          BUTTON_RC_FF },
+    { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL,          BUTTON_RC_FF|BUTTON_REPEAT },
+    { ACTION_WPS_VOLDOWN,  BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,  BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_WPS_VOLUP,    BUTTON_RC_VOL_UP,                 BUTTON_NONE },
+    { ACTION_WPS_VOLUP,    BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_WPS_MENU,     BUTTON_RC_DSP|BUTTON_REL,         BUTTON_RC_DSP },
+    { ACTION_WPS_CONTEXT,  BUTTON_RC_DSP|BUTTON_REPEAT,      BUTTON_RC_DSP },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* remote_button_context_wps */
+
+static const struct button_mapping remote_button_context_tree[]  = {
+    { ACTION_TREE_WPS,   BUTTON_RC_PLAY|BUTTON_REL,    BUTTON_RC_PLAY },
+    { ACTION_TREE_STOP,  BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY },
+    { ACTION_STD_CANCEL, BUTTON_RC_REW|BUTTON_REL,     BUTTON_RC_REW },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* remote_button_context_tree */
+
+static const struct button_mapping remote_button_context_radio[]  = {
+    { ACTION_FM_MODE,            BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_RC_PLAY },
+    { ACTION_FM_PLAY,            BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_RC_PLAY },
+    { ACTION_STD_PREV,           BUTTON_RC_REW,                    BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,     BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_NEXT,           BUTTON_RC_FF,                     BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,     BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_SETTINGS_INC,       BUTTON_RC_VOL_UP,                 BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,       BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_FM_EXIT,            BUTTON_RC_DSP|BUTTON_REL,         BUTTON_RC_DSP },
+    { ACTION_FM_STOP,            BUTTON_RC_DSP|BUTTON_REPEAT,      BUTTON_RC_DSP },
 
-    { ACTION_WPS_SKIPNEXT,  BUTTON_RC_FF|BUTTON_REL,           BUTTON_RC_FF },
-    { ACTION_WPS_SKIPPREV,  BUTTON_RC_REW|BUTTON_REL,          BUTTON_RC_REW },
+    LAST_ITEM_IN_LIST
+}; /* remote_button_context_radio */
+
+static const struct button_mapping remote_button_context_recscreen[]  = {
+    { ACTION_REC_NEWFILE,        BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_RC_PLAY },
+    { ACTION_REC_PAUSE,          BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_RC_PLAY },
+    { ACTION_STD_CANCEL,         BUTTON_RC_DSP|BUTTON_REL,         BUTTON_RC_DSP },
+    { ACTION_STD_MENU,           BUTTON_RC_DSP|BUTTON_REPEAT,      BUTTON_RC_DSP },
+    { ACTION_SETTINGS_INC,       BUTTON_RC_FF,                     BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,       BUTTON_RC_REW,                    BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_PREV,           BUTTON_RC_VOL_UP,                 BUTTON_NONE },
+    { ACTION_STD_PREV,           BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_STD_NEXT,           BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_STD_NEXT,           BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
 
-    { ACTION_WPS_SEEKBACK,  BUTTON_RC_REW|BUTTON_REPEAT,       BUTTON_NONE },
-    { ACTION_WPS_SEEKFWD,   BUTTON_RC_FF|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK,  BUTTON_RC_REW|BUTTON_REL,          BUTTON_RC_REW|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,  BUTTON_RC_FF|BUTTON_REL,           BUTTON_RC_FF|BUTTON_REPEAT },
+    LAST_ITEM_IN_LIST
+}; /* button_context_recscreen */
 
-    { ACTION_WPS_STOP,      BUTTON_RC_PLAY|BUTTON_REPEAT,      BUTTON_RC_PLAY },
-    { ACTION_WPS_MENU,      BUTTON_RC_DSP,                     BUTTON_NONE },
+static const struct button_mapping remote_button_context_time[]  = {
+    { ACTION_SETTINGS_INC,       BUTTON_RC_VOL_UP,                 BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,       BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_STD_PREV,           BUTTON_RC_REW,                    BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,     BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_NEXT,           BUTTON_RC_FF,                     BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,     BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_STD_OK,             BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_RC_PLAY },
+    { ACTION_STD_CANCEL,         BUTTON_RC_DSP|BUTTON_REL,         BUTTON_RC_DSP },
 
-    { ACTION_WPS_VOLDOWN,   BUTTON_RC_VOL_DOWN,                BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,   BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_WPS_VOLUP,     BUTTON_RC_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_WPS_VOLUP,     BUTTON_RC_VOL_UP,                  BUTTON_NONE },
+    LAST_ITEM_IN_LIST
+}; /* remote_button_context_time */
+
+static const struct button_mapping remote_button_context_bmark[]  = {
+    { ACTION_BMS_DELETE, BUTTON_RC_DSP|BUTTON_REPEAT, BUTTON_RC_DSP },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-};
+}; /* remote_button_context_bmark */
 
-static const struct button_mapping remote_button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_RC_PLAY|BUTTON_REL,           BUTTON_RC_PLAY },
-    { ACTION_TREE_STOP,   BUTTON_RC_PLAY|BUTTON_REPEAT,        BUTTON_RC_PLAY },
-    { ACTION_STD_CANCEL,  BUTTON_RC_REW|BUTTON_REPEAT,         BUTTON_NONE },
+static const struct button_mapping remote_button_context_yesno[]  = {
+    { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-};
+}; /* button_context_settings_yesno */
+
+static const struct button_mapping remote_button_context_quickscreen[]  = {
+    { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP,                 BUTTON_NONE },
+    { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_QS_DOWN,    BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_QS_DOWN,    BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_QS_LEFT,    BUTTON_RC_REW,                    BUTTON_NONE },
+    { ACTION_QS_LEFT,    BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_QS_RIGHT,   BUTTON_RC_FF,                     BUTTON_NONE },
+    { ACTION_QS_RIGHT,   BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_STD_CANCEL, BUTTON_RC_DSP|BUTTON_REL,         BUTTON_RC_DSP },
+
+    LAST_ITEM_IN_LIST
+}; /* remote_button_context_quickscreen */
+
+static const struct button_mapping remote_button_context_pitchscreen[]  = {
+    { ACTION_PS_INC_SMALL,      BUTTON_RC_VOL_UP,                 BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_PS_DEC_SMALL,      BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,        BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_RC_REW,                    BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_RC_REW|BUTTON_REL,         BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RC_FF,                     BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_FF|BUTTON_REL,          BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_RC_PLAY },
+    { ACTION_PS_TOGGLE_MODE,    BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_RC_PLAY },
+    { ACTION_PS_EXIT,           BUTTON_RC_DSP|BUTTON_REL,         BUTTON_RC_DSP },
+
+    LAST_ITEM_IN_LIST
+}; /* remote_button_context_pitchscreen */
+
+static const struct button_mapping remote_button_context_right_is_inc[]  = {
+    { ACTION_SETTINGS_INC,       BUTTON_RC_FF,                     BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,       BUTTON_RC_REW,                    BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_PREV,           BUTTON_RC_VOL_UP,                 BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,     BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_STD_NEXT,           BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,     BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_STD_OK,             BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_RC_PLAY },
+    { ACTION_STD_CANCEL,         BUTTON_RC_DSP|BUTTON_REL,         BUTTON_RC_DSP },
+
+    LAST_ITEM_IN_LIST
+}; /* remote_button_context_right_is_inc */
 
 static const struct button_mapping* get_context_mapping_remote( int context )
 {
-    context ^= CONTEXT_REMOTE;
+    context &= ~CONTEXT_REMOTE;
 
     switch (context)
     {
         case CONTEXT_WPS:
             return remote_button_context_wps;
+
         case CONTEXT_MAINMENU:
         case CONTEXT_TREE:
             return remote_button_context_tree;
+
+        case CONTEXT_SETTINGS_COLOURCHOOSER:
+        case CONTEXT_SETTINGS_EQ:
+        case CONTEXT_SETTINGS_RECTRIGGER:
+            return remote_button_context_right_is_inc;
+
+        case CONTEXT_SETTINGS_TIME:
+            return remote_button_context_time;
+
+        case CONTEXT_YESNOSCREEN:
+            return remote_button_context_yesno;
+
+        case CONTEXT_BOOKMARKSCREEN:
+            return remote_button_context_bmark;
+
+        case CONTEXT_QUICKSCREEN:
+            return remote_button_context_quickscreen;
+
+        case CONTEXT_PITCHSCREEN:
+            return remote_button_context_pitchscreen;
+
+        case CONTEXT_RECSCREEN:
+            return remote_button_context_recscreen;
+
+        case CONTEXT_KEYBOARD:
+            return ACTION_NONE; /* Any sensible mapping for this remote? */
+
+        case CONTEXT_FM:
+            return remote_button_context_radio;
+
+        default:
+            return remote_button_context_standard;
     }
-    return remote_button_context_standard;
 }
 
 const struct button_mapping* get_context_mapping(int context)
 {
-    if (context&CONTEXT_REMOTE)
+    if (context & CONTEXT_REMOTE)
         return get_context_mapping_remote(context);
 
     switch (context)
     {
-        case CONTEXT_STD:
-            return button_context_standard;
         case CONTEXT_WPS:
             return button_context_wps;
 
         case CONTEXT_LIST:
             return button_context_list;
+
         case CONTEXT_MAINMENU:
         case CONTEXT_TREE:
             if (global_settings.hold_lr_for_scroll_in_list)
                 return button_context_listtree_scroll_without_combo;
             else
                 return button_context_listtree_scroll_with_combo;
+
         case CONTEXT_CUSTOM|CONTEXT_TREE:
             return button_context_tree;
 
         case CONTEXT_SETTINGS:
             return button_context_settings;
+
         case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
             return button_context_settings_right_is_inc;
 
         case CONTEXT_SETTINGS_COLOURCHOOSER:
             return button_context_colorchooser;
+
         case CONTEXT_SETTINGS_EQ:
             return button_context_eq;
 
@@ -408,20 +551,29 @@ const struct button_mapping* get_context_mapping(int context)
 
         case CONTEXT_YESNOSCREEN:
             return button_context_yesno;
+
         case CONTEXT_BOOKMARKSCREEN:
             return button_context_bmark;
+
         case CONTEXT_QUICKSCREEN:
             return button_context_quickscreen;
+
         case CONTEXT_PITCHSCREEN:
             return button_context_pitchscreen;
+
         case CONTEXT_RECSCREEN:
             return button_context_recscreen;
+
         case CONTEXT_SETTINGS_RECTRIGGER:
             return button_context_settings_right_is_inc;
+
         case CONTEXT_KEYBOARD:
             return button_context_keyboard;
+
         case CONTEXT_FM:
             return button_context_radio;
+
+        default:
+            return button_context_standard;
     }
-    return button_context_standard;
 }
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 4ae1b1d894..e5745cda64 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -39,7 +39,8 @@ const struct button_mapping remote_directions[] =
     { PLA_RIGHT_REPEAT,      BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE},
 #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || \
       (CONFIG_KEYPAD == IRIVER_H10_PAD) || \
-      (CONFIG_KEYPAD == GIGABEAT_PAD)
+      (CONFIG_KEYPAD == GIGABEAT_PAD) || \
+      (CONFIG_KEYPAD == GIGABEAT_S_PAD)
     { PLA_UP,                BUTTON_RC_FF,                     BUTTON_NONE},
     { PLA_DOWN,              BUTTON_RC_REW,                    BUTTON_NONE},
     { PLA_LEFT,              BUTTON_RC_VOL_DOWN,               BUTTON_NONE},
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index f9f31fa88f..de667ec782 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -65,6 +65,13 @@ struct mpeg_settings settings;
 #define MPEG_START_TIME_SCROLL_UP   BUTTON_VOL_UP
 #define MPEG_START_TIME_EXIT        BUTTON_POWER
 
+#define MPEG_START_TIME_RC_SELECT      (BUTTON_RC_PLAY | BUTTON_REL)
+#define MPEG_START_TIME_RC_LEFT        BUTTON_RC_REW
+#define MPEG_START_TIME_RC_RIGHT       BUTTON_RC_FF
+#define MPEG_START_TIME_RC_UP          BUTTON_RC_VOL_UP
+#define MPEG_START_TIME_RC_DOWN        BUTTON_RC_VOL_DOWN
+#define MPEG_START_TIME_RC_EXIT        (BUTTON_RC_PLAY | BUTTON_REPEAT)
+
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
 #define MPEG_START_TIME_SELECT      BUTTON_PLAY
 #define MPEG_START_TIME_LEFT        BUTTON_LEFT
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 66c647ff00..6e8f9350f8 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -170,6 +170,13 @@ PLUGIN_IRAM_DECLARE
 #define MPEG_VOLUP2     BUTTON_VOL_UP
 #define MPEG_RW         BUTTON_UP
 #define MPEG_FF         BUTTON_DOWN
+#define MPEG_RC_MENU    BUTTON_RC_DSP
+#define MPEG_RC_STOP    (BUTTON_RC_PLAY | BUTTON_REPEAT)
+#define MPEG_RC_PAUSE   (BUTTON_RC_PLAY | BUTTON_REL)
+#define MPEG_RC_VOLDOWN BUTTON_RC_VOL_DOWN
+#define MPEG_RC_VOLUP   BUTTON_RC_VOL_UP
+#define MPEG_RC_RW      BUTTON_RC_REW
+#define MPEG_RC_FF      BUTTON_RC_FF
 
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
 #define MPEG_MENU       BUTTON_LEFT
diff --git a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c b/firmware/target/arm/imx31/gigabeat-s/button-imx31.c
index 9c35fb13da..d2a46f2c9f 100644
--- a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/button-imx31.c
@@ -55,8 +55,13 @@ static __attribute__((interrupt("IRQ"))) void KPP_HANDLER(void)
     };
 
     int col;
-    /* Power button is handled separately on PMIC */
+    /* Power button is handled separately on PMIC, remote read in headphone
+     * jack driver. */
+#ifdef HAVE_HEADPHONE_DETECTION
+    int button = int_btn & (BUTTON_POWER | BUTTON_REMOTE);
+#else
     int button = int_btn & BUTTON_POWER;
+#endif
 
     int oldlevel = disable_irq_save();
 
@@ -110,9 +115,9 @@ static __attribute__((interrupt("IRQ"))) void KPP_HANDLER(void)
     else
         KPP_KPSR |= KPP_KPSR_KDIE;
 
-    restore_irq(oldlevel);
-
     int_btn = button;
+
+    restore_irq(oldlevel);
 }
 
 bool button_hold(void)