diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/tuner.h | 2 | ||||
-rw-r--r-- | firmware/tuner.c | 18 |
2 files changed, 16 insertions, 4 deletions
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h index f92e94269c..b27e660667 100644 --- a/firmware/export/tuner.h +++ b/firmware/export/tuner.h | |||
@@ -58,6 +58,8 @@ enum | |||
58 | REGION_US_CANADA, | 58 | REGION_US_CANADA, |
59 | REGION_JAPAN, | 59 | REGION_JAPAN, |
60 | REGION_KOREA, | 60 | REGION_KOREA, |
61 | REGION_ITALY, | ||
62 | REGION_OTHER, | ||
61 | 63 | ||
62 | /* Add new regions above this line */ | 64 | /* Add new regions above this line */ |
63 | TUNER_NUM_REGIONS | 65 | TUNER_NUM_REGIONS |
diff --git a/firmware/tuner.c b/firmware/tuner.c index a471c4e970..5fd7fa1f38 100644 --- a/firmware/tuner.c +++ b/firmware/tuner.c | |||
@@ -28,10 +28,12 @@ | |||
28 | /* General region information */ | 28 | /* General region information */ |
29 | const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] = | 29 | const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] = |
30 | { | 30 | { |
31 | [REGION_EUROPE] = { 87500000, 108000000, 50000 }, | 31 | [REGION_EUROPE] = { 87500000, 108000000, 100000 }, |
32 | [REGION_US_CANADA] = { 87900000, 107900000, 200000 }, | 32 | [REGION_US_CANADA] = { 87900000, 107900000, 200000 }, |
33 | [REGION_JAPAN] = { 76000000, 90000000, 100000 }, | 33 | [REGION_JAPAN] = { 76000000, 90000000, 100000 }, |
34 | [REGION_KOREA] = { 87500000, 108000000, 100000 } | 34 | [REGION_KOREA] = { 87500000, 108000000, 200000 }, |
35 | [REGION_ITALY] = { 87500000, 108000000, 50000 }, | ||
36 | [REGION_OTHER] = { 87500000, 108000000, 50000 } | ||
35 | }; | 37 | }; |
36 | 38 | ||
37 | #ifndef SIMULATOR | 39 | #ifndef SIMULATOR |
@@ -46,6 +48,8 @@ const unsigned char lv24020lp_region_data[TUNER_NUM_REGIONS] = | |||
46 | [REGION_US_CANADA] = 1, /* 75uS */ | 48 | [REGION_US_CANADA] = 1, /* 75uS */ |
47 | [REGION_JAPAN] = 0, /* 50uS */ | 49 | [REGION_JAPAN] = 0, /* 50uS */ |
48 | [REGION_KOREA] = 0, /* 50uS */ | 50 | [REGION_KOREA] = 0, /* 50uS */ |
51 | [REGION_ITALY] = 0, /* 50uS */ | ||
52 | [REGION_OTHER] = 0, /* 50uS */ | ||
49 | }; | 53 | }; |
50 | #endif /* (CONFIG_TUNER & LV24020LP) */ | 54 | #endif /* (CONFIG_TUNER & LV24020LP) */ |
51 | 55 | ||
@@ -56,6 +60,8 @@ const struct tea5760_region_data tea5760_region_data[TUNER_NUM_REGIONS] = | |||
56 | [REGION_US_CANADA] = { 0, 0 }, /* 75uS, US/Europe band */ | 60 | [REGION_US_CANADA] = { 0, 0 }, /* 75uS, US/Europe band */ |
57 | [REGION_JAPAN] = { 1, 1 }, /* 50uS, Japanese band */ | 61 | [REGION_JAPAN] = { 1, 1 }, /* 50uS, Japanese band */ |
58 | [REGION_KOREA] = { 1, 0 }, /* 50uS, US/Europe band */ | 62 | [REGION_KOREA] = { 1, 0 }, /* 50uS, US/Europe band */ |
63 | [REGION_ITALY] = { 1, 0 }, /* 50uS, US/Europe band */ | ||
64 | [REGION_OTHER] = { 1, 0 }, /* 50uS, US/Europe band */ | ||
59 | }; | 65 | }; |
60 | #endif /* (CONFIG_TUNER & TEA5760) */ | 66 | #endif /* (CONFIG_TUNER & TEA5760) */ |
61 | 67 | ||
@@ -66,16 +72,20 @@ const struct tea5767_region_data tea5767_region_data[TUNER_NUM_REGIONS] = | |||
66 | [REGION_US_CANADA] = { 1, 0 }, /* 75uS, US/Europe band */ | 72 | [REGION_US_CANADA] = { 1, 0 }, /* 75uS, US/Europe band */ |
67 | [REGION_JAPAN] = { 0, 1 }, /* 50uS, Japanese band */ | 73 | [REGION_JAPAN] = { 0, 1 }, /* 50uS, Japanese band */ |
68 | [REGION_KOREA] = { 0, 0 }, /* 50uS, US/Europe band */ | 74 | [REGION_KOREA] = { 0, 0 }, /* 50uS, US/Europe band */ |
75 | [REGION_ITALY] = { 0, 0 }, /* 50uS, US/Europe band */ | ||
76 | [REGION_OTHER] = { 0, 0 }, /* 50uS, US/Europe band */ | ||
69 | }; | 77 | }; |
70 | #endif /* (CONFIG_TUNER & TEA5767) */ | 78 | #endif /* (CONFIG_TUNER & TEA5767) */ |
71 | 79 | ||
72 | #if (CONFIG_TUNER & SI4700) | 80 | #if (CONFIG_TUNER & SI4700) |
73 | const struct si4700_region_data si4700_region_data[TUNER_NUM_REGIONS] = | 81 | const struct si4700_region_data si4700_region_data[TUNER_NUM_REGIONS] = |
74 | { | 82 | { |
75 | [REGION_EUROPE] = { 1, 0, 2 }, /* 50uS, US/Europe band, 50kHz spacing */ | 83 | [REGION_EUROPE] = { 1, 0, 1 }, /* 50uS, US/Europe band, 100kHz spacing */ |
76 | [REGION_US_CANADA] = { 0, 0, 0 }, /* 75uS, US/Europe band, 200kHz spacing */ | 84 | [REGION_US_CANADA] = { 0, 0, 0 }, /* 75uS, US/Europe band, 200kHz spacing */ |
77 | [REGION_JAPAN] = { 1, 2, 1 }, /* 50uS, Japanese band, 100kHz spacing */ | 85 | [REGION_JAPAN] = { 1, 2, 1 }, /* 50uS, Japanese band, 100kHz spacing */ |
78 | [REGION_KOREA] = { 1, 0, 1 }, /* 50uS, US/Europe band, 100kHz spacing */ | 86 | [REGION_KOREA] = { 1, 0, 0 }, /* 50uS, US/Europe band, 200kHz spacing */ |
87 | [REGION_ITALY] = { 1, 0, 2 }, /* 50uS, US/Europe band, 50kHz spacing */ | ||
88 | [REGION_OTHER] = { 1, 0, 2 }, /* 50uS, US/Europe band, 50kHz spacing */ | ||
79 | }; | 89 | }; |
80 | #endif /* (CONFIG_TUNER & SI4700) */ | 90 | #endif /* (CONFIG_TUNER & SI4700) */ |
81 | 91 | ||