summaryrefslogtreecommitdiff
path: root/firmware/drivers/button.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/drivers/button.c')
-rw-r--r--firmware/drivers/button.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 307b424d09..15276a985e 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -63,7 +63,7 @@ static int button_read(void);
63static bool remote_button_hold_only(void); 63static bool remote_button_hold_only(void);
64#endif 64#endif
65 65
66#if CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD 66#if CONFIG_KEYPAD == IPOD_4G_PAD
67/* Variable to use for setting button status in interrupt handler */ 67/* Variable to use for setting button status in interrupt handler */
68int int_btn = BUTTON_NONE; 68int int_btn = BUTTON_NONE;
69 69
@@ -371,7 +371,7 @@ void button_init(void)
371 /* nothing to initialize here */ 371 /* nothing to initialize here */
372#elif CONFIG_KEYPAD == GMINI100_PAD 372#elif CONFIG_KEYPAD == GMINI100_PAD
373 /* nothing to initialize here */ 373 /* nothing to initialize here */
374#elif CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD 374#elif CONFIG_KEYPAD == IPOD_4G_PAD
375 opto_i2c_init(); 375 opto_i2c_init();
376 /* hold button - enable as input */ 376 /* hold button - enable as input */
377 GPIOA_ENABLE |= 0x20; 377 GPIOA_ENABLE |= 0x20;
@@ -397,7 +397,7 @@ void button_init(void)
397} 397}
398 398
399#ifdef HAVE_LCD_BITMAP /* only bitmap displays can be flipped */ 399#ifdef HAVE_LCD_BITMAP /* only bitmap displays can be flipped */
400#if (CONFIG_KEYPAD != IPOD_4G_PAD) && (CONFIG_KEYPAD != IPOD_NANO_PAD) 400#if (CONFIG_KEYPAD != IPOD_4G_PAD)
401/* 401/*
402 * helper function to swap UP/DOWN, LEFT/RIGHT (and F1/F3 for Recorder) 402 * helper function to swap UP/DOWN, LEFT/RIGHT (and F1/F3 for Recorder)
403 */ 403 */
@@ -821,7 +821,7 @@ static int button_read(void)
821 if (data & 0x01) 821 if (data & 0x01)
822 btn |= BUTTON_ON; 822 btn |= BUTTON_ON;
823 823
824#elif CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD 824#elif CONFIG_KEYPAD == IPOD_4G_PAD
825 (void)data; 825 (void)data;
826 /* The int_btn variable is set in the button interrupt handler */ 826 /* The int_btn variable is set in the button interrupt handler */
827 btn = int_btn; 827 btn = int_btn;