aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2021-06-02 22:09:48 +0200
committerlaforge <laforge@osmocom.org>2021-06-30 08:17:58 +0000
commit3ef40d1ca6a207b0a391260f19cf00b250fa37b0 (patch)
tree8036f314a1eedba6ec3d1a411192be2c08f18da5
parentdcfea28a4f40ed077ad9ba5610bfa4afc3300bc8 (diff)
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
-rw-r--r--host/src/simtrace2_usb.c10
1 files changed, 2 insertions, 8 deletions
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 @@ static int find_devices(void)
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)