diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/button.c | 14 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/button-e200.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/button-target.h | 4 |
3 files changed, 11 insertions, 11 deletions
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) | |||
412 | #if defined(BUTTON_UP) && defined(BUTTON_DOWN) | 412 | #if defined(BUTTON_UP) && defined(BUTTON_DOWN) |
413 | | BUTTON_UP | BUTTON_DOWN | 413 | | BUTTON_UP | BUTTON_DOWN |
414 | #endif | 414 | #endif |
415 | #if defined(BUTTON_SCROLL_UP) && defined(BUTTON_SCROLL_DOWN) | 415 | #if defined(BUTTON_SCROLL_BACK) && defined(BUTTON_SCROLL_FWD) |
416 | | BUTTON_SCROLL_UP | BUTTON_SCROLL_DOWN | 416 | | BUTTON_SCROLL_BACK | BUTTON_SCROLL_FWD |
417 | #endif | 417 | #endif |
418 | #if CONFIG_KEYPAD == RECORDER_PAD | 418 | #if CONFIG_KEYPAD == RECORDER_PAD |
419 | | BUTTON_F1 | BUTTON_F3 | 419 | | BUTTON_F1 | BUTTON_F3 |
@@ -430,11 +430,11 @@ static int button_flip(int button) | |||
430 | if (button & BUTTON_DOWN) | 430 | if (button & BUTTON_DOWN) |
431 | newbutton |= BUTTON_UP; | 431 | newbutton |= BUTTON_UP; |
432 | #endif | 432 | #endif |
433 | #if defined(BUTTON_SCROLL_UP) && defined(BUTTON_SCROLL_DOWN) | 433 | #if defined(BUTTON_SCROLL_BACK) && defined(BUTTON_SCROLL_FWD) |
434 | if (button & BUTTON_SCROLL_UP) | 434 | if (button & BUTTON_SCROLL_BACK) |
435 | newbutton |= BUTTON_SCROLL_DOWN; | 435 | newbutton |= BUTTON_SCROLL_FWD; |
436 | if (button & BUTTON_SCROLL_DOWN) | 436 | if (button & BUTTON_SCROLL_FWD) |
437 | newbutton |= BUTTON_SCROLL_UP; | 437 | newbutton |= BUTTON_SCROLL_BACK; |
438 | #endif | 438 | #endif |
439 | #if CONFIG_KEYPAD == RECORDER_PAD | 439 | #if CONFIG_KEYPAD == RECORDER_PAD |
440 | if (button & BUTTON_F1) | 440 | 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) | |||
128 | unsigned int btn = BUTTON_NONE; | 128 | unsigned int btn = BUTTON_NONE; |
129 | 129 | ||
130 | if (old_wheel_value == wheel_tbl[0][wheel_value >> 6]) | 130 | if (old_wheel_value == wheel_tbl[0][wheel_value >> 6]) |
131 | btn = BUTTON_SCROLL_DOWN; | 131 | btn = BUTTON_SCROLL_FWD; |
132 | else if (old_wheel_value == wheel_tbl[1][wheel_value >> 6]) | 132 | else if (old_wheel_value == wheel_tbl[1][wheel_value >> 6]) |
133 | btn = BUTTON_SCROLL_UP; | 133 | btn = BUTTON_SCROLL_BACK; |
134 | 134 | ||
135 | if (btn != BUTTON_NONE) | 135 | if (btn != BUTTON_NONE) |
136 | { | 136 | { |
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); | |||
40 | #define BUTTON_UP 0x00000020 | 40 | #define BUTTON_UP 0x00000020 |
41 | #define BUTTON_POWER 0x00000040 | 41 | #define BUTTON_POWER 0x00000040 |
42 | 42 | ||
43 | #define BUTTON_SCROLL_UP 0x00000080 | 43 | #define BUTTON_SCROLL_BACK 0x00000080 |
44 | #define BUTTON_SCROLL_DOWN 0x00000100 | 44 | #define BUTTON_SCROLL_FWD 0x00000100 |
45 | 45 | ||
46 | #define BUTTON_MAIN 0x00000fff | 46 | #define BUTTON_MAIN 0x00000fff |
47 | 47 | ||