kopia lustrzana https://github.com/keenerd/rtl-sdr
Explicitly cast to correct type to suppress MSVC warnings.
rodzic
3efc90e58f
commit
e536345494
|
@ -705,7 +705,7 @@ int rtlsdr_set_if_freq(rtlsdr_dev_t *dev, uint32_t freq)
|
|||
if (rtlsdr_get_xtal_freq(dev, &rtl_xtal, NULL))
|
||||
return -2;
|
||||
|
||||
if_freq = ((freq * TWO_POW(22)) / rtl_xtal) * (-1);
|
||||
if_freq = (int32_t)(((freq * TWO_POW(22)) / rtl_xtal) * -1);
|
||||
|
||||
tmp = (if_freq >> 16) & 0x3f;
|
||||
r = rtlsdr_demod_write_reg(dev, 1, 0x19, tmp, 1);
|
||||
|
@ -728,7 +728,7 @@ int rtlsdr_set_sample_freq_correction(rtlsdr_dev_t *dev, int ppm)
|
|||
{
|
||||
int r = 0;
|
||||
uint8_t tmp;
|
||||
int16_t offs = ppm * (-1) * TWO_POW(24) / 1000000;
|
||||
int16_t offs = (int16_t)(ppm * -1 * TWO_POW(24) / 1000000);
|
||||
rtlsdr_set_i2c_repeater(dev, 0);
|
||||
|
||||
tmp = offs & 0xff;
|
||||
|
@ -1103,7 +1103,7 @@ int rtlsdr_set_sample_rate(rtlsdr_dev_t *dev, uint32_t samp_rate)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
rsamp_ratio = (dev->rtl_xtal * TWO_POW(22)) / samp_rate;
|
||||
rsamp_ratio = (uint32_t)((dev->rtl_xtal * TWO_POW(22)) / samp_rate);
|
||||
rsamp_ratio &= 0x0ffffffc;
|
||||
|
||||
real_rsamp_ratio = rsamp_ratio | ((rsamp_ratio & 0x08000000) << 1);
|
||||
|
|
|
@ -755,7 +755,7 @@ void dc_block_filter(struct demod_state *fm)
|
|||
for (i=0; i < fm->lp_len; i++) {
|
||||
sum += lp[i];
|
||||
}
|
||||
avg = sum / fm->lp_len;
|
||||
avg = (int)(sum / fm->lp_len);
|
||||
avg = (avg + fm->dc_avg * 9) / 10;
|
||||
for (i=0; i < fm->lp_len; i++) {
|
||||
lp[i] -= avg;
|
||||
|
|
|
@ -443,7 +443,7 @@ static uint32_t compute_flo(uint32_t f_osc, uint8_t z, uint16_t x, uint8_t r)
|
|||
if (fvco == 0)
|
||||
return -EINVAL;
|
||||
|
||||
return fvco / r;
|
||||
return (uint32_t)(fvco / r);
|
||||
}
|
||||
|
||||
static int e4k_band_set(struct e4k_state *e4k, enum e4k_band band)
|
||||
|
@ -482,11 +482,11 @@ uint32_t e4k_compute_pll_params(struct e4k_pll_params *oscp, uint32_t fosc, uint
|
|||
{
|
||||
uint32_t i;
|
||||
uint8_t r = 2;
|
||||
uint8_t z = 0;
|
||||
uint8_t three_phase_mixing = 0;
|
||||
uint64_t intended_fvco, remainder;
|
||||
uint64_t z = 0;
|
||||
uint32_t x;
|
||||
int flo;
|
||||
int three_phase_mixing = 0;
|
||||
uint32_t flo;
|
||||
oscp->r_idx = 0;
|
||||
|
||||
if (!is_fosc_valid(fosc))
|
||||
|
@ -507,13 +507,13 @@ uint32_t e4k_compute_pll_params(struct e4k_pll_params *oscp, uint32_t fosc, uint
|
|||
intended_fvco = (uint64_t)intended_flo * r;
|
||||
|
||||
/* compute integral component of multiplier */
|
||||
z = intended_fvco / fosc;
|
||||
z = (uint8_t)(intended_fvco / fosc);
|
||||
|
||||
/* compute fractional part. this will not overflow,
|
||||
* as fosc(max) = 30MHz and z(max) = 255 */
|
||||
remainder = intended_fvco - (fosc * z);
|
||||
/* remainder(max) = 30MHz, E4K_PLL_Y = 65536 -> 64bit! */
|
||||
x = (remainder * E4K_PLL_Y) / fosc;
|
||||
x = (uint32_t)((remainder * E4K_PLL_Y) / fosc);
|
||||
/* x(max) as result of this computation is 65536 */
|
||||
|
||||
flo = compute_flo(fosc, z, x, r);
|
||||
|
|
Ładowanie…
Reference in New Issue