From 50743b1ccba6242bb77421d5c15afcd4f9a0adb7 Mon Sep 17 00:00:00 2001 From: Steve Markgraf Date: Tue, 4 Feb 2014 19:53:24 +0100 Subject: [PATCH] remove unused variables, type fixes Signed-off-by: Steve Markgraf --- src/librtlsdr.c | 2 +- src/rtl_adsb.c | 7 +++---- src/rtl_fm.c | 12 +++++------- src/rtl_power.c | 6 ++---- src/rtl_sdr.c | 2 +- src/tuner_e4k.c | 2 -- src/tuner_r82xx.c | 2 +- 7 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/librtlsdr.c b/src/librtlsdr.c index 29e4116..f21b187 100644 --- a/src/librtlsdr.c +++ b/src/librtlsdr.c @@ -534,7 +534,7 @@ int rtlsdr_demod_write_reg(rtlsdr_dev_t *dev, uint8_t page, uint16_t addr, uint1 void rtlsdr_set_gpio_bit(rtlsdr_dev_t *dev, uint8_t gpio, int val) { - uint8_t r; + uint16_t r; gpio = 1 << gpio; r = rtlsdr_read_reg(dev, SYSB, GPO, 1); diff --git a/src/rtl_adsb.c b/src/rtl_adsb.c index bb0c8d2..7b10306 100644 --- a/src/rtl_adsb.c +++ b/src/rtl_adsb.c @@ -306,8 +306,7 @@ void manchester(uint16_t *buf, int len) void messages(uint16_t *buf, int len) { - int i, i2, start, preamble_found; - int data_i, index, shift, frame_len; + int i, data_i, index, shift, frame_len; // todo, allow wrap across buffers for (i=0; i 1) { @@ -365,8 +364,8 @@ int main(int argc, char **argv) struct sigaction sigact; #endif char *filename = NULL; - int n_read, r, opt; - int i, gain = AUTO_GAIN; /* tenths of a dB */ + int r, opt; + int gain = AUTO_GAIN; /* tenths of a dB */ int dev_index = 0; int dev_given = 0; int ppm_error = 0; diff --git a/src/rtl_fm.c b/src/rtl_fm.c index dffa62a..9831431 100644 --- a/src/rtl_fm.c +++ b/src/rtl_fm.c @@ -394,7 +394,7 @@ void fifth_order(int16_t *data, int length, int16_t *hist) void generic_fir(int16_t *data, int length, int *fir, int16_t *hist) /* Okay, not at all generic. Assumes length 9, fix that eventually. */ { - int d, f, temp, sum; + int d, temp, sum; for (d=0; ddownsample_passes; if (ds_p) { @@ -856,7 +855,7 @@ static void optimal_settings(int freq, int rate) { // giant ball of hacks // seems unable to do a single pass, 2:1 - int r, capture_freq, capture_rate; + int capture_freq, capture_rate; struct dongle_state *d = &dongle; struct demod_state *dm = &demod; struct controller_state *cs = &controller; @@ -883,7 +882,7 @@ static void *controller_thread_fn(void *arg) { // thoughts for multiple dongles // might be no good using a controller thread if retune/rate blocks - int i, r; + int i; struct controller_state *s = arg; if (s->wb_mode) { @@ -1042,8 +1041,7 @@ int main(int argc, char **argv) #ifndef _WIN32 struct sigaction sigact; #endif - int n_read, r, opt; - int i; + int r, opt; int dev_given = 0; int custom_ppm = 0; dongle_init(&dongle); diff --git a/src/rtl_power.c b/src/rtl_power.c index f28055b..7eb1d06 100644 --- a/src/rtl_power.c +++ b/src/rtl_power.c @@ -403,7 +403,6 @@ void rms_power(struct tuning_state *ts) uint8_t *buf = ts->buf8; int buf_len = ts->buf_len; long p, t; - int ln, lp; double dc, err; p = t = 0L; @@ -588,7 +587,7 @@ void remove_dc(int16_t *data, int length) void generic_fir(int16_t *data, int length, int *fir) /* Okay, not at all generic. Assumes length 9, fix that eventually. */ { - int d, f, temp, sum; + int d, temp, sum; int hist[9] = {0,}; /* cheat on the beginning, let it go unfiltered */ for (d=0; d<18; d+=2) { @@ -760,10 +759,9 @@ int main(int argc, char **argv) struct sigaction sigact; #endif char *filename = NULL; - int i, length, n_read, r, opt, wb_mode = 0; + int i, length, r, opt, wb_mode = 0; int f_set = 0; int gain = AUTO_GAIN; // tenths of a dB - uint8_t *buffer; int dev_index = 0; int dev_given = 0; int ppm_error = 0; diff --git a/src/rtl_sdr.c b/src/rtl_sdr.c index c20b3d7..0c6a707 100644 --- a/src/rtl_sdr.c +++ b/src/rtl_sdr.c @@ -111,7 +111,7 @@ int main(int argc, char **argv) char *filename = NULL; int n_read; int r, opt; - int i, gain = 0; + int gain = 0; int ppm_error = 0; int sync_mode = 0; FILE *file; diff --git a/src/tuner_e4k.c b/src/tuner_e4k.c index aff5534..c2ec044 100644 --- a/src/tuner_e4k.c +++ b/src/tuner_e4k.c @@ -532,8 +532,6 @@ uint32_t e4k_compute_pll_params(struct e4k_pll_params *oscp, uint32_t fosc, uint int e4k_tune_params(struct e4k_state *e4k, struct e4k_pll_params *p) { - uint8_t val; - /* program R + 3phase/2phase */ e4k_reg_write(e4k, E4K_REG_SYNTH7, p->r_idx); /* program Z */ diff --git a/src/tuner_r82xx.c b/src/tuner_r82xx.c index f964614..d07ba59 100644 --- a/src/tuner_r82xx.c +++ b/src/tuner_r82xx.c @@ -765,7 +765,7 @@ static int r82xx_set_tv_standard(struct r82xx_priv *priv, { int rc, i; uint32_t if_khz, filt_cal_lo; - uint8_t data[5], val; + uint8_t data[5]; uint8_t filt_gain, img_r, filt_q, hp_cor, ext_enable, loop_through; uint8_t lt_att, flt_ext_widest, polyfil_cur; int need_calibration;