diff options
| author | Harald Welte <laforge@osmocom.org> | 2021-10-06 21:02:20 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2021-10-06 21:06:06 +0200 |
| commit | e304015b3c015d0f43740d6713babf1efbb76ea4 (patch) | |
| tree | 251c6f2923622a25abb32c4687f5085913b3b9ef | |
| parent | 19ccc209c14036902abca6f506150644c66b3f36 (diff) | |
Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}()
We use other osmo_libusb_* functions later in the code, so it is best
to initialize the library via libosmousb, and not directly.
Change-Id: I2fd981935e1420e529f5dd8a98edd347c317284c
| -rw-r--r-- | host/src/simtrace2-cardem-pcsc.c | 2 | ||||
| -rw-r--r-- | host/src/simtrace2-sniff.c | 4 | ||||
| -rw-r--r-- | host/src/simtrace2-tool.c | 4 | ||||
| -rw-r--r-- | host/src/simtrace2_usb.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 8e143ba..510a371 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -633,7 +633,7 @@ close_exit: if (transp->usb_devh) libusb_close(transp->usb_devh); - libusb_exit(NULL); + osmo_libusb_exit(NULL); do_exit: return ret; } diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c index c44029a..653508d 100644 --- a/host/src/simtrace2-sniff.c +++ b/host/src/simtrace2-sniff.c @@ -379,7 +379,7 @@ int main(int argc, char **argv) } /* Scan for available SIMtrace USB devices supporting sniffing */ - rc = libusb_init(NULL); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); goto do_exit; @@ -505,7 +505,7 @@ close_exit: sleep(1); } while (keep_running); - libusb_exit(NULL); + osmo_libusb_exit(NULL); do_exit: return ret; } diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index 658f84a..f1423b0 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -265,7 +265,7 @@ int main(int argc, char **argv) transp->udp_fd = -1; - rc = libusb_init(NULL); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); goto do_exit; @@ -326,7 +326,7 @@ close_exit: libusb_close(transp->usb_devh); } while (0); - libusb_exit(NULL); + osmo_libusb_exit(NULL); do_exit: return ret; } diff --git a/host/src/simtrace2_usb.c b/host/src/simtrace2_usb.c index 8fa41fc..be1ba6e 100644 --- a/host/src/simtrace2_usb.c +++ b/host/src/simtrace2_usb.c @@ -77,7 +77,7 @@ static int find_devices(void) int main(int argc, char **argv) { - libusb_init(NULL); + osmo_libusb_init(NULL); find_devices(); return 0; } |