diff options
author | Hristo Kovachev <bger@rockbox.org> | 2006-03-21 10:33:11 +0000 |
---|---|---|
committer | Hristo Kovachev <bger@rockbox.org> | 2006-03-21 10:33:11 +0000 |
commit | b492cf4ac4cb98169b0074436a30923be3d0bbe4 (patch) | |
tree | 18c00f8b325a5a0b701a5171326a9d8a7d948452 /firmware | |
parent | 63c8bb21ae06e625d631d54aeb06301dc86b388e (diff) | |
download | rockbox-b492cf4ac4cb98169b0074436a30923be3d0bbe4.tar.gz rockbox-b492cf4ac4cb98169b0074436a30923be3d0bbe4.zip |
Removed an unneeded BUTTON_HOLD define for iPod 3G
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9151 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/button.c | 1 | ||||
-rw-r--r-- | firmware/export/button.h | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index d86b8d8d2d..dbdb171bf2 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -359,7 +359,6 @@ static int ipod_3g_button_read(void) | |||
359 | 359 | ||
360 | if ((state & 0x20) == 0) { | 360 | if ((state & 0x20) == 0) { |
361 | /* 3g hold switch is active low */ | 361 | /* 3g hold switch is active low */ |
362 | btn |= BUTTON_HOLD; | ||
363 | was_hold = 1; | 362 | was_hold = 1; |
364 | /* hold switch on 3g causes all outputs to go low */ | 363 | /* hold switch on 3g causes all outputs to go low */ |
365 | /* we shouldn't interpret these as key presses */ | 364 | /* we shouldn't interpret these as key presses */ |
diff --git a/firmware/export/button.h b/firmware/export/button.h index 90edd05d51..02d91d6a9b 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -221,18 +221,9 @@ bool remote_button_hold(void); | |||
221 | 221 | ||
222 | #define BUTTON_PLAY 0x00000040 | 222 | #define BUTTON_PLAY 0x00000040 |
223 | 223 | ||
224 | #if CONFIG_KEYPAD == IPOD_3G_PAD | ||
225 | #define BUTTON_HOLD 0x00000100 | ||
226 | /* TODO Does the BUTTON_HOLD need to be here? */ | ||
227 | #define BUTTON_MAIN (BUTTON_SELECT|BUTTON_MENU\ | ||
228 | |BUTTON_LEFT|BUTTON_RIGHT\ | ||
229 | |BUTTON_SCROLL_FWD|BUTTON_SCROLL_BACK\ | ||
230 | |BUTTON_PLAY|BUTTON_HOLD) | ||
231 | #else | ||
232 | #define BUTTON_MAIN (BUTTON_SELECT|BUTTON_MENU\ | 224 | #define BUTTON_MAIN (BUTTON_SELECT|BUTTON_MENU\ |
233 | |BUTTON_LEFT|BUTTON_RIGHT|BUTTON_SCROLL_FWD\ | 225 | |BUTTON_LEFT|BUTTON_RIGHT|BUTTON_SCROLL_FWD\ |
234 | |BUTTON_SCROLL_BACK|BUTTON_PLAY) | 226 | |BUTTON_SCROLL_BACK|BUTTON_PLAY) |
235 | #endif | ||
236 | 227 | ||
237 | #define BUTTON_REMOTE 0 | 228 | #define BUTTON_REMOTE 0 |
238 | 229 | ||