mirror/rtl-sdr-blog
1
0
Fork 0
mirror of https://github.com/rtlsdrblog/rtl-sdr-blog.git synced 2024-11-10 04:37:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix clang compiler issue, fix compiler warnings, tidy up

Browse Source
This commit is contained in:
rtlsdrblog 2023-08-21 15:16:24 +12:00
parent 2ed800b05a
commit ba387da714
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/tuner_r82xx.h
View File

@ -120,4 +120,6 @@ int r82xx_set_freq(struct r82xx_priv *priv, uint32_t freq);
int r82xx_set_gain(struct r82xx_priv *priv, int set_manual_gain, int gain); int r82xx_set_gain(struct r82xx_priv *priv, int set_manual_gain, int gain);
int r82xx_set_bandwidth(struct r82xx_priv *priv, int bandwidth, uint32_t rate); int r82xx_set_bandwidth(struct r82xx_priv *priv, int bandwidth, uint32_t rate);
int rtlsdr_check_dongle_model(void *dev, char* manufact_check, char* product_check);
#endif #endif

6
src/librtlsdr.c
View File

@ -1497,8 +1497,8 @@ int rtlsdr_get_index_by_serial(const char *serial)
} }
/* Returns true if the manufact_check and product_check strings match what is in the dongles EEPROM */ /* Returns true if the manufact_check and product_check strings match what is in the dongles EEPROM */
int rtlsdr_check_dongle_model(rtlsdr_dev_t *dev, char* manufact_check, char* product_check) { int rtlsdr_check_dongle_model(void *dev, char *manufact_check, char *product_check) {
if ((strcmp(dev->manufact, manufact_check) == 0 && strcmp(dev->product, product_check) == 0)) if ((strcmp(((rtlsdr_dev_t *)dev)->manufact, manufact_check) == 0 && strcmp(((rtlsdr_dev_t *)dev)->product, product_check) == 0))
{ {
return 1; return 1;
} }
@ -2218,4 +2218,4 @@ int rtlsdr_set_gpio(rtlsdr_dev_t *dev, int gpio_pin, int on)
rtlsdr_set_gpio_bit(dev, gpio_pin, on); rtlsdr_set_gpio_bit(dev, gpio_pin, on);
return 1; return 1;
} }

32
src/tuner_r82xx.c
View File

