summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2010-07-23 20:20:40 +0000
committerNils Wallménius <nils@rockbox.org>2010-07-23 20:20:40 +0000
commitd15a4f617f7d6e524ef811efef5707958031dc8f (patch)
treebe02d4779171b55003197babc8ef9b33ce9280cb /firmware
parentee166960b493e7adf9d736644b82bc65be207e17 (diff)
downloadrockbox-d15a4f617f7d6e524ef811efef5707958031dc8f.tar.gz
rockbox-d15a4f617f7d6e524ef811efef5707958031dc8f.tar.bz2
rockbox-d15a4f617f7d6e524ef811efef5707958031dc8f.zip
Define CONFIG_REMOTE_KEYPAD for iaudio x5/m5 and add a keymap for that remote to the logo plugin. Fixes a warning when building with gcc 4.4.4.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27533 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config.h8
-rw-r--r--firmware/export/config/iaudiom5.h2
-rw-r--r--firmware/export/config/iaudiox5.h2
3 files changed, 8 insertions, 4 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index e0581507b5..1b8a782f39 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -128,10 +128,10 @@
#define MPIO_HD200_PAD 44
/* CONFIG_REMOTE_KEYPAD */
-#define H100_REMOTE 1
-#define H300_REMOTE 2
-#define X5_REMOTE 3
-#define MROBE_REMOTE 4
+#define H100_REMOTE 1
+#define H300_REMOTE 2
+#define IAUDIO_REMOTE 3
+#define MROBE_REMOTE 4
/* CONFIG_BACKLIGHT_FADING */
/* No fading capabilities at all (yet) */
diff --git a/firmware/export/config/iaudiom5.h b/firmware/export/config/iaudiom5.h
index 824744032a..ad86308667 100644
--- a/firmware/export/config/iaudiom5.h
+++ b/firmware/export/config/iaudiom5.h
@@ -86,6 +86,8 @@
#define CONFIG_KEYPAD IAUDIO_X5M5_PAD
+#define CONFIG_REMOTE_KEYPAD IAUDIO_REMOTE
+
/* Define this to enable morse code input */
#define HAVE_MORSE_INPUT
diff --git a/firmware/export/config/iaudiox5.h b/firmware/export/config/iaudiox5.h
index 998feedb87..2083095c2b 100644
--- a/firmware/export/config/iaudiox5.h
+++ b/firmware/export/config/iaudiox5.h
@@ -88,6 +88,8 @@
#define CONFIG_KEYPAD IAUDIO_X5M5_PAD
+#define CONFIG_REMOTE_KEYPAD IAUDIO_REMOTE
+
/* Define this to enable morse code input */
#define HAVE_MORSE_INPUT