diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-18 02:04:47 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-18 02:04:47 +0000 |
commit | 8ff3a653bdf89747100389a2ee933d2e7b5efe08 (patch) | |
tree | 28b9039d587f1998ae54f62d3c2317bdcc72b9d9 /firmware | |
parent | 1083de8e7dd9360c999dbfe08cdf5d7c1ee5c4a6 (diff) | |
download | rockbox-8ff3a653bdf89747100389a2ee933d2e7b5efe08.tar.gz rockbox-8ff3a653bdf89747100389a2ee933d2e7b5efe08.zip |
Explicilty set CONFIG_ defines to 0 which are not used.. because doing
#if defined(BLAA) && BLAA == something defeats the point of Wundef
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12378 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/export/config.h | 6 | ||||
-rw-r--r-- | firmware/powermgmt.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 9842689544..d8dd65e635 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -145,7 +145,7 @@ drivers/rtc/rtc_as3514.c | |||
145 | #endif /* SIMULATOR */ | 145 | #endif /* SIMULATOR */ |
146 | 146 | ||
147 | /* Tuner */ | 147 | /* Tuner */ |
148 | #ifdef CONFIG_TUNER | 148 | #if CONFIG_TUNER |
149 | #ifndef SIMULATOR | 149 | #ifndef SIMULATOR |
150 | #if (CONFIG_TUNER & S1A0903X01) | 150 | #if (CONFIG_TUNER & S1A0903X01) |
151 | drivers/fmradio.c | 151 | drivers/fmradio.c |
diff --git a/firmware/export/config.h b/firmware/export/config.h index b9420122e0..8519628d47 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -216,6 +216,12 @@ | |||
216 | /* no known platform */ | 216 | /* no known platform */ |
217 | #endif | 217 | #endif |
218 | 218 | ||
219 | /* now set any CONFIG_ defines correctly if they are not used, | ||
220 | No need to do this on CONFIG_'s which are compulsary (e.g CONFIG_CODEC ) */ | ||
221 | #ifndef CONFIG_TUNER | ||
222 | #define CONFIG_TUNER 0 | ||
223 | #endif | ||
224 | |||
219 | /* Enable the directory cache and tagcache in RAM if we have | 225 | /* Enable the directory cache and tagcache in RAM if we have |
220 | * plenty of RAM. Both features can be enabled independently. */ | 226 | * plenty of RAM. Both features can be enabled independently. */ |
221 | #if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8) && \ | 227 | #if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8) && \ |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 1b160af232..88fc5e8e33 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include "backlight.h" | 37 | #include "backlight.h" |
38 | #include "lcd.h" | 38 | #include "lcd.h" |
39 | #include "rtc.h" | 39 | #include "rtc.h" |
40 | #ifdef CONFIG_TUNER | 40 | #if CONFIG_TUNER |
41 | #include "fmradio.h" | 41 | #include "fmradio.h" |
42 | #endif | 42 | #endif |
43 | #ifdef HAVE_UDA1380 | 43 | #ifdef HAVE_UDA1380 |
@@ -634,7 +634,7 @@ static void handle_auto_poweroff(void) | |||
634 | #endif | 634 | #endif |
635 | 635 | ||
636 | if(timeout && | 636 | if(timeout && |
637 | #if defined(CONFIG_TUNER) && !defined(BOOTLOADER) | 637 | #if CONFIG_TUNER && !defined(BOOTLOADER) |
638 | (!(get_radio_status() & FMRADIO_PLAYING)) && | 638 | (!(get_radio_status() & FMRADIO_PLAYING)) && |
639 | #endif | 639 | #endif |
640 | !usb_inserted() && | 640 | !usb_inserted() && |