<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9871">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">host USB: use central SIMtrace USB ID definition header<br><br>Change-Id: Id18e64fba0a2c308a8aef7d3865200bf0237cae9<br>---<br>M host/simtrace2_usb.c<br>A host/simtrace_usb.h<br>2 files changed, 5 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/host/simtrace2_usb.c b/host/simtrace2_usb.c</span><br><span>index 6cbb8b7..2016670 100644</span><br><span>--- a/host/simtrace2_usb.c</span><br><span>+++ b/host/simtrace2_usb.c</span><br><span>@@ -6,15 +6,7 @@</span><br><span> #include <osmocom/core/utils.h></span><br><span> </span><br><span> #include "libusb_util.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define USB_VENDOR_OPENMOKO           0x1d50</span><br><span style="color: hsl(0, 100%, 40%);">-#define USB_PRODUCT_OWHW_SAM3_DFU 0x4000</span><br><span style="color: hsl(0, 100%, 40%);">-#define USB_PRODUCT_OWHW_SAM3             0x4001</span><br><span style="color: hsl(0, 100%, 40%);">-#define USB_PRODUCT_QMOD_HUB              0x4002</span><br><span style="color: hsl(0, 100%, 40%);">-#define USB_PRODUCT_QMOD_SAM3_DFU 0x4003</span><br><span style="color: hsl(0, 100%, 40%);">-#define USB_PRODUCT_QMOD_SAM3             0x4004</span><br><span style="color: hsl(0, 100%, 40%);">-#define USB_PRODUCT_SIMTRACE2_DFU 0x60e2</span><br><span style="color: hsl(0, 100%, 40%);">-#define USB_PRODUCT_SIMTRACE2             0x60e3</span><br><span style="color: hsl(120, 100%, 40%);">+#include "simtrace_usb.h"</span><br><span> </span><br><span> static const struct dev_id compatible_dev_ids[] = {</span><br><span>       { USB_VENDOR_OPENMOKO, USB_PRODUCT_OWHW_SAM3 },</span><br><span>@@ -23,15 +15,15 @@</span><br><span>        { 0, 0 }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-//libusb_get_string_descriptor_ascii(hdl, idx, *data, len)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int find_devices(void)</span><br><span> {</span><br><span>   struct usb_interface_match ifm[16];</span><br><span>  int rc, i, num_interfaces;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        /* scan for USB devices matching SIMtrace USB ID with proprietary class */ </span><br><span>  rc = usb_match_interfaces(NULL, compatible_dev_ids,</span><br><span style="color: hsl(0, 100%, 40%);">-                               255, 2, -1, ifm, ARRAY_SIZE(ifm));</span><br><span style="color: hsl(120, 100%, 40%);">+                           USB_CLASS_PROPRIETARY, -1, -1, ifm, ARRAY_SIZE(ifm));</span><br><span style="color: hsl(120, 100%, 40%);">+        printf("USB matches: %d\n", rc);</span><br><span>   if (rc < 0)</span><br><span>               return rc;</span><br><span>   num_interfaces = rc;</span><br><span>diff --git a/host/simtrace_usb.h b/host/simtrace_usb.h</span><br><span>new file mode 120000</span><br><span>index 0000000..f1e0982</span><br><span>--- /dev/null</span><br><span>+++ b/host/simtrace_usb.h</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+../firmware/libcommon/include/simtrace_usb.h</span><br><span>\ No newline at end of file</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9871">change 9871</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9871"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id18e64fba0a2c308a8aef7d3865200bf0237cae9 </div>
<div style="display:none"> Gerrit-Change-Number: 9871 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>