1 files changed, 141 insertions, 68 deletions

diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c
index 16b29e5115..c8bf9d771d 100644
--- a/apps/keymaps/keymap-yh8xx_yh9xx.c
+++ b/apps/keymaps/keymap-yh8xx_yh9xx.c
@@ -40,15 +40,15 @@
 
 CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
 CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens
-                                  i.e where up/down is inc/dec
-               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec
+                                  i.e where l/r is inc/dec
+               CONTEXT_SETTINGS = l/r is prev/next, up/down is inc/dec
 
 */
 
 
 static const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,       BUTTON_RIGHT },
-    { ACTION_STD_CANCEL,        BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
     { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_STD_PREV,          BUTTON_UP,                      BUTTON_NONE },
     { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
@@ -59,8 +59,12 @@ static const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_QUICKSCREEN,   BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT,
                                 BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT },
     { ACTION_STD_MENU,          BUTTON_LEFT|BUTTON_UP|BUTTON_REPEAT,
-                                BUTTON_LEFT|BUTTON_UP|BUTTON_REPEAT },
+                                                      BUTTON_LEFT|BUTTON_UP },
+#ifdef SAMSUNG_YH820
     { ACTION_STD_REC,           BUTTON_REC|BUTTON_REPEAT,        BUTTON_REC },
+#else
+    { ACTION_STD_REC,           BUTTON_REC_SW_ON,               BUTTON_NONE },
+#endif
 
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
@@ -74,34 +78,50 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_SKIPPREV,      BUTTON_REW|BUTTON_REL,           BUTTON_REW },
     { ACTION_WPS_SEEKBACK,      BUTTON_REW|BUTTON_REPEAT,       BUTTON_NONE },
     { ACTION_WPS_STOPSEEK,      BUTTON_REW|BUTTON_REL,          BUTTON_REW|BUTTON_REPEAT },
+#ifdef SAMSUNG_YH820
+    { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_REC|BUTTON_FFWD,         BUTTON_NONE },
+    { ACTION_WPS_ABSETA_PREVDIR,BUTTON_REC|BUTTON_REW,          BUTTON_NONE },
+    { ACTION_WPS_ABRESET,       BUTTON_REC|BUTTON_PLAY,         BUTTON_NONE },
+#else
     { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_PLAY|BUTTON_RIGHT,       BUTTON_PLAY },
     { ACTION_WPS_ABSETA_PREVDIR,BUTTON_PLAY|BUTTON_LEFT,        BUTTON_PLAY },
     { ACTION_WPS_ABRESET,       BUTTON_PLAY|BUTTON_UP,          BUTTON_PLAY },
+    { ACTION_WPS_ABRESET,       BUTTON_PLAY|BUTTON_DOWN,        BUTTON_PLAY },
+#endif
     { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },
     { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_WPS_BROWSE,        BUTTON_RIGHT|BUTTON_REL,        BUTTON_NONE },
