<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13673">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">switch UART_debug to ASYNC<br><br>using the synchronous HAL library causes RX overflow after 5 bytes<br>on bulk incoming data (e.g. pasted).<br>this mainly due to printing synchronously the character, but to<br>further prevent congestion we switch to asynchronous (e.g.<br>interrupt driven) communication.<br><br>The RX part works great now (no overflow), but the TX part is<br>malfunctioning because the HAL Async library does not buffer the<br>data to be transmitted and expects it to be in memory until<br>the transmission is complete (which printf does not do).<br><br>This change will not be reflected in Atmel START since it does not<br>allow to set the underlying STDIO redirect peripheral to async.<br><br>Change-Id: If18883e96f336aa9f6b11607859260da5e1503c7<br>---<br>M sysmoOCTSIM/command.c<br>M sysmoOCTSIM/driver_init.c<br>M sysmoOCTSIM/driver_init.h<br>M sysmoOCTSIM/hpl/sercom/hpl_sercom.c<br>M sysmoOCTSIM/main.c<br>M sysmoOCTSIM/manual_test.c<br>M sysmoOCTSIM/stdio_start.c<br>7 files changed, 73 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/command.c b/sysmoOCTSIM/command.c</span><br><span>index b0949f3..6fa25cf 100644</span><br><span>--- a/sysmoOCTSIM/command.c</span><br><span>+++ b/sysmoOCTSIM/command.c</span><br><span>@@ -81,7 +81,7 @@</span><br><span> unsigned int i = 0;</span><br><span> </span><br><span> /* yield CPU after maximum of 10 received characters */</span><br><span style="color: hsl(0, 100%, 40%);">- while (usart_sync_is_rx_not_empty(&UART_debug) && (i < 10)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ while (usart_async_is_rx_not_empty(&UART_debug) && (i < 10)) {</span><br><span> int c = getchar();</span><br><span> if (c < 0)</span><br><span> return;</span><br><span>diff --git a/sysmoOCTSIM/driver_init.c b/sysmoOCTSIM/driver_init.c</span><br><span>index 726129d..8a50925 100644</span><br><span>--- a/sysmoOCTSIM/driver_init.c</span><br><span>+++ b/sysmoOCTSIM/driver_init.c</span><br><span>@@ -32,6 +32,9 @@</span><br><span> /*! The buffer size for USART */</span><br><span> #define SIM6_BUFFER_SIZE 16</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! The buffer size for USART */</span><br><span style="color: hsl(120, 100%, 40%);">+#define UART_DEBUG_BUFFER_SIZE 32</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct usart_async_descriptor SIM0;</span><br><span> struct usart_async_descriptor SIM1;</span><br><span> struct usart_async_descriptor SIM2;</span><br><span>@@ -48,7 +51,9 @@</span><br><span> static uint8_t SIM5_buffer[SIM5_BUFFER_SIZE];</span><br><span> static uint8_t SIM6_buffer[SIM6_BUFFER_SIZE];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct usart_sync_descriptor UART_debug;</span><br><span style="color: hsl(120, 100%, 40%);">+struct usart_async_descriptor UART_debug;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static uint8_t UART_DEBUG_buffer[UART_DEBUG_BUFFER_SIZE];</span><br><span> </span><br><span> /**</span><br><span> * \brief USART Clock initialization function</span><br><span>@@ -309,7 +314,26 @@</span><br><span> SIM6_PORT_init();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void UART_debug_PORT_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+/**</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief USART Clock initialization function</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Enables register interface and peripheral clock</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void UART_debug_CLOCK_init()</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%);">+ hri_gclk_write_PCHCTRL_reg(GCLK, SERCOM7_GCLK_ID_CORE, CONF_GCLK_SERCOM7_CORE_SRC | (1 << GCLK_PCHCTRL_CHEN_Pos));</span><br><span style="color: hsl(120, 100%, 40%);">+ hri_gclk_write_PCHCTRL_reg(GCLK, SERCOM7_GCLK_ID_SLOW, CONF_GCLK_SERCOM7_SLOW_SRC | (1 << GCLK_PCHCTRL_CHEN_Pos));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ hri_mclk_set_APBDMASK_SERCOM7_bit(MCLK);</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%);">+ * \brief USART pinmux initialization function</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Set each required pin to USART functionality</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void UART_debug_PORT_init()</span><br><span> {</span><br><span> </span><br><span> gpio_set_pin_function(UART_TX, PINMUX_PB30C_SERCOM7_PAD0);</span><br><span>@@ -317,18 +341,15 @@</span><br><span> gpio_set_pin_function(UART_RX, PINMUX_PB31C_SERCOM7_PAD1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void UART_debug_CLOCK_init(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- hri_gclk_write_PCHCTRL_reg(GCLK, SERCOM7_GCLK_ID_CORE, CONF_GCLK_SERCOM7_CORE_SRC | (1 << GCLK_PCHCTRL_CHEN_Pos));</span><br><span style="color: hsl(0, 100%, 40%);">- hri_gclk_write_PCHCTRL_reg(GCLK, SERCOM7_GCLK_ID_SLOW, CONF_GCLK_SERCOM7_SLOW_SRC | (1 << GCLK_PCHCTRL_CHEN_Pos));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- hri_mclk_set_APBDMASK_SERCOM7_bit(MCLK);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+/**</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief USART initialization function</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Enables USART peripheral, clocks and initializes USART driver</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> void UART_debug_init(void)</span><br><span> {</span><br><span> UART_debug_CLOCK_init();</span><br><span style="color: hsl(0, 100%, 40%);">- usart_sync_init(&UART_debug, SERCOM7, (void *)NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ usart_async_init(&UART_debug, SERCOM7, UART_DEBUG_buffer, UART_DEBUG_BUFFER_SIZE, (void *)NULL);</span><br><span> UART_debug_PORT_init();</span><br><span> }</span><br><span> </span><br><span>diff --git a/sysmoOCTSIM/driver_init.h b/sysmoOCTSIM/driver_init.h</span><br><span>index d809db8..9d009b9 100644</span><br><span>--- a/sysmoOCTSIM/driver_init.h</span><br><span>+++ b/sysmoOCTSIM/driver_init.h</span><br><span>@@ -40,8 +40,7 @@</span><br><span> extern struct usart_async_descriptor SIM4;</span><br><span> extern struct usart_async_descriptor SIM5;</span><br><span> extern struct usart_async_descriptor SIM6;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-extern struct usart_sync_descriptor UART_debug;</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct usart_async_descriptor UART_debug;</span><br><span> </span><br><span> void SIM0_PORT_init(void);</span><br><span> void SIM0_CLOCK_init(void);</span><br><span>diff --git a/sysmoOCTSIM/hpl/sercom/hpl_sercom.c b/sysmoOCTSIM/hpl/sercom/hpl_sercom.c</span><br><span>index b14e720..f235115 100644</span><br><span>--- a/sysmoOCTSIM/hpl/sercom/hpl_sercom.c</span><br><span>+++ b/sysmoOCTSIM/hpl/sercom/hpl_sercom.c</span><br><span>@@ -177,6 +177,8 @@</span><br><span> </span><br><span> static struct _usart_async_device *_sercom6_dev = NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static struct _usart_async_device *_sercom7_dev = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static uint8_t _get_sercom_index(const void *const hw);</span><br><span> static uint8_t _sercom_get_irq_num(const void *const hw);</span><br><span> static void _sercom_init_irq_param(const void *const hw, void *dev);</span><br><span>@@ -665,6 +667,10 @@</span><br><span> if (hw == SERCOM6) {</span><br><span> _sercom6_dev = (struct _usart_async_device *)dev;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hw == SERCOM7) {</span><br><span style="color: hsl(120, 100%, 40%);">+ _sercom7_dev = (struct _usart_async_device *)dev;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /**</span><br><span>@@ -2628,6 +2634,35 @@</span><br><span> _sercom_usart_interrupt_handler(_sercom6_dev);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/**</span><br><span style="color: hsl(120, 100%, 40%);">+ * \internal Sercom interrupt handler</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void SERCOM7_0_Handler(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ _sercom_usart_interrupt_handler(_sercom7_dev);</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%);">+ * \internal Sercom interrupt handler</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void SERCOM7_1_Handler(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ _sercom_usart_interrupt_handler(_sercom7_dev);</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%);">+ * \internal Sercom interrupt handler</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void SERCOM7_2_Handler(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ _sercom_usart_interrupt_handler(_sercom7_dev);</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%);">+ * \internal Sercom interrupt handler</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+void SERCOM7_3_Handler(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ _sercom_usart_interrupt_handler(_sercom7_dev);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int32_t _spi_m_sync_init(struct _spi_m_sync_dev *dev, void *const hw)</span><br><span> {</span><br><span> const struct sercomspi_regs_cfg *regs = _spi_get_regs((uint32_t)hw);</span><br><span>diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c</span><br><span>index 843652b..47d1cd1 100644</span><br><span>--- a/sysmoOCTSIM/main.c</span><br><span>+++ b/sysmoOCTSIM/main.c</span><br><span>@@ -308,8 +308,6 @@</span><br><span> {</span><br><span> atmel_start_init();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- usart_sync_enable(&UART_debug);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> usb_start();</span><br><span> </span><br><span> board_init();</span><br><span>diff --git a/sysmoOCTSIM/manual_test.c b/sysmoOCTSIM/manual_test.c</span><br><span>index 5cc9bca..526414a 100644</span><br><span>--- a/sysmoOCTSIM/manual_test.c</span><br><span>+++ b/sysmoOCTSIM/manual_test.c</span><br><span>@@ -203,7 +203,7 @@</span><br><span> int c;</span><br><span> </span><br><span> do {</span><br><span style="color: hsl(0, 100%, 40%);">- } while (!usart_sync_is_rx_not_empty(&UART_debug));</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (!usart_async_is_rx_not_empty(&UART_debug));</span><br><span> </span><br><span> c = getchar();</span><br><span> if (c < 0)</span><br><span>diff --git a/sysmoOCTSIM/stdio_start.c b/sysmoOCTSIM/stdio_start.c</span><br><span>index 7450a08..e2fb0c2 100644</span><br><span>--- a/sysmoOCTSIM/stdio_start.c</span><br><span>+++ b/sysmoOCTSIM/stdio_start.c</span><br><span>@@ -9,15 +9,13 @@</span><br><span> #include "atmel_start.h"</span><br><span> #include "stdio_start.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void STDIO_REDIRECT_0_example(void)</span><br><span style="color: hsl(120, 100%, 40%);">+static void UART_debug_rx_cb(const struct usart_async_descriptor *const io_descr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Print welcome message */</span><br><span style="color: hsl(0, 100%, 40%);">- printf("\r\nHello ATMEL World!\r\n");</span><br><span> }</span><br><span> </span><br><span> void stdio_redirect_init(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- usart_sync_enable(&UART_debug);</span><br><span style="color: hsl(120, 100%, 40%);">+ usart_async_register_callback(&UART_debug, USART_ASYNC_RXC_CB, UART_debug_rx_cb); // if no callback function is registered receive won't work, even if the callback does nothing</span><br><span style="color: hsl(120, 100%, 40%);">+ usart_async_enable(&UART_debug);</span><br><span> stdio_io_init(&UART_debug.io);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13673">change 13673</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/13673"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: If18883e96f336aa9f6b11607859260da5e1503c7 </div>
<div style="display:none"> Gerrit-Change-Number: 13673 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Kévin Redon <kredon@sysmocom.de> </div>