<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15016">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;">ensure kernel >= 5.0 is happy<br><br>dummy_hcd now checks wMaxPacketSize<br><br>Change-Id: I3ca4fa3948b5eb9995e0c9f679713ad860dd118e<br>---<br>M ccid/README.linux-dummy_hcd-ffs<br>M ccid/ccid_main_functionfs.c<br>2 files changed, 7 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid/README.linux-dummy_hcd-ffs b/ccid/README.linux-dummy_hcd-ffs</span><br><span>index bb628b6..2b98eff 100644</span><br><span>--- a/ccid/README.linux-dummy_hcd-ffs</span><br><span>+++ b/ccid/README.linux-dummy_hcd-ffs</span><br><span>@@ -2,7 +2,8 @@</span><br><span> ============</span><br><span> </span><br><span> * you need dummy_hcd.ko, i.e. a kernel compiled with CONFIG_USB_DUMMY_HCD=m</span><br><span style="color: hsl(0, 100%, 40%);">-* you need a fixed usb_f_fs.ko, which doesn't make blind assumptions about</span><br><span style="color: hsl(120, 100%, 40%);">+* kernel version >= 5.0 does NOT require patching</span><br><span style="color: hsl(120, 100%, 40%);">+* kernel version < 5.0 needs a fixed usb_f_fs.ko, which doesn't make blind assumptions about</span><br><span>   everything being a HID descriptor.  See CCID.patch</span><br><span> </span><br><span> On a stock Debian system, this works as follows (kernel versions will change over time,</span><br><span>diff --git a/ccid/ccid_main_functionfs.c b/ccid/ccid_main_functionfs.c</span><br><span>index 81cf225..26bb525 100644</span><br><span>--- a/ccid/ccid_main_functionfs.c</span><br><span>+++ b/ccid/ccid_main_functionfs.c</span><br><span>@@ -2,6 +2,7 @@</span><br><span> #include <errno.h></span><br><span> #include <stdint.h></span><br><span> #include <endian.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <signal.h></span><br><span> #include <sys/types.h></span><br><span> #include <linux/usb/functionfs.h></span><br><span> </span><br><span>@@ -87,20 +88,22 @@</span><br><span>                     .bEndpointAddress = 1 | USB_DIR_IN,</span><br><span>                  .bmAttributes = USB_ENDPOINT_XFER_INT,</span><br><span>                       .wMaxPacketSize = 64,</span><br><span style="color: hsl(120, 100%, 40%);">+                 .bInterval = 1,</span><br><span>              },</span><br><span style="color: hsl(120, 100%, 40%);">+            // dummy_hcd expects a valid wMaxPacketSize!</span><br><span>                 .ep_out = {</span><br><span>                  .bLength = sizeof(descriptors.fs_descs.ep_out),</span><br><span>                      .bDescriptorType = USB_DT_ENDPOINT,</span><br><span>                  .bEndpointAddress = 2 | USB_DIR_OUT,</span><br><span>                         .bmAttributes = USB_ENDPOINT_XFER_BULK,</span><br><span style="color: hsl(0, 100%, 40%);">-                 /* .wMaxPacketSize = autoconfiguration (kernel) */</span><br><span style="color: hsl(120, 100%, 40%);">+                    .wMaxPacketSize = 64,</span><br><span>                },</span><br><span>           .ep_in = {</span><br><span>                   .bLength = sizeof(descriptors.fs_descs.ep_in),</span><br><span>                       .bDescriptorType = USB_DT_ENDPOINT,</span><br><span>                  .bEndpointAddress = 3 | USB_DIR_IN,</span><br><span>                  .bmAttributes = USB_ENDPOINT_XFER_BULK,</span><br><span style="color: hsl(0, 100%, 40%);">-                 /* .wMaxPacketSize = autoconfiguration (kernel) */</span><br><span style="color: hsl(120, 100%, 40%);">+                    .wMaxPacketSize = 64,</span><br><span>                },</span><br><span>   },</span><br><span> };</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15016">change 15016</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/+/15016"/><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: I3ca4fa3948b5eb9995e0c9f679713ad860dd118e </div>
<div style="display:none"> Gerrit-Change-Number: 15016 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>