summaryrefslogtreecommitdiffstats
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
parent756e7404d8b2605c1fd1f5ef3ae8c6c8dc856c37 (diff)
downloadrockbox-9794cd449bf8a67cba4d65c3118895d1033c4271.tar.gz
rockbox-9794cd449bf8a67cba4d65c3118895d1033c4271.tar.bz2
rockbox-9794cd449bf8a67cba4d65c3118895d1033c4271.zip
(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
-rw-r--r--firmware/drivers/button.c14
-rw-r--r--firmware/export/button.h90
2 files changed, 52 insertions, 52 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index b5f4693215..e60657c82d 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 */
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 6bfeecb46f..f381ea9cfc 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -30,7 +30,7 @@ int button_get (bool block);
int button_get_w_tmo(int ticks);
int button_status(void);
void button_clear_queue(void);
-#if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ONDIO_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD
+#ifdef HAVE_LCD_BITMAP
void button_set_flip(bool flip); /* turn 180 degrees */
#endif
@@ -38,76 +38,76 @@ void button_set_flip(bool flip); /* turn 180 degrees */
bool button_hold(void);
#endif
-#define BUTTON_NONE 0x0000
+#define BUTTON_NONE 0x0000
/* Shared button codes */
-#define BUTTON_LEFT 0x0040
-#define BUTTON_RIGHT 0x0080
+#define BUTTON_LEFT 0x0040
+#define BUTTON_RIGHT 0x0080
/* Button modifiers */
-#define BUTTON_REMOTE 0x2000
-#define BUTTON_REPEAT 0x4000
-#define BUTTON_REL 0x8000
+#define BUTTON_REMOTE 0x2000
+#define BUTTON_REPEAT 0x4000
+#define BUTTON_REL 0x8000
/* remote control buttons */
-#define BUTTON_RC_VOL_UP (0x0008 | BUTTON_REMOTE)
-#define BUTTON_RC_VOL_DOWN (0x0800 | BUTTON_REMOTE)
-#define BUTTON_RC_LEFT (BUTTON_LEFT | BUTTON_REMOTE)
-#define BUTTON_RC_RIGHT (BUTTON_RIGHT| BUTTON_REMOTE)
+#define BUTTON_RC_VOL_UP (0x0008 | BUTTON_REMOTE)
+#define BUTTON_RC_VOL_DOWN (0x0800 | BUTTON_REMOTE)
+#define BUTTON_RC_LEFT (BUTTON_LEFT | BUTTON_REMOTE)
+#define BUTTON_RC_RIGHT (BUTTON_RIGHT| BUTTON_REMOTE)
#if CONFIG_KEYPAD == IRIVER_H100_PAD
/* iRiver H100 specific button codes */
-#define BUTTON_SELECT 0x0100
-#define BUTTON_MODE 0x0200
-#define BUTTON_REC 0x0400
-#define BUTTON_ON 0x0001
-#define BUTTON_OFF 0x0002
-#define BUTTON_UP 0x0010
-#define BUTTON_DOWN 0x0020
+#define BUTTON_SELECT 0x0100
+#define BUTTON_MODE 0x0200
+#define BUTTON_REC 0x0400
+#define BUTTON_ON 0x0001
+#define BUTTON_OFF 0x0002
+#define BUTTON_UP 0x0010
+#define BUTTON_DOWN 0x0020
#elif CONFIG_KEYPAD == RECORDER_PAD
/* Recorder specific button codes */
-#define BUTTON_ON 0x0001
-#define BUTTON_OFF 0x0002
-#define BUTTON_PLAY 0x0004
-#define BUTTON_UP 0x0010
-#define BUTTON_DOWN 0x0020
-#define BUTTON_F1 0x0100
-#define BUTTON_F2 0x0200
-#define BUTTON_F3 0x0400
-
-#define BUTTON_RC_PLAY (BUTTON_PLAY | BUTTON_REMOTE)
-#define BUTTON_RC_STOP (BUTTON_OFF | BUTTON_REMOTE)
+#define BUTTON_ON 0x0001
+#define BUTTON_OFF 0x0002
+#define BUTTON_PLAY 0x0004
+#define BUTTON_UP 0x0010
+#define BUTTON_DOWN 0x0020
+#define BUTTON_F1 0x0100
+#define BUTTON_F2 0x0200
+#define BUTTON_F3 0x0400
+
+#define BUTTON_RC_PLAY (BUTTON_PLAY | BUTTON_REMOTE)
+#define BUTTON_RC_STOP (BUTTON_OFF | BUTTON_REMOTE)
#elif CONFIG_KEYPAD == PLAYER_PAD
/* Jukebox 6000 and Studio specific button codes */
-#define BUTTON_ON 0x0001
-#define BUTTON_MENU 0x0002
-#define BUTTON_PLAY 0x0010
-#define BUTTON_STOP 0x0020
+#define BUTTON_ON 0x0001
+#define BUTTON_MENU 0x0002
+#define BUTTON_PLAY 0x0010
+#define BUTTON_STOP 0x0020
-#define BUTTON_RC_PLAY (BUTTON_PLAY | BUTTON_REMOTE)
-#define BUTTON_RC_STOP (BUTTON_STOP | BUTTON_REMOTE)
+#define BUTTON_RC_PLAY (BUTTON_PLAY | BUTTON_REMOTE)
+#define BUTTON_RC_STOP (BUTTON_STOP | BUTTON_REMOTE)
#elif CONFIG_KEYPAD == ONDIO_PAD
/* Ondio specific button codes */
-#define BUTTON_OFF 0x0002
-#define BUTTON_UP 0x0010
-#define BUTTON_DOWN 0x0020
-#define BUTTON_MENU 0x0100
+#define BUTTON_OFF 0x0002
+#define BUTTON_UP 0x0010
+#define BUTTON_DOWN 0x0020
+#define BUTTON_MENU 0x0100
#elif CONFIG_KEYPAD == GMINI100_PAD
-#define BUTTON_ON 0x0001
-#define BUTTON_CANCEL 0x0002
-#define BUTTON_PLAY 0x0004
-#define BUTTON_UP 0x0010
-#define BUTTON_DOWN 0x0020
-#define BUTTON_MENU 0x0100
+#define BUTTON_ON 0x0001
+#define BUTTON_OFF 0x0002
+#define BUTTON_PLAY 0x0004
+#define BUTTON_UP 0x0010
+#define BUTTON_DOWN 0x0020
+#define BUTTON_MENU 0x0100
#endif /* RECORDER/PLAYER/ONDIO/GMINI KEYPAD */