From 3f2c525c57cf97ca2954bd1be9630e7ed529a991 Mon Sep 17 00:00:00 2001 From: Szymon Dziok Date: Mon, 14 Jul 2014 00:10:37 +0000 Subject: Reduce definitions of actions for fm radio. Change-Id: I89188ecc820058b79b5c8fcf3e9b5ed49ae8aff4 --- apps/radio/radio.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/apps/radio/radio.c b/apps/radio/radio.c index c927be7b6d..424ed6a34c 100644 --- a/apps/radio/radio.c +++ b/apps/radio/radio.c @@ -74,7 +74,7 @@ #define FM_NEXT_PRESET #define FM_PREV_PRESET -#elif CONFIG_KEYPAD == IRIVER_H10_PAD +#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) || (CONFIG_KEYPAD == GIGABEAT_S_PAD) #define FM_PRESET #define FM_MODE @@ -92,20 +92,9 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SANSA_C200_PAD) ||\ (CONFIG_KEYPAD == SANSA_FUZE_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD) ||\ - (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) ||\ - (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) -#define FM_MENU -#define FM_PRESET -#define FM_STOP -#define FM_MODE -#define FM_EXIT -#define FM_PLAY - -#elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) -#define FM_PRESET -#define FM_MODE - -#elif (CONFIG_KEYPAD == COWON_D2_PAD) + (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)||(CONFIG_KEYPAD == COWON_D2_PAD)||\ + (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)||(CONFIG_KEYPAD == MPIO_HD200_PAD)||\ + (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) #define FM_MENU #define FM_PRESET #define FM_STOP @@ -114,21 +103,13 @@ #define FM_PLAY #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_1G2G_PAD) + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define FM_MENU #define FM_STOP #define FM_EXIT #define FM_PLAY #define FM_MODE -#elif (CONFIG_KEYPAD == MPIO_HD200_PAD) -#define FM_MENU -#define FM_PRESET -#define FM_EXIT -#define FM_PLAY -#define FM_MODE -#define FM_STOP - #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) #define FM_MENU #define FM_PRESET -- cgit v1.2.3