<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15741">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">card_uart_ctrl: change from bool to integer argument<br><br>This allows for control functions for e.g. baud rate or waiting time<br><br>Change-Id: Ifa8dde9dbcd27b79055aaac1a05bb040be616e05<br>---<br>M ccid_common/cuart.c<br>M ccid_common/cuart.h<br>M ccid_host/cuart_driver_tty.c<br>3 files changed, 9 insertions(+), 9 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/41/15741/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c</span><br><span>index 895717a..fc3cfb6 100644</span><br><span>--- a/ccid_common/cuart.c</span><br><span>+++ b/ccid_common/cuart.c</span><br><span>@@ -53,20 +53,20 @@</span><br><span>      return cuart->driver->ops->close(cuart);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int card_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, bool enable)</span><br><span style="color: hsl(120, 100%, 40%);">+int card_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, int arg)</span><br><span> {</span><br><span>        int rc;</span><br><span>      OSMO_ASSERT(cuart);</span><br><span>  OSMO_ASSERT(cuart->driver);</span><br><span>       OSMO_ASSERT(cuart->driver->ops);</span><br><span>       OSMO_ASSERT(cuart->driver->ops->ctrl);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = cuart->driver->ops->ctrl(cuart, ctl, enable);</span><br><span style="color: hsl(120, 100%, 40%);">+   rc = cuart->driver->ops->ctrl(cuart, ctl, arg);</span><br><span>     if (rc < 0)</span><br><span>               return rc;</span><br><span> </span><br><span>       switch (ctl) {</span><br><span>       case CUART_CTL_RX:</span><br><span style="color: hsl(0, 100%, 40%);">-              cuart->rx_enabled = enable;</span><br><span style="color: hsl(120, 100%, 40%);">+                cuart->rx_enabled = arg ? true : false;</span><br><span>           break;</span><br><span>       default:</span><br><span>             break;</span><br><span>diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h</span><br><span>index 790c277..f35cdd2 100644</span><br><span>--- a/ccid_common/cuart.h</span><br><span>+++ b/ccid_common/cuart.h</span><br><span>@@ -33,7 +33,7 @@</span><br><span>  int (*async_tx)(struct card_uart *cuart, const uint8_t *data, size_t len);</span><br><span>   int (*async_rx)(struct card_uart *cuart, uint8_t *data, size_t len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        int (*ctrl)(struct card_uart *cuart, enum card_uart_ctl ctl, bool enable);</span><br><span style="color: hsl(120, 100%, 40%);">+    int (*ctrl)(struct card_uart *cuart, enum card_uart_ctl ctl, int arg);</span><br><span> };</span><br><span> </span><br><span> /* Card UART driver */</span><br><span>@@ -98,7 +98,7 @@</span><br><span> /*! Schedule (asynchronous) receive data via UART (after CUART_E_RX_COMPLETE) */</span><br><span> int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int card_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, bool enable);</span><br><span style="color: hsl(120, 100%, 40%);">+int card_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, int arg);</span><br><span> </span><br><span> /*! Set the Rx notification threshold in number of bytes received */</span><br><span> void card_uart_set_rx_threshold(struct card_uart *cuart, size_t rx_threshold);</span><br><span>diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c</span><br><span>index 3695b58..10ea60f 100644</span><br><span>--- a/ccid_host/cuart_driver_tty.c</span><br><span>+++ b/ccid_host/cuart_driver_tty.c</span><br><span>@@ -249,7 +249,7 @@</span><br><span>     return i;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int tty_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, bool enable)</span><br><span style="color: hsl(120, 100%, 40%);">+static int tty_uart_ctrl(struct card_uart *cuart, enum card_uart_ctl ctl, int arg)</span><br><span> {</span><br><span>    struct termios tio;</span><br><span>  int rc;</span><br><span>@@ -263,7 +263,7 @@</span><br><span>                }</span><br><span>            /* We do our best here, but lots of [USB] serial drivers seem to ignore</span><br><span>               * CREAD, see https://bugzilla.kernel.org/show_bug.cgi?id=205033 */</span><br><span style="color: hsl(0, 100%, 40%);">-             if (enable)</span><br><span style="color: hsl(120, 100%, 40%);">+           if (arg)</span><br><span>                     tio.c_cflag |= CREAD;</span><br><span>                else</span><br><span>                         tio.c_cflag &= ~CREAD;</span><br><span>@@ -274,8 +274,8 @@</span><br><span>             }</span><br><span>            break;</span><br><span>       case CUART_CTL_RST:</span><br><span style="color: hsl(0, 100%, 40%);">-             _set_rts(cuart->u.tty.ofd.fd, enable);</span><br><span style="color: hsl(0, 100%, 40%);">-               if (enable)</span><br><span style="color: hsl(120, 100%, 40%);">+           _set_rts(cuart->u.tty.ofd.fd, arg ? true : false);</span><br><span style="color: hsl(120, 100%, 40%);">+         if (arg)</span><br><span>                     _flush(cuart->u.tty.ofd.fd);</span><br><span>              break;</span><br><span>       case CUART_CTL_POWER:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15741">change 15741</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/+/15741"/><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: Ifa8dde9dbcd27b79055aaac1a05bb040be616e05 </div>
<div style="display:none"> Gerrit-Change-Number: 15741 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>