diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-01-10 08:08:31 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-01-10 08:08:31 +0000 |
commit | 81ba146706e0a1c21c59f11022767577be7d71b2 (patch) | |
tree | afce479f5133dcfaaaa71b2aa47a2e4f7c1004f3 /firmware/drivers/button.c | |
parent | 4d238c14d70199e3a991db0c3b938eb4b0f6c93a (diff) | |
download | rockbox-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
Diffstat (limited to 'firmware/drivers/button.c')
-rw-r--r-- | firmware/drivers/button.c | 14 |
1 files changed, 7 insertions, 7 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) |