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.tar.gz rockbox-b47e64ed6a22dff207facd6192159a910bdba387.zip |
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 d4d08bc673..197e8fec8b 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -44,7 +44,7 @@ extern int ata_io_address; | |||
44 | extern int num_threads; | 44 | extern int num_threads; |
45 | extern char *thread_name[]; | 45 | extern char *thread_name[]; |
46 | 46 | ||
47 | #ifdef ARCHOS_RECORDER | 47 | #ifdef HAVE_LCD_BITMAP |
48 | /* Test code!!! */ | 48 | /* Test code!!! */ |
49 | void dbg_os(void) | 49 | void dbg_os(void) |
50 | { | 50 | { |
@@ -120,7 +120,7 @@ void dbg_os(void) | |||
120 | } | 120 | } |
121 | #endif | 121 | #endif |
122 | 122 | ||
123 | #ifdef ARCHOS_RECORDER | 123 | #ifdef HAVE_LCD_BITMAP |
124 | /* Test code!!! */ | 124 | /* Test code!!! */ |
125 | void dbg_ports(void) | 125 | void dbg_ports(void) |
126 | { | 126 | { |
@@ -395,7 +395,7 @@ void dbg_mas(void) | |||
395 | } | 395 | } |
396 | } | 396 | } |
397 | 397 | ||
398 | #ifdef ARCHOS_RECORDER | 398 | #ifdef HAVE_MAS3587F |
399 | void dbg_mas_codec(void) | 399 | void dbg_mas_codec(void) |
400 | { | 400 | { |
401 | char buf[32]; | 401 | char buf[32]; |
@@ -428,7 +428,9 @@ void dbg_mas_codec(void) | |||
428 | } | 428 | } |
429 | } | 429 | } |
430 | } | 430 | } |
431 | #endif | ||
431 | 432 | ||
433 | #ifdef HAVE_LCD_BITMAP | ||
432 | /* | 434 | /* |
433 | * view_battery() shows a automatically scaled graph of the battery voltage | 435 | * view_battery() shows a automatically scaled graph of the battery voltage |
434 | * over time. Usable for estimating battery life / charging rate. | 436 | * over time. Usable for estimating battery life / charging rate. |
@@ -566,8 +568,10 @@ void debug_menu(void) | |||
566 | #endif /* HAVE_LCD_BITMAP */ | 568 | #endif /* HAVE_LCD_BITMAP */ |
567 | { "View OS stacks", dbg_os }, | 569 | { "View OS stacks", dbg_os }, |
568 | { "View MAS regs", dbg_mas }, | 570 | { "View MAS regs", dbg_mas }, |
569 | #ifdef ARCHOS_RECORDER | 571 | #ifdef HAVE_MAS3587F |
570 | { "View MAS codec", dbg_mas_codec }, | 572 | { "View MAS codec", dbg_mas_codec }, |
573 | #endif | ||
574 | #ifdef HAVE_LCD_BITMAP | ||
571 | { "View battery", view_battery }, | 575 | { "View battery", view_battery }, |
572 | #endif | 576 | #endif |
573 | }; | 577 | }; |
diff --git a/apps/main.c b/apps/main.c index df7d7c128f..e7098b979a 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -114,7 +114,7 @@ void init(void) | |||
114 | rc = ata_init(); | 114 | rc = ata_init(); |
115 | if(rc) | 115 | if(rc) |
116 | { | 116 | { |
117 | #ifdef ARCHOS_RECORDER | 117 | #ifdef HAVE_LCD_BITMAP |
118 | char str[32]; | 118 | char str[32]; |
119 | lcd_clear_display(); | 119 | lcd_clear_display(); |
120 | snprintf(str, 31, "ATA error: %d", rc); | 120 | snprintf(str, 31, "ATA error: %d", rc); |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 3b97e10243..9ea82e811b 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -122,7 +122,7 @@ static void treble(void) | |||
122 | set_sound("Treble", &global_settings.treble, SOUND_TREBLE); | 122 | set_sound("Treble", &global_settings.treble, SOUND_TREBLE); |
123 | } | 123 | } |
124 | 124 | ||
125 | #ifdef ARCHOS_RECORDER | 125 | #ifdef HAVE_MAS3587F |
126 | static void loudness(void) | 126 | static void loudness(void) |
127 | { | 127 | { |
128 | set_sound("Loudness", &global_settings.loudness, SOUND_LOUDNESS); | 128 | set_sound("Loudness", &global_settings.loudness, SOUND_LOUDNESS); |
@@ -148,7 +148,7 @@ void sound_menu(void) | |||
148 | { "Volume", volume }, | 148 | { "Volume", volume }, |
149 | { "Bass", bass }, | 149 | { "Bass", bass }, |
150 | { "Treble", treble }, | 150 | { "Treble", treble }, |
151 | #ifdef ARCHOS_RECORDER | 151 | #ifdef HAVE_MAS3587F |
152 | { "Loudness", loudness }, | 152 | { "Loudness", loudness }, |
153 | { "Bass Boost", bass_boost }, | 153 | { "Bass Boost", bass_boost }, |
154 | { "Auto Volume", avc } | 154 | { "Auto Volume", avc } |
diff --git a/firmware/mpeg.h b/firmware/mpeg.h index a267079579..4ea0001e25 100644 --- a/firmware/mpeg.h +++ b/firmware/mpeg.h | |||
@@ -44,7 +44,7 @@ bool mpeg_has_changed_track(void); | |||
44 | #define SOUND_TREBLE 2 | 44 | #define SOUND_TREBLE 2 |
45 | #define SOUND_BALANCE 3 | 45 | #define SOUND_BALANCE 3 |
46 | 46 | ||
47 | #ifdef ARCHOS_RECORDER | 47 | #ifdef HAVE_MAS3587F |
48 | #define SOUND_LOUDNESS 4 | 48 | #define SOUND_LOUDNESS 4 |
49 | #define SOUND_SUPERBASS 5 | 49 | #define SOUND_SUPERBASS 5 |
50 | #define SOUND_AVC 6 | 50 | #define SOUND_AVC 6 |