summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2005-12-19 00:11:28 +0000
committerDave Chapman <dave@dchapman.com>2005-12-19 00:11:28 +0000
commit0dc63c1b7145b0b37476bdd701b8d5c15ad038b3 (patch)
tree5b83cc73ca892f4faf669036da32abaff0d6b2fc /firmware
parent2a7bd9fb7b9698b949ae85e24b17921c807c323c (diff)
downloadrockbox-0dc63c1b7145b0b37476bdd701b8d5c15ad038b3.tar.gz
rockbox-0dc63c1b7145b0b37476bdd701b8d5c15ad038b3.zip
Remove IPOD_NANO_PAD definition - the Nano's keypad has turned out to be identical to the other 4G models
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8262 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/button.c8
-rw-r--r--firmware/export/button.h2
-rw-r--r--firmware/export/config-ipodnano.h2
-rw-r--r--firmware/export/config.h1
4 files changed, 6 insertions, 7 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);
static bool remote_button_hold_only(void);
#endif
-#if CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD
+#if CONFIG_KEYPAD == IPOD_4G_PAD
/* Variable to use for setting button status in interrupt handler */
int int_btn = BUTTON_NONE;
@@ -371,7 +371,7 @@ void button_init(void)
/* nothing to initialize here */
#elif CONFIG_KEYPAD == GMINI100_PAD
/* nothing to initialize here */
-#elif CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD
+#elif CONFIG_KEYPAD == IPOD_4G_PAD
opto_i2c_init();
/* hold button - enable as input */
GPIOA_ENABLE |= 0x20;
@@ -397,7 +397,7 @@ void button_init(void)
}
#ifdef HAVE_LCD_BITMAP /* only bitmap displays can be flipped */
-#if (CONFIG_KEYPAD != IPOD_4G_PAD) && (CONFIG_KEYPAD != IPOD_NANO_PAD)
+#if (CONFIG_KEYPAD != IPOD_4G_PAD)
/*
* helper function to swap UP/DOWN, LEFT/RIGHT (and F1/F3 for Recorder)
*/
@@ -821,7 +821,7 @@ static int button_read(void)
if (data & 0x01)
btn |= BUTTON_ON;
-#elif CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD
+#elif CONFIG_KEYPAD == IPOD_4G_PAD
(void)data;
/* The int_btn variable is set in the button interrupt handler */
btn = int_btn;
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 4bf5edde5b..47912ef1df 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -149,7 +149,7 @@ bool remote_button_hold(void);
#define BUTTON_DOWN 0x0020
#define BUTTON_MENU 0x0100
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
/* TODO: These codes should relate to the hardware */
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index 6657ba8aaa..8c7a3b2f8c 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -21,7 +21,7 @@
#define LCD_DEPTH 16 /* 65536 colours */
#define LCD_PIXELFORMAT RGB565SWAPPED /* rgb565 byte-swapped */
-#define CONFIG_KEYPAD IPOD_NANO_PAD
+#define CONFIG_KEYPAD IPOD_4G_PAD
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 858b348ed3..3f563ca9df 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -51,7 +51,6 @@
#define IRIVER_H300_PAD 5
#define IAUDIO_X5_PAD 6
#define IPOD_4G_PAD 7
-#define IPOD_NANO_PAD 8
/* CONFIG_REMOTE_KEYPAD */
#define H100_REMOTE 1