<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17055">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Implement serial number string descriptor in CTRL EP callback<br><br>Change-Id: I910eca1db4baa375bf604110301a0bde25ffcb26<br>---<br>M sysmoOCTSIM/main.c<br>M sysmoOCTSIM/usb_descriptors.h<br>M sysmoOCTSIM/usb_start.c<br>3 files changed, 77 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/55/17055/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c</span><br><span>index 07c5af8..3db67d9 100644</span><br><span>--- a/sysmoOCTSIM/main.c</span><br><span>+++ b/sysmoOCTSIM/main.c</span><br><span>@@ -436,11 +436,15 @@</span><br><span> //#######################</span><br><span> </span><br><span> #define NUM_OUT_BUF 16</span><br><span style="color: hsl(120, 100%, 40%);">+char sernr_buf[16*2+1];</span><br><span style="color: hsl(120, 100%, 40%);">+//unicode for descriptor</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t sernr_buf_descr[1+1+16*2*2];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+char rstcause_buf[RSTCAUSE_STR_SIZE];</span><br><span> </span><br><span> int main(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- char sernr_buf[16*2+1];</span><br><span style="color: hsl(0, 100%, 40%);">- char rstcause_buf[RSTCAUSE_STR_SIZE];</span><br><span> </span><br><span> #if 0</span><br><span> CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk ; //| /* tracing*/</span><br><span>@@ -469,6 +473,11 @@</span><br><span> get_chip_unique_serial_str(sernr_buf, sizeof(sernr_buf));</span><br><span> get_rstcause_str(rstcause_buf);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ sernr_buf_descr[0] = sizeof(sernr_buf_descr);</span><br><span style="color: hsl(120, 100%, 40%);">+ sernr_buf_descr[1] = 0x3;</span><br><span style="color: hsl(120, 100%, 40%);">+ for(int i= 2; i < sizeof(sernr_buf_descr); i+=2)</span><br><span style="color: hsl(120, 100%, 40%);">+ sernr_buf_descr[i] = sernr_buf[i >> 1];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> usb_start();</span><br><span> </span><br><span> board_init();</span><br><span>diff --git a/sysmoOCTSIM/usb_descriptors.h b/sysmoOCTSIM/usb_descriptors.h</span><br><span>index adf6405..df072c2 100644</span><br><span>--- a/sysmoOCTSIM/usb_descriptors.h</span><br><span>+++ b/sysmoOCTSIM/usb_descriptors.h</span><br><span>@@ -19,6 +19,8 @@</span><br><span> #ifndef USB_DESCRIPTORS_H_</span><br><span> #define USB_DESCRIPTORS_H_</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "ccid_device.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define CCID_NUM_CLK_SUPPORTED 4</span><br><span> </span><br><span> /* aggregate descriptors for the combined CDC-ACM + CCID device that we expose</span><br><span>diff --git a/sysmoOCTSIM/usb_start.c b/sysmoOCTSIM/usb_start.c</span><br><span>index c6d9fe9..08201cb 100644</span><br><span>--- a/sysmoOCTSIM/usb_start.c</span><br><span>+++ b/sysmoOCTSIM/usb_start.c</span><br><span>@@ -7,6 +7,7 @@</span><br><span> */</span><br><span> #include "atmel_start.h"</span><br><span> #include "usb_start.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "usb_descriptors.h"</span><br><span> </span><br><span> #define CDCD_ECHO_BUF_SIZ CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ</span><br><span> </span><br><span>@@ -58,6 +59,67 @@</span><br><span> </span><br><span> extern const struct usbd_descriptors usb_descs[];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* transmit given string descriptor */</span><br><span style="color: hsl(120, 100%, 40%);">+static bool send_str_desc(uint8_t ep, const struct usb_req *req, enum usb_ctrl_stage stage,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *desc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t len_req = LE16(req->wLength);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t len_desc = desc[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t len_tx;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool need_zlp = !(len_req & (CONF_USB_CDCD_ACM_BMAXPKSZ0 - 1));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (len_req <= len_desc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ need_zlp = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ len_tx = len_req;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ len_tx = len_desc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ERR_NONE != usbdc_xfer(ep, (uint8_t *)desc, len_tx, need_zlp)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern uint8_t sernr_buf_descr[];</span><br><span style="color: hsl(120, 100%, 40%);">+/* call-back for every control EP request */</span><br><span style="color: hsl(120, 100%, 40%);">+static int32_t string_req_cb(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t index, type;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (stage != USB_SETUP_STAGE)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ERR_NOT_FOUND;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((req->bmRequestType & (USB_REQT_TYPE_MASK | USB_REQT_DIR_IN)) !=</span><br><span style="color: hsl(120, 100%, 40%);">+ (USB_REQT_TYPE_STANDARD | USB_REQT_DIR_IN))</span><br><span style="color: hsl(120, 100%, 40%);">+ return ERR_NOT_FOUND;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* abort if it's not a GET DESCRIPTOR request */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (req->bRequest != USB_REQ_GET_DESC)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ERR_NOT_FOUND;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* abort if it's not about a string descriptor */</span><br><span style="color: hsl(120, 100%, 40%);">+ type = req->wValue >> 8;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (type != USB_DT_STRING)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ERR_NOT_FOUND;</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("ep=%02x, bmReqT=%04x, bReq=%02x, wValue=%04x, stage=%d\r\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ep, req->bmRequestType, req->bRequest, req->wValue, stage);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ /* abort if it's not a standard GET request */</span><br><span style="color: hsl(120, 100%, 40%);">+ index = req->wValue & 0x00FF;</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (index) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case STR_DESC_SERIAL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return send_str_desc(ep, req, stage, sernr_buf_descr);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return ERR_NOT_FOUND;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct usbdc_handler string_req_h = {NULL, (FUNC_PTR)string_req_cb};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /**</span><br><span> * \brief CDC ACM Init</span><br><span> */</span><br><span>@@ -65,10 +127,12 @@</span><br><span> {</span><br><span> /* usb stack init */</span><br><span> usbdc_init(ctrl_buffer);</span><br><span style="color: hsl(120, 100%, 40%);">+ usbdc_register_handler(USBDC_HDL_REQ, &string_req_h);</span><br><span> </span><br><span> /* usbdc_register_funcion inside */</span><br><span> cdcdf_acm_init();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ printf("usb_descs_size=%u\r\n", usb_descs[0].eod - usb_descs[0].sod);</span><br><span> usbdc_start((struct usbd_descriptors *) usb_descs);</span><br><span> usbdc_attach();</span><br><span> }</span><br><span>@@ -87,7 +151,6 @@</span><br><span> </span><br><span> void usb_init(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> cdc_device_acm_init();</span><br><span> ccid_df_init();</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17055">change 17055</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/+/17055"/><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: I910eca1db4baa375bf604110301a0bde25ffcb26 </div>
<div style="display:none"> Gerrit-Change-Number: 17055 </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-MessageType: newchange </div>