From d10dd1945c468060c8bc0331cb1c58beac4ae4d9 Mon Sep 17 00:00:00 2001 From: Heikki Hannikainen Date: Tue, 24 Feb 2015 00:45:57 +0200 Subject: [PATCH] hackrf_info: Adjust output to print USB device identification string and device index number, before trying to open. --- host/hackrf-tools/src/hackrf_info.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/host/hackrf-tools/src/hackrf_info.c b/host/hackrf-tools/src/hackrf_info.c index 571c546b..99b86d3b 100644 --- a/host/hackrf-tools/src/hackrf_info.c +++ b/host/hackrf-tools/src/hackrf_info.c @@ -28,7 +28,6 @@ int main(int argc, char** argv) { - hackrf_device* device = NULL; int result = HACKRF_SUCCESS; uint8_t board_id = BOARD_ID_INVALID; char version[255 + 1]; @@ -51,10 +50,15 @@ int main(int argc, char** argv) } for (i = 0; i < list->devicecount; i++) { - if (i > 0) 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); if (result != HACKRF_SUCCESS) { fprintf(stderr, "hackrf_open() failed: %s (%d)\n", @@ -62,8 +66,6 @@ int main(int argc, char** argv) return EXIT_FAILURE; } - printf("Found HackRF board %d:\n", i); - result = hackrf_board_id_read(device, &board_id); if (result != HACKRF_SUCCESS) { fprintf(stderr, "hackrf_board_id_read() failed: %s (%d)\n", @@ -100,10 +102,10 @@ int main(int argc, char** argv) if (result != HACKRF_SUCCESS) { fprintf(stderr, "hackrf_close() failed: %s (%d)\n", hackrf_error_name(result), result); - return EXIT_FAILURE; } } + hackrf_device_list_free(list); hackrf_exit(); return EXIT_SUCCESS;