From 8ff3a653bdf89747100389a2ee933d2e7b5efe08 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sun, 18 Feb 2007 02:04:47 +0000 Subject: 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 --- firmware/SOURCES | 2 +- firmware/export/config.h | 6 ++++++ firmware/powermgmt.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'firmware') 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 #endif /* SIMULATOR */ /* Tuner */ -#ifdef CONFIG_TUNER +#if CONFIG_TUNER #ifndef SIMULATOR #if (CONFIG_TUNER & S1A0903X01) 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 @@ /* no known platform */ #endif +/* now set any CONFIG_ defines correctly if they are not used, + No need to do this on CONFIG_'s which are compulsary (e.g CONFIG_CODEC ) */ +#ifndef CONFIG_TUNER +#define CONFIG_TUNER 0 +#endif + /* Enable the directory cache and tagcache in RAM if we have * plenty of RAM. Both features can be enabled independently. */ #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 @@ #include "backlight.h" #include "lcd.h" #include "rtc.h" -#ifdef CONFIG_TUNER +#if CONFIG_TUNER #include "fmradio.h" #endif #ifdef HAVE_UDA1380 @@ -634,7 +634,7 @@ static void handle_auto_poweroff(void) #endif if(timeout && -#if defined(CONFIG_TUNER) && !defined(BOOTLOADER) +#if CONFIG_TUNER && !defined(BOOTLOADER) (!(get_radio_status() & FMRADIO_PLAYING)) && #endif !usb_inserted() && -- cgit v1.2.3