From d15a4f617f7d6e524ef811efef5707958031dc8f Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Fri, 23 Jul 2010 20:20:40 +0000 Subject: 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 --- apps/plugins/logo.c | 9 ++++++++- firmware/export/config.h | 8 ++++---- firmware/export/config/iaudiom5.h | 2 ++ firmware/export/config/iaudiox5.h | 2 ++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 59baa2d5af..db692840ba 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -217,7 +217,14 @@ const unsigned char rockbox16x7[] = { #define LP_R_DEC_Y BUTTON_RC_SOURCE #define LP_R_INC_Y BUTTON_RC_BITRATE -#elif (CONFIG_REMOTE_KEYPAD==MROBE_REMOTE) +#elif CONFIG_REMOTE_KEYPAD == IAUDIO_REMOTE +#define LP_R_QUIT BUTTON_RC_REC +#define LP_R_DEC_X BUTTON_RC_REW +#define LP_R_INC_X BUTTON_RC_FF +#define LP_R_DEC_Y BUTTON_RC_VOL_DOWN +#define LP_R_INC_Y BUTTON_RC_VOL_UP + +#elif (CONFIG_REMOTE_KEYPAD == MROBE_REMOTE) #define LP_R_QUIT BUTTON_RC_HEART #define LP_R_DEC_X BUTTON_RC_REW #define LP_R_INC_X BUTTON_RC_FF 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 -- cgit v1.2.3