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

use uint32_t instead of int for frequency

Browse Source 
Signed-off-by: Steve Markgraf <steve@steve-m.de>
This commit is contained in:
Steve Markgraf 2012-04-07 01:02:08 +02:00
parent 2b0d5963b7
commit 3051aa4eef
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@ -70,7 +70,7 @@ int main(int argc, char **argv)
dev_index = atoi(optarg); dev_index = atoi(optarg);
break; break;
case 'f': case 'f':
frequency = (int)atof(optarg); frequency = (uint32_t)atof(optarg);
break; break;
case 'g': case 'g':
gain = atoi(optarg); gain = atoi(optarg);
@ -122,7 +122,7 @@ int main(int argc, char **argv)
if (r < 0) if (r < 0)
fprintf(stderr, "WARNING: Failed to set center freq.\n"); fprintf(stderr, "WARNING: Failed to set center freq.\n");
else else
fprintf(stderr, "Tuned to %i Hz.\n", frequency); fprintf(stderr, "Tuned to %u Hz.\n", frequency);
r = rtlsdr_set_tuner_gain(dev, gain); r = rtlsdr_set_tuner_gain(dev, gain);
if (r < 0) if (r < 0)

14
src/rtl-sdr.c
View File

@ -48,10 +48,10 @@
typedef struct rtlsdr_tuner { typedef struct rtlsdr_tuner {
int(*init)(void *); int(*init)(void *);
int(*exit)(void *); int(*exit)(void *);
int(*tune)(void *, int freq /* Hz */); int(*tune)(void *, uint32_t freq /* Hz */);
int(*set_bw)(void *, int bw /* Hz */); int(*set_bw)(void *, int bw /* Hz */);
int(*set_gain)(void *, int gain /* dB */); int(*set_gain)(void *, int gain /* dB */);
int freq; /* Hz */ uint32_t freq; /* Hz */
int corr; /* ppm */ int corr; /* ppm */
int gain; /* dB */ int gain; /* dB */
} rtlsdr_tuner_t; } rtlsdr_tuner_t;
@ -61,13 +61,13 @@ void rtlsdr_set_gpio_bit(rtlsdr_dev_t *dev, uint8_t gpio, int val);
/* generic tuner interface functions, shall be moved to the tuner implementations */ /* generic tuner interface functions, shall be moved to the tuner implementations */
int e4k_init(void *dev) { return e4000_Initialize(dev); } int e4k_init(void *dev) { return e4000_Initialize(dev); }
int e4k_exit(void *dev) { return 0; } int e4k_exit(void *dev) { return 0; }
int e4k_tune(void *dev, int freq) { return e4000_SetRfFreqHz(dev, freq); } int e4k_tune(void *dev, uint32_t freq) { return e4000_SetRfFreqHz(dev, freq); }
int e4k_set_bw(void *dev, int bw) { return e4000_SetBandwidthHz(dev, 8000000); } int e4k_set_bw(void *dev, int bw) { return e4000_SetBandwidthHz(dev, 8000000); }
int e4k_set_gain(void *dev, int gain) { return 0; } int e4k_set_gain(void *dev, int gain) { return 0; }
int fc0012_init(void *dev) { return FC0012_Open(dev); } int fc0012_init(void *dev) { return FC0012_Open(dev); }
int fc0012_exit(void *dev) { return 0; } int fc0012_exit(void *dev) { return 0; }
int fc0012_tune(void *dev, int freq) { int fc0012_tune(void *dev, uint32_t freq) {
unsigned int bw = 6; unsigned int bw = 6;
/* select V-band/U-band filter */ /* select V-band/U-band filter */
rtlsdr_set_gpio_bit(dev, 6, (freq > 300000000) ? 1 : 0); rtlsdr_set_gpio_bit(dev, 6, (freq > 300000000) ? 1 : 0);
@ -81,7 +81,7 @@ int fc0012_set_gain(void *dev, int gain) { return 0; }
int fc0013_init(void *dev) { return FC0013_Open(dev); } int fc0013_init(void *dev) { return FC0013_Open(dev); }
int fc0013_exit(void *dev) { return 0; } int fc0013_exit(void *dev) { return 0; }
int fc0013_tune(void *dev, int freq) { int fc0013_tune(void *dev, uint32_t freq) {
unsigned int bw = 6; unsigned int bw = 6;
return FC0013_SetFrequency(dev, freq/1000, bw & 0xff); return FC0013_SetFrequency(dev, freq/1000, bw & 0xff);
} }
@ -93,7 +93,7 @@ int fc0013_set_gain(void *dev, int gain) { return 0; }
int fc2580_init(void *dev) { return fc2580_Initialize(dev); } int fc2580_init(void *dev) { return fc2580_Initialize(dev); }
int fc2580_exit(void *dev) { return 0; } int fc2580_exit(void *dev) { return 0; }
int fc2580_tune(void *dev, int freq) { return fc2580_SetRfFreqHz(dev, freq); } int fc2580_tune(void *dev, uint32_t freq) { return fc2580_SetRfFreqHz(dev, freq); }
int fc2580_set_bw(void *dev, int bw) { return fc2580_SetBandwidthMode(dev, 1); } int fc2580_set_bw(void *dev, int bw) { return fc2580_SetBandwidthMode(dev, 1); }
int fc2580_set_gain(void *dev, int gain) { return 0; } int fc2580_set_gain(void *dev, int gain) { return 0; }
@ -435,7 +435,7 @@ int rtlsdr_set_center_freq(rtlsdr_dev_t *dev, uint32_t freq)
rtlsdr_set_i2c_repeater(dev, 1); rtlsdr_set_i2c_repeater(dev, 1);
f *= 1.0 + dev->tuner->corr / 1e6; f *= 1.0 + dev->tuner->corr / 1e6;
r = dev->tuner->tune((void *)dev, (int) f); r = dev->tuner->tune((void *)dev, (uint32_t) f);
rtlsdr_set_i2c_repeater(dev, 0); rtlsdr_set_i2c_repeater(dev, 0);