summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarianne Arnold <pixelma@rockbox.org>2008-09-03 22:30:30 +0000
committerMarianne Arnold <pixelma@rockbox.org>2008-09-03 22:30:30 +0000
commit23ab966f6401fa7558200a70f411ac704b22555f (patch)
treef24aea6b4a55a1b456fe218bc3c43e9d4ba8f6ce
parent16b8817f9fc21f89cd989ebaa3910ab9198739ce (diff)
C200: Also flip the function of the volume buttons when display flip is enabled. I think it is more consistent, especially when thinking of cases where these buttons are used for something else (e.g. left/right in brickmania). Taken from FS#8393 by Volker Mische - add him to CREDITS too.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18404 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--docs/CREDITS1
-rw-r--r--firmware/drivers/button.c9
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index dff8826faf..391edecd26 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -415,6 +415,7 @@ Jelle Geerts
Tadeusz Pyś
Rostislav Chekan
Florin Popescu
+Volker Mische
The libmad team
The wavpack team
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 8ad93ae022..9dfebf6e38 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -438,6 +438,9 @@ static int button_flip(int button)
#if CONFIG_KEYPAD == RECORDER_PAD
| BUTTON_F1 | BUTTON_F3
#endif
+#if CONFIG_KEYPAD == SANSA_C200_PAD
+ | BUTTON_VOL_UP | BUTTON_VOL_DOWN
+#endif
);
if (button & BUTTON_LEFT)
@@ -462,6 +465,12 @@ static int button_flip(int button)
if (button & BUTTON_F3)
newbutton |= BUTTON_F1;
#endif
+#if CONFIG_KEYPAD == SANSA_C200_PAD
+ if (button & BUTTON_VOL_UP)
+ newbutton |= BUTTON_VOL_DOWN;
+ if (button & BUTTON_VOL_DOWN)
+ newbutton |= BUTTON_VOL_UP;
+#endif
return newbutton;
}