From 81ba146706e0a1c21c59f11022767577be7d71b2 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Thu, 10 Jan 2008 08:08:31 +0000 Subject: 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 --- firmware/drivers/button.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'firmware/drivers/button.c') diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index c7d532e..33b708e 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) -- cgit v1.1