len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FS#9824: Fix FM channel spacing for Europe

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22822 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Bertrik Sikken 2009-09-24 22:05:07 +00:00
parent 55cd14f875
commit a738e5f3a0
4 changed files with 53 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

34
apps/lang/english.lang
View file

@ -12735,3 +12735,37 @@
quickscreen: "Set as Top Quickscreen Item" quickscreen: "Set as Top Quickscreen Item"
</voice> </voice>
</phrase> </phrase>
<phrase>
id: LANG_FM_ITALY
desc: fm region Italy
user: core
<source>
*: none
radio: "Italy"
</source>
<dest>
*: none
radio: "Italy"
</dest>
<voice>
*: none
radio: "Italy"
</voice>
</phrase>
<phrase>
id: LANG_FM_OTHER
desc: Catch-all FM region. Select if none of the others work
user: core
<source>
*: none
radio: "Other"
</source>
<dest>
*: none
radio: "Other"
</dest>
<voice>
*: none
radio: "Other"
</voice>
</phrase>

5
apps/settings_list.c
View file

@ -1376,9 +1376,10 @@ const struct settings_list settings[] = {
#endif #endif
#if CONFIG_TUNER #if CONFIG_TUNER
CHOICE_SETTING(0, fm_region, LANG_FM_REGION, 0, CHOICE_SETTING(0, fm_region, LANG_FM_REGION, 0,
"fm_region", "eu,us,jp,kr", set_radio_region, 4, "fm_region", "eu,us,jp,kr,it,wo", set_radio_region, 6,
ID2P(LANG_FM_EUROPE), ID2P(LANG_FM_US), ID2P(LANG_FM_EUROPE), ID2P(LANG_FM_US),
ID2P(LANG_FM_JAPAN), ID2P(LANG_FM_KOREA)), ID2P(LANG_FM_JAPAN), ID2P(LANG_FM_KOREA),
ID2P(LANG_FM_ITALY), ID2P(LANG_FM_OTHER)),
#endif #endif
OFFON_SETTING(F_BANFROMQS, audioscrobbler, LANG_AUDIOSCROBBLER, false, OFFON_SETTING(F_BANFROMQS, audioscrobbler, LANG_AUDIOSCROBBLER, false,

2
firmware/export/tuner.h
View file

@ -58,6 +58,8 @@ enum
REGION_US_CANADA, REGION_US_CANADA,
REGION_JAPAN, REGION_JAPAN,
REGION_KOREA, REGION_KOREA,
REGION_ITALY,
REGION_OTHER,
/* Add new regions above this line */ /* Add new regions above this line */
TUNER_NUM_REGIONS TUNER_NUM_REGIONS

18
firmware/tuner.c
View file

@ -28,10 +28,12 @@
/* General region information */ /* General region information */
const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] = const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] =
{ {
[REGION_EUROPE] = { 87500000, 108000000, 50000 }, [REGION_EUROPE] = { 87500000, 108000000, 100000 },
[REGION_US_CANADA] = { 87900000, 107900000, 200000 }, [REGION_US_CANADA] = { 87900000, 107900000, 200000 },
[REGION_JAPAN] = { 76000000, 90000000, 100000 }, [REGION_JAPAN] = { 76000000, 90000000, 100000 },
[REGION_KOREA] = { 87500000, 108000000, 100000 } [REGION_KOREA] = { 87500000, 108000000, 200000 },
[REGION_ITALY] = { 87500000, 108000000, 50000 },
[REGION_OTHER] = { 87500000, 108000000, 50000 }
}; };
#ifndef SIMULATOR #ifndef SIMULATOR
@ -46,6 +48,8 @@ const unsigned char lv24020lp_region_data[TUNER_NUM_REGIONS] =
[REGION_US_CANADA] = 1, /* 75uS */ [REGION_US_CANADA] = 1, /* 75uS */
[REGION_JAPAN] = 0, /* 50uS */ [REGION_JAPAN] = 0, /* 50uS */
[REGION_KOREA] = 0, /* 50uS */ [REGION_KOREA] = 0, /* 50uS */
[REGION_ITALY] = 0, /* 50uS */
[REGION_OTHER] = 0, /* 50uS */
}; };
#endif /* (CONFIG_TUNER & LV24020LP) */ #endif /* (CONFIG_TUNER & LV24020LP) */
@ -56,6 +60,8 @@ const struct tea5760_region_data tea5760_region_data[TUNER_NUM_REGIONS] =
[REGION_US_CANADA] = { 0, 0 }, /* 75uS, US/Europe band */ [REGION_US_CANADA] = { 0, 0 }, /* 75uS, US/Europe band */
[REGION_JAPAN] = { 1, 1 }, /* 50uS, Japanese band */ [REGION_JAPAN] = { 1, 1 }, /* 50uS, Japanese band */
[REGION_KOREA] = { 1, 0 }, /* 50uS, US/Europe band */ [REGION_KOREA] = { 1, 0 }, /* 50uS, US/Europe band */
[REGION_ITALY] = { 1, 0 }, /* 50uS, US/Europe band */
[REGION_OTHER] = { 1, 0 }, /* 50uS, US/Europe band */
}; };
#endif /* (CONFIG_TUNER & TEA5760) */ #endif /* (CONFIG_TUNER & TEA5760) */
@ -66,16 +72,20 @@ const struct tea5767_region_data tea5767_region_data[TUNER_NUM_REGIONS] =
[REGION_US_CANADA] = { 1, 0 }, /* 75uS, US/Europe band */ [REGION_US_CANADA] = { 1, 0 }, /* 75uS, US/Europe band */
[REGION_JAPAN] = { 0, 1 }, /* 50uS, Japanese band */ [REGION_JAPAN] = { 0, 1 }, /* 50uS, Japanese band */
[REGION_KOREA] = { 0, 0 }, /* 50uS, US/Europe band */ [REGION_KOREA] = { 0, 0 }, /* 50uS, US/Europe band */
[REGION_ITALY] = { 0, 0 }, /* 50uS, US/Europe band */
[REGION_OTHER] = { 0, 0 }, /* 50uS, US/Europe band */
}; };
#endif /* (CONFIG_TUNER & TEA5767) */ #endif /* (CONFIG_TUNER & TEA5767) */
#if (CONFIG_TUNER & SI4700) #if (CONFIG_TUNER & SI4700)
const struct si4700_region_data si4700_region_data[TUNER_NUM_REGIONS] = const struct si4700_region_data si4700_region_data[TUNER_NUM_REGIONS] =
{ {
[REGION_EUROPE] = { 1, 0, 2 }, /* 50uS, US/Europe band, 50kHz spacing */ [REGION_EUROPE] = { 1, 0, 1 }, /* 50uS, US/Europe band, 100kHz spacing */
[REGION_US_CANADA] = { 0, 0, 0 }, /* 75uS, US/Europe band, 200kHz spacing */ [REGION_US_CANADA] = { 0, 0, 0 }, /* 75uS, US/Europe band, 200kHz spacing */
[REGION_JAPAN] = { 1, 2, 1 }, /* 50uS, Japanese band, 100kHz spacing */ [REGION_JAPAN] = { 1, 2, 1 }, /* 50uS, Japanese band, 100kHz spacing */
[REGION_KOREA] = { 1, 0, 1 }, /* 50uS, US/Europe band, 100kHz spacing */ [REGION_KOREA] = { 1, 0, 0 }, /* 50uS, US/Europe band, 200kHz spacing */
[REGION_ITALY] = { 1, 0, 2 }, /* 50uS, US/Europe band, 50kHz spacing */
[REGION_OTHER] = { 1, 0, 2 }, /* 50uS, US/Europe band, 50kHz spacing */
}; };
#endif /* (CONFIG_TUNER & SI4700) */ #endif /* (CONFIG_TUNER & SI4700) */