Changed #ifdef from ARCHOS_RECORDER to HAVE_*

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

apps/debug_menu.c

@@ -44,7 +44,7 @@ extern int ata_io_address;
 extern int num_threads;
 extern char *thread_name[];
 
-#ifdef ARCHOS_RECORDER
+#ifdef HAVE_LCD_BITMAP
 /* Test code!!! */
 void dbg_os(void)
 {
@@ -120,7 +120,7 @@ void dbg_os(void)
 }
 #endif
 
-#ifdef ARCHOS_RECORDER
+#ifdef HAVE_LCD_BITMAP
 /* Test code!!! */
 void dbg_ports(void)
 {
@@ -395,7 +395,7 @@ void dbg_mas(void)
     }
 }
 
-#ifdef ARCHOS_RECORDER
+#ifdef HAVE_MAS3587F
 void dbg_mas_codec(void)
 {
     char buf[32];
@@ -428,7 +428,9 @@ void dbg_mas_codec(void)
         }
     }
 }
+#endif
 
+#ifdef HAVE_LCD_BITMAP
 /*
  * view_battery() shows a automatically scaled graph of the battery voltage
  * over time. Usable for estimating battery life / charging rate.
@@ -566,8 +568,10 @@ void debug_menu(void)
 #endif /* HAVE_LCD_BITMAP */
         { "View OS stacks", dbg_os },
         { "View MAS regs", dbg_mas },
-#ifdef ARCHOS_RECORDER
+#ifdef HAVE_MAS3587F
         { "View MAS codec", dbg_mas_codec },
+#endif
+#ifdef HAVE_LCD_BITMAP
         { "View battery", view_battery },
 #endif
     };

apps/main.c

@@ -114,7 +114,7 @@ void init(void)
     rc = ata_init();
     if(rc)
     {
-#ifdef ARCHOS_RECORDER
+#ifdef HAVE_LCD_BITMAP
         char str[32];
         lcd_clear_display();
         snprintf(str, 31, "ATA error: %d", rc);

apps/sound_menu.c

@@ -122,7 +122,7 @@ static void treble(void)
     set_sound("Treble", &global_settings.treble, SOUND_TREBLE);
 }
 
-#ifdef ARCHOS_RECORDER
+#ifdef HAVE_MAS3587F
 static void loudness(void)
 {
     set_sound("Loudness", &global_settings.loudness, SOUND_LOUDNESS);
@@ -148,7 +148,7 @@ void sound_menu(void)
         { "Volume", volume },
         { "Bass",   bass },
         { "Treble", treble },
-#ifdef ARCHOS_RECORDER
+#ifdef HAVE_MAS3587F
         { "Loudness", loudness },
         { "Bass Boost", bass_boost },
         { "Auto Volume", avc }

firmware/mpeg.h

@@ -44,7 +44,7 @@ bool mpeg_has_changed_track(void);
 #define SOUND_TREBLE 2
 #define SOUND_BALANCE 3
 
-#ifdef ARCHOS_RECORDER
+#ifdef HAVE_MAS3587F
 #define SOUND_LOUDNESS 4
 #define SOUND_SUPERBASS 5
 #define SOUND_AVC 6