<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19961">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ccid_host: Migrate to OpenMoko USB VID/PID<br><br>We used 0x2342 just for internal testing.  Let's use a proper<br>unique allocation even for the FunctionFS version of the code.<br><br>Change-Id: Idbaf173b0ec1fd80885f26b3df24a4412913c100<br>---<br>M ccid_host/README.linux-dummy_hcd-ffs<br>M ccid_host/create_ccid_gadget.sh<br>M contrib/ccid-control.c<br>3 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_host/README.linux-dummy_hcd-ffs b/ccid_host/README.linux-dummy_hcd-ffs</span><br><span>index 2b98eff..29c6584 100644</span><br><span>--- a/ccid_host/README.linux-dummy_hcd-ffs</span><br><span>+++ b/ccid_host/README.linux-dummy_hcd-ffs</span><br><span>@@ -55,7 +55,7 @@</span><br><span> </span><br><span> ----</span><br><span> usb 3-1: new full-speed USB device number 8 using dummy_hcd</span><br><span style="color: hsl(0, 100%, 40%);">-usb 3-1: New USB device found, idVendor=2342, idProduct=2342, bcdDevice= 4.19</span><br><span style="color: hsl(120, 100%, 40%);">+usb 3-1: New USB device found, idVendor=1d50, idProduct=615f, bcdDevice= 4.19</span><br><span> usb 3-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3</span><br><span> usb 3-1: Product: sysmoOCTSIM</span><br><span> usb 3-1: Manufacturer: sysmocom GmbH</span><br><span>@@ -76,7 +76,7 @@</span><br><span>               <string>0x08C3</string></span><br><span>                  <string>0x15E1</string></span><br><span>                  <string>0x062D</string></span><br><span style="color: hsl(0, 100%, 40%);">-+            <string>0x2342</string></span><br><span style="color: hsl(120, 100%, 40%);">++          <string>0x1D50</string></span><br><span>          </array></span><br><span>  </span><br><span>          <key>ifdProductID</key></span><br><span>@@ -84,7 +84,7 @@</span><br><span>              <string>0x0402</string></span><br><span>                  <string>0x2007</string></span><br><span>                  <string>0x0001</string></span><br><span style="color: hsl(0, 100%, 40%);">-+            <string>0x2342</string></span><br><span style="color: hsl(120, 100%, 40%);">++          <string>0x615F</string></span><br><span>          </array></span><br><span>  </span><br><span>          <key>ifdFriendlyName</key></span><br><span>diff --git a/ccid_host/create_ccid_gadget.sh b/ccid_host/create_ccid_gadget.sh</span><br><span>index aafb152..d17b3cc 100755</span><br><span>--- a/ccid_host/create_ccid_gadget.sh</span><br><span>+++ b/ccid_host/create_ccid_gadget.sh</span><br><span>@@ -23,8 +23,8 @@</span><br><span> [ -d $gadgetdir ] || mkdir $gadgetdir || die "Cannot create $gadgetdir. Permission problem?"</span><br><span> set -e -x</span><br><span> cd $gadgetdir</span><br><span style="color: hsl(0, 100%, 40%);">-echo 0x2342 > idVendor</span><br><span style="color: hsl(0, 100%, 40%);">-echo 0x2342 > idProduct</span><br><span style="color: hsl(120, 100%, 40%);">+echo 0x1d50 > idVendor</span><br><span style="color: hsl(120, 100%, 40%);">+echo 0x615f > idProduct</span><br><span> [ -d strings/0x409 ] || mkdir strings/0x409</span><br><span> echo 2342 > strings/0x409/serialnumber</span><br><span> echo "sysmocom GmbH" > strings/0x409/manufacturer</span><br><span>diff --git a/contrib/ccid-control.c b/contrib/ccid-control.c</span><br><span>index 378828a..d28ddfc 100644</span><br><span>--- a/contrib/ccid-control.c</span><br><span>+++ b/contrib/ccid-control.c</span><br><span>@@ -26,8 +26,8 @@</span><br><span> #include <libusb-1.0/libusb.h></span><br><span> </span><br><span> static libusb_context *g_uctx;</span><br><span style="color: hsl(0, 100%, 40%);">-static uint16_t g_vendor_id = 0x2342;</span><br><span style="color: hsl(0, 100%, 40%);">-static uint16_t g_product_id = 0x2342;</span><br><span style="color: hsl(120, 100%, 40%);">+static uint16_t g_vendor_id = 0x1d50;</span><br><span style="color: hsl(120, 100%, 40%);">+static uint16_t g_product_id = 0x615f;</span><br><span> static uint8_t g_interface = 0;</span><br><span> </span><br><span> #define GET_CLOCK_FREQS  0x02</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19961">change 19961</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/c/osmo-ccid-firmware/+/19961"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Idbaf173b0ec1fd80885f26b3df24a4412913c100 </div>
<div style="display:none"> Gerrit-Change-Number: 19961 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>