hackrf_info: Adjust output to print USB device identification string and device index number, before trying to open.

This commit is contained in:
Heikki Hannikainen
2015-02-24 00:45:57 +02:00
committed by Heikki Hannikainen
parent 856d9a6354
commit d10dd1945c

View File

@ -28,7 +28,6 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
hackrf_device* device = NULL;
int result = HACKRF_SUCCESS; int result = HACKRF_SUCCESS;
uint8_t board_id = BOARD_ID_INVALID; uint8_t board_id = BOARD_ID_INVALID;
char version[255 + 1]; char version[255 + 1];
@ -51,10 +50,15 @@ int main(int argc, char** argv)
} }
for (i = 0; i < list->devicecount; i++) { for (i = 0; i < list->devicecount; i++) {
if (i > 0) if (i > 0)
printf("\n"); printf("\n");
printf("Found HackRF board %d:\n", i);
if (list->serial_numbers[i])
printf("USB descriptor string: %s\n", list->serial_numbers[i]);
hackrf_device* device = NULL;
result = hackrf_device_list_open(list, i, &device); result = hackrf_device_list_open(list, i, &device);
if (result != HACKRF_SUCCESS) { if (result != HACKRF_SUCCESS) {
fprintf(stderr, "hackrf_open() failed: %s (%d)\n", fprintf(stderr, "hackrf_open() failed: %s (%d)\n",
@ -62,8 +66,6 @@ int main(int argc, char** argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
printf("Found HackRF board %d:\n", i);
result = hackrf_board_id_read(device, &board_id); result = hackrf_board_id_read(device, &board_id);
if (result != HACKRF_SUCCESS) { if (result != HACKRF_SUCCESS) {
fprintf(stderr, "hackrf_board_id_read() failed: %s (%d)\n", fprintf(stderr, "hackrf_board_id_read() failed: %s (%d)\n",
@ -100,10 +102,10 @@ int main(int argc, char** argv)
if (result != HACKRF_SUCCESS) { if (result != HACKRF_SUCCESS) {
fprintf(stderr, "hackrf_close() failed: %s (%d)\n", fprintf(stderr, "hackrf_close() failed: %s (%d)\n",
hackrf_error_name(result), result); hackrf_error_name(result), result);
return EXIT_FAILURE;
} }
} }
hackrf_device_list_free(list);
hackrf_exit(); hackrf_exit();
return EXIT_SUCCESS; return EXIT_SUCCESS;