summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/drivers/button.c1
-rw-r--r--firmware/export/button.h9
2 files changed, 0 insertions, 10 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index d86b8d8..dbdb171 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -359,7 +359,6 @@ static int ipod_3g_button_read(void)
if ((state & 0x20) == 0) {
/* 3g hold switch is active low */
- btn |= BUTTON_HOLD;
was_hold = 1;
/* hold switch on 3g causes all outputs to go low */
/* we shouldn't interpret these as key presses */
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 90edd05..02d91d6 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -221,18 +221,9 @@ bool remote_button_hold(void);
#define BUTTON_PLAY 0x00000040
-#if CONFIG_KEYPAD == IPOD_3G_PAD
-#define BUTTON_HOLD 0x00000100
-/* TODO Does the BUTTON_HOLD need to be here? */
-#define BUTTON_MAIN (BUTTON_SELECT|BUTTON_MENU\
- |BUTTON_LEFT|BUTTON_RIGHT\
- |BUTTON_SCROLL_FWD|BUTTON_SCROLL_BACK\
- |BUTTON_PLAY|BUTTON_HOLD)
-#else
#define BUTTON_MAIN (BUTTON_SELECT|BUTTON_MENU\
|BUTTON_LEFT|BUTTON_RIGHT|BUTTON_SCROLL_FWD\
|BUTTON_SCROLL_BACK|BUTTON_PLAY)
-#endif
#define BUTTON_REMOTE 0