<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git version appended to the product usb string descriptor<br><br>Change-Id: I4a9d010c9025cf8c14ebaf42de048b9a172c7786<br>---<br>M sysmoOCTSIM/main.c<br>M sysmoOCTSIM/usb_start.c<br>2 files changed, 26 insertions(+), 7 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/35/17035/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 3db67d9..17255e2 100644</span><br><span>--- a/sysmoOCTSIM/main.c</span><br><span>+++ b/sysmoOCTSIM/main.c</span><br><span>@@ -365,6 +365,19 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int str_to_usb_desc(char* in, uint8_t in_sz, uint8_t* out, uint8_t out_sz){</span><br><span style="color: hsl(120, 100%, 40%);">+ if(2+in_sz*2 < out_sz)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(out, 0, out_sz);</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = out_sz;</span><br><span style="color: hsl(120, 100%, 40%);">+ out[1] = 0x3;</span><br><span style="color: hsl(120, 100%, 40%);">+ for(int i= 2; i < out_sz; i+=2)</span><br><span style="color: hsl(120, 100%, 40%);">+ out[i] = in[(i >> 1) - 1];</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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> #define RSTCAUSE_STR_SIZE 64</span><br><span> static void get_rstcause_str(char *out)</span><br><span> {</span><br><span>@@ -436,13 +449,16 @@</span><br><span> //#######################</span><br><span> </span><br><span> #define NUM_OUT_BUF 16</span><br><span style="color: hsl(0, 100%, 40%);">-char sernr_buf[16*2+1];</span><br><span style="color: hsl(0, 100%, 40%);">-//unicode for descriptor</span><br><span style="color: hsl(0, 100%, 40%);">-uint8_t sernr_buf_descr[1+1+16*2*2];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+char sernr_buf[16*2+1];</span><br><span style="color: hsl(120, 100%, 40%);">+char product_buf[] = "sysmoOCTSIM "GIT_VERSION;</span><br><span style="color: hsl(120, 100%, 40%);">+//len, type, 2 byte per hex char * 2 for unicode</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%);">+uint8_t product_buf_descr[1+1+sizeof(product_buf)*2];</span><br><span> </span><br><span> char rstcause_buf[RSTCAUSE_STR_SIZE];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(void)</span><br><span> {</span><br><span> </span><br><span>@@ -471,12 +487,12 @@</span><br><span> </span><br><span> atmel_start_init();</span><br><span> get_chip_unique_serial_str(sernr_buf, sizeof(sernr_buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ str_to_usb_desc(sernr_buf, sizeof(sernr_buf), sernr_buf_descr, sizeof(sernr_buf_descr));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ str_to_usb_desc(product_buf, sizeof(product_buf), product_buf_descr, sizeof(product_buf_descr));</span><br><span> get_rstcause_str(rstcause_buf);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sernr_buf_descr[0] = sizeof(sernr_buf_descr);</span><br><span style="color: hsl(0, 100%, 40%);">- sernr_buf_descr[1] = 0x3;</span><br><span style="color: hsl(0, 100%, 40%);">- for(int i= 2; i < sizeof(sernr_buf_descr); i+=2)</span><br><span style="color: hsl(0, 100%, 40%);">- sernr_buf_descr[i] = sernr_buf[i >> 1];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> usb_start();</span><br><span> </span><br><span>diff --git a/sysmoOCTSIM/usb_start.c b/sysmoOCTSIM/usb_start.c</span><br><span>index f737dc4..d40ea75 100644</span><br><span>--- a/sysmoOCTSIM/usb_start.c</span><br><span>+++ b/sysmoOCTSIM/usb_start.c</span><br><span>@@ -89,6 +89,7 @@</span><br><span> }</span><br><span> </span><br><span> extern uint8_t sernr_buf_descr[];</span><br><span style="color: hsl(120, 100%, 40%);">+extern uint8_t product_buf_descr[];</span><br><span> /* call-back for every control EP request */</span><br><span> static int32_t string_req_cb(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage)</span><br><span> {</span><br><span>@@ -118,6 +119,8 @@</span><br><span> switch (index) {</span><br><span> case STR_DESC_SERIAL:</span><br><span> return send_str_desc(ep, req, stage, sernr_buf_descr);</span><br><span style="color: hsl(120, 100%, 40%);">+ case STR_DESC_PRODUCT:</span><br><span style="color: hsl(120, 100%, 40%);">+ return send_str_desc(ep, req, stage, product_buf_descr);</span><br><span> default:</span><br><span> return ERR_NOT_FOUND;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17035">change 17035</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/+/17035"/><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: I4a9d010c9025cf8c14ebaf42de048b9a172c7786 </div>
<div style="display:none"> Gerrit-Change-Number: 17035 </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>