diff options
-rw-r--r-- | apps/SOURCES | 2 | ||||
-rw-r--r-- | apps/debug_menu.c | 6 | ||||
-rw-r--r-- | apps/filetree.c | 6 | ||||
-rw-r--r-- | apps/main.c | 4 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 8 | ||||
-rw-r--r-- | apps/status.c | 4 | ||||
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/export/config.h | 6 | ||||
-rw-r--r-- | firmware/powermgmt.c | 4 |
9 files changed, 24 insertions, 18 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 95e3479341..c186614733 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -72,7 +72,7 @@ recorder/backdrop.c | |||
72 | gui/color_picker.c | 72 | gui/color_picker.c |
73 | #endif | 73 | #endif |
74 | #endif | 74 | #endif |
75 | #ifdef CONFIG_TUNER | 75 | #if CONFIG_TUNER |
76 | recorder/radio.c | 76 | recorder/radio.c |
77 | #endif | 77 | #endif |
78 | #ifdef HAVE_RECORDING | 78 | #ifdef HAVE_RECORDING |
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 95b9aa8f01..9d449d78b9 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -60,7 +60,7 @@ | |||
60 | #ifdef HAVE_MMC | 60 | #ifdef HAVE_MMC |
61 | #include "ata_mmc.h" | 61 | #include "ata_mmc.h" |
62 | #endif | 62 | #endif |
63 | #ifdef CONFIG_TUNER | 63 | #if CONFIG_TUNER |
64 | #include "tuner.h" | 64 | #include "tuner.h" |
65 | #include "radio.h" | 65 | #include "radio.h" |
66 | #endif | 66 | #endif |
@@ -1986,7 +1986,7 @@ static bool dbg_save_roms(void) | |||
1986 | #endif /* CPU */ | 1986 | #endif /* CPU */ |
1987 | 1987 | ||
1988 | #ifndef SIMULATOR | 1988 | #ifndef SIMULATOR |
1989 | #ifdef CONFIG_TUNER | 1989 | #if CONFIG_TUNER |
1990 | static bool dbg_fm_radio(void) | 1990 | static bool dbg_fm_radio(void) |
1991 | { | 1991 | { |
1992 | char buf[32]; | 1992 | char buf[32]; |
@@ -2357,7 +2357,7 @@ bool debug_menu(void) | |||
2357 | #endif /* PM_DEBUG */ | 2357 | #endif /* PM_DEBUG */ |
2358 | #endif /* HAVE_LCD_BITMAP */ | 2358 | #endif /* HAVE_LCD_BITMAP */ |
2359 | #ifndef SIMULATOR | 2359 | #ifndef SIMULATOR |
2360 | #ifdef CONFIG_TUNER | 2360 | #if CONFIG_TUNER |
2361 | { "FM Radio", dbg_fm_radio }, | 2361 | { "FM Radio", dbg_fm_radio }, |
2362 | #endif | 2362 | #endif |
2363 | #endif | 2363 | #endif |
diff --git a/apps/filetree.c b/apps/filetree.c index df4065c91b..edf4fa0b63 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include "keyboard.h" | 46 | #include "keyboard.h" |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | #ifdef CONFIG_TUNER | 49 | #if CONFIG_TUNER |
50 | #include "radio.h" | 50 | #include "radio.h" |
51 | #endif | 51 | #endif |
52 | 52 | ||
@@ -288,7 +288,7 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
288 | #ifdef HAVE_REMOTE_LCD | 288 | #ifdef HAVE_REMOTE_LCD |
289 | (*c->dirfilter == SHOW_RWPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_RWPS) || | 289 | (*c->dirfilter == SHOW_RWPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_RWPS) || |
290 | #endif | 290 | #endif |
291 | #ifdef CONFIG_TUNER | 291 | #if CONFIG_TUNER |
292 | (*c->dirfilter == SHOW_FMR && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_FMR) || | 292 | (*c->dirfilter == SHOW_FMR && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_FMR) || |
293 | #endif | 293 | #endif |
294 | (*c->dirfilter == SHOW_CFG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_CFG) || | 294 | (*c->dirfilter == SHOW_CFG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_CFG) || |
@@ -435,7 +435,7 @@ int ft_enter(struct tree_context* c) | |||
435 | } | 435 | } |
436 | break; | 436 | break; |
437 | 437 | ||
438 | #ifdef CONFIG_TUNER | 438 | #if CONFIG_TUNER |
439 | /* fmr preset file */ | 439 | /* fmr preset file */ |
440 | case TREE_ATTR_FMR: | 440 | case TREE_ATTR_FMR: |
441 | 441 | ||
diff --git a/apps/main.c b/apps/main.c index 9f521e5064..70a3f8ddea 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -84,7 +84,7 @@ | |||
84 | #define SETTINGS_RESET BUTTON_REC | 84 | #define SETTINGS_RESET BUTTON_REC |
85 | #endif | 85 | #endif |
86 | 86 | ||
87 | #ifdef CONFIG_TUNER | 87 | #if CONFIG_TUNER |
88 | #include "radio.h" | 88 | #include "radio.h" |
89 | #endif | 89 | #endif |
90 | #ifdef HAVE_MMC | 90 | #ifdef HAVE_MMC |
@@ -364,7 +364,7 @@ static void init(void) | |||
364 | audio_preinit(); | 364 | audio_preinit(); |
365 | #endif | 365 | #endif |
366 | 366 | ||
367 | #ifdef CONFIG_TUNER | 367 | #if CONFIG_TUNER |
368 | radio_init(); | 368 | radio_init(); |
369 | #endif | 369 | #endif |
370 | 370 | ||
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 52d4d6116a..9a618e2e33 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include "settings_menu.h" | 30 | #include "settings_menu.h" |
31 | #include "exported_menus.h" | 31 | #include "exported_menus.h" |
32 | #include "tree.h" | 32 | #include "tree.h" |
33 | #ifdef CONFIG_TUNER | 33 | #if CONFIG_TUNER |
34 | #include "radio.h" | 34 | #include "radio.h" |
35 | #endif | 35 | #endif |
36 | #ifdef HAVE_RECORDING | 36 | #ifdef HAVE_RECORDING |
@@ -386,7 +386,7 @@ MENUITEM_FUNCTION_WPARAM(browse_themes, ID2P(LANG_CUSTOM_THEME), | |||
386 | MENUITEM_FUNCTION_WPARAM(browse_plugins, ID2P(LANG_PLUGINS), | 386 | MENUITEM_FUNCTION_WPARAM(browse_plugins, ID2P(LANG_PLUGINS), |
387 | browse_folder, (void*)&rocks, NULL, bitmap_icons_6x8[Icon_Plugin]); | 387 | browse_folder, (void*)&rocks, NULL, bitmap_icons_6x8[Icon_Plugin]); |
388 | 388 | ||
389 | #ifdef CONFIG_TUNER | 389 | #if CONFIG_TUNER |
390 | MENUITEM_FUNCTION(load_radio_screen, ID2P(LANG_FM_RADIO), | 390 | MENUITEM_FUNCTION(load_radio_screen, ID2P(LANG_FM_RADIO), |
391 | (menu_function)radio_screen, dynamicitem_callback, | 391 | (menu_function)radio_screen, dynamicitem_callback, |
392 | bitmap_icons_6x8[Icon_Radio_screen]); | 392 | bitmap_icons_6x8[Icon_Radio_screen]); |
@@ -428,7 +428,7 @@ MAKE_MENU(main_menu_, "Rockbox Main Menu", mainmenu_callback, | |||
428 | bitmap_icons_6x8[Icon_Submenu_Entered], | 428 | bitmap_icons_6x8[Icon_Submenu_Entered], |
429 | &mrb_bookmarks, &sound_settings, | 429 | &mrb_bookmarks, &sound_settings, |
430 | &settings_menu_item, &manage_settings, &browse_themes, | 430 | &settings_menu_item, &manage_settings, &browse_themes, |
431 | #ifdef CONFIG_TUNER | 431 | #if CONFIG_TUNER |
432 | &load_radio_screen, | 432 | &load_radio_screen, |
433 | #endif | 433 | #endif |
434 | #ifdef HAVE_RECORDING | 434 | #ifdef HAVE_RECORDING |
@@ -449,7 +449,7 @@ int dynamicitem_callback(int action,const struct menu_item_ex *this_item) | |||
449 | if (action != ACTION_ENTER_MENUITEM) | 449 | if (action != ACTION_ENTER_MENUITEM) |
450 | return action; | 450 | return action; |
451 | 451 | ||
452 | #ifdef CONFIG_TUNER | 452 | #if CONFIG_TUNER |
453 | if (this_item == &load_radio_screen) | 453 | if (this_item == &load_radio_screen) |
454 | { | 454 | { |
455 | if (radio_hardware_present() == 0) | 455 | if (radio_hardware_present() == 0) |
diff --git a/apps/status.c b/apps/status.c index 3f46607ed1..1551f77d53 100644 --- a/apps/status.c +++ b/apps/status.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include "button.h" | 43 | #include "button.h" |
44 | #endif | 44 | #endif |
45 | #include "usb.h" | 45 | #include "usb.h" |
46 | #ifdef CONFIG_TUNER | 46 | #if CONFIG_TUNER |
47 | #include "radio.h" | 47 | #include "radio.h" |
48 | #endif | 48 | #endif |
49 | #if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC | 49 | #if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC |
@@ -96,7 +96,7 @@ int current_playmode(void) | |||
96 | } | 96 | } |
97 | #endif | 97 | #endif |
98 | 98 | ||
99 | #ifdef CONFIG_TUNER | 99 | #if CONFIG_TUNER |
100 | audio_stat = get_radio_status(); | 100 | audio_stat = get_radio_status(); |
101 | if(audio_stat & FMRADIO_PLAYING) | 101 | if(audio_stat & FMRADIO_PLAYING) |
102 | return STATUS_RADIO; | 102 | return STATUS_RADIO; |
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() && |