From 3fa414d9591ddeb1b5971d16581ce75e4a53997a Mon Sep 17 00:00:00 2001 From: Rob Purchase Date: Sun, 27 Apr 2008 16:13:18 +0000 Subject: Fix red (#ifdef hell). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17262 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/plasma.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 3090e1a2d0..e8ae7645b4 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c @@ -100,7 +100,6 @@ static int plasma_frequency; #elif (CONFIG_KEYPAD == COWOND2_PAD) #define PLASMA_QUIT BUTTON_POWER -// the new button definitions should be placed here #endif #ifdef HAVE_TOUCHPAD @@ -113,10 +112,8 @@ static int plasma_frequency; #ifndef PLASMA_DECREASE_FREQUENCY #define PLASMA_DECREASE_FREQUENCY BUTTON_MIDLEFT #endif +#endif /* HAVE_TOUCHPAD */ -#endif - -// if no button definitions specified and no touchpad use default #ifndef PLASMA_QUIT #define PLASMA_QUIT BUTTON_OFF #endif @@ -130,7 +127,6 @@ static int plasma_frequency; #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) #define PLASMA_RC_QUIT BUTTON_RC_STOP #endif -#endif #ifdef HAVE_LCD_COLOR #if CONFIG_KEYPAD == IAUDIO_X5M5_PAD @@ -153,7 +149,8 @@ static int plasma_frequency; #ifndef PLASMA_REGEN_COLORS #define PLASMA_REGEN_COLORS BUTTON_CENTER #endif -#endif +#endif /* HAVE_TOUCHPAD */ +#endif /* HAVE_LCD_COLOR */ #define WAV_AMP 90 -- cgit v1.2.3