Skip to content

Commit 6f1660d

Browse files
racerxdlracerxdl
committed
Fixes for identation
1 parent af20337 commit 6f1660d

File tree

3 files changed

+277
-274
lines changed

3 files changed

+277
-274
lines changed

‎src/librtlsdr.c‎

Lines changed: 71 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
*
1111
* This program is distributed in the hope that it will be useful,
1212
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1414
* GNU General Public License for more details.
1515
*
1616
* You should have received a copy of the GNU General Public License
17-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

2020
#include <errno.h>
@@ -60,7 +60,7 @@ typedef struct rtlsdr_tuner_iface {
6060
int (*init)(void *);
6161
int (*exit)(void *);
6262
int (*set_freq)(void *, uint32_t freq /* Hz */);
63-
int (*set_bw)(void *, int bw /* Hz */, uint32_t *applied_bw /* configured bw in Hz */, int apply /* 1 == configure it!, 0 == deliver applied_bw */);
63+
int (*set_bw)(void *, int bw /* Hz */, uint32_t *applied_bw /* configured bw in Hz */, int apply /* 1 == configure it!, 0 == deliver applied_bw */);
6464
int (*set_gain)(void *, int gain /* tenth dB */);
6565
int (*set_if_gain)(void *, int stage, int gain /* tenth dB */);
6666
int (*set_gain_mode)(void *, int manual);
@@ -149,8 +149,8 @@ int e4000_set_freq(void *dev, uint32_t freq) {
149149
int e4000_set_bw(void *dev, int bw, uint32_t *applied_bw, int apply) {
150150
int r = 0;
151151
rtlsdr_dev_t* devt = (rtlsdr_dev_t*)dev;
152-
if(!apply)
153-
return 0;
152+
if(!apply)
153+
return 0;
154154

155155
r |= e4k_if_filter_bw_set(&devt->e4k_s, E4K_IF_FILTER_MIX, bw);
156156
r |= e4k_if_filter_bw_set(&devt->e4k_s, E4K_IF_FILTER_RC, bw);
@@ -210,9 +210,9 @@ int _fc2580_set_freq(void *dev, uint32_t freq) {
210210
return fc2580_SetRfFreqHz(dev, freq);
211211
}
212212
int fc2580_set_bw(void *dev, int bw, uint32_t *applied_bw, int apply) {
213-
if(!apply)
214-
return 0;
215-
return fc2580_SetBandwidthMode(dev, 1);
213+
if(!apply)
214+
return 0;
215+
return fc2580_SetBandwidthMode(dev, 1);
216216
}
217217
int fc2580_set_gain(void *dev, int gain) { return 0; }
218218
int fc2580_set_gain_mode(void *dev, int manual) { return 0; }
@@ -251,30 +251,31 @@ int r820t_set_bw(void *dev, int bw, uint32_t *applied_bw, int apply) {
251251
int r;
252252
rtlsdr_dev_t* devt = (rtlsdr_dev_t*)dev;
253253

254-
r = r82xx_set_bandwidth(&devt->r82xx_p, bw, devt->rate, applied_bw, apply);
255-
if(!apply)
256-
return 0;
257-
if(r < 0)
258-
return r;
254+
r = r82xx_set_bandwidth(&devt->r82xx_p, bw, devt->rate, applied_bw, apply);
255+
if(!apply)
256+
return 0;
257+
if(r < 0)
258+
return r;
259+
259260
r = rtlsdr_set_if_freq(devt, r);
260261
if (r)
261262
return r;
262263
return rtlsdr_set_center_freq(devt, devt->freq);
263264
}
264265

265266
int r820t_set_gain(void *dev, int gain) {
266-
rtlsdr_dev_t* devt = (rtlsdr_dev_t*)dev;
267-
return r82xx_set_gain(&devt->r82xx_p, 1, gain, 0, 0, 0, 0);
267+
rtlsdr_dev_t* devt = (rtlsdr_dev_t*)dev;
268+
return r82xx_set_gain(&devt->r82xx_p, 1, gain, 0, 0, 0, 0);
268269
}
269270

270271
int r820t_set_gain_ext(void *dev, int lna_gain, int mixer_gain, int vga_gain) {
271-
rtlsdr_dev_t* devt = (rtlsdr_dev_t*)dev;
272-
return r82xx_set_gain(&devt->r82xx_p, 0, 0, 1, lna_gain, mixer_gain, vga_gain);
272+
rtlsdr_dev_t* devt = (rtlsdr_dev_t*)dev;
273+
return r82xx_set_gain(&devt->r82xx_p, 0, 0, 1, lna_gain, mixer_gain, vga_gain);
273274
}
274275

275276
int r820t_set_gain_mode(void *dev, int manual) {
276277
rtlsdr_dev_t* devt = (rtlsdr_dev_t*)dev;
277-
return r82xx_set_gain(&devt->r82xx_p, manual, 0, 0, 0, 0, 0);
278+
return r82xx_set_gain(&devt->r82xx_p, manual, 0, 0, 0, 0, 0);
278279
}
279280

280281
/* definition order must match enum rtlsdr_tuner */
@@ -647,7 +648,7 @@ void rtlsdr_init_baseband(rtlsdr_dev_t *dev)
647648
rtlsdr_demod_write_reg(dev, 1, 0x15, 0x00, 1);
648649
rtlsdr_demod_write_reg(dev, 1, 0x16, 0x0000, 2);
649650

650-
/* clear both DDC shift and IF frequency registers */
651+
/* clear both DDC shift and IF frequency registers */
651652
for (i = 0; i < 6; i++)
652653
rtlsdr_demod_write_reg(dev, 1, 0x16 + i, 0x00, 1);
653654

@@ -766,7 +767,7 @@ int rtlsdr_set_xtal_freq(rtlsdr_dev_t *dev, uint32_t rtl_freq, uint32_t tuner_fr
766767

767768
/* read corrected clock value into e4k and r82xx structure */
768769
if (rtlsdr_get_xtal_freq(dev, NULL, &dev->e4k_s.vco.fosc) ||
769-
rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal))
770+
rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal))
770771
return -3;
771772

772773
/* update xtal-dependent settings */
@@ -794,7 +795,7 @@ int rtlsdr_get_xtal_freq(rtlsdr_dev_t *dev, uint32_t *rtl_freq, uint32_t *tuner_
794795
}
795796

796797
int rtlsdr_get_usb_strings(rtlsdr_dev_t *dev, char *manufact, char *product,
797-
char *serial)
798+
char *serial)
798799
{
799800
struct libusb_device_descriptor dd;
800801
libusb_device *device = NULL;
@@ -813,22 +814,22 @@ int rtlsdr_get_usb_strings(rtlsdr_dev_t *dev, char *manufact, char *product,
813814
if (manufact) {
814815
memset(manufact, 0, buf_max);
815816
libusb_get_string_descriptor_ascii(dev->devh, dd.iManufacturer,
816-
(unsigned char *)manufact,
817-
buf_max);
817+
(unsigned char *)manufact,
818+
buf_max);
818819
}
819820

820821
if (product) {
821822
memset(product, 0, buf_max);
822823
libusb_get_string_descriptor_ascii(dev->devh, dd.iProduct,
823-
(unsigned char *)product,
824-
buf_max);
824+
(unsigned char *)product,
825+
buf_max);
825826
}
826827

