AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Handle errors from rtlsdr_get_device_usb_strings.

Browse source 
Fixes #106.
This commit is contained in:
Oliver Jowett 2016-03-21 22:11:04 +00:00
parent 5781e6ab96
commit 03c29a3721
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dump1090.c
View file

@ -294,10 +294,13 @@ int modesInitRTLSDR(void) {
fprintf(stderr, "Found %d device(s):\n", device_count); fprintf(stderr, "Found %d device(s):\n", device_count);
for (j = 0; j < device_count; j++) { for (j = 0; j < device_count; j++) {
rtlsdr_get_device_usb_strings(j, vendor, product, serial); if (rtlsdr_get_device_usb_strings(j, vendor, product, serial) != 0) {
fprintf(stderr, "%d: unable to read device details\n", j);
} else {
fprintf(stderr, "%d: %s, %s, SN: %s %s\n", j, vendor, product, serial, fprintf(stderr, "%d: %s, %s, SN: %s %s\n", j, vendor, product, serial,
(j == dev_index) ? "(currently selected)" : ""); (j == dev_index) ? "(currently selected)" : "");
} }
}
if (rtlsdr_open(&Modes.dev, dev_index) < 0) { if (rtlsdr_open(&Modes.dev, dev_index) < 0) {
fprintf(stderr, "Error opening the RTLSDR device: %s\n", fprintf(stderr, "Error opening the RTLSDR device: %s\n",
@ -860,9 +863,12 @@ int verbose_device_search(char *s)
} }
fprintf(stderr, "Found %d device(s):\n", device_count); fprintf(stderr, "Found %d device(s):\n", device_count);
for (i = 0; i < device_count; i++) { for (i = 0; i < device_count; i++) {
rtlsdr_get_device_usb_strings(i, vendor, product, serial); if (rtlsdr_get_device_usb_strings(i, vendor, product, serial) != 0) {
fprintf(stderr, " %d: unable to read device details\n", i);
} else {
fprintf(stderr, " %d: %s, %s, SN: %s\n", i, vendor, product, serial); fprintf(stderr, " %d: %s, %s, SN: %s\n", i, vendor, product, serial);
} }
}
fprintf(stderr, "\n"); fprintf(stderr, "\n");
/* does string look like raw id number */ /* does string look like raw id number */
device = (int)strtol(s, &s2, 0); device = (int)strtol(s, &s2, 0);