Change in simtrace2[master]: Use osmo_libusb_{init, exit}() instead of libusb_{init, exit}()

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25703 )


Change subject: Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}()
......................................................................

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
---
M host/src/simtrace2-cardem-pcsc.c
M host/src/simtrace2-sniff.c
M host/src/simtrace2-tool.c
M host/src/simtrace2_usb.c
4 files changed, 6 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/03/25703/1

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 @@
 	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 @@
 	}
 
 	/* 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 @@
 			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 @@
 
 	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 @@
 			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 @@
 
 int main(int argc, char **argv)
 {
-	libusb_init(NULL);
+	osmo_libusb_init(NULL);
 	find_devices();
 	return 0;
 }

-- 
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25703
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I2fd981935e1420e529f5dd8a98edd347c317284c
Gerrit-Change-Number: 25703
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211006/d62645cf/attachment.htm>