@ -1131,14 +1131,14 @@ int sensitivity_mode_toggle(struct r82xx_priv *priv, int toggle)
{ {
//fprintf(stdout, "TOGGLE ON"); //fprintf(stdout, "TOGGLE ON");
priv->gain_sensitivity_mode = 1; priv->gain_sensitivity_mode = 1;
r82xx_set_gain(priv, priv->gain_manual_mode, priv->gain); rc = r82xx_set_gain(priv, priv->gain_manual_mode, priv->gain);
//rc = r82xx_write_reg_mask(priv, 0x06, 0x10, 0x10); //rc = r82xx_write_reg_mask(priv, 0x06, 0x10, 0x10);
} }
else else
{ {
priv->gain_sensitivity_mode = 0; priv->gain_sensitivity_mode = 0;
//fprintf(stdout, "TOGGLE OFF"); //fprintf(stdout, "TOGGLE OFF");
r82xx_set_gain(priv, priv->gain_manual_mode, priv->gain); rc = r82xx_set_gain(priv, priv->gain_manual_mode, priv->gain);
//rc = r82xx_write_reg_mask(priv, 0x06, 0x00, 0x10); //rc = r82xx_write_reg_mask(priv, 0x06, 0x00, 0x10);
} }
@ -1166,14 +1166,22 @@ int notch_toggle(struct r82xx_priv *priv, int toggle)
int r82xx_set_freq(struct r82xx_priv *priv, uint32_t freq) int r82xx_set_freq(struct r82xx_priv *priv, uint32_t freq)
{ {
int rc = -1; int rc = -1;
int is_rtlsdr_blog_v4 = rtlsdr_check_dongle_model(priv->rtl_dev, "RTLSDRBlog", "Blog V4"); int is_rtlsdr_blog_v4;
uint32_t upconvert_freq;
uint32_t lo_freq;
uint8_t air_cable1_in;
uint8_t open_d;
uint8_t band;
uint8_t cable_2_in;
uint8_t cable_1_in;
uint8_t air_in;
is_rtlsdr_blog_v4 = rtlsdr_check_dongle_model(priv->rtl_dev, "RTLSDRBlog", "Blog V4");
/* if it's an RTL-SDR Blog V4, automatically upconvert by 28.8 MHz if we tune to HF /* if it's an RTL-SDR Blog V4, automatically upconvert by 28.8 MHz if we tune to HF
* so that we don't need to manually set any upconvert offset in the SDR software */ * so that we don't need to manually set any upconvert offset in the SDR software */
uint32_t upconvert_freq = is_rtlsdr_blog_v4 ? ((freq < MHZ(28.8)) ? (freq + MHZ(28.8)) : freq) : freq; upconvert_freq = is_rtlsdr_blog_v4 ? ((freq < MHZ(28.8)) ? (freq + MHZ(28.8)) : freq) : freq;
lo_freq = upconvert_freq + priv->int_freq;
uint32_t lo_freq = upconvert_freq + priv->int_freq;
uint8_t air_cable1_in;
rc = r82xx_set_mux(priv, lo_freq); rc = r82xx_set_mux(priv, lo_freq);
if (rc < 0) if (rc < 0)
@ -1189,7 +1197,7 @@ int r82xx_set_freq(struct r82xx_priv *priv, uint32_t freq)
* notches are turned OFF when tuned within the notch band * notches are turned OFF when tuned within the notch band
* and ON when tuned outside the notch band. * and ON when tuned outside the notch band.
*/ */
uint8_t open_d = (freq <= MHZ(2.2) || (freq >= MHZ(85) && freq <= MHZ(112)) || (freq >= MHZ(172) && freq <= MHZ(242))) ? 0x00 : 0x08; open_d = (freq <= MHZ(2.2) || (freq >= MHZ(85) && freq <= MHZ(112)) || (freq >= MHZ(172) && freq <= MHZ(242))) ? 0x00 : 0x08;
rc = r82xx_write_reg_mask(priv, 0x17, open_d, 0x08); rc = r82xx_write_reg_mask(priv, 0x17, open_d, 0x08);
if (rc < 0) if (rc < 0)
@ -1198,7 +1206,7 @@ int r82xx_set_freq(struct r82xx_priv *priv, uint32_t freq)
/* select tuner band based on frequency /* select tuner band based on frequency
* and only switch if there is a band change * and only switch if there is a band change
*(to avoid excessive register writes when tuning rapidly) */ *(to avoid excessive register writes when tuning rapidly) */
uint8_t band = (freq <= MHZ(28.8)) ? HF : ((freq > MHZ(28.8) && freq < MHZ(250)) ? VHF : UHF); band = (freq <= MHZ(28.8)) ? HF : ((freq > MHZ(28.8) && freq < MHZ(250)) ? VHF : UHF);
/* switch between tuner inputs on the RTL-SDR Blog V4 */ /* switch between tuner inputs on the RTL-SDR Blog V4 */
if (band != priv->input) if (band != priv->input)
@ -1206,11 +1214,11 @@ int r82xx_set_freq(struct r82xx_priv *priv, uint32_t freq)
priv->input = band; priv->input = band;
/* activate cable 2 (HF input) */ /* activate cable 2 (HF input) */
uint8_t cable_2_in = (band == HF) ? 0x08 : 0x00; cable_2_in = (band == HF) ? 0x08 : 0x00;
rc = r82xx_write_reg_mask(priv, 0x06, cable_2_in, 0x08); rc = r82xx_write_reg_mask(priv, 0x06, cable_2_in, 0x08);
/* activate cable 1 (VHF input) */ /* activate cable 1 (VHF input) */
uint8_t cable_1_in = (band == VHF) ? 0x40 : 0x00; cable_1_in = (band == VHF) ? 0x40 : 0x00;
rc = r82xx_write_reg_mask(priv, 0x05, cable_1_in, 0x40); rc = r82xx_write_reg_mask(priv, 0x05, cable_1_in, 0x40);
/* this register appears to boost cable 1 SNR slightly */ /* this register appears to boost cable 1 SNR slightly */
@ -1218,7 +1226,7 @@ int r82xx_set_freq(struct r82xx_priv *priv, uint32_t freq)
//rc = r82xx_write_reg_mask(priv, 0x06, cable_1_enhance, 0x04); //rc = r82xx_write_reg_mask(priv, 0x06, cable_1_enhance, 0x04);
/* activate air_in (UHF input) */ /* activate air_in (UHF input) */
uint8_t air_in = (band == UHF) ? 0x00 : 0x20; air_in = (band == UHF) ? 0x00 : 0x20;
rc = r82xx_write_reg_mask(priv, 0x05, air_in, 0x20); rc = r82xx_write_reg_mask(priv, 0x05, air_in, 0x20);
if (rc < 0) if (rc < 0)