diff options
-rw-r--r-- | apps/recorder/radio.c | 3 | ||||
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/export/hwcompat.h | 12 | ||||
-rw-r--r-- | firmware/export/s1a0903x01.h | 4 | ||||
-rw-r--r-- | firmware/tuner.c | 32 | ||||
-rw-r--r-- | uisimulator/common/fmradio.c | 4 |
6 files changed, 32 insertions, 25 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index c15f5196ec..eb457fc2e3 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -1304,9 +1304,12 @@ void toggle_mono_mode(bool mono) | |||
1304 | 1304 | ||
1305 | void set_radio_region(int region) | 1305 | void set_radio_region(int region) |
1306 | { | 1306 | { |
1307 | #ifdef HAVE_RADIO_REGION | ||
1307 | tuner_set(RADIO_REGION, region); | 1308 | tuner_set(RADIO_REGION, region); |
1309 | #endif | ||
1308 | next_station(0); | 1310 | next_station(0); |
1309 | remember_frequency(); | 1311 | remember_frequency(); |
1312 | (void)region; | ||
1310 | } | 1313 | } |
1311 | 1314 | ||
1312 | MENUITEM_SETTING(set_region, &global_settings.fm_region, NULL); | 1315 | MENUITEM_SETTING(set_region, &global_settings.fm_region, NULL); |
diff --git a/firmware/SOURCES b/firmware/SOURCES index 2db8e9e568..d899551a37 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -150,8 +150,8 @@ drivers/rtc/rtc_as3514.c | |||
150 | 150 | ||
151 | /* Tuner */ | 151 | /* Tuner */ |
152 | #if CONFIG_TUNER | 152 | #if CONFIG_TUNER |
153 | #ifndef SIMULATOR | ||
154 | tuner.c | 153 | tuner.c |
154 | #ifndef SIMULATOR | ||
155 | #if (CONFIG_TUNER & LV24020LP) | 155 | #if (CONFIG_TUNER & LV24020LP) |
156 | drivers/tuner/lv24020lp.c | 156 | drivers/tuner/lv24020lp.c |
157 | #endif /* (CONFIG_TUNER & LV24020LP) */ | 157 | #endif /* (CONFIG_TUNER & LV24020LP) */ |
diff --git a/firmware/export/hwcompat.h b/firmware/export/hwcompat.h index bebca68a6c..2261a91a36 100644 --- a/firmware/export/hwcompat.h +++ b/firmware/export/hwcompat.h | |||
@@ -40,12 +40,6 @@ | |||
40 | #define HW_MASK (*(short *)0x020000fc) | 40 | #define HW_MASK (*(short *)0x020000fc) |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | #endif /* (CONFIG_CPU == SH7034) && !SIMULATOR */ | ||
44 | |||
45 | #ifdef ARCHOS_PLAYER | ||
46 | bool is_new_player(void); | ||
47 | #endif | ||
48 | |||
49 | #ifdef CONFIG_TUNER_MULTI | 43 | #ifdef CONFIG_TUNER_MULTI |
50 | static inline int tuner_detect_type(void) | 44 | static inline int tuner_detect_type(void) |
51 | { | 45 | { |
@@ -53,4 +47,10 @@ static inline int tuner_detect_type(void) | |||
53 | } | 47 | } |
54 | #endif | 48 | #endif |
55 | 49 | ||
50 | #endif /* (CONFIG_CPU == SH7034) && !SIMULATOR */ | ||
51 | |||
52 | #ifdef ARCHOS_PLAYER | ||
53 | bool is_new_player(void); | ||
54 | #endif | ||
55 | |||
56 | #endif /* HWCOMPAT_H */ | 56 | #endif /* HWCOMPAT_H */ |
diff --git a/firmware/export/s1a0903x01.h b/firmware/export/s1a0903x01.h index bf497628b7..f36cfffae7 100644 --- a/firmware/export/s1a0903x01.h +++ b/firmware/export/s1a0903x01.h | |||
@@ -33,8 +33,8 @@ int s1a0903x01_set(int setting, int value); | |||
33 | int s1a0903x01_get(int setting); | 33 | int s1a0903x01_get(int setting); |
34 | 34 | ||
35 | #ifndef CONFIG_TUNER_MULTI | 35 | #ifndef CONFIG_TUNER_MULTI |
36 | #define tuner_set s1a0903x01_get | 36 | #define tuner_get s1a0903x01_get |
37 | #define tuner_get s1a0903x01_set | 37 | #define tuner_set s1a0903x01_set |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | #endif /* _S1A0903X01_H_ */ | 40 | #endif /* _S1A0903X01_H_ */ |
diff --git a/firmware/tuner.c b/firmware/tuner.c index 85f56b8976..1ee42a5355 100644 --- a/firmware/tuner.c +++ b/firmware/tuner.c | |||
@@ -23,22 +23,6 @@ | |||
23 | #include "tuner.h" | 23 | #include "tuner.h" |
24 | #include "fmradio.h" | 24 | #include "fmradio.h" |
25 | 25 | ||
26 | #ifdef CONFIG_TUNER_MULTI | ||
27 | int (*tuner_set)(int setting, int value); | ||
28 | int (*tuner_get)(int setting); | ||
29 | |||
30 | #define TUNER_TYPE_CASE(type, set, get, region_data) \ | ||
31 | case type: \ | ||
32 | tuner_set = set; \ | ||
33 | tuner_get = get; \ | ||
34 | break; | ||
35 | |||
36 | #else | ||
37 | |||
38 | #define TUNER_TYPE_CASE(type, set, get, region_data) | ||
39 | |||
40 | #endif /* CONFIG_TUNER_MULTI */ | ||
41 | |||
42 | /* General region information */ | 26 | /* General region information */ |
43 | const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] = | 27 | const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] = |
44 | { | 28 | { |
@@ -48,6 +32,8 @@ const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] = | |||
48 | [REGION_KOREA] = { 87500000, 108000000, 100000 } | 32 | [REGION_KOREA] = { 87500000, 108000000, 100000 } |
49 | }; | 33 | }; |
50 | 34 | ||
35 | #ifndef SIMULATOR | ||
36 | |||
51 | /* Tuner-specific region information */ | 37 | /* Tuner-specific region information */ |
52 | 38 | ||
53 | #if (CONFIG_TUNER & LV24020LP) | 39 | #if (CONFIG_TUNER & LV24020LP) |
@@ -71,6 +57,18 @@ const struct tea5767_region_data tea5767_region_data[TUNER_NUM_REGIONS] = | |||
71 | }; | 57 | }; |
72 | #endif /* (CONFIG_TUNER & TEA5767) */ | 58 | #endif /* (CONFIG_TUNER & TEA5767) */ |
73 | 59 | ||
60 | #ifdef CONFIG_TUNER_MULTI | ||
61 | int (*tuner_set)(int setting, int value); | ||
62 | int (*tuner_get)(int setting); | ||
63 | #define TUNER_TYPE_CASE(type, set, get, region_data) \ | ||
64 | case type: \ | ||
65 | tuner_set = set; \ | ||
66 | tuner_get = get; \ | ||
67 | break; | ||
68 | #else | ||
69 | #define TUNER_TYPE_CASE(type, set, get, region_data) | ||
70 | #endif /* CONFIG_TUNER_MULTI */ | ||
71 | |||
74 | void tuner_init(void) | 72 | void tuner_init(void) |
75 | { | 73 | { |
76 | #ifdef CONFIG_TUNER_MULTI | 74 | #ifdef CONFIG_TUNER_MULTI |
@@ -97,3 +95,5 @@ void tuner_init(void) | |||
97 | #endif | 95 | #endif |
98 | } | 96 | } |
99 | } | 97 | } |
98 | |||
99 | #endif /* SIMULATOR */ | ||
diff --git a/uisimulator/common/fmradio.c b/uisimulator/common/fmradio.c index 372fd10b38..63edd9dd23 100644 --- a/uisimulator/common/fmradio.c +++ b/uisimulator/common/fmradio.c | |||
@@ -30,6 +30,10 @@ static bool mono = false; | |||
30 | static bool powered = false; | 30 | static bool powered = false; |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | void tuner_init(void) | ||
34 | { | ||
35 | } | ||
36 | |||
33 | int tuner_set(int setting, int value) | 37 | int tuner_set(int setting, int value) |
34 | { | 38 | { |
35 | switch(setting) | 39 | switch(setting) |