Changed the button action code to allow both single-fire and multi-fire events to be triggered with _REPEAT. Also simplifies the code. * Made the button mapping tables const to save RAM when running rockbox from flash ROM. * Repaired button mappings for Ondio. * Repaired some more button mappings for player. * Added missing TREE_STOP for iriver, and fixed WPS skipping for recorder.

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

7 files changed, 222 insertions, 210 deletions

diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index 7e11c27..557feea 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -42,11 +42,11 @@ CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions
 */
 
 
-struct button_mapping button_context_standard[]  = {
+const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_PREV,          BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
+    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_STD_NEXT,          BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
     
     { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_OFF,                 BUTTON_NONE },
@@ -60,21 +60,21 @@ struct button_mapping button_context_standard[]  = {
 }; /* button_context_standard */
 
 
-struct button_mapping button_context_wps[]  = {
+const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,          BUTTON_ON|BUTTON_REL,           BUTTON_ON },
     { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
     { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
-    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
-    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
+    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
     { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
     { ACTION_WPS_NEXTDIR,       BUTTON_ON|BUTTON_RIGHT,         BUTTON_ON },
     { ACTION_WPS_PREVDIR,       BUTTON_ON|BUTTON_LEFT,          BUTTON_ON },
     { ACTION_WPS_STOP,          BUTTON_OFF,                     BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REL,         BUTTON_DOWN },
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
+    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REL,           BUTTON_UP },
-    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },
+    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_WPS_PITCHSCREEN,   BUTTON_ON|BUTTON_REPEAT,        BUTTON_ON },
     { ACTION_WPS_QUICKSCREEN,   BUTTON_MODE|BUTTON_REPEAT,      BUTTON_MODE },
     { ACTION_WPS_MENU,          BUTTON_MODE|BUTTON_REL,         BUTTON_MODE },
@@ -85,91 +85,93 @@ struct button_mapping button_context_wps[]  = {
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
    
-struct button_mapping button_context_listtree[]  = {
+const struct button_mapping button_context_listtree[]  = {
     { ACTION_LISTTREE_PGUP,         BUTTON_ON|BUTTON_UP,                    BUTTON_ON },
     { ACTION_LISTTREE_PGUP,         BUTTON_UP|BUTTON_REL,                   BUTTON_ON|BUTTON_UP },
-    { ACTION_LISTTREE_PGUP,         BUTTON_ON|BUTTON_UP|BUTTON_REPEAT,      BUTTON_ON|BUTTON_UP },
+    { ACTION_LISTTREE_PGUP,         BUTTON_ON|BUTTON_UP|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_LISTTREE_PGDOWN,       BUTTON_ON|BUTTON_DOWN,                  BUTTON_ON|BUTTON_UP },
     { ACTION_LISTTREE_PGDOWN,       BUTTON_DOWN|BUTTON_REL,                 BUTTON_ON|BUTTON_DOWN },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_ON|BUTTON_DOWN|BUTTON_REPEAT,    BUTTON_ON|BUTTON_DOWN },  
+    { ACTION_LISTTREE_PGDOWN,       BUTTON_ON|BUTTON_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
     LAST_ITEM_IN_LIST
 }; /* button_context_listtree */
 
-struct button_mapping button_context_tree[]  = {
+const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,          BUTTON_ON|BUTTON_REL,                   BUTTON_ON },   
+    { ACTION_TREE_STOP,   BUTTON_OFF,                   BUTTON_NONE },
+
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_listtree */
 
-struct button_mapping button_context_listtree_scroll_with_combo[]  = {
+const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
     { ACTION_NONE,              BUTTON_ON,                              BUTTON_NONE }, 
     { ACTION_TREE_PGLEFT,       BUTTON_ON|BUTTON_LEFT,                  BUTTON_ON },
     { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,                 BUTTON_ON|BUTTON_LEFT },
     { ACTION_TREE_PGLEFT,       BUTTON_ON|BUTTON_LEFT,                  BUTTON_LEFT|BUTTON_REL },
-    { ACTION_TREE_PGLEFT,       BUTTON_ON|BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_ON|BUTTON_LEFT },
+    { ACTION_TREE_PGLEFT,       BUTTON_ON|BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_TREE_PGRIGHT,      BUTTON_ON|BUTTON_RIGHT,                 BUTTON_ON },
     { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,                BUTTON_ON|BUTTON_RIGHT },
     { ACTION_TREE_PGRIGHT,      BUTTON_ON|BUTTON_RIGHT,                 BUTTON_RIGHT|BUTTON_REL },
-    { ACTION_TREE_PGRIGHT,      BUTTON_ON|BUTTON_RIGHT|BUTTON_REPEAT,   BUTTON_ON|BUTTON_RIGHT },
+    { ACTION_TREE_PGRIGHT,      BUTTON_ON|BUTTON_RIGHT|BUTTON_REPEAT,   BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1),
 };
 
-struct button_mapping button_context_listtree_scroll_without_combo[]  = {
+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_PGLEFT,       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_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|1),
 };
 
-struct button_mapping button_context_settings[]  = {
+const struct button_mapping button_context_settings[]  = {
     { ACTION_SETTINGS_INC,          BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_NONE,                  BUTTON_LEFT,                    BUTTON_NONE },
     { ACTION_NONE,                  BUTTON_RIGHT,                   BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_settings */
 
-struct button_mapping button_context_settingsgraphical[]  = {
+const struct button_mapping button_context_settingsgraphical[]  = {
     { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
+    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
+    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_settingsgraphical */
 
-struct button_mapping button_context_yesno[]  = {
+const struct button_mapping button_context_yesno[]  = {
     { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,                  BUTTON_NONE },
     { ACTION_YESNO_ACCEPT,          BUTTON_RC_ON,                   BUTTON_NONE },
     LAST_ITEM_IN_LIST
 }; /* button_context_settings_yesno */
 
-struct button_mapping button_context_bmark[]  = {
+const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMARK_DELETE,      BUTTON_REC,    BUTTON_NONE },
     { ACTION_STD_OK,            BUTTON_SELECT,   BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL),
 }; /* button_context_settings_bmark */
 
-struct button_mapping button_context_quickscreen[]  = {
+const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },
+    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
+    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
+    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
+    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_STD_CANCEL,    BUTTON_MODE,                    BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
@@ -180,11 +182,11 @@ struct button_mapping button_context_quickscreen[]  = {
  
  
 /*********   H100 LCD remote ******/
-struct button_mapping button_context_standard_h100lcdremote[]  = {
+const struct button_mapping button_context_standard_h100lcdremote[]  = {
     { ACTION_STD_PREV,          BUTTON_RC_REW,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,    BUTTON_RC_REW|BUTTON_REPEAT,    BUTTON_RC_REW },
+    { 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_RC_FF },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_RC_FF|BUTTON_REPEAT,     BUTTON_NONE },
     
     { ACTION_STD_OK,            BUTTON_RC_ON|BUTTON_REL,        BUTTON_RC_ON },
     { ACTION_STD_CONTEXT,       BUTTON_RC_MENU|BUTTON_REPEAT,   BUTTON_RC_MENU },
@@ -196,17 +198,17 @@ struct button_mapping button_context_standard_h100lcdremote[]  = {
     LAST_ITEM_IN_LIST
 }; /* button_context_standard_h100lcdremote */
 
-struct button_mapping button_context_wps_h100lcdremote[]  = {
+const struct button_mapping button_context_wps_h100lcdremote[]  = {
     { ACTION_WPS_PLAY,              BUTTON_RC_ON|BUTTON_REL,            BUTTON_RC_ON },
     { ACTION_WPS_SKIPNEXT,          BUTTON_RC_FF|BUTTON_REL,            BUTTON_RC_FF },
-    { ACTION_WPS_SEEKFWD,           BUTTON_RC_FF|BUTTON_REPEAT,         BUTTON_RC_FF },
+    { ACTION_WPS_SEEKFWD,           BUTTON_RC_FF|BUTTON_REPEAT,         BUTTON_NONE },
     { ACTION_WPS_SKIPPREV,          BUTTON_RC_REW|BUTTON_REL,           BUTTON_RC_REW },
-    { ACTION_WPS_SEEKBACK,          BUTTON_RC_REW|BUTTON_REPEAT,        BUTTON_RC_REW },
+    { ACTION_WPS_SEEKBACK,          BUTTON_RC_REW|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_WPS_STOP,              BUTTON_RC_STOP,                     BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,           BUTTON_RC_VOL_DOWN,                 BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,           BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,   BUTTON_RC_VOL_DOWN },
+    { 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_RC_VOL_UP },
+    { ACTION_WPS_VOLUP,             BUTTON_RC_VOL_UP|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_WPS_NEXTDIR,           BUTTON_RC_BITRATE,                  BUTTON_NONE },
     { ACTION_WPS_PREVDIR,           BUTTON_RC_SOURCE,                   BUTTON_NONE },
     { ACTION_WPS_PITCHSCREEN,       BUTTON_RC_ON|BUTTON_REPEAT,         BUTTON_RC_ON },
@@ -218,31 +220,31 @@ struct button_mapping button_context_wps_h100lcdremote[]  = {
     LAST_ITEM_IN_LIST
 }; /* button_context_wps_h100lcdremote */
 
-struct button_mapping button_context_listtree_h100lcdremote[]  = {
+const struct button_mapping button_context_listtree_h100lcdremote[]  = {
     { ACTION_LISTTREE_PGUP,     BUTTON_RC_SOURCE,                    BUTTON_NONE },
-    { ACTION_LISTTREE_PGUP,     BUTTON_RC_SOURCE|BUTTON_REPEAT,      BUTTON_RC_SOURCE },
+    { ACTION_LISTTREE_PGUP,     BUTTON_RC_SOURCE|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_LISTTREE_PGDOWN,   BUTTON_RC_BITRATE,                   BUTTON_NONE },
-    { ACTION_LISTTREE_PGDOWN,   BUTTON_RC_BITRATE|BUTTON_REPEAT,     BUTTON_RC_BITRATE },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_RC_BITRATE|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_TREE_WPS,      BUTTON_RC_ON|BUTTON_REL,             BUTTON_RC_ON },
     { ACTION_TREE_STOP,     BUTTON_RC_STOP,                      BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_listtree_h100lcdremote */
 /* Not needed? _std_ actions seem to be fine */
-struct button_mapping button_context_settings_h100lcdremote[]  = { 
+const struct button_mapping button_context_settings_h100lcdremote[]  = { 
     LAST_ITEM_IN_LIST
 };/*  button_context_settings_h100lcdremote */
 
 
 /*********   H300 LCD remote ******/
-struct button_mapping button_context_standard_h300lcdremote[]  = {
+const struct button_mapping button_context_standard_h300lcdremote[]  = {
     { ACTION_STD_PREV,          BUTTON_RC_VOL_UP,                   BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,    BUTTON_RC_VOL_UP|BUTTON_REPEAT,     BUTTON_RC_VOL_UP },
+    { 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_RC_VOL_DOWN },    
+    { ACTION_STD_NEXTREPEAT,    BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_STD_OK,            BUTTON_RC_ON|BUTTON_REL,            BUTTON_RC_ON },
     { ACTION_STD_CANCEL,        BUTTON_RC_REW,                      BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_RC_REW|BUTTON_REPEAT,        BUTTON_RC_REW },
+    { ACTION_STD_CANCEL,        BUTTON_RC_REW|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_STD_CONTEXT,       BUTTON_RC_MENU|BUTTON_REPEAT,       BUTTON_RC_MENU },
     { ACTION_STD_CANCEL,        BUTTON_RC_STOP,                     BUTTON_NONE },
     { ACTION_STD_QUICKSCREEN,   BUTTON_RC_MODE|BUTTON_REPEAT,       BUTTON_RC_MODE },
@@ -256,15 +258,15 @@ struct button_mapping button_context_standard_h300lcdremote[]  = {
 }; /* button_context_standard */
 
 /* the mapping of the 2 LCD remotes in the WPS screen should be the same */
-struct button_mapping *button_context_wps_h300lcdremote =
+const struct button_mapping *button_context_wps_h300lcdremote =
                                 button_context_wps_h100lcdremote;
 
 /* FIXME: the same as h100 ?? */
-struct button_mapping *button_context_listtree_h300lcdremote  = 
+const struct button_mapping *button_context_listtree_h300lcdremote  = 
                                 button_context_listtree_h100lcdremote;
 /* FIXME: the same as h100 ?? */
 
-struct button_mapping *button_context_settings_h300lcdremote  = 
+const struct button_mapping *button_context_settings_h300lcdremote  = 
                                 button_context_settings_h100lcdremote; 
 /* FIXME: non lcd remotes need mappings.. ?? */
 
@@ -274,7 +276,7 @@ struct button_mapping *button_context_settings_h300lcdremote  =
 
 
 /* the actual used tables */
-static struct button_mapping 
+static const struct button_mapping 
         *remote_button_context_std = button_context_standard_h100lcdremote, 
         *remote_button_context_wps = button_context_wps_h100lcdremote,
         *remote_button_context_listtree = button_context_listtree_h100lcdremote,
@@ -320,7 +322,7 @@ static void remap_remote(void)
 
 
 
-struct button_mapping* get_context_mapping_remote(int context)
+const struct button_mapping* get_context_mapping_remote(int context)
 {
     if(remote_type() != _remote_type)
         remap_remote();
@@ -347,7 +349,7 @@ struct button_mapping* get_context_mapping_remote(int context)
     return remote_button_context_std;
 }
 
-struct button_mapping* get_context_mapping(int context)
+const struct button_mapping* get_context_mapping(int context)
 {
     if (context&CONTEXT_REMOTE)
         return get_context_mapping_remote(context);
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 4faf40d..2beb428 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -37,11 +37,11 @@ CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions)
 
 */
 
-struct button_mapping button_context_standard[]  = {
+const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_PREV,          BUTTON_SCROLL_BACK,                 BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,    BUTTON_SCROLL_BACK|BUTTON_REPEAT,   BUTTON_SCROLL_BACK },
+    { ACTION_STD_PREVREPEAT,    BUTTON_SCROLL_BACK|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_STD_NEXT,          BUTTON_SCROLL_FWD,                  BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,    BUTTON_SCROLL_FWD|BUTTON_REPEAT,    BUTTON_SCROLL_FWD },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_SCROLL_FWD|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_LEFT,                        BUTTON_NONE },
     { ACTION_STD_OK,            BUTTON_RIGHT,                       BUTTON_NONE },
 
@@ -53,38 +53,38 @@ struct button_mapping button_context_standard[]  = {
 
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
-struct button_mapping button_context_tree[]  = {
+const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,          BUTTON_PLAY|BUTTON_REL,      BUTTON_PLAY },
     { ACTION_TREE_STOP,         BUTTON_PLAY|BUTTON_REPEAT,   BUTTON_PLAY },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_tree */
 
-struct button_mapping button_context_tree_scroll_lr[]  = {
+const struct button_mapping button_context_tree_scroll_lr[]  = {
     { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       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_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|1),
 };
 
-struct button_mapping button_context_wps[]  = {
+const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,      BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
     { ACTION_WPS_STOP,      BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
     { ACTION_WPS_SKIPPREV,  BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
-    { ACTION_WPS_SEEKBACK,  BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
+    { ACTION_WPS_SEEKBACK,  BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_WPS_STOPSEEK,  BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
     { ACTION_WPS_SKIPNEXT,  BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
-    { ACTION_WPS_SEEKFWD,   BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
+    { ACTION_WPS_SEEKFWD,   BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_WPS_STOPSEEK,  BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
     { ACTION_WPS_VOLDOWN,   BUTTON_SCROLL_BACK,                 BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,   BUTTON_SCROLL_BACK|BUTTON_REPEAT,   BUTTON_SCROLL_BACK },
+    { ACTION_WPS_VOLDOWN,   BUTTON_SCROLL_BACK|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_WPS_VOLUP,     BUTTON_SCROLL_FWD,                  BUTTON_NONE },
-    { ACTION_WPS_VOLUP,     BUTTON_SCROLL_FWD|BUTTON_REPEAT,    BUTTON_SCROLL_FWD },
+    { ACTION_WPS_VOLUP,     BUTTON_SCROLL_FWD|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_WPS_BROWSE,    BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT },
     { ACTION_WPS_CONTEXT,   BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_SELECT },
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
@@ -93,44 +93,44 @@ struct button_mapping button_context_wps[]  = {
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
 
-struct button_mapping button_context_settings[]  = {
+const struct button_mapping button_context_settings[]  = {
     { ACTION_SETTINGS_INC,          BUTTON_SCROLL_FWD,         BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_SCROLL_FWD|BUTTON_REPEAT,  BUTTON_SCROLL_FWD },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_SCROLL_FWD|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_SETTINGS_DEC,          BUTTON_SCROLL_BACK,          BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_SCROLL_BACK|BUTTON_REPEAT,  BUTTON_SCROLL_BACK },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_SCROLL_BACK|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_STD_PREV,              BUTTON_LEFT,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_LEFT },
+    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_STD_NEXT,              BUTTON_RIGHT,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_RIGHT },
+    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_STD_CANCEL,            BUTTON_MENU|BUTTON_REL,      BUTTON_MENU }, /* rel so bmark screen works */
     
     LAST_ITEM_IN_LIST
 }; /* button_context_settings */
 
-struct button_mapping button_context_yesno[]  = {
+const struct button_mapping button_context_yesno[]  = {
     { ACTION_YESNO_ACCEPT,          BUTTON_PLAY,                  BUTTON_NONE },
     LAST_ITEM_IN_LIST
 }; /* button_context_settings_yesno */
 
-struct button_mapping button_context_bmark[]  = {
+const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMARK_DELETE,          BUTTON_MENU|BUTTON_REPEAT,       BUTTON_MENU },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
 }; /* button_context_settings_bmark */
 
-struct button_mapping button_context_quickscreen[]  = {
+const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_DOWN,       BUTTON_PLAY,                    BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
+    { ACTION_QS_DOWN,       BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
+    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
+    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_quickscreen */
 
 /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
-struct button_mapping* get_context_mapping(int context)
+const struct button_mapping* get_context_mapping(int context)
 {
     switch (context)
     {
diff --git a/apps/keymaps/keymap-newtarget.c b/apps/keymaps/keymap-newtarget.c
index 3cd828c..ab1e157 100644
--- a/apps/keymaps/keymap-newtarget.c
+++ b/apps/keymaps/keymap-newtarget.c
@@ -42,12 +42,12 @@
  * if there's no need to check the previous button's value, use BUTTON_NONE
  * Insert LAST_ITEM_IN_LIST at the end of each mapping 
  */
-struct button_mapping button_context_standard[]  = {
+const struct button_mapping button_context_standard[]  = {
 
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
 
-struct button_mapping button_context_wps[]  = {
+const struct button_mapping button_context_wps[]  = {
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
@@ -55,7 +55,7 @@ struct button_mapping button_context_wps[]  = {
 
 
 /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
-struct button_mapping* get_context_mapping(int context)
+const struct button_mapping* get_context_mapping(int context)
 {
     switch (context)
     {
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index 2ad86c8..a82d6eb 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -18,8 +18,6 @@
 
 /* *
  * Button Code Definitions for archos ondio fm/sp targets
- *
- * \TODO test!
  */
 
 #include "config.h"
@@ -34,77 +32,86 @@ CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions)
 
 */
 
-struct button_mapping button_context_standard[]  = {
+const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_PREV,       BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
+    { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_STD_NEXT,       BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
+    { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
 
-    { ACTION_STD_CONTEXT,    BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },    
+    { ACTION_STD_CONTEXT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
     { ACTION_STD_CANCEL,     BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_STD_OK,         BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
-    { ACTION_STD_MENU,       BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
+    { ACTION_STD_MENU,       BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },
     { ACTION_STD_CANCEL,     BUTTON_OFF,                 BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,      BUTTON_OFF|BUTTON_REL,       BUTTON_OFF },
-    { ACTION_WPS_SKIPNEXT,  BUTTON_RIGHT,                BUTTON_NONE },
-    { ACTION_WPS_SKIPPREV,  BUTTON_LEFT,                 BUTTON_NONE },
-    { ACTION_WPS_SEEKBACK,  BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_LEFT },
-    { ACTION_WPS_SEEKFWD,   BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_RIGHT },
-    { ACTION_WPS_STOPSEEK,  BUTTON_LEFT|BUTTON_REL,      BUTTON_LEFT|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,  BUTTON_RIGHT|BUTTON_REL,     BUTTON_RIGHT|BUTTON_REPEAT },
-    { ACTION_WPS_STOP,      BUTTON_OFF|BUTTON_REPEAT,    BUTTON_OFF },
-    { ACTION_WPS_VOLDOWN,   BUTTON_DOWN,                 BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,   BUTTON_DOWN|BUTTON_REPEAT,   BUTTON_DOWN },
-    { ACTION_WPS_VOLUP,     BUTTON_UP,                   BUTTON_NONE },
-    { ACTION_WPS_VOLUP,     BUTTON_UP|BUTTON_REPEAT,     BUTTON_UP },
-    { ACTION_WPS_BROWSE,    BUTTON_MENU|BUTTON_REL,      BUTTON_MENU },
-    { ACTION_WPS_MENU,      BUTTON_MENU|BUTTON_REPEAT,   BUTTON_MENU },
-    { ACTION_WPS_CONTEXT,   BUTTON_MENU|BUTTON_OFF,      BUTTON_MENU }, /* this may trigger ACTION_WPS_BROWSE so may need changing */
+const struct button_mapping button_context_wps[]  = {
+    { ACTION_WPS_PLAY,       BUTTON_OFF|BUTTON_REL,      BUTTON_OFF },
+    { ACTION_WPS_SKIPNEXT,   BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
+    { ACTION_WPS_SKIPPREV,   BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
+    { ACTION_WPS_SEEKBACK,   BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,   BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,   BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },
+    { ACTION_WPS_STOP,       BUTTON_OFF|BUTTON_REPEAT,   BUTTON_OFF },
+    { ACTION_WPS_VOLDOWN,    BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_WPS_VOLUP,      BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_WPS_VOLUP,      BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_WPS_BROWSE,     BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
+    { ACTION_WPS_CONTEXT,    BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },
+ /* { ACTION_WPS_MENU,       BUTTON_NONE,                BUTTON_NONE }, we can't have that */
 
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_settings[] = {
+const struct button_mapping button_context_settings[] = {
     { ACTION_SETTINGS_INC,          BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
-    { ACTION_STD_NEXT,              BUTTON_MENU,                BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_STD_OK,                BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_STD_CANCEL,            BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_STD_OK,                BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_STD_CANCEL,            BUTTON_MENU,                BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 };
-struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_OFF|BUTTON_REL,        BUTTON_OFF },
-    { ACTION_TREE_STOP,   BUTTON_OFF|BUTTON_REPEAT,     BUTTON_OFF },
+const struct button_mapping button_context_tree[]  = {
+    { ACTION_TREE_WPS,    BUTTON_MENU|BUTTON_REL,       BUTTON_MENU },
+    { ACTION_TREE_STOP,   BUTTON_OFF,                   BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_listtree */
-struct button_mapping button_context_tree_scroll_lr[]  = {
+const struct button_mapping button_context_tree_scroll_lr[]  = {
     { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       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_RIGHT },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },    
+    { 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|1),
 };
 
-struct button_mapping button_context_yesno[] = {
-    { ACTION_YESNO_ACCEPT,     BUTTON_RIGHT,    BUTTON_NONE },
+const struct button_mapping button_context_yesno[] = {
+    { ACTION_YESNO_ACCEPT,      BUTTON_RIGHT,    BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; 
 
-struct button_mapping* get_context_mapping( int context )
+struct button_mapping button_context_bmark[]  = {
+    { ACTION_NONE,              BUTTON_LEFT,                 BUTTON_NONE },
+    { ACTION_BMARK_DELETE,      BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_LEFT },
+    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,      BUTTON_LEFT },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
+}; /* button_context_settings_bmark */
+
+const struct button_mapping* get_context_mapping( int context )
 {
     switch( context )
     {
@@ -120,7 +127,10 @@ struct button_mapping* get_context_mapping( int context )
         case CONTEXT_YESNOSCREEN:
             return button_context_yesno;
             
-        case CONTEXT_TREE:
+        case CONTEXT_BOOKMARKSCREEN:
+            return button_context_bmark;
+
+        case CONTEXT_TREE:     
             if (global_settings.hold_lr_for_scroll_in_list)
                 return button_context_tree_scroll_lr;
             /* else fall through to CUSTOM|1 */
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index b03dc39..eecd9b9 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -25,65 +25,65 @@
 #include "action.h"
 #include "button.h"
 
-struct button_mapping button_context_standard[]  = {
+const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_PREV,       BUTTON_LEFT,                 BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_LEFT },
+    { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_STD_NEXT,       BUTTON_RIGHT,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_RIGHT },
+    { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_NONE },
 
-    { ACTION_STD_CONTEXT,    BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },    
-    { ACTION_STD_CANCEL,     BUTTON_STOP,                BUTTON_NONE },
-    { ACTION_STD_OK,         BUTTON_PLAY,               BUTTON_NONE },
-    { ACTION_STD_MENU,       BUTTON_MENU|BUTTON_REL,    BUTTON_MENU },
+    { ACTION_STD_CONTEXT,    BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
+    { ACTION_STD_CANCEL,     BUTTON_STOP,               BUTTON_NONE },
+    { ACTION_STD_OK,         BUTTON_PLAY|BUTTON_REL,    BUTTON_PLAY },
+    { ACTION_STD_MENU,       BUTTON_MENU,               BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_wps[]  = {
+const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,      BUTTON_PLAY,                BUTTON_NONE },
-    { ACTION_WPS_SKIPNEXT,  BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_WPS_SKIPPREV,  BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_WPS_SEEKBACK,  BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
-    { ACTION_WPS_SEEKFWD,   BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
+    { ACTION_WPS_SKIPNEXT,  BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
+    { ACTION_WPS_SKIPPREV,  BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
+    { ACTION_WPS_SEEKBACK,  BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,   BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_WPS_STOPSEEK,  BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT|BUTTON_REPEAT },
     { ACTION_WPS_STOPSEEK,  BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },
     { ACTION_WPS_STOP,      BUTTON_STOP,                BUTTON_NONE },
     
     { ACTION_WPS_VOLDOWN,   BUTTON_MENU|BUTTON_LEFT,    BUTTON_MENU },
-    { ACTION_WPS_VOLDOWN,   BUTTON_MENU|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_MENU|BUTTON_LEFT },
+    { ACTION_WPS_VOLDOWN,   BUTTON_MENU|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_WPS_VOLUP,     BUTTON_MENU|BUTTON_RIGHT,   BUTTON_MENU },
-    { ACTION_WPS_VOLUP,     BUTTON_MENU|BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_MENU|BUTTON_RIGHT },
+    { ACTION_WPS_VOLUP,     BUTTON_MENU|BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_NONE },
     
-    { ACTION_WPS_BROWSE,    BUTTON_ON|BUTTON_REL,     BUTTON_ON },
-    { ACTION_WPS_MENU,      BUTTON_MENU|BUTTON_REL,   BUTTON_MENU },
-    { ACTION_WPS_CONTEXT,   BUTTON_ON|BUTTON_REPEAT,  BUTTON_ON },
-    { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON,    BUTTON_MENU },
+    { ACTION_WPS_BROWSE,    BUTTON_ON|BUTTON_REL,       BUTTON_ON },
+    { ACTION_WPS_MENU,      BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
+    { ACTION_WPS_CONTEXT,   BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_PLAY },
+    { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON,      BUTTON_NONE },
     
 
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_settings[] = {
+const struct button_mapping button_context_settings[] = {
     { ACTION_SETTINGS_INC,          BUTTON_LEFT,                  BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_LEFT },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_SETTINGS_DEC,          BUTTON_RIGHT,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_RIGHT },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_ON|BUTTON_REL,     BUTTON_NONE },
+const struct button_mapping button_context_tree[]  = {
+    { ACTION_TREE_WPS,      BUTTON_ON,     BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_listtree */
 
-struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,  BUTTON_PLAY,      BUTTON_NONE },
+const struct button_mapping button_context_yesno[]  = {
+    { ACTION_YESNO_ACCEPT,  BUTTON_PLAY,   BUTTON_NONE },
     LAST_ITEM_IN_LIST
 }; /* button_context_settings_yesno */
 
-struct button_mapping* get_context_mapping( int context )
+const struct button_mapping* get_context_mapping( int context )
 {
     switch( context )
     {
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index feeda35..a282869 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -34,40 +34,40 @@ CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions)
 
 */
 
-struct button_mapping button_context_standard[]  = {
-    { ACTION_STD_PREV,       BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
-    { ACTION_STD_NEXT,       BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
-
-    { ACTION_STD_OK,     BUTTON_ON,                  BUTTON_NONE },
-    { ACTION_STD_OK,     BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_STD_OK,     BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
-
-    { ACTION_STD_OK,     BUTTON_PLAY|BUTTON_REL,     BUTTON_PLAY },
-    { ACTION_STD_MENU,       BUTTON_F1,                  BUTTON_NONE },
-    { ACTION_STD_QUICKSCREEN,   BUTTON_F2,                  BUTTON_NONE }, 
-    { ACTION_STD_CONTEXT,    BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_PLAY },
-    { ACTION_STD_CANCEL,       BUTTON_OFF,                 BUTTON_NONE },
-    { ACTION_STD_CANCEL,     BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,     BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
+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_OK,          BUTTON_ON,                  BUTTON_NONE },
+    { ACTION_STD_OK,          BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_STD_OK,          BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
+
+    { ACTION_STD_OK,          BUTTON_PLAY|BUTTON_REL,     BUTTON_PLAY },
+    { ACTION_STD_MENU,        BUTTON_F1,                  BUTTON_NONE },
+    { ACTION_STD_QUICKSCREEN, BUTTON_F2,                  BUTTON_NONE },
+    { ACTION_STD_CONTEXT,     BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_PLAY },
+    { ACTION_STD_CANCEL,      BUTTON_OFF,                 BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_wps[]  = {
+const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,        BUTTON_PLAY,                BUTTON_NONE },
-    { ACTION_WPS_SKIPNEXT,    BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_WPS_SKIPPREV,    BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_WPS_SEEKBACK,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
-    { ACTION_WPS_SEEKFWD,     BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
-    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,         BUTTON_RIGHT|BUTTON_REPEAT },
+    { ACTION_WPS_SKIPNEXT,    BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
+    { ACTION_WPS_SKIPPREV,    BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
+    { ACTION_WPS_SEEKBACK,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,     BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,    BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,    BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },
     { ACTION_WPS_STOP,        BUTTON_OFF,                 BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,     BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,     BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
+    { ACTION_WPS_VOLDOWN,     BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_WPS_VOLUP,       BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_WPS_VOLUP,       BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
+    { ACTION_WPS_VOLUP,       BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_WPS_MENU,        BUTTON_F1,                  BUTTON_NONE },
     { ACTION_WPS_CONTEXT,     BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_PLAY },
     { ACTION_WPS_QUICKSCREEN, BUTTON_F2,                  BUTTON_NONE },
@@ -79,53 +79,53 @@ struct button_mapping button_context_wps[]  = {
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_settings[] = {
+const struct button_mapping button_context_settings[] = {
     { ACTION_SETTINGS_INC,          BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_tree[]  = {
+const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,     BUTTON_PLAY,    BUTTON_NONE },
     { ACTION_TREE_STOP,    BUTTON_OFF,     BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_listtree */
-struct button_mapping button_context_tree_scroll_lr[]  = {
+const struct button_mapping button_context_tree_scroll_lr[]  = {
     { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       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_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|1),
 };
 
-struct button_mapping button_context_yesno[] = {
+const struct button_mapping button_context_yesno[] = {
     { ACTION_YESNO_ACCEPT,     BUTTON_PLAY,    BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; 
-struct button_mapping button_context_quickscreen[]  = {
+const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },
+    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
+    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
+    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
+    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_STD_CANCEL,    BUTTON_PLAY,                    BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_quickscreen */
 
-struct button_mapping* get_context_mapping( int context )
+const struct button_mapping* get_context_mapping( int context )
 {
     switch( context )
     {
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index 666ce78..61e20f9 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -34,11 +34,11 @@ CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions)
 
 */
 
-struct button_mapping button_context_standard[]  = {
-    { ACTION_STD_PREV,       BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
-    { ACTION_STD_NEXT,       BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
+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_CONTEXT,    BUTTON_SELECT|BUTTON_REPEAT,   BUTTON_SELECT },    
     { ACTION_STD_CANCEL,     BUTTON_LEFT,                   BUTTON_NONE },
@@ -52,20 +52,20 @@ struct button_mapping button_context_standard[]  = {
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_wps[]  = {
+const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,      BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
     { ACTION_WPS_STOP,      BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
     { ACTION_WPS_SKIPPREV,  BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
-    { ACTION_WPS_SEEKBACK,  BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
+    { ACTION_WPS_SEEKBACK,  BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_WPS_STOPSEEK,  BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
     { ACTION_WPS_SKIPNEXT,  BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
-    { ACTION_WPS_SEEKFWD,   BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
+    { ACTION_WPS_SEEKFWD,   BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_WPS_STOPSEEK,  BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
     
     { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
+    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },
+    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
     
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
@@ -76,7 +76,7 @@ struct button_mapping button_context_wps[]  = {
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_settings[] = {
+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 },
@@ -86,45 +86,45 @@ struct button_mapping button_context_settings[] = {
 
     LAST_ITEM_IN_LIST
 };
-struct button_mapping button_context_tree[]  = {
+const struct button_mapping button_context_tree[]  = {
     { ACTION_NONE,        BUTTON_PLAY,                BUTTON_NONE },
     { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,     BUTTON_PLAY },
     { ACTION_TREE_STOP,   BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_PLAY },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_listtree */
-struct button_mapping button_context_tree_scroll_lr[]  = {
+const struct button_mapping button_context_tree_scroll_lr[]  = {
     { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       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_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|1),
 };
 
-struct button_mapping button_context_yesno[]  = {
+const struct button_mapping button_context_yesno[]  = {
     { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,              BUTTON_NONE },
     LAST_ITEM_IN_LIST
 }; /* button_context_settings_yesno */
 
-struct button_mapping button_context_quickscreen[]  = {
+const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },
+    { ACTION_QS_DOWNINV,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
+    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
+    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
-    { ACTION_STD_CANCEL,    BUTTON_REC,                    BUTTON_NONE },
+    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_STD_CANCEL,    BUTTON_REC,                     BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_quickscreen */
 
-struct button_mapping* get_context_mapping( int context )
+const struct button_mapping* get_context_mapping( int context )
 {
     switch( context )
     {