devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix red (#ifdef hell).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17262 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rob Purchase 2008-04-27 16:13:18 +00:00
parent 297e0504da
commit 3fa414d959
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/plugins/plasma.c
View file

@ -100,7 +100,6 @@ static int plasma_frequency;
#elif (CONFIG_KEYPAD == COWOND2_PAD) #elif (CONFIG_KEYPAD == COWOND2_PAD)
#define PLASMA_QUIT BUTTON_POWER #define PLASMA_QUIT BUTTON_POWER
// the new button definitions should be placed here
#endif #endif
#ifdef HAVE_TOUCHPAD #ifdef HAVE_TOUCHPAD
@ -113,10 +112,8 @@ static int plasma_frequency;
#ifndef PLASMA_DECREASE_FREQUENCY #ifndef PLASMA_DECREASE_FREQUENCY
#define PLASMA_DECREASE_FREQUENCY BUTTON_MIDLEFT #define PLASMA_DECREASE_FREQUENCY BUTTON_MIDLEFT
#endif #endif
#endif /* HAVE_TOUCHPAD */
#endif
// if no button definitions specified and no touchpad use default
#ifndef PLASMA_QUIT #ifndef PLASMA_QUIT
#define PLASMA_QUIT BUTTON_OFF #define PLASMA_QUIT BUTTON_OFF
#endif #endif
@ -130,7 +127,6 @@ static int plasma_frequency;
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
#define PLASMA_RC_QUIT BUTTON_RC_STOP #define PLASMA_RC_QUIT BUTTON_RC_STOP
#endif #endif
#endif
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
#if CONFIG_KEYPAD == IAUDIO_X5M5_PAD #if CONFIG_KEYPAD == IAUDIO_X5M5_PAD
@ -153,7 +149,8 @@ static int plasma_frequency;
#ifndef PLASMA_REGEN_COLORS #ifndef PLASMA_REGEN_COLORS
#define PLASMA_REGEN_COLORS BUTTON_CENTER #define PLASMA_REGEN_COLORS BUTTON_CENTER
#endif #endif
#endif #endif /* HAVE_TOUCHPAD */
#endif /* HAVE_LCD_COLOR */
#define WAV_AMP 90 #define WAV_AMP 90