Enable recording for Sansa c200, the keymap is usable but maybe could still be improved later.

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

2 files changed, 11 insertions, 18 deletions

diff --git a/apps/keymaps/keymap-c200.c b/apps/keymaps/keymap-c200.c
index 3f4bb49743..c6eb28c5de 100644
--- a/apps/keymaps/keymap-c200.c
+++ b/apps/keymaps/keymap-c200.c
@@ -211,22 +211,15 @@ static const struct button_mapping button_context_pitchscreen[]  = {
 /** Recording Screen **/
 #ifdef HAVE_RECORDING
 static const struct button_mapping button_context_recscreen[]  = {
-    { ACTION_STD_MENU,          BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE  },
-    { ACTION_REC_PAUSE,         BUTTON_UP|BUTTON_REL,           BUTTON_UP    },
-    { ACTION_STD_CANCEL,        BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
-    { ACTION_REC_NEWFILE,       BUTTON_REC|BUTTON_REL,          BUTTON_REC   },
-    
-    { ACTION_SETTINGS_INC,      BUTTON_RIGHT,                   BUTTON_NONE  },
-    { ACTION_SETTINGS_INC,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE  },
-    
-    { ACTION_SETTINGS_DEC,      BUTTON_LEFT,                    BUTTON_NONE  },
-    { ACTION_SETTINGS_DEC,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE  },
-    
-    { ACTION_STD_PREV,          BUTTON_SCROLL_UP,               BUTTON_NONE  },
-    { ACTION_STD_PREV,          BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE  },
-    
-    { ACTION_STD_NEXT,          BUTTON_SCROLL_DOWN,             BUTTON_NONE  },
-    { ACTION_STD_NEXT,          BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE },
+    { ACTION_STD_MENU,          BUTTON_POWER|BUTTON_REL,        BUTTON_POWER  },
+    { ACTION_REC_PAUSE,         BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
+    { ACTION_STD_CANCEL,        BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE   },
+    { ACTION_REC_NEWFILE,       BUTTON_REC|BUTTON_REL,          BUTTON_REC    },
+
+    { 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 },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_recscreen */
@@ -239,7 +232,7 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_PRESET,         BUTTON_SELECT,                  BUTTON_NONE },
     { ACTION_FM_STOP,           BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP   },
     { ACTION_FM_MODE,           BUTTON_REC,                     BUTTON_NONE },
-    { ACTION_FM_EXIT,           BUTTON_POWER,                   BUTTON_NONE },
+    { ACTION_FM_EXIT,           BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
     { ACTION_FM_PLAY,           BUTTON_UP|BUTTON_REL,           BUTTON_UP   },
     { ACTION_SETTINGS_INC,      BUTTON_VOL_UP,                  BUTTON_NONE },
     { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
diff --git a/firmware/export/config-c200.h b/firmware/export/config-c200.h
index dfb688719f..2e3423c79f 100644
--- a/firmware/export/config-c200.h
+++ b/firmware/export/config-c200.h
@@ -10,7 +10,7 @@
 #define HW_SAMPR_CAPS       (SAMPR_CAP_44)
 
 /* define this if you have recording possibility */
-/* TODO: #define HAVE_RECORDING */
+#define HAVE_RECORDING
 
 #define REC_SAMPR_CAPS      (SAMPR_CAP_22)
 #define REC_FREQ_DEFAULT    REC_FREQ_22 /* Default is not 44.1kHz */