<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13678">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;">UART_debug now uses the async library with tx ring<br><br>Change-Id: I4cf689a8d3dc292201f1e2ce6c013aa1686ad6bc<br>---<br>M sysmoOCTSIM/command.c<br>M sysmoOCTSIM/driver_init.c<br>M sysmoOCTSIM/driver_init.h<br>M sysmoOCTSIM/manual_test.c<br>M sysmoOCTSIM/stdio_start.c<br>5 files changed, 13 insertions(+), 18 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 6fa25cf..454cd2f 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_async_is_rx_not_empty(&UART_debug) && (i < 10)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ while (usart_async_rings_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 8a50925..0b6b190 100644</span><br><span>--- a/sysmoOCTSIM/driver_init.c</span><br><span>+++ b/sysmoOCTSIM/driver_init.c</span><br><span>@@ -33,7 +33,7 @@</span><br><span> #define SIM6_BUFFER_SIZE 16</span><br><span> </span><br><span> /*! The buffer size for USART */</span><br><span style="color: hsl(0, 100%, 40%);">-#define UART_DEBUG_BUFFER_SIZE 32</span><br><span style="color: hsl(120, 100%, 40%);">+#define UART_DEBUG_BUFFER_SIZE 256</span><br><span> </span><br><span> struct usart_async_descriptor SIM0;</span><br><span> struct usart_async_descriptor SIM1;</span><br><span>@@ -51,9 +51,10 @@</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_async_descriptor UART_debug;</span><br><span style="color: hsl(120, 100%, 40%);">+struct usart_async_rings_descriptor UART_debug;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint8_t UART_DEBUG_buffer[UART_DEBUG_BUFFER_SIZE];</span><br><span style="color: hsl(120, 100%, 40%);">+static uint8_t UART_DEBUG_buffer_rx[UART_DEBUG_BUFFER_SIZE];</span><br><span style="color: hsl(120, 100%, 40%);">+static uint8_t UART_DEBUG_buffer_tx[UART_DEBUG_BUFFER_SIZE];</span><br><span> </span><br><span> /**</span><br><span> * \brief USART Clock initialization function</span><br><span>@@ -349,7 +350,7 @@</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_async_init(&UART_debug, SERCOM7, UART_DEBUG_buffer, UART_DEBUG_BUFFER_SIZE, (void *)NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ usart_async_rings_init(&UART_debug, SERCOM7, UART_DEBUG_buffer_rx, UART_DEBUG_BUFFER_SIZE, UART_DEBUG_buffer_tx, 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 9d009b9..6c4f3a1 100644</span><br><span>--- a/sysmoOCTSIM/driver_init.h</span><br><span>+++ b/sysmoOCTSIM/driver_init.h</span><br><span>@@ -21,15 +21,9 @@</span><br><span> #include <hal_io.h></span><br><span> #include <hal_sleep.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <hal_usart_async.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <hal_usart_async.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <hal_usart_async.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <hal_usart_async.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <hal_usart_async.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <hal_usart_async.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <hal_usart_async.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <hal_usart_sync.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <hal_usart_async.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <hal_usart_async_rings.h></span><br><span> </span><br><span> #include "hal_usb_device.h"</span><br><span> </span><br><span>@@ -40,7 +34,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%);">-extern struct usart_async_descriptor UART_debug;</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct usart_async_rings_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/manual_test.c b/sysmoOCTSIM/manual_test.c</span><br><span>index 526414a..d6852bc 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_async_is_rx_not_empty(&UART_debug));</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (!usart_async_rings_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 e2fb0c2..8a15c88 100644</span><br><span>--- a/sysmoOCTSIM/stdio_start.c</span><br><span>+++ b/sysmoOCTSIM/stdio_start.c</span><br><span>@@ -9,13 +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%);">-static void UART_debug_rx_cb(const struct usart_async_descriptor *const io_descr)</span><br><span style="color: hsl(120, 100%, 40%);">+static void UART_debug_rx_cb(const struct usart_async_rings_descriptor *const io_descr)</span><br><span> {</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%);">- 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(0, 100%, 40%);">- usart_async_enable(&UART_debug);</span><br><span style="color: hsl(120, 100%, 40%);">+ usart_async_rings_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_rings_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/13678">change 13678</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/13678"/><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: I4cf689a8d3dc292201f1e2ce6c013aa1686ad6bc </div>
<div style="display:none"> Gerrit-Change-Number: 13678 </div>
<div style="display:none"> Gerrit-PatchSet: 11 </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>