Change in simtrace2[master]: simtrace2-list: Use osmo_st2_compatible_dev_ids[]

laforge gerrit-no-reply at lists.osmocom.org
Wed Jun 2 20:58:52 UTC 2021


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


Change subject: simtrace2-list: Use osmo_st2_compatible_dev_ids[]
......................................................................

simtrace2-list: Use osmo_st2_compatible_dev_ids[]

we shouldn't use a local copy of the device id list, which is already
outdated now that OCTSIMTEST support has been added to libosmo-st2

Change-Id: I2231006b94c33fe3b28ce37b0d54c67206751058
---
M host/src/simtrace2_usb.c
1 file changed, 2 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/23/24523/1

diff --git a/host/src/simtrace2_usb.c b/host/src/simtrace2_usb.c
index 94e19ff..8fa41fc 100644
--- a/host/src/simtrace2_usb.c
+++ b/host/src/simtrace2_usb.c
@@ -25,13 +25,7 @@
 
 #include <osmocom/usb/libusb.h>
 #include <osmocom/simtrace2/simtrace_usb.h>
-
-static const struct dev_id compatible_dev_ids[] = {
-	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_OWHW_SAM3 },
-	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_QMOD_SAM3 },
-	{ USB_VENDOR_OPENMOKO, USB_PRODUCT_SIMTRACE2 },
-	{ 0, 0 }
-};
+#include <osmocom/simtrace2/usb_util.h>
 
 static int find_devices(void)
 {
@@ -39,7 +33,7 @@
 	int rc, i, num_interfaces;
 
 	/* scan for USB devices matching SIMtrace USB ID with proprietary class */
-	rc = osmo_libusb_find_matching_interfaces(NULL, compatible_dev_ids,
+	rc = osmo_libusb_find_matching_interfaces(NULL, osmo_st2_compatible_dev_ids,
 						  USB_CLASS_PROPRIETARY, -1, -1, ifm, ARRAY_SIZE(ifm));
 	printf("USB matches: %d\n", rc);
 	if (rc < 0)

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

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I2231006b94c33fe3b28ce37b0d54c67206751058
Gerrit-Change-Number: 24523
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/20210602/37c2af3b/attachment.htm>


More information about the gerrit-log mailing list