summaryrefslogtreecommitdiff
path: root/firmware/drivers/button.c
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-01-23 00:27:21 +0000
committerJens Arnold <amiconn@rockbox.org>2005-01-23 00:27:21 +0000
commit9794cd449bf8a67cba4d65c3118895d1033c4271 (patch)
tree117d8a80484fd41ba9eb2f7abf62dae0f319f65e /firmware/drivers/button.c
parent756e7404d8b2605c1fd1f5ef3ae8c6c8dc856c37 (diff)
downloadrockbox-9794cd449bf8a67cba4d65c3118895d1033c4271.zip
rockbox-9794cd449bf8a67cba4d65c3118895d1033c4271.tar.gz
rockbox-9794cd449bf8a67cba4d65c3118895d1033c4271.tar.bz2
rockbox-9794cd449bf8a67cba4d65c3118895d1033c4271.tar.xz
(1) Remapped BUTTON_CANCEL->BUTTON_OFF for gmini better representing its function, and for consistency. (2) Removed TAB chars, prettified formatting
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5634 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/button.c')
-rw-r--r--firmware/drivers/button.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index b5f4693..e60657c 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -465,20 +465,20 @@ static int button_read(void)
#elif CONFIG_KEYPAD == GMINI100_PAD
if (adc_read(7) < 0x80)
- btn |= BUTTON_LEFT;
+ btn |= BUTTON_LEFT;
else if (adc_read(7) < 0x168)
- btn |= BUTTON_DOWN;
+ btn |= BUTTON_DOWN;
else if (adc_read(7) < 0x260)
- btn |= BUTTON_RIGHT;
+ btn |= BUTTON_RIGHT;
else if (adc_read(7) < 0x360)
- btn |= BUTTON_UP;
+ btn |= BUTTON_UP;
if (adc_read(6) < 0x240)
- btn |= BUTTON_CANCEL;
+ btn |= BUTTON_OFF;
else if (adc_read(6) < 0x280)
- btn |= BUTTON_PLAY;
+ btn |= BUTTON_PLAY;
else if (adc_read(6) < 0x300)
- btn |= BUTTON_MENU;
+ btn |= BUTTON_MENU;
#endif /* CONFIG_KEYPAD */