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 --- apps/SOURCES | 2 +- apps/debug_menu.c | 6 +++--- apps/filetree.c | 6 +++--- apps/main.c | 4 ++-- apps/menus/main_menu.c | 8 ++++---- apps/status.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'apps') diff --git a/apps/SOURCES b/apps/SOURCES index 95e3479..c186614 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -72,7 +72,7 @@ recorder/backdrop.c gui/color_picker.c #endif #endif -#ifdef CONFIG_TUNER +#if CONFIG_TUNER recorder/radio.c #endif #ifdef HAVE_RECORDING diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 95b9aa8..9d449d7 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -60,7 +60,7 @@ #ifdef HAVE_MMC #include "ata_mmc.h" #endif -#ifdef CONFIG_TUNER +#if CONFIG_TUNER #include "tuner.h" #include "radio.h" #endif @@ -1986,7 +1986,7 @@ static bool dbg_save_roms(void) #endif /* CPU */ #ifndef SIMULATOR -#ifdef CONFIG_TUNER +#if CONFIG_TUNER static bool dbg_fm_radio(void) { char buf[32]; @@ -2357,7 +2357,7 @@ bool debug_menu(void) #endif /* PM_DEBUG */ #endif /* HAVE_LCD_BITMAP */ #ifndef SIMULATOR -#ifdef CONFIG_TUNER +#if CONFIG_TUNER { "FM Radio", dbg_fm_radio }, #endif #endif diff --git a/apps/filetree.c b/apps/filetree.c index df4065c..edf4fa0 100644 --- a/apps/filetree.c +++ b/apps/filetree.c @@ -46,7 +46,7 @@ #include "keyboard.h" #endif -#ifdef CONFIG_TUNER +#if CONFIG_TUNER #include "radio.h" #endif @@ -288,7 +288,7 @@ int ft_load(struct tree_context* c, const char* tempdir) #ifdef HAVE_REMOTE_LCD (*c->dirfilter == SHOW_RWPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_RWPS) || #endif -#ifdef CONFIG_TUNER +#if CONFIG_TUNER (*c->dirfilter == SHOW_FMR && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_FMR) || #endif (*c->dirfilter == SHOW_CFG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_CFG) || @@ -435,7 +435,7 @@ int ft_enter(struct tree_context* c) } break; -#ifdef CONFIG_TUNER +#if CONFIG_TUNER /* fmr preset file */ case TREE_ATTR_FMR: diff --git a/apps/main.c b/apps/main.c index 9f521e5..70a3f8d 100644 --- a/apps/main.c +++ b/apps/main.c @@ -84,7 +84,7 @@ #define SETTINGS_RESET BUTTON_REC #endif -#ifdef CONFIG_TUNER +#if CONFIG_TUNER #include "radio.h" #endif #ifdef HAVE_MMC @@ -364,7 +364,7 @@ static void init(void) audio_preinit(); #endif -#ifdef CONFIG_TUNER +#if CONFIG_TUNER radio_init(); #endif diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 52d4d61..9a618e2 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -30,7 +30,7 @@ #include "settings_menu.h" #include "exported_menus.h" #include "tree.h" -#ifdef CONFIG_TUNER +#if CONFIG_TUNER #include "radio.h" #endif #ifdef HAVE_RECORDING @@ -386,7 +386,7 @@ MENUITEM_FUNCTION_WPARAM(browse_themes, ID2P(LANG_CUSTOM_THEME), MENUITEM_FUNCTION_WPARAM(browse_plugins, ID2P(LANG_PLUGINS), browse_folder, (void*)&rocks, NULL, bitmap_icons_6x8[Icon_Plugin]); -#ifdef CONFIG_TUNER +#if CONFIG_TUNER MENUITEM_FUNCTION(load_radio_screen, ID2P(LANG_FM_RADIO), (menu_function)radio_screen, dynamicitem_callback, bitmap_icons_6x8[Icon_Radio_screen]); @@ -428,7 +428,7 @@ MAKE_MENU(main_menu_, "Rockbox Main Menu", mainmenu_callback, bitmap_icons_6x8[Icon_Submenu_Entered], &mrb_bookmarks, &sound_settings, &settings_menu_item, &manage_settings, &browse_themes, -#ifdef CONFIG_TUNER +#if CONFIG_TUNER &load_radio_screen, #endif #ifdef HAVE_RECORDING @@ -449,7 +449,7 @@ int dynamicitem_callback(int action,const struct menu_item_ex *this_item) if (action != ACTION_ENTER_MENUITEM) return action; -#ifdef CONFIG_TUNER +#if CONFIG_TUNER if (this_item == &load_radio_screen) { if (radio_hardware_present() == 0) diff --git a/apps/status.c b/apps/status.c index 3f46607..1551f77 100644 --- a/apps/status.c +++ b/apps/status.c @@ -43,7 +43,7 @@ #include "button.h" #endif #include "usb.h" -#ifdef CONFIG_TUNER +#if CONFIG_TUNER #include "radio.h" #endif #if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC @@ -96,7 +96,7 @@ int current_playmode(void) } #endif -#ifdef CONFIG_TUNER +#if CONFIG_TUNER audio_stat = get_radio_status(); if(audio_stat & FMRADIO_PLAYING) return STATUS_RADIO; -- cgit v1.1