a hell of a commit: changed several HAVE_xx configuration flags into multiple choice values (keypad, tuner, CPU, h/w codec)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5126 a1c6a512-1295-4272-9138-f99709370657

6 files changed, 32 insertions, 32 deletions

diff --git a/apps/plugins/battery_test.c b/apps/plugins/battery_test.c
index c7dac01..04be9b0 100644
--- a/apps/plugins/battery_test.c
+++ b/apps/plugins/battery_test.c
@@ -97,7 +97,7 @@ enum plugin_status loop(void)
 
             /* Check if we shall exit the plugin */
             if (button==BUTTON_ON ||
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
                 button==BUTTON_OFF
 #else
                 button==BUTTON_STOP
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index b647a0f..4df1696 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -227,7 +227,7 @@ static int run_timer(int nr)
         button = rb->button_get_w_tmo(10);
         switch (button) {
             /* OFF/MENU key to exit */
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_OFF:
 #else
             case BUTTON_ON:
@@ -299,7 +299,7 @@ static int run_timer(int nr)
             break;
 
             /* UP (RIGHT/+) = Scroll Lap timer up */
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_UP:
 #else
             case BUTTON_RIGHT:
@@ -309,7 +309,7 @@ static int run_timer(int nr)
                 break;
 
             /* DOWN (LEFT/-) = Scroll Lap timer down */
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_DOWN:
 #else
             case BUTTON_LEFT:
@@ -364,7 +364,7 @@ static int chessclock_set_int(char* string,
 #endif
         button = rb->button_get_w_tmo(HZ/2);
         switch(button) {
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_UP:
             case BUTTON_UP | BUTTON_REPEAT:
 #else
@@ -374,7 +374,7 @@ static int chessclock_set_int(char* string,
                 *variable += step;
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_DOWN:
             case BUTTON_DOWN | BUTTON_REPEAT:
 #else
@@ -384,7 +384,7 @@ static int chessclock_set_int(char* string,
                 *variable -= step;
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_LEFT:
             case BUTTON_PLAY:
 #else
@@ -393,7 +393,7 @@ static int chessclock_set_int(char* string,
                 done = true;
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_OFF:
 #else
             case BUTTON_STOP:
@@ -442,7 +442,7 @@ static int simple_menu(int nr, char **strarr)
         rb->lcd_puts_scroll(0, 0, strarr[show]);
         button = rb->button_get(false);
         switch(button) {
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_UP:
             case BUTTON_UP | BUTTON_REPEAT:
 #else
@@ -452,7 +452,7 @@ static int simple_menu(int nr, char **strarr)
                 show++;
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_DOWN:
             case BUTTON_DOWN | BUTTON_REPEAT:
 #else
@@ -462,7 +462,7 @@ static int simple_menu(int nr, char **strarr)
                 show--;
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_LEFT:
             case BUTTON_PLAY:
 #else
@@ -471,7 +471,7 @@ static int simple_menu(int nr, char **strarr)
                 return show;
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_OFF:
 #else
             case BUTTON_STOP:
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c
index dbccd03..74b7663 100644
--- a/apps/plugins/metronome.c
+++ b/apps/plugins/metronome.c
@@ -200,7 +200,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){
     while (true){
     
     switch (rb->button_get(true)) {
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
     case BUTTON_OFF:
 #else
     case BUTTON_STOP:
@@ -220,7 +220,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){
         draw_display();
         break;
       
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
     case BUTTON_UP:
     case BUTTON_UP | BUTTON_REPEAT:
 #else
@@ -231,7 +231,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter){
         calc_period();
         break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
     case BUTTON_DOWN:
     case BUTTON_DOWN | BUTTON_REPEAT:
 #else
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c
index db99c5b..b76a08c 100644
--- a/apps/plugins/splitedit.c
+++ b/apps/plugins/splitedit.c
@@ -230,7 +230,7 @@ static void update_icons(void)
         LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT,
         BMPWIDTH, BMPHEIGHT, true);
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     /* The scale icon */
     rb->lcd_bitmap(SCALE_BMP[rb->peak_meter_get_use_dbfs()],
         2 *LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT,
@@ -849,7 +849,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
             {
                 /* read volume info */
                 unsigned short volume;
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
                 volume = rb->mas_codec_readreg(0x0c);
                 volume += rb->mas_codec_readreg(0x0d);
                 volume = volume / 2;
@@ -1003,7 +1003,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
                 lastx = time_to_xpos(mp3->elapsed);
                 break;
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
             case BUTTON_ON | BUTTON_RIGHT:
                 rb->mpeg_set_pitch(1500);
                 splitedit_invalidate_osci();
@@ -1060,7 +1060,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
                 break;
 
             case BUTTON_F3:
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
                 rb->peak_meter_set_use_dbfs(rb->peak_meter_get_use_dbfs() +1);
 #endif
                 splitedit_invalidate_osci();
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index f71c4fe..370a1b5 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -103,7 +103,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
         {
 
             /* OFF/MENU key to exit */
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_OFF:
 #else
             case BUTTON_MENU:
@@ -127,7 +127,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
                  break;
 
             /* LEFT = Reset timer */
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_LEFT:
 #else
             case BUTTON_STOP:
@@ -148,7 +148,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
                  break;
 
             /* UP (RIGHT/+) = Scroll Lap timer up */
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_UP:
 #else
             case BUTTON_RIGHT:
@@ -161,7 +161,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
                  break;
 
             /* DOWN (LEFT/-) = Scroll Lap timer down */
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_DOWN:
 #else
             case BUTTON_LEFT:
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c
index a593da2..eb15127 100644
--- a/apps/plugins/viewer.c
+++ b/apps/plugins/viewer.c
@@ -746,7 +746,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
 
     while (!exit) {
         switch (rb->button_get(true)) {
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_OFF:
 #else
             case BUTTON_STOP:
@@ -755,7 +755,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
                 exit = true;
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_F1:
 #else
             case BUTTON_ON | BUTTON_LEFT:
@@ -776,7 +776,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
                 viewer_draw(col);
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_F2:
 #else
             case BUTTON_ON | BUTTON_MENU | BUTTON_RIGHT:
@@ -802,7 +802,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
                 viewer_draw(col);
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_F3:
 #else
             case BUTTON_ON | BUTTON_RIGHT:
@@ -843,7 +843,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
                 viewer_draw(col);
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_UP:
             case BUTTON_UP | BUTTON_REPEAT:
 #else
@@ -861,7 +861,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
                 viewer_draw(col);
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_DOWN:
             case BUTTON_DOWN | BUTTON_REPEAT:
 #else
@@ -875,7 +875,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
                 viewer_draw(col);
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_LEFT:
             case BUTTON_LEFT | BUTTON_REPEAT:
 #else
@@ -895,7 +895,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
                 viewer_draw(col);
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_RIGHT:
             case BUTTON_RIGHT | BUTTON_REPEAT:
 #else
@@ -915,7 +915,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
                 viewer_draw(col);
                 break;
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_ON:
                 /*Go to On-btn combinations */
                 col = viewer_recorder_on_button(col);