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) #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) |