827828
if (serial) {
828829
memset(serial, 0, buf_max);
829830
libusb_get_string_descriptor_ascii(dev->devh, dd.iSerialNumber,
830-
(unsigned char *)serial,
831-
buf_max);
831+
(unsigned char *)serial,
832+
buf_max);
832833
}
833834

834835
return 0;
@@ -944,7 +945,7 @@ int rtlsdr_set_freq_correction(rtlsdr_dev_t *dev, int ppm)
944945

945946
/* read corrected clock value into e4k and r82xx structure */
946947
if (rtlsdr_get_xtal_freq(dev, NULL, &dev->e4k_s.vco.fosc) ||
947-
rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal))
948+
rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal))
948949
return -3;
949950

950951
if (dev->freq) /* retune to apply new correction value */
@@ -973,16 +974,16 @@ int rtlsdr_get_tuner_gains(rtlsdr_dev_t *dev, int *gains)
973974
{
974975
/* all gain values are expressed in tenths of a dB */
975976
const int e4k_gains[] = { -10, 15, 40, 65, 90, 115, 140, 165, 190, 215,
976-
240, 290, 340, 420 };
977+
240, 290, 340, 420 };
977978
const int fc0012_gains[] = { -99, -40, 71, 179, 192 };
978979
const int fc0013_gains[] = { -99, -73, -65, -63, -60, -58, -54, 58, 61,
979-
63, 65, 67, 68, 70, 71, 179, 181, 182,
980-
184, 186, 188, 191, 197 };
980+
63, 65, 67, 68, 70, 71, 179, 181, 182,
981+
184, 186, 188, 191, 197 };
981982
const int fc2580_gains[] = { 0 /* no gain values */ };
982983
const int r82xx_gains[] = { 0, 9, 14, 27, 37, 77, 87, 125, 144, 157,
983-
166, 197, 207, 229, 254, 280, 297, 328,
984-
338, 364, 372, 386, 402, 421, 434, 439,
985-
445, 480, 496 };
984+
166, 197, 207, 229, 254, 280, 297, 328,
985+
338, 364, 372, 386, 402, 421, 434, 439,
986+
445, 480, 496 };
986987
const int unknown_gains[] = { 0 /* no gain values */ };
987988

