M:Robe 500: Commit some minor changes and some keymap changes (short press power takes you out of the WPS)

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

1 files changed, 29 insertions, 32 deletions

diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c
index 73d20d8ae9..aa04461b64 100644
--- a/apps/keymaps/keymap-mr500.c
+++ b/apps/keymaps/keymap-mr500.c
@@ -36,31 +36,22 @@
  * Insert LAST_ITEM_IN_LIST at the end of each mapping
  */
 
-
-#define BUTTON_UP       BUTTON_RC_PLAY
-#define BUTTON_DOWN     BUTTON_RC_DOWN
-
-#define BUTTON_SELECT   BUTTON_RC_HEART
-#define BUTTON_MENU     BUTTON_RC_MODE
-#define BUTTON_VOL_DOWN BUTTON_RC_VOL_DOWN
-#define BUTTON_VOL_UP   BUTTON_RC_VOL_UP
-
 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_OK,          BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT },
-    { ACTION_STD_OK,          BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_STD_OK,          BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
-
-    { ACTION_STD_MENU,        BUTTON_MENU,                BUTTON_NONE },
-    { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_STD_CONTEXT,   BUTTON_SELECT|BUTTON_REPEAT,  BUTTON_SELECT },
-    { ACTION_STD_CANCEL,      BUTTON_POWER,               BUTTON_NONE },
-    { ACTION_STD_CANCEL,      BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,      BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_PREV,        BUTTON_RC_PLAY,                BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,  BUTTON_RC_PLAY|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_NEXT,        BUTTON_RC_DOWN,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,  BUTTON_RC_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+
+    { ACTION_STD_OK,          BUTTON_RC_HEART|BUTTON_REL,    BUTTON_RC_HEART },
+    { ACTION_STD_OK,          BUTTON_RC_FF,                  BUTTON_NONE },
+    { ACTION_STD_OK,          BUTTON_RC_FF|BUTTON_REPEAT,    BUTTON_RC_FF },
+
+    { ACTION_STD_MENU,        BUTTON_RC_MODE,                BUTTON_NONE },
+    { ACTION_STD_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_CONTEXT,     BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_RC_HEART },
+    { ACTION_STD_CANCEL,      BUTTON_POWER,                  BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_RC_REW,                 BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_RC_REW|BUTTON_REPEAT,   BUTTON_NONE },
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
 
@@ -73,19 +64,24 @@ static const struct button_mapping button_context_wps[]  = {
 
     { 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},
-
-    { ACTION_WPS_VOLDOWN,   BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,   BUTTON_RC_VOL_DOWN,                 BUTTON_NONE },
-    { ACTION_WPS_VOLUP,     BUTTON_RC_VOL_UP|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_WPS_VOLUP,     BUTTON_RC_VOL_UP,                   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},
+
+    { ACTION_WPS_VOLDOWN,   BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,   BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_WPS_VOLUP,     BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_WPS_VOLUP,     BUTTON_RC_VOL_UP,                 BUTTON_NONE },
 
     { ACTION_WPS_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT,   BUTTON_RC_MODE },
     { ACTION_WPS_MENU,        BUTTON_RC_MODE|BUTTON_REL,      BUTTON_RC_MODE },
+    { ACTION_WPS_MENU,        BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
     { ACTION_WPS_CONTEXT,     BUTTON_RC_HEART|BUTTON_REPEAT,  BUTTON_RC_HEART },
 
-    { ACTION_WPS_BROWSE,        BUTTON_RC_HEART|BUTTON_REL,     BUTTON_RC_HEART },
+    { ACTION_WPS_BROWSE,      BUTTON_RC_HEART|BUTTON_REL,     BUTTON_RC_HEART },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
@@ -244,3 +240,4 @@ const struct button_mapping* target_get_context_mapping(int context)
     }
     return button_context_standard;
 }
+