FreeDV
/
librtlsdr
mirror of https://github.com/drowe67/librtlsdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'development' of github.com:drowe67/librtlsdr into development

development
David 2020-09-19 08:29:45 +09:30
parent 0299f5fc2d 8ef067e642
commit 1c5a141d61
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tuner_r82xx.c
View File

@ -779,8 +779,7 @@ static int r82xx_set_pll_yc(struct r82xx_priv *priv, uint32_t freq)
return rc;
}
if (vco_frac == 0)
{
if (vco_frac == 0) {
/* Disable frac pll */
rc = r82xx_write_reg_mask(priv, 0x12, 0x08, 0x08);
if(rc < 0) {
@ -1105,6 +1104,7 @@ static int r82xx_set_pll(struct r82xx_priv *priv, uint32_t freq)
int r82xx_is_tuner_locked(struct r82xx_priv *priv)
{
int rc;
uint8_t data[5];
/* was all PLL stuff set for last frequency? */
@ -1112,7 +1112,7 @@ int r82xx_is_tuner_locked(struct r82xx_priv *priv)
return 1;
/* Check if PLL has locked */
int rc = r82xx_read(priv, 0x00, data, sizeof(data));
rc = r82xx_read(priv, 0x00, data, sizeof(data));
if (rc < 0)
return -3;
if (!(data[2] & 0x40)) {
@ -1661,6 +1661,8 @@ static const struct IFinfo IFi[] = {
{ 2, 1100+2, IFB(1100), 0, 0x0F, 0xEF, 0x60 }, /* steep high freq edge */
#endif
{ 3, 1200+0, 1350, 0, 0x0F, 0xEE, 0x00 }, /* centered with hpf */
{ 3, 1300+0, 2050, -7, 0x0F, 0x8A, 0x00 }, /* centered with hpf */
#if (WITH_ASYM_FILTER)
{ 1, 1300+1, IFA(1300), 26, 0x0F, 0xEF, 0x60 }, /* steep low freq edge */
@ -1670,7 +1672,15 @@ static const struct IFinfo IFi[] = {
{ 3, 1500+3, 1300, -24, 0x0F, 0xEF, 0x60 },
{ 3, 1600+0, 1900, 0, 0x0F, 0x8B, 0x00 }, /* centered with hpf */
{ 3, 1750+3, 1400, 12, 0x0F, 0xCF, 0x60 }, /* 20 */
{ 3, 1950+3, 1500, 30, 0x0F, 0x8F, 0x60 }
{ 3, 1800+0, 1400, 0, 0x0F, 0xAF, 0x00 },
{ 3, 1950+3, 1500, 30, 0x0F, 0x8F, 0x60 },
{ 3, 2200+0, 1600, 0, 0x0F, 0x8F, 0x00 },
{ 3, 3000+0, 2000, 0, 0x04, 0x8F, 0x00 },
{ 3, 5000+0, 3570, 0, 0x0B, 0x6B, 0x00 }
};