diff options
author | Nils Wallménius <nils@rockbox.org> | 2010-07-23 20:20:40 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2010-07-23 20:20:40 +0000 |
commit | d15a4f617f7d6e524ef811efef5707958031dc8f (patch) | |
tree | be02d4779171b55003197babc8ef9b33ce9280cb /firmware/export | |
parent | ee166960b493e7adf9d736644b82bc65be207e17 (diff) | |
download | rockbox-d15a4f617f7d6e524ef811efef5707958031dc8f.tar.gz 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/export')
-rw-r--r-- | firmware/export/config.h | 8 | ||||
-rw-r--r-- | firmware/export/config/iaudiom5.h | 2 | ||||
-rw-r--r-- | firmware/export/config/iaudiox5.h | 2 |
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 @@ | |||
128 | #define MPIO_HD200_PAD 44 | 128 | #define MPIO_HD200_PAD 44 |
129 | 129 | ||
130 | /* CONFIG_REMOTE_KEYPAD */ | 130 | /* CONFIG_REMOTE_KEYPAD */ |
131 | #define H100_REMOTE 1 | 131 | #define H100_REMOTE 1 |
132 | #define H300_REMOTE 2 | 132 | #define H300_REMOTE 2 |
133 | #define X5_REMOTE 3 | 133 | #define IAUDIO_REMOTE 3 |
134 | #define MROBE_REMOTE 4 | 134 | #define MROBE_REMOTE 4 |
135 | 135 | ||
136 | /* CONFIG_BACKLIGHT_FADING */ | 136 | /* CONFIG_BACKLIGHT_FADING */ |
137 | /* No fading capabilities at all (yet) */ | 137 | /* 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 @@ | |||
86 | 86 | ||
87 | #define CONFIG_KEYPAD IAUDIO_X5M5_PAD | 87 | #define CONFIG_KEYPAD IAUDIO_X5M5_PAD |
88 | 88 | ||
89 | #define CONFIG_REMOTE_KEYPAD IAUDIO_REMOTE | ||
90 | |||
89 | /* Define this to enable morse code input */ | 91 | /* Define this to enable morse code input */ |
90 | #define HAVE_MORSE_INPUT | 92 | #define HAVE_MORSE_INPUT |
91 | 93 | ||
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 @@ | |||
88 | 88 | ||
89 | #define CONFIG_KEYPAD IAUDIO_X5M5_PAD | 89 | #define CONFIG_KEYPAD IAUDIO_X5M5_PAD |
90 | 90 | ||
91 | #define CONFIG_REMOTE_KEYPAD IAUDIO_REMOTE | ||
92 | |||
91 | /* Define this to enable morse code input */ | 93 | /* Define this to enable morse code input */ |
92 | #define HAVE_MORSE_INPUT | 94 | #define HAVE_MORSE_INPUT |
93 | 95 | ||