Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

RDA5802 tuner: use channel spacing of 100 kHz when possible (instead of always 50 kHz)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31213 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Bertrik Sikken 2011-12-11 17:38:49 +00:00
parent 6119f4887d
commit 5515a7a880
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
firmware/drivers/tuner/rda5802.c
View file

@ -208,10 +208,13 @@ static void rda5802_set_frequency(int freq)
{ {
int i; int i;
uint16_t readchan; uint16_t readchan;
static const int spacings[] = {100000, 200000, 50000, 50000};
static const int bandstart[] = {87000000, 76000000, 76000000, 65000000};
/* check BAND and spacings */ /* calculate channel number */
int start = CHANNEL_BANDr(cache[CHANNEL]) & 1 ? 76000000 : 87000000; int start = bandstart[CHANNEL_BANDr(cache[CHANNEL])];
int chan = (freq - start) / 50000; int space = spacings[CHANNEL_SPACEr(cache[CHANNEL])];
int chan = (freq - start) / space;
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
/* tune and wait a bit */ /* tune and wait a bit */
@ -247,14 +250,16 @@ static int rda5802_tuned(void)
static void rda5802_set_region(int region) static void rda5802_set_region(int region)
{ {
const struct fm_region_data *rd = &fm_region_data[region]; const struct fm_region_data *rd = &fm_region_data[region];
int band = (rd->freq_min == 76000000) ? int band = (rd->freq_min == 76000000) ?
CHANNEL_BAND_760_900 : CHANNEL_BAND_870_1080; CHANNEL_BAND_760_900 : CHANNEL_BAND_870_1080;
int deemphasis = (rd->deemphasis == 50) ? SYSCONFIG1_DE : 0; int deemphasis = (rd->deemphasis == 50) ? SYSCONFIG1_DE : 0;
int space = (rd->freq_step == 50000) ?
CHANNEL_SPACE_50KHZ : CHANNEL_SPACE_100KHZ;
uint16_t bandspacing = CHANNEL_BANDw(band) |
CHANNEL_SPACEw(CHANNEL_SPACE_50KHZ);
rda5802_write_masked(SYSCONFIG1, deemphasis, SYSCONFIG1_DE); rda5802_write_masked(SYSCONFIG1, deemphasis, SYSCONFIG1_DE);
rda5802_write_masked(CHANNEL, bandspacing, CHANNEL_BAND | CHANNEL_SPACE); rda5802_write_masked(CHANNEL, CHANNEL_BANDw(band), CHANNEL_BAND);
rda5802_write_masked(CHANNEL, CHANNEL_SPACEw(space), CHANNEL_SPACE);
rda5802_write_cache(); rda5802_write_cache();
} }