1 files changed, 44 insertions, 60 deletions

diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c
index f93e08eaba..e17a147139 100644
--- a/apps/plugins/plasma.c
+++ b/apps/plugins/plasma.c
@@ -58,83 +58,102 @@ static bool boosted = false;
 #endif
 
 /* Key assignement, all bitmapped models */
-#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
-    (CONFIG_KEYPAD == IPOD_1G2G_PAD)
-#define PLASMA_QUIT BUTTON_MENU
+#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD)
+#define PLASMA_QUIT               BUTTON_OFF
+#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
+#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
+
+#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
+#define PLASMA_QUIT               BUTTON_OFF
+#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
+#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
+#define PLASMA_REGEN_COLORS       BUTTON_SELECT
+#define PLASMA_RC_QUIT            BUTTON_RC_STOP
+
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
+      (CONFIG_KEYPAD == IPOD_1G2G_PAD)
+#define PLASMA_QUIT               BUTTON_MENU
 #define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_FWD
 #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK
+#define PLASMA_REGEN_COLORS       BUTTON_SELECT
 
 #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
-#define PLASMA_QUIT BUTTON_POWER
+#define PLASMA_QUIT               BUTTON_POWER
 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
+#define PLASMA_REGEN_COLORS       BUTTON_SELECT
 
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
       (CONFIG_KEYPAD == SANSA_C200_PAD) || \
       (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \
       (CONFIG_KEYPAD == SANSA_M200_PAD)
-#define PLASMA_QUIT BUTTON_POWER
+#define PLASMA_QUIT               BUTTON_POWER
 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
+#define PLASMA_REGEN_COLORS       BUTTON_SELECT
 
 #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-#define PLASMA_QUIT (BUTTON_HOME|BUTTON_REPEAT)
+#define PLASMA_QUIT               (BUTTON_HOME|BUTTON_REPEAT)
 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
+#define PLASMA_REGEN_COLORS       BUTTON_SELECT
 
 #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
-#define PLASMA_QUIT BUTTON_POWER
+#define PLASMA_QUIT               BUTTON_POWER
 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
+#define PLASMA_REGEN_COLORS       BUTTON_PLAY
 
 #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
-#define PLASMA_QUIT BUTTON_POWER
+#define PLASMA_QUIT               BUTTON_POWER
 #define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_DOWN
+#define PLASMA_REGEN_COLORS       BUTTON_PLAY
 
 #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD)
-#define PLASMA_QUIT BUTTON_BACK
+#define PLASMA_QUIT               BUTTON_BACK
 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
+#define PLASMA_REGEN_COLORS       BUTTON_SELECT
 
 #elif (CONFIG_KEYPAD == MROBE100_PAD)
-#define PLASMA_QUIT BUTTON_POWER
+#define PLASMA_QUIT               BUTTON_POWER
 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
 
 #elif (CONFIG_KEYPAD == IAUDIO_M3_PAD)
-#define PLASMA_QUIT BUTTON_RC_REC
+#define PLASMA_QUIT               BUTTON_RC_REC
 #define PLASMA_INCREASE_FREQUENCY BUTTON_RC_VOL_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_RC_VOL_DOWN
 #define PLASMA_RC_QUIT            BUTTON_REC
 
 #elif (CONFIG_KEYPAD == COWOND2_PAD)
-#define PLASMA_QUIT BUTTON_POWER
+#define PLASMA_QUIT               BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == IAUDIO67_PAD)
-#define PLASMA_QUIT BUTTON_POWER
+#define PLASMA_QUIT               BUTTON_POWER
 #define PLASMA_INCREASE_FREQUENCY BUTTON_RIGHT
 #define PLASMA_DECREASE_FREQUENCY BUTTON_LEFT
+#define PLASMA_REGEN_COLORS       BUTTON_PLAY
 #define PLASMA_RC_QUIT            BUTTON_STOP
-#define PLASMA_REGEN_COLORS BUTTON_PLAY
 
 #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define PLASMA_QUIT BUTTON_BACK
+#define PLASMA_QUIT               BUTTON_BACK
 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
-#define PLASMA_REGEN_COLORS BUTTON_SELECT
+#define PLASMA_REGEN_COLORS       BUTTON_SELECT
 
 #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
-#define PLASMA_QUIT BUTTON_POWER
+#define PLASMA_QUIT               BUTTON_POWER
 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
-#define PLASMA_REGEN_COLORS BUTTON_SELECT
+#define PLASMA_REGEN_COLORS       BUTTON_SELECT
 
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
-#define PLASMA_QUIT BUTTON_POWER
+#define PLASMA_QUIT               BUTTON_POWER
 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
-#define PLASMA_REGEN_COLORS BUTTON_PLAY
+#define PLASMA_REGEN_COLORS       BUTTON_PLAY
 
 #elif (CONFIG_KEYPAD == ONDAVX747_PAD)
 #define PLASMA_QUIT BUTTON_POWER
@@ -157,47 +176,12 @@ static bool boosted = false;
 #ifndef PLASMA_DECREASE_FREQUENCY
 #define PLASMA_DECREASE_FREQUENCY BUTTON_MIDLEFT
 #endif
-#endif /* HAVE_TOUCHSCREEN */
-
-#ifndef PLASMA_QUIT
-#define PLASMA_QUIT               BUTTON_OFF
-#endif
-#ifndef PLASMA_INCREASE_FREQUENCY
-#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
-#endif
-#ifndef PLASMA_DECREASE_FREQUENCY
-#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
-#endif
-
-#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
-#define PLASMA_RC_QUIT            BUTTON_RC_STOP
-#endif
-
-/* FIXME: cleanup */
 #ifdef HAVE_LCD_COLOR
-#if CONFIG_KEYPAD == IAUDIO_X5M5_PAD
-#define PLASMA_REGEN_COLORS BUTTON_PLAY
-#elif CONFIG_KEYPAD == IRIVER_H10_PAD
-#define PLASMA_REGEN_COLORS BUTTON_PLAY
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
-(CONFIG_KEYPAD == SANSA_C200_PAD) || \
-(CONFIG_KEYPAD == SANSA_FUZE_PAD)
-#define PLASMA_REGEN_COLORS BUTTON_SELECT
-#elif CONFIG_KEYPAD == IPOD_4G_PAD
-#define PLASMA_REGEN_COLORS BUTTON_SELECT
-#elif CONFIG_KEYPAD == IRIVER_H300_PAD
-#define PLASMA_REGEN_COLORS BUTTON_SELECT
-#elif CONFIG_KEYPAD == GIGABEAT_PAD
-#define PLASMA_REGEN_COLORS BUTTON_SELECT
-#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
-#define PLASMA_REGEN_COLORS BUTTON_SELECT
-#endif
-#ifdef HAVE_TOUCHSCREEN
 #ifndef PLASMA_REGEN_COLORS
-#define PLASMA_REGEN_COLORS BUTTON_CENTER
+#define PLASMA_REGEN_COLORS       BUTTON_CENTER
 #endif
-#endif /* HAVE_TOUCHSCREEN */
 #endif /* HAVE_LCD_COLOR */
+#endif /* HAVE_TOUCHSCREEN */
 
 #define WAV_AMP 90
 
@@ -268,7 +252,7 @@ static void shades_generate(void)
 void cleanup(void *parameter)
 {
     (void)parameter;
-    
+
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
     if (boosted)
         rb->cpu_boost(false);
@@ -345,7 +329,7 @@ int main(void)
             z0 = wave_array[t1] + wave_array[t2];
             for(x = 0; x < LCD_WIDTH; ++x)
             {
-                z = z0 + wave_array[t3] + wave_array[t4];  
+                z = z0 + wave_array[t3] + wave_array[t4];
 #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256)
                 *ptr++ = z;
 #else
@@ -422,7 +406,7 @@ int main(void)
                 bluephase=rb->rand()%256;
                 break;
 #endif
-                
+
             default:
                 if (rb->default_event_handler_ex(button, cleanup, NULL)
                     == SYS_USB_CONNECTED)