summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-01-10 08:08:31 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-01-10 08:08:31 +0000
commit81ba146706e0a1c21c59f11022767577be7d71b2 (patch)
treeafce479f5133dcfaaaa71b2aa47a2e4f7c1004f3
parent4d238c14d70199e3a991db0c3b938eb4b0f6c93a (diff)
downloadrockbox-81ba146706e0a1c21c59f11022767577be7d71b2.tar.gz
rockbox-81ba146706e0a1c21c59f11022767577be7d71b2.zip
Accept FS#8341 - rename BUTTON_SCROLL_UP/DOWN to FWD/BACK on the e200 to make it consistant with the ipods. apart from removing a bit of confusion, it fixes the wheel in pictureflow and possibly elsewhere.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16045 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-e200.c60
-rw-r--r--apps/plugins/blackjack.c4
-rw-r--r--apps/plugins/bounce.c4
-rw-r--r--apps/plugins/brickmania.c8
-rw-r--r--apps/plugins/chessbox/chessbox.c4
-rw-r--r--apps/plugins/chessbox/chessbox_pgn.c4
-rw-r--r--apps/plugins/chip8.c4
-rw-r--r--apps/plugins/cube.c4
-rw-r--r--apps/plugins/doom/i_video.c4
-rw-r--r--apps/plugins/fire.c4
-rw-r--r--apps/plugins/jpeg.c8
-rw-r--r--apps/plugins/lib/pluginlib_actions.c12
-rw-r--r--apps/plugins/mandelbrot.c4
-rw-r--r--apps/plugins/matrix.c4
-rw-r--r--apps/plugins/metronome.c11
-rw-r--r--apps/plugins/midi/midiplay.c12
-rw-r--r--apps/plugins/minesweeper.c4
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c4
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c4
-rw-r--r--apps/plugins/oscilloscope.c4
-rw-r--r--apps/plugins/pictureflow.c8
-rw-r--r--apps/plugins/rockblox.c4
-rw-r--r--apps/plugins/rockboy/rockboy.c4
-rw-r--r--apps/plugins/rockboy/sys_rockbox.c4
-rw-r--r--apps/plugins/solitaire.c6
-rw-r--r--apps/plugins/spacerocks.c8
-rw-r--r--apps/plugins/sudoku/sudoku.h4
-rw-r--r--apps/plugins/superdom.c4
-rw-r--r--apps/plugins/viewer.c4
-rw-r--r--apps/plugins/vu_meter.c4
-rw-r--r--docs/CREDITS1
-rw-r--r--firmware/drivers/button.c14
-rw-r--r--firmware/target/arm/sandisk/sansa-e200/button-e200.c4
-rw-r--r--firmware/target/arm/sandisk/sansa-e200/button-target.h4
-rw-r--r--uisimulator/sdl/button.c4
35 files changed, 131 insertions, 113 deletions
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index 331f26ee2b..748b56d23d 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -31,10 +31,10 @@
* Insert LAST_ITEM_IN_LIST at the end of each mapping
*/
static const struct button_mapping button_context_standard[] = {
- { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE },
- { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE },
- { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE },
+ { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE },
+ { 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 },
@@ -67,10 +67,10 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER },
{ ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER },
- { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN, BUTTON_NONE },
- { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_UP, BUTTON_NONE },
- { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE },
+ { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE },
+ { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
@@ -88,10 +88,10 @@ static const struct button_mapping button_context_wps[] = {
static const struct button_mapping button_context_settings[] = {
{ ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
- { ACTION_SETTINGS_INC, BUTTON_SCROLL_DOWN, BUTTON_NONE },
- { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_SETTINGS_DEC, BUTTON_SCROLL_UP, BUTTON_NONE },
- { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE },
+ { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE },
+ { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
@@ -103,8 +103,8 @@ static const struct button_mapping button_context_settings[] = {
}; /* button_context_settings */
static const struct button_mapping button_context_list[] = {
- { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_UP, BUTTON_REC },
- { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_DOWN, BUTTON_REC },
+ { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_BACK, BUTTON_REC },
+ { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_FWD, BUTTON_REC },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_list */
@@ -162,10 +162,10 @@ static const struct button_mapping button_context_quickscreen[] = {
}; /* button_context_quickscreen */
static const struct button_mapping button_context_settings_right_is_inc[] = {
- { ACTION_SETTINGS_INC, BUTTON_SCROLL_DOWN, BUTTON_NONE },
- { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_SETTINGS_DEC, BUTTON_SCROLL_UP, BUTTON_NONE },
- { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT,BUTTON_NONE },
+ { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE },
+ { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
+ { 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_NONE },
{ ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
@@ -190,10 +190,10 @@ static const struct button_mapping button_context_settings_time[] = {
}; /* button_context_settings_time */
static const struct button_mapping button_context_pitchscreen[] = {
- { ACTION_PS_INC_SMALL, BUTTON_SCROLL_DOWN, BUTTON_NONE },
- { ACTION_PS_INC_BIG, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE },
- { ACTION_PS_DEC_BIG, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE },
+ { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE },
+ { ACTION_PS_DEC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
{ ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
@@ -215,10 +215,10 @@ static const struct button_mapping button_context_recscreen[] = {
{ 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_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_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE },
+ { ACTION_STD_PREV, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE },
+ { ACTION_STD_NEXT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_recscreen */
@@ -245,10 +245,10 @@ static const struct button_mapping button_context_keyboard[] = {
{ ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_KBD_UP, BUTTON_SCROLL_UP, BUTTON_NONE },
- { ACTION_KBD_UP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE },
- { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_KBD_UP, BUTTON_SCROLL_BACK, BUTTON_NONE },
+ { ACTION_KBD_UP, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE },
+ { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC },
{ ACTION_KBD_BACKSPACE, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_KBD_BACKSPACE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index 421326e9c0..c2d4ea0f09 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -168,8 +168,8 @@ PLUGIN_HEADER
#define BJACK_DOUBLEDOWN BUTTON_LEFT
#define BJACK_SCORES BUTTON_UP
#define BJACK_RESUME BUTTON_REC
-#define BJACK_UP BUTTON_SCROLL_UP
-#define BJACK_DOWN BUTTON_SCROLL_DOWN
+#define BJACK_UP BUTTON_SCROLL_FWD
+#define BJACK_DOWN BUTTON_SCROLL_BACK
#define BJACK_RIGHT BUTTON_RIGHT
#define BJACK_LEFT BUTTON_LEFT
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c
index 9373050292..67375021b5 100644
--- a/apps/plugins/bounce.c
+++ b/apps/plugins/bounce.c
@@ -77,8 +77,8 @@ PLUGIN_HEADER
#define BOUNCE_MODE BUTTON_A
#elif CONFIG_KEYPAD == SANSA_E200_PAD
-#define BOUNCE_UP BUTTON_SCROLL_UP
-#define BOUNCE_DOWN BUTTON_SCROLL_DOWN
+#define BOUNCE_UP BUTTON_SCROLL_BACK
+#define BOUNCE_DOWN BUTTON_SCROLL_FWD
#define BOUNCE_QUIT BUTTON_POWER
#define BOUNCE_MODE BUTTON_SELECT
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 8a4e07c9d7..52102eb037 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -107,11 +107,11 @@ PLUGIN_HEADER
#define LEFT BUTTON_LEFT
#define RIGHT BUTTON_RIGHT
#define SELECT BUTTON_SELECT
-#define UP BUTTON_SCROLL_UP
-#define DOWN BUTTON_SCROLL_DOWN
+#define UP BUTTON_SCROLL_BACK
+#define DOWN BUTTON_SCROLL_FWD
-#define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_DOWN)
-#define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_UP)
+#define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_FWD)
+#define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK)
#elif CONFIG_KEYPAD == SANSA_C200_PAD
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c
index cc31fe067f..f38f761109 100644
--- a/apps/plugins/chessbox/chessbox.c
+++ b/apps/plugins/chessbox/chessbox.c
@@ -191,8 +191,8 @@ PLUGIN_HEADER
#define CB_LEVEL BUTTON_REC
#define CB_MENU BUTTON_POWER
-#define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT)
-#define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT)
+#define CB_SCROLL_UP (BUTTON_SCROLL_BACK|BUTTON_REPEAT)
+#define CB_SCROLL_DOWN (BUTTON_SCROLL_FWD|BUTTON_REPEAT)
#define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT)
#define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT)
diff --git a/apps/plugins/chessbox/chessbox_pgn.c b/apps/plugins/chessbox/chessbox_pgn.c
index 9b09411170..14d93b059f 100644
--- a/apps/plugins/chessbox/chessbox_pgn.c
+++ b/apps/plugins/chessbox/chessbox_pgn.c
@@ -163,8 +163,8 @@
#define CB_RESTART (BUTTON_REW | BUTTON_PLAY)
#define CB_MENU BUTTON_POWER
-#define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT)
-#define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT)
+#define CB_SCROLL_UP (BUTTON_SCROLL_BACK|BUTTON_REPEAT)
+#define CB_SCROLL_DOWN (BUTTON_SCROLL_FWD|BUTTON_REPEAT)
#define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT)
#define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT)
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index ae6e3bfd29..4fd28d357a 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1022,11 +1022,11 @@ STATIC void chip8 (void)
#elif CONFIG_KEYPAD == SANSA_E200_PAD
#define CHIP8_OFF BUTTON_POWER
-#define CHIP8_KEY2 BUTTON_SCROLL_UP
+#define CHIP8_KEY2 BUTTON_SCROLL_BACK
#define CHIP8_KEY4 BUTTON_LEFT
#define CHIP8_KEY5 BUTTON_SELECT
#define CHIP8_KEY6 BUTTON_RIGHT
-#define CHIP8_KEY8 BUTTON_SCROLL_DOWN
+#define CHIP8_KEY8 BUTTON_SCROLL_FWD
#elif CONFIG_KEYPAD == SANSA_C200_PAD
#define CHIP8_OFF BUTTON_POWER
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 5eea42f634..73d0630adc 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -153,8 +153,8 @@ PLUGIN_HEADER
#define CUBE_QUIT BUTTON_POWER
#define CUBE_X_INC BUTTON_LEFT
#define CUBE_X_DEC BUTTON_RIGHT
-#define CUBE_Y_INC BUTTON_SCROLL_UP
-#define CUBE_Y_DEC BUTTON_SCROLL_DOWN
+#define CUBE_Y_INC BUTTON_SCROLL_FWD
+#define CUBE_Y_DEC BUTTON_SCROLL_BACK
#define CUBE_Z_INC BUTTON_UP
#define CUBE_Z_DEC BUTTON_DOWN
#define CUBE_MODE_PRE BUTTON_SELECT
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index fa5f065bbf..cc5036c59d 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -181,8 +181,8 @@ void I_ShutdownGraphics(void)
#define DOOMBUTTON_WEAPON BUTTON_FF
#elif CONFIG_KEYPAD == SANSA_E200_PAD
#define DOOMBUTTON_SCROLLWHEEL
-#define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_UP
-#define DOOMBUTTON_SCROLLWHEEL_CW BUTTON_SCROLL_DOWN
+#define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK
+#define DOOMBUTTON_SCROLLWHEEL_CW BUTTON_SCROLL_FWD
#define DOOMBUTTON_UP BUTTON_UP
#define DOOMBUTTON_DOWN BUTTON_DOWN
#define DOOMBUTTON_LEFT BUTTON_LEFT
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c
index 2d7a66ea16..6eb66eb4df 100644
--- a/apps/plugins/fire.c
+++ b/apps/plugins/fire.c
@@ -117,8 +117,8 @@ static unsigned char draw_buffer[FIRE_WIDTH];
#define FIRE_QUIT BUTTON_POWER
#define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT
#define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT
-#define FIRE_INCREASE_MULT BUTTON_SCROLL_UP
-#define FIRE_DECREASE_MULT BUTTON_SCROLL_DOWN
+#define FIRE_INCREASE_MULT BUTTON_SCROLL_FWD
+#define FIRE_DECREASE_MULT BUTTON_SCROLL_BACK
#elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD)
#define FIRE_QUIT BUTTON_PLAY
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c
index adb76cdd3c..d14b03637b 100644
--- a/apps/plugins/jpeg.c
+++ b/apps/plugins/jpeg.c
@@ -136,10 +136,10 @@ PLUGIN_HEADER
#define JPEG_RIGHT BUTTON_RIGHT
#define JPEG_MENU BUTTON_POWER
#define JPEG_SLIDE_SHOW BUTTON_REC
-#define JPEG_NEXT BUTTON_SCROLL_DOWN
-#define JPEG_NEXT_REPEAT (BUTTON_SCROLL_DOWN|BUTTON_REPEAT)
-#define JPEG_PREVIOUS BUTTON_SCROLL_UP
-#define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_UP|BUTTON_REPEAT)
+#define JPEG_NEXT BUTTON_SCROLL_FWD
+#define JPEG_NEXT_REPEAT (BUTTON_SCROLL_FWD|BUTTON_REPEAT)
+#define JPEG_PREVIOUS BUTTON_SCROLL_BACK
+#define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_BACK|BUTTON_REPEAT)
#elif CONFIG_KEYPAD == SANSA_C200_PAD
#define JPEG_ZOOM_PRE BUTTON_SELECT
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 1063c245a4..baf7440397 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -83,13 +83,14 @@ const struct button_mapping generic_directions[] =
{ PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
|| (CONFIG_KEYPAD == IPOD_3G_PAD) \
+ || (CONFIG_KEYPAD == SANSA_E200_PAD) \
|| (CONFIG_KEYPAD == IPOD_4G_PAD)
- { PLA_UP, BUTTON_SCROLL_FWD, BUTTON_NONE},
- { PLA_DOWN, BUTTON_SCROLL_BACK, BUTTON_NONE},
+ { PLA_UP, BUTTON_SCROLL_BACK, BUTTON_NONE},
+ { PLA_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE},
{ PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
{ PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
- { PLA_UP_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE},
- { PLA_DOWN_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE},
+ { PLA_UP_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE},
+ { PLA_DOWN_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
#elif CONFIG_KEYPAD == ONDIO_PAD
@@ -110,8 +111,7 @@ const struct button_mapping generic_directions[] =
{PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
{PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
{PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD) \
- || (CONFIG_KEYPAD == IRIVER_H10_PAD)
+#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
{ PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE},
{ PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE},
{ PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c
index df1c2030e5..76c5030874 100644
--- a/apps/plugins/mandelbrot.c
+++ b/apps/plugins/mandelbrot.c
@@ -130,8 +130,8 @@ PLUGIN_HEADER
#define MANDELBROT_DOWN BUTTON_DOWN
#define MANDELBROT_LEFT BUTTON_LEFT
#define MANDELBROT_RIGHT BUTTON_RIGHT
-#define MANDELBROT_ZOOM_IN BUTTON_SCROLL_DOWN
-#define MANDELBROT_ZOOM_OUT BUTTON_SCROLL_UP
+#define MANDELBROT_ZOOM_IN BUTTON_SCROLL_FWD
+#define MANDELBROT_ZOOM_OUT BUTTON_SCROLL_BACK
#define MANDELBROT_MAXITER_INC (BUTTON_SELECT | BUTTON_RIGHT)
#define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT)
#define MANDELBROT_RESET BUTTON_REC
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c
index 08341c2e05..f936318897 100644
--- a/apps/plugins/matrix.c
+++ b/apps/plugins/matrix.c
@@ -77,8 +77,8 @@ extern const fb_data matrix_normal[];
#define MATRIX_PAUSE BUTTON_SELECT
#elif CONFIG_KEYPAD == SANSA_E200_PAD
#define MATRIX_EXIT BUTTON_POWER
-#define MATRIX_SLEEP_MORE BUTTON_SCROLL_UP|BUTTON_REPEAT
-#define MATRIX_SLEEP_LESS BUTTON_SCROLL_DOWN|BUTTON_REPEAT
+#define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT
+#define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT
#define MATRIX_PAUSE BUTTON_SELECT
#elif CONFIG_KEYPAD == SANSA_C200_PAD
#define MATRIX_EXIT BUTTON_POWER
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c
index 6359329179..bd99ce2ce3 100644
--- a/apps/plugins/metronome.c
+++ b/apps/plugins/metronome.c
@@ -20,12 +20,21 @@
#include "metronome.h"
PLUGIN_HEADER
-
#define METRONOME_QUIT PLA_QUIT
+
+/* for volume changes, PLA with scrollwheel isn't proper */
+
+#ifdef HAVE_SCROLLWHEEL
+#define METRONOME_VOL_UP PLA_DOWN
+#define METRONOME_VOL_DOWN PLA_UP
+#define METRONOME_VOL_UP_REP PLA_DOWN_REPEAT
+#define METRONOME_VOL_DOWN_REP PLA_UP_REPEAT
+#else
#define METRONOME_VOL_UP PLA_UP
#define METRONOME_VOL_DOWN PLA_DOWN
#define METRONOME_VOL_UP_REP PLA_UP_REPEAT
#define METRONOME_VOL_DOWN_REP PLA_DOWN_REPEAT
+#endif
#define METRONOME_LEFT PLA_LEFT
#define METRONOME_RIGHT PLA_RIGHT
#define METRONOME_LEFT_REP PLA_LEFT_REPEAT
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index 1b0e755c6c..07ecb56934 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -72,8 +72,16 @@ PLUGIN_IRAM_DECLARE
#define BTN_PLAY BUTTON_A
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
-(CONFIG_KEYPAD == SANSA_C200_PAD)
+#elif (CONFIG_KEYPAD == SANSA_E200_PAD)
+#define BTN_QUIT BUTTON_POWER
+#define BTN_RIGHT BUTTON_RIGHT
+#define BTN_LEFT BUTTON_LEFT
+#define BTN_UP BUTTON_SCROLL_FWD
+#define BTN_DOWN BUTTON_SCROLL_BACK
+#define BTN_PLAY BUTTON_UP
+
+
+#elif (CONFIG_KEYPAD == SANSA_C200_PAD)
#define BTN_QUIT BUTTON_POWER
#define BTN_RIGHT BUTTON_RIGHT
#define BTN_LEFT BUTTON_LEFT
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index 062ba58368..0fa0bbcde4 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -108,8 +108,8 @@ enum minesweeper_status {
# define MINESWP_UP BUTTON_UP
# define MINESWP_DOWN BUTTON_DOWN
# define MINESWP_QUIT BUTTON_POWER
-# define MINESWP_NEXT BUTTON_SCROLL_DOWN
-# define MINESWP_PREV BUTTON_SCROLL_UP
+# define MINESWP_NEXT BUTTON_SCROLL_FWD
+# define MINESWP_PREV BUTTON_SCROLL_BACK
# define MINESWP_TOGGLE BUTTON_REC
# define MINESWP_DISCOVER BUTTON_SELECT
# define MINESWP_INFO (BUTTON_REC|BUTTON_REPEAT)
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 720101706c..dee374d957 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -61,8 +61,8 @@ struct mpeg_settings settings;
#elif (CONFIG_KEYPAD == SANSA_E200_PAD)
#define MPEG_SELECT BUTTON_SELECT
-#define MPEG_SCROLL_UP BUTTON_SCROLL_UP
-#define MPEG_SCROLL_DOWN BUTTON_SCROLL_DOWN
+#define MPEG_SCROLL_UP BUTTON_SCROLL_BACK
+#define MPEG_SCROLL_DOWN BUTTON_SCROLL_FWD
#define MPEG_LEFT BUTTON_LEFT
#define MPEG_RIGHT BUTTON_RIGHT
#define MPEG_UP BUTTON_UP
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index a41d3b498a..2ecc2b45a2 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -163,8 +163,8 @@ PLUGIN_IRAM_DECLARE
#define MPEG_MENU BUTTON_SELECT
#define MPEG_STOP BUTTON_POWER
#define MPEG_PAUSE BUTTON_UP
-#define MPEG_VOLDOWN BUTTON_SCROLL_UP
-#define MPEG_VOLUP BUTTON_SCROLL_DOWN
+#define MPEG_VOLDOWN BUTTON_SCROLL_BACK
+#define MPEG_VOLUP BUTTON_SCROLL_FWD
#define MPEG_RW BUTTON_LEFT
#define MPEG_FF BUTTON_RIGHT
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index ee4b089ac1..e96442afd4 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -106,8 +106,8 @@ PLUGIN_HEADER
#define OSCILLOSCOPE_PAUSE BUTTON_REC
#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT
#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT
-#define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_DOWN
-#define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_UP
+#define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_FWD
+#define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_BACK
#elif (CONFIG_KEYPAD == SANSA_C200_PAD)
#define OSCILLOSCOPE_QUIT BUTTON_POWER
diff --git a/apps/plugins/pictureflow.c b/apps/plugins/pictureflow.c
index 8f34ca5b8b..6e88138efc 100644
--- a/apps/plugins/pictureflow.c
+++ b/apps/plugins/pictureflow.c
@@ -50,10 +50,10 @@ const struct button_mapping *plugin_contexts[]
#endif
#ifdef SCROLLWHEEL
-#define PICTUREFLOW_NEXT_ALBUM PLA_UP
-#define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_UP_REPEAT
-#define PICTUREFLOW_PREV_ALBUM PLA_DOWN
-#define PICTUREFLOW_PREV_ALBUM_REPEAT PLA_DOWN_REPEAT
+#define PICTUREFLOW_NEXT_ALBUM PLA_DOWN
+#define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_DOWN_REPEAT
+#define PICTUREFLOW_PREV_ALBUM PLA_UP
+#define PICTUREFLOW_PREV_ALBUM_REPEAT PLA_UP_REPEAT
#else
#define PICTUREFLOW_NEXT_ALBUM PLA_RIGHT
#define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_RIGHT_REPEAT
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 64c9485bd0..ba8a1480b7 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -113,8 +113,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == SANSA_E200_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_UP
-#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_DOWN
+#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK
+#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 4ef95b0be9..4ccfdbf872 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -153,8 +153,8 @@ static void setoptions (void)
options.A=BUTTON_SELECT;
options.B=BUTTON_REC;
- options.START=BUTTON_SCROLL_UP;
- options.SELECT=BUTTON_SCROLL_DOWN;
+ options.START=BUTTON_SCROLL_BACK;
+ options.SELECT=BUTTON_SCROLL_FWD;
options.MENU=BUTTON_POWER;
#elif CONFIG_KEYPAD == SANSA_C200_PAD
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c
index 313e8ae46b..bcd795cded 100644
--- a/apps/plugins/rockboy/sys_rockbox.c
+++ b/apps/plugins/rockboy/sys_rockbox.c
@@ -26,8 +26,8 @@
#if CONFIG_KEYPAD == SANSA_E200_PAD
#define ROCKBOY_SCROLLWHEEL
-#define ROCKBOY_SCROLLWHEEL_CC BUTTON_SCROLL_UP
-#define ROCKBOY_SCROLLWHEEL_CW BUTTON_SCROLL_DOWN
+#define ROCKBOY_SCROLLWHEEL_CC BUTTON_SCROLL_BACK
+#define ROCKBOY_SCROLLWHEEL_CW BUTTON_SCROLL_FWD
#endif
struct fb fb IBSS_ATTR;
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 89b3966dfd..2176e8cb22 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -185,8 +185,8 @@ static struct plugin_api* rb;
# define SOL_QUIT BUTTON_POWER
# define SOL_UP BUTTON_UP
# define SOL_DOWN BUTTON_DOWN
-# define SOL_LEFT BUTTON_SCROLL_UP
-# define SOL_RIGHT BUTTON_SCROLL_DOWN
+# define SOL_LEFT BUTTON_SCROLL_BACK
+# define SOL_RIGHT BUTTON_SCROLL_FWD
# define SOL_MOVE BUTTON_SELECT
# define SOL_DRAW BUTTON_REC
# define SOL_REM2CUR BUTTON_LEFT
@@ -1408,7 +1408,7 @@ int solitaire( int skipmenu )
/* what to do when a key is pressed ... */
button = rb->button_get( true );
#if (CONFIG_KEYPAD == SANSA_E200_PAD)
- if (button&(BUTTON_SCROLL_UP|BUTTON_SCROLL_DOWN))
+ if (button&(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD))
button = button & (~BUTTON_REPEAT);
#endif
switch( button )
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index d98041da39..2ea1dc84e5 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -128,10 +128,10 @@ static struct plugin_api* rb; /* global api struct pointer */
#define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT)
#define AST_THRUST BUTTON_UP
#define AST_HYPERSPACE BUTTON_DOWN
-#define AST_LEFT BUTTON_SCROLL_UP
-#define AST_LEFT_REP (BUTTON_SCROLL_UP | BUTTON_REPEAT)
-#define AST_RIGHT BUTTON_SCROLL_DOWN
-#define AST_RIGHT_REP (BUTTON_SCROLL_DOWN | BUTTON_REPEAT)
+#define AST_LEFT BUTTON_SCROLL_BACK
+#define AST_LEFT_REP (BUTTON_SCROLL_BACK | BUTTON_REPEAT)
+#define AST_RIGHT BUTTON_SCROLL_FWD
+#define AST_RIGHT_REP (BUTTON_SCROLL_FWD | BUTTON_REPEAT)
#define AST_FIRE BUTTON_SELECT
#define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT)
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index ce8dfa00f4..87c0f692b5 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -117,8 +117,8 @@
#define SUDOKU_BUTTON_DOWN BUTTON_DOWN
#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
-#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_UP
-#define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_DOWN
+#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_BACK
+#define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_FWD
#define SUDOKU_BUTTON_MENU BUTTON_SELECT
#define SUDOKU_BUTTON_POSSIBLE BUTTON_REC
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c
index f963d7f828..b5e780460a 100644
--- a/apps/plugins/superdom.c
+++ b/apps/plugins/superdom.c
@@ -113,8 +113,8 @@ char buf[255];
#elif CONFIG_KEYPAD == SANSA_E200_PAD
#define SUPERDOM_OK BUTTON_SELECT
-#define SUPERDOM_UP BUTTON_SCROLL_UP
-#define SUPERDOM_DOWN BUTTON_SCROLL_DOWN
+#define SUPERDOM_UP BUTTON_SCROLL_BACK
+#define SUPERDOM_DOWN BUTTON_SCROLL_FWD
#define SUPERDOM_LEFT BUTTON_LEFT
#define SUPERDOM_RIGHT BUTTON_RIGHT
#define SUPERDOM_CANCEL BUTTON_POWER
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c
index 540adb4562..b66c24fd90 100644
--- a/apps/plugins/viewer.c
+++ b/apps/plugins/viewer.c
@@ -180,8 +180,8 @@ PLUGIN_HEADER
#define VIEWER_SCREEN_RIGHT BUTTON_RIGHT
#define VIEWER_MENU BUTTON_SELECT
#define VIEWER_AUTOSCROLL BUTTON_REC
-#define VIEWER_LINE_UP BUTTON_SCROLL_UP
-#define VIEWER_LINE_DOWN BUTTON_SCROLL_DOWN
+#define VIEWER_LINE_UP BUTTON_SCROLL_FWD
+#define VIEWER_LINE_DOWN BUTTON_SCROLL_BACK
/* Sansa C200 keys */
#elif CONFIG_KEYPAD == SANSA_C200_PAD
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 9175e1d4d3..810c600d29 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -91,8 +91,8 @@ PLUGIN_HEADER
#define VUMETER_MENU BUTTON_SELECT
#define VUMETER_MENU_EXIT BUTTON_SELECT
#define VUMETER_MENU_EXIT2 BUTTON_POWER
-#define VUMETER_UP BUTTON_SCROLL_DOWN
-#define VUMETER_DOWN BUTTON_SCROLL_UP
+#define VUMETER_UP BUTTON_SCROLL_FWD
+#define VUMETER_DOWN BUTTON_SCROLL_BACK
#elif (CONFIG_KEYPAD == SANSA_C200_PAD)
#define VUMETER_QUIT BUTTON_POWER
diff --git a/docs/CREDITS b/docs/CREDITS
index 4ec9f4154e..c62c356dda 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -362,6 +362,7 @@ Melba Sitjar
Mehmet Ş. Çatalbaş
Scott Tinman
Alexander Kuzmenkov
+Thomas Martitz
The libmad team
The wavpack team
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index c7d532ebde..33b708ea5c 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -412,8 +412,8 @@ static int button_flip(int button)
#if defined(BUTTON_UP) && defined(BUTTON_DOWN)
| BUTTON_UP | BUTTON_DOWN
#endif
-#if defined(BUTTON_SCROLL_UP) && defined(BUTTON_SCROLL_DOWN)
- | BUTTON_SCROLL_UP | BUTTON_SCROLL_DOWN
+#if defined(BUTTON_SCROLL_BACK) && defined(BUTTON_SCROLL_FWD)
+ | BUTTON_SCROLL_BACK | BUTTON_SCROLL_FWD
#endif
#if CONFIG_KEYPAD == RECORDER_PAD
| BUTTON_F1 | BUTTON_F3
@@ -430,11 +430,11 @@ static int button_flip(int button)
if (button & BUTTON_DOWN)
newbutton |= BUTTON_UP;
#endif
-#if defined(BUTTON_SCROLL_UP) && defined(BUTTON_SCROLL_DOWN)
- if (button & BUTTON_SCROLL_UP)
- newbutton |= BUTTON_SCROLL_DOWN;
- if (button & BUTTON_SCROLL_DOWN)
- newbutton |= BUTTON_SCROLL_UP;
+#if defined(BUTTON_SCROLL_BACK) && defined(BUTTON_SCROLL_FWD)
+ if (button & BUTTON_SCROLL_BACK)
+ newbutton |= BUTTON_SCROLL_FWD;
+ if (button & BUTTON_SCROLL_FWD)
+ newbutton |= BUTTON_SCROLL_BACK;
#endif
#if CONFIG_KEYPAD == RECORDER_PAD
if (button & BUTTON_F1)
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
index a74d8607c3..117b993763 100644
--- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
@@ -128,9 +128,9 @@ void clickwheel_int(void)
unsigned int btn = BUTTON_NONE;
if (old_wheel_value == wheel_tbl[0][wheel_value >> 6])
- btn = BUTTON_SCROLL_DOWN;
+ btn = BUTTON_SCROLL_FWD;
else if (old_wheel_value == wheel_tbl[1][wheel_value >> 6])
- btn = BUTTON_SCROLL_UP;
+ btn = BUTTON_SCROLL_BACK;
if (btn != BUTTON_NONE)
{
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-target.h b/firmware/target/arm/sandisk/sansa-e200/button-target.h
index ddc86a01fc..c5d14df4c7 100644
--- a/firmware/target/arm/sandisk/sansa-e200/button-target.h
+++ b/firmware/target/arm/sandisk/sansa-e200/button-target.h
@@ -40,8 +40,8 @@ int button_read_device(void);
#define BUTTON_UP 0x00000020
#define BUTTON_POWER 0x00000040
-#define BUTTON_SCROLL_UP 0x00000080
-#define BUTTON_SCROLL_DOWN 0x00000100
+#define BUTTON_SCROLL_BACK 0x00000080
+#define BUTTON_SCROLL_FWD 0x00000100
#define BUTTON_MAIN 0x00000fff
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 504533bc3a..5e46cbe7c6 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -537,11 +537,11 @@ void button_event(int key, bool pressed)
break;
case SDLK_KP8:
case SDLK_UP:
- new_btn = BUTTON_SCROLL_UP;
+ new_btn = BUTTON_SCROLL_BACK;
break;
case SDLK_KP2:
case SDLK_DOWN:
- new_btn = BUTTON_SCROLL_DOWN;
+ new_btn = BUTTON_SCROLL_FWD;
break;
case SDLK_KP9:
new_btn = BUTTON_UP;