988989
const int *ptr = NULL;
@@ -1027,22 +1028,22 @@ int rtlsdr_set_and_get_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw, uint32_t
10271028
{
10281029
int r = 0;
10291030

1030-
*applied_bw = 0; /* unknown */
1031+
*applied_bw = 0; /* unknown */
10311032

10321033
if (!dev || !dev->tuner)
10331034
return -1;
10341035

1035-
if(!apply_bw)
1036-
{
1037-
if (dev->tuner->set_bw) {
1038-
r = dev->tuner->set_bw(dev, bw > 0 ? bw : dev->rate, applied_bw, apply_bw);
1039-
}
1040-
return r;
1041-
}
1036+
if(!apply_bw)
1037+
{
1038+
if (dev->tuner->set_bw) {
1039+
r = dev->tuner->set_bw(dev, bw > 0 ? bw : dev->rate, applied_bw, apply_bw);
1040+
}
1041+
return r;
1042+
}
10421043

10431044
if (dev->tuner->set_bw) {
10441045
rtlsdr_set_i2c_repeater(dev, 1);
1045-
r = dev->tuner->set_bw(dev, bw > 0 ? bw : dev->rate, applied_bw, apply_bw);
1046+
r = dev->tuner->set_bw(dev, bw > 0 ? bw : dev->rate, applied_bw, apply_bw);
10461047
rtlsdr_set_i2c_repeater(dev, 0);
10471048
if (r)
10481049
return r;
@@ -1053,8 +1054,8 @@ int rtlsdr_set_and_get_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw, uint32_t
10531054

10541055
int rtlsdr_set_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw )
10551056
{
1056-
uint32_t applied_bw = 0;
1057-
return rtlsdr_set_and_get_tuner_bandwidth(dev, bw, &applied_bw, 1 /* =apply_bw */ );
1057+
uint32_t applied_bw = 0;
1058+
return rtlsdr_set_and_get_tuner_bandwidth(dev, bw, &applied_bw, 1 /* =apply_bw */ );
10581059
}
10591060

10601061

@@ -1153,7 +1154,7 @@ int rtlsdr_set_sample_rate(rtlsdr_dev_t *dev, uint32_t samp_rate)
11531154

11541155
/* check if the rate is supported by the resampler */
11551156
if ((samp_rate <= 225000) || (samp_rate > 3200000) ||
1156-
((samp_rate > 300000) && (samp_rate <= 900000))) {
1157+
((samp_rate > 300000) && (samp_rate <= 900000))) {
11571158
fprintf(stderr, "Invalid sample rate: %u Hz\n", samp_rate);
11581159
return -EINVAL;
11591160
}
@@ -1170,9 +1171,9 @@ int rtlsdr_set_sample_rate(rtlsdr_dev_t *dev, uint32_t samp_rate)
11701171
dev->rate = (uint32_t)real_rate;
11711172

11721173
if (dev->tuner && dev->tuner->set_bw) {
1173-
uint32_t applied_bw = 0;
1174+
uint32_t applied_bw = 0;
11741175
rtlsdr_set_i2c_repeater(dev, 1);
1175-
dev->tuner->set_bw(dev, dev->bw > 0 ? dev->bw : dev->rate, &applied_bw, 1);
1176+
dev->tuner->set_bw(dev, dev->bw > 0 ? dev->bw : dev->rate, &applied_bw, 1);
11761177
rtlsdr_set_i2c_repeater(dev, 0);
11771178
}
11781179

@@ -1254,7 +1255,7 @@ int rtlsdr_set_direct_sampling(rtlsdr_dev_t *dev, int on)
12541255
}
12551256

