Index: apps/keymaps/keymap-e200.c
===================================================================
--- apps/keymaps/keymap-e200.c (revision 22779)
+++ apps/keymaps/keymap-e200.c (working copy)
@@ -40,7 +40,7 @@
{ ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
- { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_REC, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
{ ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
@@ -54,7 +54,7 @@
static const struct button_mapping button_context_wps[] = {
- { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
+ { ACTION_WPS_PLAY, BUTTON_REC|BUTTON_REL, BUTTON_REC },
{ ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
{ ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
@@ -67,7 +67,7 @@
{ ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER },
{ ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER },
- { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER },
+ { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_REC, BUTTON_POWER },
{ ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE },
{ ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
@@ -81,9 +81,9 @@
{ ACTION_WPS_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
{ ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL, BUTTON_REC },
- { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_WPS_REC, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT },
+ { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_REC, BUTTON_SELECT },
{ ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT },
LAST_ITEM_IN_LIST
@@ -96,8 +96,8 @@
{ ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_UP },
- { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
+ { ACTION_STD_PREV, BUTTON_REC|BUTTON_REL, BUTTON_REC },
+ { ACTION_STD_PREVREPEAT, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
{ ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
{ ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
{ ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
@@ -113,7 +113,7 @@
}; /* button_context_list */
static const struct button_mapping button_context_tree[] = {
- { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP },
+ { ACTION_TREE_WPS, BUTTON_REC|BUTTON_REL, BUTTON_REC },
{ ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
@@ -153,8 +153,8 @@
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_REC|BUTTON_REL, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
@@ -171,8 +171,8 @@
{ ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT,BUTTON_NONE },
- { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_UP },
- { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
+ { ACTION_STD_PREV, BUTTON_REC|BUTTON_REL, BUTTON_REC },
+ { ACTION_STD_PREVREPEAT, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
{ ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
{ ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
{ ACTION_NONE, BUTTON_SELECT, BUTTON_NONE },
@@ -184,8 +184,8 @@
}; /* button_context_settings_right_is_inc */
static const struct button_mapping button_context_settings_time[] = {
- { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
- { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_PREV, BUTTON_REC|BUTTON_REL, BUTTON_NONE },
+ { ACTION_STD_PREVREPEAT, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
@@ -204,7 +204,7 @@
{ ACTION_PS_TOGGLE_MODE, BUTTON_REC, BUTTON_NONE },
{ ACTION_PS_RESET, BUTTON_SELECT, BUTTON_NONE },
{ ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE },
- { ACTION_PS_EXIT, BUTTON_UP, BUTTON_NONE },
+ { ACTION_PS_EXIT, BUTTON_REC, BUTTON_NONE },
{ ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
@@ -215,7 +215,7 @@
static const struct button_mapping button_context_recscreen[] = {
{ ACTION_REC_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP },
{ ACTION_STD_CANCEL, BUTTON_DOWN, BUTTON_NONE },
- { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC },
+ { ACTION_REC_NEWFILE, BUTTON_UP|BUTTON_REL, BUTTON_UP },
{ ACTION_STD_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT},
{ ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
@@ -238,9 +238,9 @@
{ ACTION_FM_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_FM_PRESET, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
{ ACTION_FM_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
- { ACTION_FM_MODE, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
+ { ACTION_FM_MODE, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
{ ACTION_FM_EXIT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
- { ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
+ { ACTION_FM_PLAY, BUTTON_REC|BUTTON_REL, BUTTON_REC },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_radio */
@@ -263,7 +263,7 @@
{ ACTION_KBD_BACKSPACE, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_KBD_BACKSPACE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE },
- { ACTION_KBD_DONE, BUTTON_UP, BUTTON_NONE },
+ { ACTION_KBD_DONE, BUTTON_REC, BUTTON_NONE },
{ ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE },
LAST_ITEM_IN_LIST
@@ -277,7 +277,7 @@
#ifdef HAVE_USBSTACK
static const struct button_mapping button_context_usb_hid[] = {
- { ACTION_USB_HID_PLAY, BUTTON_UP, BUTTON_NONE },
+ { ACTION_USB_HID_PLAY, BUTTON_REC, BUTTON_NONE },
{ ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE },
{ ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE },
Index: firmware/target/arm/sandisk/sansa-e200/button-e200.c
===================================================================
--- firmware/target/arm/sandisk/sansa-e200/button-e200.c (revision 22779)
+++ firmware/target/arm/sandisk/sansa-e200/button-e200.c (working copy)
@@ -252,12 +252,12 @@
if (!_button_hold())
{
/* Read normal buttons */
- if ((state & 0x01) == 0) int_btn |= BUTTON_REC;
+ if ((state & 0x01) == 0) int_btn |= BUTTON_UP;
if ((state & 0x02) == 0) int_btn |= BUTTON_DOWN;
if ((state & 0x04) == 0) int_btn |= BUTTON_RIGHT;
if ((state & 0x08) == 0) int_btn |= BUTTON_LEFT;
if ((state & 0x10) == 0) int_btn |= BUTTON_SELECT; /* The centre button */
- if ((state & 0x20) == 0) int_btn |= BUTTON_UP; /* The "play" button */
+ if ((state & 0x20) == 0) int_btn |= BUTTON_REC; /* The "play" button */
if ((state & 0x40) != 0) int_btn |= BUTTON_POWER;
}
}
Index: firmware/target/arm/sandisk/sansa-e200/button-target.h
===================================================================
--- firmware/target/arm/sandisk/sansa-e200/button-target.h (revision 22779)
+++ firmware/target/arm/sandisk/sansa-e200/button-target.h (working copy)
@@ -43,7 +43,7 @@
#define BUTTON_RIGHT 0x00000004
#define BUTTON_LEFT 0x00000008
#define BUTTON_SELECT 0x00000010
-#define BUTTON_UP 0x00000020
+#define BUTTON_UP 0
#define BUTTON_POWER 0x00000040
#define BUTTON_SCROLL_BACK 0x00000080