+    { ACTION_WPS_BROWSE,        BUTTON_RIGHT|BUTTON_REL,       BUTTON_RIGHT },
     /* these match context_standard */
     { ACTION_WPS_MENU,          BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
     { ACTION_WPS_CONTEXT,       BUTTON_RIGHT|BUTTON_REPEAT,    BUTTON_RIGHT },
     /* kludge: pressing 2 directional buttons is easy on this target  */
     { ACTION_WPS_QUICKSCREEN,   BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT,
                                 BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT },
+#ifdef SAMSUNG_YH820
     { ACTION_WPS_HOTKEY,        BUTTON_REC|BUTTON_REL,           BUTTON_REC },
+#else
+    { ACTION_WPS_HOTKEY,        BUTTON_RIGHT|BUTTON_DOWN|BUTTON_REPEAT,
+                                BUTTON_RIGHT|BUTTON_DOWN|BUTTON_REPEAT },
+    { ACTION_WPS_REC,           BUTTON_REC_SW_ON,               BUTTON_NONE },
+#endif
     { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
-    { ACTION_WPS_REC,           BUTTON_REC|BUTTON_REPEAT,       BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
 
 static const struct button_mapping button_context_list[]  = {
 #ifdef SAMSUNG_YH820
-    { ACTION_LISTTREE_PGUP,     BUTTON_REC|BUTTON_UP,           BUTTON_NONE },
-    { ACTION_LISTTREE_PGDOWN,   BUTTON_REC|BUTTON_DOWN,         BUTTON_NONE },
+    { ACTION_LISTTREE_PGUP,     BUTTON_REW,                     BUTTON_NONE },
+    { ACTION_LISTTREE_PGUP,     BUTTON_REW|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_FFWD,                    BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_FFWD|BUTTON_REPEAT,      BUTTON_NONE },
 #else
     { ACTION_LISTTREE_PGUP,     BUTTON_FFWD,                    BUTTON_NONE },
+    { ACTION_LISTTREE_PGUP,     BUTTON_FFWD|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_LISTTREE_PGDOWN,   BUTTON_REW,                     BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_REW|BUTTON_REPEAT,       BUTTON_NONE },
 #endif
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
@@ -110,94 +130,115 @@ static const struct button_mapping button_context_list[]  = {
 static 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 },
+#ifdef SAMSUNG_YH820
     { ACTION_TREE_HOTKEY,       BUTTON_REC|BUTTON_REL,           BUTTON_REC },
+#else
+    { ACTION_TREE_HOTKEY,       BUTTON_RIGHT|BUTTON_DOWN|BUTTON_REPEAT,
+                                BUTTON_RIGHT|BUTTON_DOWN|BUTTON_REPEAT },
+#endif
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_tree */
 
 static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
-    { ACTION_TREE_PGLEFT,       BUTTON_REC|BUTTON_LEFT,         BUTTON_NONE },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_REC|BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE },
-    { ACTION_TREE_PGRIGHT,      BUTTON_REC|BUTTON_RIGHT,        BUTTON_NONE },
-    { ACTION_TREE_PGRIGHT,      BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
+    { ACTION_TREE_PGLEFT,       BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
+    /* Note: we omit ACTION_TREE_ROOT_INIT to keep "left" the sole cancel button */
+    { ACTION_TREE_PGRIGHT,      BUTTON_FFWD|BUTTON_RIGHT,              BUTTON_NONE },
+    { ACTION_TREE_PGRIGHT,      BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
+#ifdef SAMSUNG_YH820
+    { ACTION_LISTTREE_PGUP,     BUTTON_REW,                     BUTTON_NONE },
+    { ACTION_LISTTREE_PGUP,     BUTTON_REW|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_FFWD|BUTTON_REL,         BUTTON_FFWD },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_FFWD|BUTTON_REPEAT,      BUTTON_FFWD|BUTTON_REPEAT },
+#else
+    { ACTION_LISTTREE_PGUP,     BUTTON_FFWD|BUTTON_REL,         BUTTON_FFWD },
+    { ACTION_LISTTREE_PGUP,     BUTTON_FFWD|BUTTON_REPEAT,      BUTTON_FFWD|BUTTON_REPEAT },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_REW,                     BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_REW|BUTTON_REPEAT,       BUTTON_NONE },
+#endif
 
     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_TREE_ROOT_INIT,    BUTTON_REW|BUTTON_REPEAT,        BUTTON_REW },
     { ACTION_TREE_PGLEFT,       BUTTON_REW|BUTTON_REPEAT,       BUTTON_NONE },
     { ACTION_TREE_PGRIGHT,      BUTTON_FFWD|BUTTON_REPEAT,      BUTTON_NONE },
+    /* Note: we omit ACTION_TREE_ROOT_INIT to keep "left" the sole cancel button */
+#ifdef SAMSUNG_YH820
+    { ACTION_LISTTREE_PGUP,     BUTTON_REW|BUTTON_REL,           BUTTON_REW },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_FFWD|BUTTON_REL,         BUTTON_FFWD },
+#else
+    { ACTION_LISTTREE_PGUP,     BUTTON_FFWD|BUTTON_REL,         BUTTON_FFWD },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_REW|BUTTON_REL,           BUTTON_REW },
+#endif
+    /* keep button combos for use with CONTEXT_TREE keymaps */
+    /* this is to permit pgup/down repeats */
+    { ACTION_LISTTREE_PGUP,     BUTTON_FFWD|BUTTON_UP,                 BUTTON_NONE },
+    { ACTION_LISTTREE_PGUP,     BUTTON_FFWD|BUTTON_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_FFWD|BUTTON_DOWN,               BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_FFWD|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
 
     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_NONE,              BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_STD_PREV,          BUTTON_LEFT|BUTTON_REL,         BUTTON_NONE },
+    { ACTION_STD_PREV,          BUTTON_LEFT,                    BUTTON_NONE },
     { ACTION_STD_PREVREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_STD_NEXT,          BUTTON_RIGHT|BUTTON_REL,        BUTTON_NONE },
+    { ACTION_STD_NEXT,          BUTTON_RIGHT,                   BUTTON_NONE },
     { ACTION_STD_NEXTREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_SETTINGS_RESET,    BUTTON_PLAY,                    BUTTON_NONE },
+    { ACTION_STD_OK,            BUTTON_PLAY,                    BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_REW,                     BUTTON_NONE },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+    LAST_ITEM_IN_LIST
 }; /* button_context_settings */
 
 static const struct button_mapping button_context_settings_right_is_inc[]  = {
-    { ACTION_NONE,              BUTTON_RIGHT|BUTTON_REL,       BUTTON_RIGHT },
     { 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_SETTINGS_RESET,    BUTTON_PLAY,                    BUTTON_NONE },
+    { ACTION_SETTINGS_RESET,    BUTTON_REW|BUTTON_REL,          BUTTON_REW  },
+
     { 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 },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settingsgraphical */
+    { ACTION_STD_OK,            BUTTON_PLAY,                    BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_REW|BUTTON_REPEAT,       BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_settings_right_is_inc */
 
 static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,      BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_YESNO_ACCEPT,      BUTTON_PLAY,                    BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings_yesno */
 
-static const struct button_mapping button_context_colorchooser[]  = {
-    { ACTION_STD_OK,            BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS)
-}; /* button_context_settings_colorchooser */
 
 static const struct button_mapping button_context_eq[]  = {
+    /* Naming scheme for EQ is misleading: "OK" switches between gain/freq/Q */
     { ACTION_STD_OK,            BUTTON_FFWD|BUTTON_REL,         BUTTON_FFWD },
-    { ACTION_STD_CANCEL,        BUTTON_REW|BUTTON_REL,           BUTTON_REW },
+    /* "CANCEL" means "leave menu and keep settings", so it's "OK" from the user's view */
+    { ACTION_STD_CANCEL,        BUTTON_PLAY,                    BUTTON_NONE },
+    /* de facto there is no CANCEL, so deactivate the correspondent keymaps */
+    { ACTION_NONE,              BUTTON_REW|BUTTON_REPEAT,       BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS)
-}; /* button_context_settings_context_eq */
+}; /* button_context_eq */
 
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,        BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
-}; /* button_context_settings_bmark */
-
-static const struct button_mapping button_context_time[]  = {
-    { ACTION_STD_OK,            BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
-    { ACTION_STD_CANCEL,        BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
-}; /* button_context_settings_bmark */
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE)
+}; /* button_context_bmark */
 
 static const struct button_mapping button_context_quickscreen[]  = {
-    { ACTION_NONE,              BUTTON_LEFT,                       BUTTON_NONE },
-    { ACTION_NONE,              BUTTON_LEFT|BUTTON_DOWN|BUTTON_REL,BUTTON_NONE },
     { ACTION_QS_TOP,            BUTTON_UP|BUTTON_REL,                BUTTON_UP },
     { ACTION_QS_TOP,            BUTTON_UP|BUTTON_REPEAT,           BUTTON_NONE },
     { ACTION_QS_DOWN,           BUTTON_DOWN|BUTTON_REL,            BUTTON_DOWN },
@@ -207,9 +248,9 @@ static const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_RIGHT,          BUTTON_RIGHT|BUTTON_REL,          BUTTON_RIGHT },
     { ACTION_QS_RIGHT,          BUTTON_RIGHT|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_PLAY,                       BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_FFWD,                       BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_REW,                        BUTTON_NONE },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+    LAST_ITEM_IN_LIST
 }; /* button_context_quickscreen */
 
 static const struct button_mapping button_context_pitchscreen[]  = {
@@ -228,18 +269,23 @@ static const struct button_mapping button_context_pitchscreen[]  = {
     { ACTION_PS_EXIT,           BUTTON_PLAY,                    BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_pitchcreen */
+}; /* button_context_pitchscreen */
 
 static const struct button_mapping button_context_recscreen[]  = {
     { ACTION_REC_PAUSE,             BUTTON_PLAY|BUTTON_REL,     BUTTON_NONE },
     { ACTION_REC_NEWFILE,           BUTTON_FFWD|BUTTON_REL,     BUTTON_NONE },
-    { ACTION_STD_MENU,              BUTTON_REW|BUTTON_REL,      BUTTON_NONE },
-    { ACTION_STD_CANCEL,            BUTTON_REW|BUTTON_REPEAT,    BUTTON_REW },
+    { ACTION_STD_CANCEL,            BUTTON_REW|BUTTON_REL,      BUTTON_NONE },
+    { ACTION_STD_MENU,              BUTTON_REW|BUTTON_REPEAT,    BUTTON_REW },
+#ifdef SAMSUNG_YH820
     { ACTION_STD_CANCEL,            BUTTON_REC,                 BUTTON_NONE },
+#else
+    { ACTION_STD_CANCEL,            BUTTON_REC_SW_OFF,          BUTTON_NONE },
+#endif
     { 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_NONE,                  BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_recscreen */
@@ -253,22 +299,30 @@ static const struct button_mapping button_context_keyboard[]  = {
     { 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_FFWD|BUTTON_LEFT,         BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT,        BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
+#ifdef SAMSUNG_YH820
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_REC|BUTTON_LEFT,               BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT,              BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
+#endif
     { ACTION_KBD_SELECT,       BUTTON_PLAY,                     BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_FFWD|BUTTON_REL,          BUTTON_FFWD },
-    { ACTION_KBD_ABORT,        BUTTON_FFWD|BUTTON_REW,          BUTTON_NONE },
-    { ACTION_KBD_ABORT,        BUTTON_REC,                      BUTTON_NONE },
-    { ACTION_KBD_BACKSPACE,    BUTTON_REW|BUTTON_REL,            BUTTON_REW },
-    { ACTION_KBD_BACKSPACE,    BUTTON_REW|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_KBD_MORSE_INPUT,  BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT },
+    { ACTION_KBD_PAGE_FLIP,    BUTTON_FFWD|BUTTON_REL,          BUTTON_FFWD },
+    { ACTION_KBD_DONE,         BUTTON_FFWD|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_REW|BUTTON_REL,           BUTTON_REW  },
+    { ACTION_KBD_ABORT,        BUTTON_REW|BUTTON_REPEAT,        BUTTON_NONE },
+#ifdef SAMSUNG_YH820
+    { ACTION_KBD_MORSE_INPUT,  BUTTON_FFWD|BUTTON_REC,          BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_REC|BUTTON_REW|BUTTON_REPEAT,  BUTTON_NONE },
+#else
+    { ACTION_KBD_MORSE_INPUT,  BUTTON_REC_SW_ON,                BUTTON_NONE },
+    { ACTION_KBD_MORSE_INPUT,  BUTTON_REC_SW_OFF,               BUTTON_NONE },
+#endif
     { ACTION_KBD_MORSE_SELECT, BUTTON_PLAY|BUTTON_REL,          BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_keyboard */
 
+
 #if CONFIG_TUNER
 static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_MENU,           BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
@@ -292,10 +346,17 @@ static const struct button_mapping button_context_radio[]  = {
 
 #ifdef USB_ENABLE_HID
 static const struct button_mapping button_context_usb_hid[] = {
+#ifdef SAMSUNG_YH820
     { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_FFWD|BUTTON_REL,   BUTTON_REC|BUTTON_FFWD },
     { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_FFWD|BUTTON_REPEAT,BUTTON_REC|BUTTON_FFWD },
     { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_REW|BUTTON_REL,     BUTTON_REC|BUTTON_REW },
     { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_REW|BUTTON_REPEAT,  BUTTON_REC|BUTTON_REW },
+#else
+    { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_FFWD|BUTTON_RIGHT,                       BUTTON_NONE },
+    { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT,         BUTTON_NONE },
+    { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_FFWD|BUTTON_LEFT,                        BUTTON_NONE },
+    { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT,          BUTTON_NONE },
+#endif
 
     LAST_ITEM_IN_LIST
 }; /* button_context_usb_hid */
@@ -315,8 +376,8 @@ static const struct button_mapping button_context_usb_hid_mode_multimedia[] = {
 }; /* button_context_usb_hid_mode_multimedia */
 
 static const struct button_mapping button_context_usb_hid_mode_presentation[] = {
-    { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START,   BUTTON_PLAY|BUTTON_REL,     BUTTON_RIGHT },
-    { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE,   BUTTON_REC|BUTTON_REL,        BUTTON_REC },
+    { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START,   BUTTON_PLAY|BUTTON_REL,      BUTTON_PLAY },
+    { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE,   BUTTON_PLAY|BUTTON_REPEAT,   BUTTON_PLAY },
     { ACTION_USB_HID_PRESENTATION_SLIDE_PREV,        BUTTON_REW|BUTTON_REL,        BUTTON_REW },
     { ACTION_USB_HID_PRESENTATION_SLIDE_NEXT,        BUTTON_FFWD|BUTTON_REL,      BUTTON_FFWD },
     { ACTION_USB_HID_PRESENTATION_SLIDE_FIRST,       BUTTON_REW|BUTTON_REPEAT,     BUTTON_REW },
@@ -348,7 +409,12 @@ static const struct button_mapping button_context_usb_hid_mode_browser[] = {
     { ACTION_USB_HID_BROWSER_TAB_CLOSE,        BUTTON_PLAY|BUTTON_REL,        BUTTON_PLAY },
     { ACTION_USB_HID_BROWSER_HISTORY_BACK,     BUTTON_REW|BUTTON_REPEAT,       BUTTON_REW },
     { ACTION_USB_HID_BROWSER_HISTORY_FORWARD,  BUTTON_FFWD|BUTTON_REPEAT,     BUTTON_FFWD },
+#ifdef SAMSUNG_YH820
     { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_REC|BUTTON_REL,          BUTTON_REC },
+#else
+    { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_REC_SW_ON,              BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_REC_SW_OFF,             BUTTON_NONE },
+#endif
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
 }; /* button_context_usb_hid_mode_browser */
@@ -363,6 +429,7 @@ static const struct button_mapping button_context_usb_hid_mode_mouse[] = {
     { ACTION_USB_HID_MOUSE_LEFT_REP,          BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_USB_HID_MOUSE_RIGHT,             BUTTON_RIGHT,                BUTTON_NONE },
     { ACTION_USB_HID_MOUSE_RIGHT_REP,         BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_NONE },
+#ifdef SAMSUNG_YH820
     { ACTION_USB_HID_MOUSE_BUTTON_LEFT,       BUTTON_REW,                  BUTTON_NONE },
     { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL,   BUTTON_REW|BUTTON_REL,       BUTTON_NONE },
     { ACTION_USB_HID_MOUSE_BUTTON_RIGHT,      BUTTON_FFWD,                 BUTTON_NONE },
@@ -371,6 +438,16 @@ static const struct button_mapping button_context_usb_hid_mode_mouse[] = {
     { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP,   BUTTON_REC|BUTTON_UP|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_REC|BUTTON_DOWN,      BUTTON_NONE },
     { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_REC|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+#else
+    { ACTION_USB_HID_MOUSE_BUTTON_LEFT,       BUTTON_FFWD,                 BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL,   BUTTON_FFWD|BUTTON_REL,      BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_BUTTON_RIGHT,      BUTTON_REW,                  BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL,  BUTTON_REW|BUTTON_REL,       BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP,   BUTTON_PLAY|BUTTON_UP,       BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP,   BUTTON_PLAY|BUTTON_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_PLAY|BUTTON_DOWN,     BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_PLAY|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+#endif
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
 }; /* button_context_usb_hid_mode_mouse */
@@ -397,20 +474,16 @@ const struct button_mapping* get_context_mapping(int context)
         case CONTEXT_CUSTOM|CONTEXT_TREE:
             return button_context_tree;
 
+        case CONTEXT_SETTINGS_TIME:
         case CONTEXT_SETTINGS:
             return button_context_settings;
         case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
         case CONTEXT_SETTINGS_RECTRIGGER:
-            return button_context_settings_right_is_inc;
-
         case CONTEXT_SETTINGS_COLOURCHOOSER:
-            return button_context_colorchooser;
+            return button_context_settings_right_is_inc;
         case CONTEXT_SETTINGS_EQ:
             return button_context_eq;
 
-        case CONTEXT_SETTINGS_TIME:
-            return button_context_time;
-
         case CONTEXT_YESNOSCREEN:
             return button_context_yesno;
         case CONTEXT_BOOKMARKSCREEN: