diff options
-rw-r--r-- | apps/debug_menu.c | 4 | ||||
-rw-r--r-- | apps/recorder/radio.c | 2 | ||||
-rw-r--r-- | firmware/tuner_samsung.c | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 81b2f6a905..c51f8d42b0 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -1935,8 +1935,6 @@ bool dbg_save_roms(void) | |||
1935 | #endif /* CONFIG_CPU == SH7034 */ | 1935 | #endif /* CONFIG_CPU == SH7034 */ |
1936 | 1936 | ||
1937 | #ifdef CONFIG_TUNER | 1937 | #ifdef CONFIG_TUNER |
1938 | extern int debug_fm_detection; | ||
1939 | |||
1940 | bool dbg_fm_radio(void) | 1938 | bool dbg_fm_radio(void) |
1941 | { | 1939 | { |
1942 | char buf[32]; | 1940 | char buf[32]; |
@@ -1954,8 +1952,6 @@ bool dbg_fm_radio(void) | |||
1954 | 1952 | ||
1955 | snprintf(buf, sizeof buf, "HW detected: %s", fm_detected?"yes":"no"); | 1953 | snprintf(buf, sizeof buf, "HW detected: %s", fm_detected?"yes":"no"); |
1956 | lcd_puts(0, 0, buf); | 1954 | lcd_puts(0, 0, buf); |
1957 | snprintf(buf, sizeof buf, "Result: %08x", debug_fm_detection); | ||
1958 | lcd_puts(0, 1, buf); | ||
1959 | lcd_update(); | 1955 | lcd_update(); |
1960 | 1956 | ||
1961 | button = button_get(true); | 1957 | button = button_get(true); |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 7ed4ef04cb..93e2022caf 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -84,8 +84,6 @@ static struct fmstation presets[MAX_PRESETS]; | |||
84 | 84 | ||
85 | static const char default_filename[] = "/.rockbox/fm-presets-default.fmr"; | 85 | static const char default_filename[] = "/.rockbox/fm-presets-default.fmr"; |
86 | 86 | ||
87 | int debug_fm_detection; | ||
88 | |||
89 | static int preset_menu; /* The menu index of the preset list */ | 87 | static int preset_menu; /* The menu index of the preset list */ |
90 | static struct menu_item preset_menu_items[MAX_PRESETS]; | 88 | static struct menu_item preset_menu_items[MAX_PRESETS]; |
91 | static int num_presets; /* The number of presets in the preset list */ | 89 | static int num_presets; /* The number of presets in the preset list */ |
diff --git a/firmware/tuner_samsung.c b/firmware/tuner_samsung.c index f54748e7c6..632fb7561f 100644 --- a/firmware/tuner_samsung.c +++ b/firmware/tuner_samsung.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #define DEFAULT_IN2 0x140884 /* 5kHz, 7.2MHz crystal */ | 27 | #define DEFAULT_IN2 0x140884 /* 5kHz, 7.2MHz crystal */ |
28 | #define PLL_FREQ_STEP 10000 | 28 | #define PLL_FREQ_STEP 10000 |
29 | 29 | ||
30 | int debug_fm_detection; | ||
31 | static int fm_in1; | 30 | static int fm_in1; |
32 | static int fm_in2; | 31 | static int fm_in2; |
33 | 32 | ||
@@ -96,9 +95,7 @@ int samsung_get(int setting) | |||
96 | { | 95 | { |
97 | case RADIO_PRESENT: | 96 | case RADIO_PRESENT: |
98 | fmradio_set(2, 0x140885); /* 5kHz, 7.2MHz crystal, test mode 1 */ | 97 | fmradio_set(2, 0x140885); /* 5kHz, 7.2MHz crystal, test mode 1 */ |
99 | val = fmradio_read(0); | 98 | val = (fmradio_read(0) == 0x140885); |
100 | debug_fm_detection = val; | ||
101 | val = (val == 0x140885); | ||
102 | break; | 99 | break; |
103 | 100 | ||
104 | case RADIO_TUNED: | 101 | case RADIO_TUNED: |