<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12807">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">echo back UART input<br><br>let main run the main loop instead of the CDC ACM example.<br>also rename the CDC ACM example functions.<br><br>Change-Id: I44b15079672b4058de1fa08365541317d54958dc<br>---<br>M sysmoOCTSIM/main.c<br>M sysmoOCTSIM/usb_start.c<br>M sysmoOCTSIM/usb_start.h<br>3 files changed, 17 insertions(+), 17 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/07/12807/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 de954f4..dfe3b03 100644</span><br><span>--- a/sysmoOCTSIM/main.c</span><br><span>+++ b/sysmoOCTSIM/main.c</span><br><span>@@ -19,19 +19,19 @@</span><br><span> #include "atmel_start.h"</span><br><span> #include "atmel_start_pins.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-volatile static uint32_t data_arrived = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+volatile static bool data_arrived = false;</span><br><span> </span><br><span> static void tx_cb_UART_debug(const struct usart_async_descriptor *const io_descr)</span><br><span> {</span><br><span> /* Transfer completed */</span><br><span style="color: hsl(0, 100%, 40%);">- gpio_toggle_pin_level(LED_system);</span><br><span style="color: hsl(120, 100%, 40%);">+ //gpio_toggle_pin_level(LED_system);</span><br><span> }</span><br><span> </span><br><span> static void rx_cb_UART_debug(const struct usart_async_descriptor *const io_descr)</span><br><span> {</span><br><span> /* Receive completed */</span><br><span> gpio_toggle_pin_level(LED_system);</span><br><span style="color: hsl(0, 100%, 40%);">- data_arrived = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ data_arrived = true;</span><br><span> }</span><br><span> </span><br><span> int main(void)</span><br><span>@@ -42,5 +42,15 @@</span><br><span> usart_async_register_callback(&UART_debug, USART_ASYNC_RXC_CB, rx_cb_UART_debug);</span><br><span> usart_async_enable(&UART_debug);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cdcd_acm_example();</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_start();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while (true) { // main loop</span><br><span style="color: hsl(120, 100%, 40%);">+ if (data_arrived) { // input on UART debug</span><br><span style="color: hsl(120, 100%, 40%);">+ data_arrived = false; // clear flag</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t recv_char; // to store the input</span><br><span style="color: hsl(120, 100%, 40%);">+ while (io_read(&UART_debug.io, &recv_char, 1) == 1) { // read input</span><br><span style="color: hsl(120, 100%, 40%);">+ while (io_write(&UART_debug.io, &recv_char, 1) != 1); // echo back to output</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> }</span><br><span>diff --git a/sysmoOCTSIM/usb_start.c b/sysmoOCTSIM/usb_start.c</span><br><span>index de86172..d02edc0 100644</span><br><span>--- a/sysmoOCTSIM/usb_start.c</span><br><span>+++ b/sysmoOCTSIM/usb_start.c</span><br><span>@@ -93,25 +93,15 @@</span><br><span> }</span><br><span> </span><br><span> /**</span><br><span style="color: hsl(0, 100%, 40%);">- * Example of using CDC ACM Function.</span><br><span style="color: hsl(0, 100%, 40%);">- * \note</span><br><span style="color: hsl(0, 100%, 40%);">- * In this example, we will use a PC as a USB host:</span><br><span style="color: hsl(0, 100%, 40%);">- * - Connect the DEBUG USB on XPLAINED board to PC for program download.</span><br><span style="color: hsl(0, 100%, 40%);">- * - Connect the TARGET USB on XPLAINED board to PC for running program.</span><br><span style="color: hsl(0, 100%, 40%);">- * The application will behave as a virtual COM.</span><br><span style="color: hsl(0, 100%, 40%);">- * - Open a HyperTerminal or other COM tools in PC side.</span><br><span style="color: hsl(0, 100%, 40%);">- * - Send out a character or string and it will echo the content received.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Start USB stack</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-void cdcd_acm_example(void)</span><br><span style="color: hsl(120, 100%, 40%);">+void usb_start(void)</span><br><span> {</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(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (1) {</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> </span><br><span> void usb_init(void)</span><br><span>diff --git a/sysmoOCTSIM/usb_start.h b/sysmoOCTSIM/usb_start.h</span><br><span>index 48b2735..daf30cc 100644</span><br><span>--- a/sysmoOCTSIM/usb_start.h</span><br><span>+++ b/sysmoOCTSIM/usb_start.h</span><br><span>@@ -15,7 +15,7 @@</span><br><span> #include "cdcdf_acm.h"</span><br><span> #include "cdcdf_acm_desc.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void cdcd_acm_example(void);</span><br><span style="color: hsl(120, 100%, 40%);">+void usb_start(void);</span><br><span> void cdc_device_acm_init(void);</span><br><span> </span><br><span> /**</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12807">change 12807</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/12807"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I44b15079672b4058de1fa08365541317d54958dc </div>
<div style="display:none"> Gerrit-Change-Number: 12807 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>