<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26398">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;">debug usb-cdc uart: disable it.<br><br>Currently unused.<br><br>Change-Id: I5f39c0fe82cbfa6f2bc4b84784a7142b461b64fb<br>---<br>M sysmoOCTSIM/main.c<br>M sysmoOCTSIM/usb_descriptors.c<br>M sysmoOCTSIM/usb_descriptors.h<br>M sysmoOCTSIM/usb_start.c<br>4 files changed, 27 insertions(+), 4 deletions(-)<br><br></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 101af30..bf145cd 100644</span><br><span>--- a/sysmoOCTSIM/main.c</span><br><span>+++ b/sysmoOCTSIM/main.c</span><br><span>@@ -506,8 +506,10 @@</span><br><span> usb_start();</span><br><span> </span><br><span> board_init();</span><br><span style="color: hsl(0, 100%, 40%);">- command_init("sysmoOCTSIM> ");</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef WITH_DEBUG_CDC</span><br><span style="color: hsl(120, 100%, 40%);">+ command_init("sysmoOCTSIM> ");</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> /* boost uart priority by setting all other irqs to uartprio+1 */</span><br><span> for(int i = 0; i < PERIPH_COUNT_IRQn; i++)</span><br><span> NVIC_SetPriority(i, 2);</span><br><span>diff --git a/sysmoOCTSIM/usb_descriptors.c b/sysmoOCTSIM/usb_descriptors.c</span><br><span>index 7652bf6..94a473e 100644</span><br><span>--- a/sysmoOCTSIM/usb_descriptors.c</span><br><span>+++ b/sysmoOCTSIM/usb_descriptors.c</span><br><span>@@ -46,17 +46,24 @@</span><br><span> .bLength = sizeof(struct usb_config_desc),</span><br><span> .bDescriptorType = USB_DT_CONFIG,</span><br><span> .wTotalLength = sizeof(usb_fs_descs.cfg) +</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef WITH_DEBUG_CDC</span><br><span> sizeof(usb_fs_descs.cdc) +</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> sizeof(usb_fs_descs.ccid) +</span><br><span> sizeof(usb_fs_descs.dfu_rt) +</span><br><span> sizeof(usb_fs_descs.func_dfu),</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef WITH_DEBUG_CDC</span><br><span> .bNumInterfaces = 4,</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ .bNumInterfaces = 2,</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> .bConfigurationValue = CONF_USB_CDCD_ACM_BCONFIGVAL,</span><br><span> .iConfiguration = STR_DESC_CONFIG,</span><br><span> .bmAttributes = CONF_USB_CDCD_ACM_BMATTRI,</span><br><span> /* FIXME: The device should offer at least one 100mA configuration. */</span><br><span> .bMaxPower = 250, /* request 500mA */</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef WITH_DEBUG_CDC</span><br><span> .cdc = {</span><br><span> .comm = {</span><br><span> .iface = {</span><br><span>@@ -139,6 +146,7 @@</span><br><span> },</span><br><span> },</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> .ccid = {</span><br><span> .iface = {</span><br><span> .bLength = sizeof(struct usb_iface_desc),</span><br><span>@@ -208,7 +216,11 @@</span><br><span> },</span><br><span> },</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef WITH_DEBUG_CDC</span><br><span> DFURT_IF_DESCRIPTOR(3, STR_DESC_INTF_DFURT),</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ DFURT_IF_DESCRIPTOR(1, STR_DESC_INTF_DFURT),</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> .str = {</span><br><span> #if 0</span><br><span> CDCD_ACM_STR_DESCES</span><br><span>diff --git a/sysmoOCTSIM/usb_descriptors.h b/sysmoOCTSIM/usb_descriptors.h</span><br><span>index ba879f7..8733b2c 100644</span><br><span>--- a/sysmoOCTSIM/usb_descriptors.h</span><br><span>+++ b/sysmoOCTSIM/usb_descriptors.h</span><br><span>@@ -43,6 +43,7 @@</span><br><span> struct usb_dev_desc dev;</span><br><span> struct usb_config_desc cfg;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef WITH_DEBUG_CDC</span><br><span> /* CDC-ACM: Two interfaces, one with IRQ EP and one with BULK IN + OUT */</span><br><span> struct {</span><br><span> struct {</span><br><span>@@ -59,6 +60,7 @@</span><br><span> } data;</span><br><span> } cdc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> /* CCID: One interface with CCID class descriptor and three endpoints */</span><br><span> struct {</span><br><span> struct usb_iface_desc iface;</span><br><span>diff --git a/sysmoOCTSIM/usb_start.c b/sysmoOCTSIM/usb_start.c</span><br><span>index a4b787e..d4057be 100644</span><br><span>--- a/sysmoOCTSIM/usb_start.c</span><br><span>+++ b/sysmoOCTSIM/usb_start.c</span><br><span>@@ -132,14 +132,14 @@</span><br><span> usbdc_init(ctrl_buffer);</span><br><span> usbdc_register_handler(USBDC_HDL_REQ, &string_req_h);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef WITH_DEBUG_CDC</span><br><span> /* usbdc_register_funcion inside */</span><br><span> cdcdf_acm_init();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> dfudf_init();</span><br><span> </span><br><span> printf("usb_descs_size=%u\r\n", usb_descs[0].eod - usb_descs[0].sod);</span><br><span style="color: hsl(0, 100%, 40%);">- usbdc_start((struct usbd_descriptors *) usb_descs);</span><br><span style="color: hsl(0, 100%, 40%);">- usbdc_attach();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> }</span><br><span> </span><br><span> /**</span><br><span>@@ -147,15 +147,22 @@</span><br><span> */</span><br><span> void usb_start(void)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef WITH_DEBUG_CDC</span><br><span> while (!cdcdf_acm_is_enabled()) {</span><br><span> // wait cdc acm to be installed</span><br><span> };</span><br><span> </span><br><span> cdcdf_acm_register_callback(CDCDF_ACM_CB_STATE_C, (FUNC_PTR)usb_device_cb_state_c);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ while (!ccid_df_is_enabled());</span><br><span> }</span><br><span> </span><br><span> void usb_init(void)</span><br><span> {</span><br><span> cdc_device_acm_init();</span><br><span> ccid_df_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ usbdc_start((struct usbd_descriptors *) usb_descs);</span><br><span style="color: hsl(120, 100%, 40%);">+ usbdc_attach();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26398">change 26398</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/+/26398"/><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: I5f39c0fe82cbfa6f2bc4b84784a7142b461b64fb </div>
<div style="display:none"> Gerrit-Change-Number: 26398 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: 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-Reviewer: tsaitgaist <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>