12561257
if ((dev->tuner_type == RTLSDR_TUNER_R820T) ||
1257-
(dev->tuner_type == RTLSDR_TUNER_R828D)) {
1258+
(dev->tuner_type == RTLSDR_TUNER_R828D)) {
12581259
r |= rtlsdr_set_if_freq(dev, R82XX_IF_FREQ);
12591260

12601261
/* enable spectrum inversion */
@@ -1298,7 +1299,7 @@ int rtlsdr_set_offset_tuning(rtlsdr_dev_t *dev, int on)
12981299
return -1;
12991300

13001301
if ((dev->tuner_type == RTLSDR_TUNER_R820T) ||
1301-
(dev->tuner_type == RTLSDR_TUNER_R828D))
1302+
(dev->tuner_type == RTLSDR_TUNER_R828D))
13021303
return -2;
13031304

13041305
if (dev->direct_sampling)
@@ -1309,7 +1310,7 @@ int rtlsdr_set_offset_tuning(rtlsdr_dev_t *dev, int on)
13091310
r |= rtlsdr_set_if_freq(dev, dev->offs_freq);
13101311

13111312
if (dev->tuner && dev->tuner->set_bw) {
1312-
uint32_t applied_bw = 0;
1313+
uint32_t applied_bw = 0;
13131314
rtlsdr_set_i2c_repeater(dev, 1);
13141315
if (on) {
13151316
bw = 2 * dev->offs_freq;
@@ -1318,7 +1319,7 @@ int rtlsdr_set_offset_tuning(rtlsdr_dev_t *dev, int on)
13181319
} else {
13191320
bw = dev->rate;
13201321
}
1321-
dev->tuner->set_bw(dev, bw, &applied_bw, 1);
1322+
dev->tuner->set_bw(dev, bw, &applied_bw, 1);
13221323
rtlsdr_set_i2c_repeater(dev, 0);
13231324
}
13241325

@@ -1420,7 +1421,7 @@ const char *rtlsdr_get_device_name(uint32_t index)
14201421
}
14211422

