<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15643">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, but someone else must approve; Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix USB descriptor bugs (wrong interface, ProtocolsSuported, ...)<br><br>Change-Id: I0be2d8b92f176f31250a76e6f5b74a5c12d8cf42<br>---<br>M sysmoOCTSIM/config/hpl_usb_config.h<br>M sysmoOCTSIM/config/usbd_config.h<br>M sysmoOCTSIM/usb_descriptors.c<br>3 files changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/config/hpl_usb_config.h b/sysmoOCTSIM/config/hpl_usb_config.h</span><br><span>index bbfd99d..dd62bd9 100644</span><br><span>--- a/sysmoOCTSIM/config/hpl_usb_config.h</span><br><span>+++ b/sysmoOCTSIM/config/hpl_usb_config.h</span><br><span>@@ -39,7 +39,7 @@</span><br><span> // <CONF_USB_D_N_EP_MAX"> Max possible (by "Max Endpoint Number" config)</span><br><span> // <id> usbd_num_ep_sp</span><br><span> #ifndef CONF_USB_D_NUM_EP_SP</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_D_NUM_EP_SP CONF_USB_N_6</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_D_NUM_EP_SP CONF_USB_N_7</span><br><span> #endif</span><br><span> </span><br><span> // </h></span><br><span>diff --git a/sysmoOCTSIM/config/usbd_config.h b/sysmoOCTSIM/config/usbd_config.h</span><br><span>index 0be4363..a8861dd 100644</span><br><span>--- a/sysmoOCTSIM/config/usbd_config.h</span><br><span>+++ b/sysmoOCTSIM/config/usbd_config.h</span><br><span>@@ -204,7 +204,7 @@</span><br><span> // <o> bInterfaceNumber <0x00-0xFF></span><br><span> // <id> usb_cdcd_acm_comm_bifcnum</span><br><span> #ifndef CONF_USB_CDCD_ACM_COMM_BIFCNUM</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_COMM_BIFCNUM 0x0</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_COMM_BIFCNUM 0x1</span><br><span> #endif</span><br><span> // <o> bAlternateSetting <0x00-0xFF></span><br><span> // <id> usb_cdcd_acm_comm_baltset</span><br><span>@@ -253,7 +253,7 @@</span><br><span> // <o> bInterfaceNumber <0x00-0xFF></span><br><span> // <id> usb_cdcd_acm_data_bifcnum</span><br><span> #ifndef CONF_USB_CDCD_ACM_DATA_BIFCNUM</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_DATA_BIFCNUM 0x1</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_DATA_BIFCNUM 0x2</span><br><span> #endif</span><br><span> // <o> bAlternateSetting <0x00-0xFF></span><br><span> // <id> usb_cdcd_acm_data_baltset</span><br><span>diff --git a/sysmoOCTSIM/usb_descriptors.c b/sysmoOCTSIM/usb_descriptors.c</span><br><span>index 429e8c2..ddb925b 100644</span><br><span>--- a/sysmoOCTSIM/usb_descriptors.c</span><br><span>+++ b/sysmoOCTSIM/usb_descriptors.c</span><br><span>@@ -162,7 +162,7 @@</span><br><span> .iface = {</span><br><span> .bLength = sizeof(struct usb_iface_desc),</span><br><span> .bDescriptorType = USB_DT_INTERFACE,</span><br><span style="color: hsl(0, 100%, 40%);">- .bInterfaceNumber = 2,</span><br><span style="color: hsl(120, 100%, 40%);">+ .bInterfaceNumber = 0,</span><br><span> .bAlternateSetting = 0,</span><br><span> .bNumEndpoints = 3,</span><br><span> .bInterfaceClass = 11,</span><br><span>@@ -175,7 +175,8 @@</span><br><span> .bDescriptorType = 33,</span><br><span> .bcdCCID = LE16(0x0110),</span><br><span> .bMaxSlotIndex = 7,</span><br><span style="color: hsl(0, 100%, 40%);">- .dwProtocols = 0x07, /* 5/3/1.8V */</span><br><span style="color: hsl(120, 100%, 40%);">+ .bVoltageSupport = 0x07, /* 5/3/1.8V */</span><br><span style="color: hsl(120, 100%, 40%);">+ .dwProtocols = 0x03,</span><br><span> .dwDefaultClock = LE32(2500),</span><br><span> .dwMaximumClock = LE32(20000),</span><br><span> .bNumClockSupported = 4,</span><br><span>@@ -185,7 +186,7 @@</span><br><span> .dwMaxIFSD = LE32(0),</span><br><span> .dwSynchProtocols = LE32(0),</span><br><span> .dwMechanical = LE32(0),</span><br><span style="color: hsl(0, 100%, 40%);">- .dwFeatures = LE32(0x10),</span><br><span style="color: hsl(120, 100%, 40%);">+ .dwFeatures = LE32(0x10 | 0x00010000),</span><br><span> .dwMaxCCIDMessageLength = 272,</span><br><span> .bClassGetResponse = 0xff,</span><br><span> .bClassEnvelope = 0xff,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15643">change 15643</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/+/15643"/><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: I0be2d8b92f176f31250a76e6f5b74a5c12d8cf42 </div>
<div style="display:none"> Gerrit-Change-Number: 15643 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>