When exiting the context menu with the menu button, call the main menu. Mainly useful on Ondio which can't have both main menu and context menu bound in wps. Holding MODE on Ondio will now bring up the wps context menu instead of the main menu.

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

1 files changed, 45 insertions, 45 deletions

diff --git a/apps/menu.h b/apps/menu.h
index 579de66aa0..9d682dad77 100644
--- a/apps/menu.h
+++ b/apps/menu.h
@@ -24,60 +24,60 @@
 
 /* button definitions */
 #if CONFIG_KEYPAD == IRIVER_H100_PAD
-#define MENU_NEXT   BUTTON_DOWN
-#define MENU_PREV   BUTTON_UP
-#define MENU_EXIT   BUTTON_LEFT
-#define MENU_EXIT2  BUTTON_OFF
-#define MENU_EXIT3  BUTTON_MODE
-#define MENU_ENTER  BUTTON_RIGHT
-#define MENU_ENTER2 BUTTON_SELECT
-
-#define MENU_RC_NEXT   BUTTON_RC_FF
-#define MENU_RC_PREV   BUTTON_RC_REW
-#define MENU_RC_EXIT   BUTTON_RC_STOP
-#define MENU_RC_ENTER  BUTTON_RC_ON
+#define MENU_NEXT       BUTTON_DOWN
+#define MENU_PREV       BUTTON_UP
+#define MENU_EXIT       BUTTON_LEFT
+#define MENU_EXIT2      BUTTON_OFF
+#define MENU_EXIT_MENU  BUTTON_MODE
+#define MENU_ENTER      BUTTON_RIGHT
+#define MENU_ENTER2     BUTTON_SELECT
+
+#define MENU_RC_NEXT    BUTTON_RC_FF
+#define MENU_RC_PREV    BUTTON_RC_REW
+#define MENU_RC_EXIT    BUTTON_RC_STOP
+#define MENU_RC_ENTER   BUTTON_RC_ON
 
 #elif CONFIG_KEYPAD == RECORDER_PAD
-#define MENU_NEXT   BUTTON_DOWN
-#define MENU_PREV   BUTTON_UP
-#define MENU_EXIT   BUTTON_LEFT
-#define MENU_EXIT2  BUTTON_OFF
-#define MENU_EXIT3  BUTTON_F1
-#define MENU_ENTER  BUTTON_RIGHT
-#define MENU_ENTER2 BUTTON_PLAY
-
-#define MENU_RC_NEXT   BUTTON_RC_RIGHT
-#define MENU_RC_PREV   BUTTON_RC_LEFT
-#define MENU_RC_EXIT   BUTTON_RC_STOP
-#define MENU_RC_ENTER  BUTTON_RC_PLAY
+#define MENU_NEXT       BUTTON_DOWN
+#define MENU_PREV       BUTTON_UP
+#define MENU_EXIT       BUTTON_LEFT
+#define MENU_EXIT2      BUTTON_OFF
+#define MENU_EXIT_MENU  BUTTON_F1
+#define MENU_ENTER      BUTTON_RIGHT
+#define MENU_ENTER2     BUTTON_PLAY
+
+#define MENU_RC_NEXT    BUTTON_RC_RIGHT
+#define MENU_RC_PREV    BUTTON_RC_LEFT
+#define MENU_RC_EXIT    BUTTON_RC_STOP
+#define MENU_RC_ENTER   BUTTON_RC_PLAY
 
 #elif CONFIG_KEYPAD == PLAYER_PAD
-#define MENU_NEXT  BUTTON_RIGHT
-#define MENU_PREV  BUTTON_LEFT
-#define MENU_EXIT  BUTTON_STOP
-#define MENU_EXIT2 BUTTON_MENU
-#define MENU_ENTER BUTTON_PLAY
+#define MENU_NEXT       BUTTON_RIGHT
+#define MENU_PREV       BUTTON_LEFT
+#define MENU_EXIT       BUTTON_STOP
+#define MENU_EXIT_MENU  BUTTON_MENU
+#define MENU_ENTER      BUTTON_PLAY
 
-#define MENU_RC_NEXT   BUTTON_RC_RIGHT
-#define MENU_RC_PREV   BUTTON_RC_LEFT
-#define MENU_RC_EXIT   BUTTON_RC_STOP
-#define MENU_RC_ENTER  BUTTON_RC_PLAY
+#define MENU_RC_NEXT    BUTTON_RC_RIGHT
+#define MENU_RC_PREV    BUTTON_RC_LEFT
+#define MENU_RC_EXIT    BUTTON_RC_STOP
+#define MENU_RC_ENTER   BUTTON_RC_PLAY
 
 #elif CONFIG_KEYPAD == ONDIO_PAD
-#define MENU_NEXT  BUTTON_DOWN
-#define MENU_PREV  BUTTON_UP
-#define MENU_EXIT  BUTTON_LEFT
-#define MENU_EXIT2 BUTTON_MENU
-#define MENU_ENTER BUTTON_RIGHT
+#define MENU_NEXT       BUTTON_DOWN
+#define MENU_PREV       BUTTON_UP
+#define MENU_EXIT       BUTTON_LEFT
+#define MENU_EXIT_MENU  BUTTON_MENU
+#define MENU_ENTER      BUTTON_RIGHT
 
 #elif CONFIG_KEYPAD == GMINI100_PAD
-#define MENU_NEXT  BUTTON_DOWN
-#define MENU_PREV  BUTTON_UP
-#define MENU_EXIT  BUTTON_LEFT
-#define MENU_EXIT2 BUTTON_OFF
-#define MENU_EXIT3 BUTTON_MENU
-#define MENU_ENTER BUTTON_RIGHT
-#define MENU_ENTER2 BUTTON_PLAY
+#define MENU_NEXT       BUTTON_DOWN
+#define MENU_PREV       BUTTON_UP
+#define MENU_EXIT       BUTTON_LEFT
+#define MENU_EXIT2      BUTTON_OFF
+#define MENU_EXIT_MENU  BUTTON_MENU
+#define MENU_ENTER      BUTTON_RIGHT
+#define MENU_ENTER2     BUTTON_PLAY
 
 #endif