14221423
int rtlsdr_get_device_usb_strings(uint32_t index, char *manufact,
1423-
char *product, char *serial)
1424+
char *product, char *serial)
14241425
{
14251426
int r = -2;
14261427
int i;
@@ -1450,9 +1451,9 @@ int rtlsdr_get_device_usb_strings(uint32_t index, char *manufact,
14501451
r = libusb_open(list[i], &devt.devh);
14511452
if (!r) {
14521453
r = rtlsdr_get_usb_strings(&devt,
1453-
manufact,
1454-
product,
1455-
serial);
1454+
manufact,
1455+
product,
1456+
serial);
14561457
libusb_close(devt.devh);
14571458
}
14581459
break;
@@ -1762,7 +1763,7 @@ static void LIBUSB_CALL _libusb_callback(struct libusb_transfer *xfer)
17621763
dev->xfer_errors++;
17631764

17641765
if (dev->xfer_errors >= dev->xfer_buf_num ||
1765-
LIBUSB_TRANSFER_NO_DEVICE == xfer->status) {
1766+
LIBUSB_TRANSFER_NO_DEVICE == xfer->status) {
17661767
#endif
17671768
dev->dev_lost = 1;
17681769
rtlsdr_cancel_async(dev);
@@ -1788,15 +1789,15 @@ static int _rtlsdr_alloc_async_buffers(rtlsdr_dev_t *dev)
17881789

17891790
if (!dev->xfer) {
17901791
dev->xfer = malloc(dev->xfer_buf_num *
1791-
sizeof(struct libusb_transfer *));
1792+
sizeof(struct libusb_transfer *));
17921793

17931794
for(i = 0; i < dev->xfer_buf_num; ++i)
17941795
dev->xfer[i] = libusb_alloc_transfer(0);
17951796
}
17961797

17971798
if (!dev->xfer_buf) {
17981799
dev->xfer_buf = malloc(dev->xfer_buf_num *
1799-
sizeof(unsigned char *));
1800+
sizeof(unsigned char *));
18001801

18011802
for(i = 0; i < dev->xfer_buf_num; ++i)
18021803
dev->xfer_buf[i] = malloc(dev->xfer_buf_len);
@@ -1837,7 +1838,7 @@ static int _rtlsdr_free_async_buffers(rtlsdr_dev_t *dev)
18371838
}
18381839

18391840
int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx,
1840-
uint32_t buf_num, uint32_t buf_len)
1841+
uint32_t buf_num, uint32_t buf_len)
18411842
{
18421843
unsigned int i;
18431844
int r = 0;
@@ -1871,13 +1872,13 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx,
18711872

18721873
for(i = 0; i < dev->xfer_buf_num; ++i) {
18731874
libusb_fill_bulk_transfer(dev->xfer[i],
1874-
dev->devh,
1875-
0x81,
1876-
dev->xfer_buf[i],
1877-
dev->xfer_buf_len,
1878-
_libusb_callback,
1879-
(void *)dev,
1880-
BULK_TIMEOUT);
1875+
dev->devh,
1876+
0x81,
1877+
dev->xfer_buf[i],
1878+
dev->xfer_buf_len,
1879+
_libusb_callback,
1880+
(void *)dev,
1881+
BULK_TIMEOUT);
18811882

18821883
r = libusb_submit_transfer(dev->xfer[i]);
18831884
if (r < 0) {
@@ -1889,7 +1890,7 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx,
18891890

18901891
while (RTLSDR_INACTIVE != dev->async_status) {
18911892
r = libusb_handle_events_timeout_completed(dev->ctx, &tv,
1892-
&dev->async_cancel);
1893+
&dev->async_cancel);
18931894
if (r < 0) {
18941895
/*fprintf(stderr, "handle_events returned: %d\n", r);*/
18951896
if (r == LIBUSB_ERROR_INTERRUPTED) /* stray signal */
@@ -1914,7 +1915,7 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx,
19141915
* to allow transfer status to
19151916
* propagate */
19161917
libusb_handle_events_timeout_completed(dev->ctx,
1917-
&zerotv, NULL);
1918+
&zerotv, NULL);
19181919
if (r < 0)
19191920
continue;
19201921

@@ -1927,7 +1928,7 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx,
19271928
* be handled before exiting after we
19281929
* just cancelled all transfers */
19291930
libusb_handle_events_timeout_completed(dev->ctx,
1930-
&zerotv, NULL);
1931+
&zerotv, NULL);
19311932
break;
19321933
}
19331934
}

0 commit comments

Comments
 (0)