diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2002-08-08 20:44:25 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2002-08-08 20:44:25 +0000 |
| commit | b47e64ed6a22dff207facd6192159a910bdba387 (patch) | |
| tree | 5e3aab783783a658e41d89645e0440e0478ec7cc | |
| parent | e46af01bc4269d8278beceea336381410510d7cd (diff) | |
| download | rockbox-b47e64ed6a22dff207facd6192159a910bdba387.zip rockbox-b47e64ed6a22dff207facd6192159a910bdba387.tar.gz rockbox-b47e64ed6a22dff207facd6192159a910bdba387.tar.bz2 rockbox-b47e64ed6a22dff207facd6192159a910bdba387.tar.xz | |
Changed #ifdef from ARCHOS_RECORDER to HAVE_*
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1625 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/debug_menu.c | 12 | ||||
| -rw-r--r-- | apps/main.c | 2 | ||||
| -rw-r--r-- | apps/sound_menu.c | 4 | ||||
| -rw-r--r-- | firmware/mpeg.h | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index d4d08bc..197e8fe 100644 --- a/apps/debug_menu.c +++ b/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 }; diff --git a/apps/main.c b/apps/main.c index df7d7c1..e7098b9 100644 --- a/apps/main.c +++ b/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); diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 3b97e10..9ea82e8 100644 --- a/apps/sound_menu.c +++ b/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 } diff --git a/firmware/mpeg.h b/firmware/mpeg.h index a267079..4ea0001 100644 --- a/firmware/mpeg.h +++ b/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 |