Index: apps/lang/english.lang =================================================================== --- apps/lang/english.lang (revision 19849) +++ apps/lang/english.lang (working copy) @@ -5735,20 +5735,20 @@ - id: LANG_FM_KOREA - desc: fm region korea + id: LANG_FM_WORLD + desc: fm region world user: *: none - radio: "Korea" + radio: "World" *: none - radio: "Korea" + radio: "World" *: none - radio: "Korea" + radio: "World" Index: apps/settings_list.c =================================================================== --- apps/settings_list.c (revision 19849) +++ apps/settings_list.c (working copy) @@ -1294,9 +1294,9 @@ #endif #if CONFIG_TUNER CHOICE_SETTING(0, fm_region, LANG_FM_REGION, 0, - "fm_region", "eu,us,jp,kr", set_radio_region, 4, + "fm_region", "eu,us,jp,wo", set_radio_region, 4, ID2P(LANG_FM_EUROPE), ID2P(LANG_FM_US), - ID2P(LANG_FM_JAPAN), ID2P(LANG_FM_KOREA)), + ID2P(LANG_FM_JAPAN), ID2P(LANG_FM_WORLD)), #endif OFFON_SETTING(F_BANFROMQS, audioscrobbler, LANG_AUDIOSCROBBLER, false, Index: firmware/export/tuner.h =================================================================== --- firmware/export/tuner.h (revision 19849) +++ firmware/export/tuner.h (working copy) @@ -57,7 +57,7 @@ REGION_EUROPE = 0, REGION_US_CANADA, REGION_JAPAN, - REGION_KOREA, + REGION_WORLD, /* Add new regions above this line */ TUNER_NUM_REGIONS Index: firmware/tuner.c =================================================================== --- firmware/tuner.c (revision 19849) +++ firmware/tuner.c (working copy) @@ -28,10 +28,10 @@ /* General region information */ 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_JAPAN] = { 76000000, 90000000, 100000 }, - [REGION_KOREA] = { 87500000, 108000000, 100000 } + [REGION_WORLD] = { 87500000, 108000000, 50000 } }; #ifndef SIMULATOR @@ -45,7 +45,7 @@ [REGION_EUROPE] = 0, /* 50uS */ [REGION_US_CANADA] = 1, /* 75uS */ [REGION_JAPAN] = 0, /* 50uS */ - [REGION_KOREA] = 0, /* 50uS */ + [REGION_WORLD] = 0, /* 50uS */ }; #endif /* (CONFIG_TUNER & LV24020LP) */ @@ -55,17 +55,17 @@ [REGION_EUROPE] = { 0, 0 }, /* 50uS, US/Europe band */ [REGION_US_CANADA] = { 1, 0 }, /* 75uS, US/Europe band */ [REGION_JAPAN] = { 0, 1 }, /* 50uS, Japanese band */ - [REGION_KOREA] = { 0, 0 }, /* 50uS, US/Europe band */ + [REGION_WORLD] = { 0, 0 }, /* 50uS, US/Europe band */ }; #endif /* (CONFIG_TUNER & TEA5767) */ #if (CONFIG_TUNER & SI4700) 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_JAPAN] = { 1, 2, 1 }, /* 50uS, Japanese band, 100kHz spacing */ - [REGION_KOREA] = { 1, 0, 1 }, /* 50uS, US/Europe band, 100kHz spacing */ + [REGION_WORLD] = { 1, 0, 2 }, /* 50uS, US/Europe band, 50kHz spacing */ }; #endif /* (CONFIG_TUNER & SI4700) */