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

1 files changed, 49 insertions, 39 deletions

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 */