<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">card_uart_tx: Remove last argument (we always have the receiver active)<br><br>Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e<br>---<br>M ccid_common/cuart.c<br>M ccid_common/cuart.h<br>M ccid_common/iso7816_fsm.c<br>M ccid_host/cuart_driver_tty.c<br>M ccid_host/cuart_test.c<br>5 files changed, 8 insertions(+), 8 deletions(-)<br><br></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 393bf55..895717a 100644</span><br><span>--- a/ccid_common/cuart.c</span><br><span>+++ b/ccid_common/cuart.c</span><br><span>@@ -75,7 +75,7 @@</span><br><span>    return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len, bool rx_after_complete)</span><br><span style="color: hsl(120, 100%, 40%);">+int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len)</span><br><span> {</span><br><span>       OSMO_ASSERT(cuart);</span><br><span>  OSMO_ASSERT(cuart->driver);</span><br><span>@@ -87,7 +87,7 @@</span><br><span>   /* disable receiver to avoid receiving what we transmit */</span><br><span>   card_uart_ctrl(cuart, CUART_CTL_RX, false);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return cuart->driver->ops->async_tx(cuart, data, len, rx_after_complete);</span><br><span style="color: hsl(120, 100%, 40%);">+    return cuart->driver->ops->async_tx(cuart, data, len);</span><br><span> }</span><br><span> </span><br><span> int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len)</span><br><span>diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h</span><br><span>index c28209f..790c277 100644</span><br><span>--- a/ccid_common/cuart.h</span><br><span>+++ b/ccid_common/cuart.h</span><br><span>@@ -30,7 +30,7 @@</span><br><span> struct card_uart_ops {</span><br><span>      int (*open)(struct card_uart *cuart, const char *device_name);</span><br><span>       int (*close)(struct card_uart *cuart);</span><br><span style="color: hsl(0, 100%, 40%);">-  int (*async_tx)(struct card_uart *cuart, const uint8_t *data, size_t len, bool rx_after_complete);</span><br><span style="color: hsl(120, 100%, 40%);">+    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>     int (*ctrl)(struct card_uart *cuart, enum card_uart_ctl ctl, bool enable);</span><br><span>@@ -93,7 +93,7 @@</span><br><span> int card_uart_close(struct card_uart *cuart);</span><br><span> </span><br><span> /*! Schedule (asynchronous) transmit data via UART; optionally enable Rx after completion */</span><br><span style="color: hsl(0, 100%, 40%);">-int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len, bool rx_after_complete);</span><br><span style="color: hsl(120, 100%, 40%);">+int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len);</span><br><span> </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>diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c</span><br><span>index f8fe14a..f20cbcd 100644</span><br><span>--- a/ccid_common/iso7816_fsm.c</span><br><span>+++ b/ccid_common/iso7816_fsm.c</span><br><span>@@ -809,7 +809,7 @@</span><br><span>          LOGPFSML(fi, LOGL_DEBUG, "Transmitting TPDU header %s via UART\n",</span><br><span>                          osmo_hexdump_nospc((uint8_t *) tpduh, sizeof(*tpduh)));</span><br><span>             osmo_fsm_inst_state_chg(fi, TPDU_S_TX_HDR, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-               card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh), true);</span><br><span style="color: hsl(120, 100%, 40%);">+           card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh));</span><br><span>                break;</span><br><span>       default:</span><br><span>             OSMO_ASSERT(0);</span><br><span>@@ -855,7 +855,7 @@</span><br><span>                } else if (byte == tpduh->ins) {</span><br><span>                  if (msgb_l2len(tfp->tpdu)) {</span><br><span>                              /* transmit all remaining bytes */</span><br><span style="color: hsl(0, 100%, 40%);">-                              card_uart_tx(ip->uart, msgb_l2(tfp->tpdu), msgb_l2len(tfp->tpdu), true);</span><br><span style="color: hsl(120, 100%, 40%);">+                             card_uart_tx(ip->uart, msgb_l2(tfp->tpdu), msgb_l2len(tfp->tpdu));</span><br><span>                          osmo_fsm_inst_state_chg(fi, TPDU_S_TX_REMAINING, 0, 0);</span><br><span>                      } else {</span><br><span>                             card_uart_set_rx_threshold(ip->uart, tpduh->p3);</span><br><span>diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c</span><br><span>index 7fc8d3a..3695b58 100644</span><br><span>--- a/ccid_host/cuart_driver_tty.c</span><br><span>+++ b/ccid_host/cuart_driver_tty.c</span><br><span>@@ -220,7 +220,7 @@</span><br><span>    return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int tty_uart_async_tx(struct card_uart *cuart, const uint8_t *data, size_t len, bool rx_after)</span><br><span style="color: hsl(120, 100%, 40%);">+static int tty_uart_async_tx(struct card_uart *cuart, const uint8_t *data, size_t len)</span><br><span> {</span><br><span>         OSMO_ASSERT(cuart->driver == &tty_uart_driver);</span><br><span> </span><br><span>diff --git a/ccid_host/cuart_test.c b/ccid_host/cuart_test.c</span><br><span>index 0ed6614..d4d8faf 100644</span><br><span>--- a/ccid_host/cuart_test.c</span><br><span>+++ b/ccid_host/cuart_test.c</span><br><span>@@ -44,7 +44,7 @@</span><br><span> static void test_apdu(void)</span><br><span> {</span><br><span>      const uint8_t select_mf[] = "\xa0\xa4\x04\x00\x02\x3f\x00";</span><br><span style="color: hsl(0, 100%, 40%);">-   card_uart_tx(&g_cuart, select_mf, 5, true);</span><br><span style="color: hsl(120, 100%, 40%);">+       card_uart_tx(&g_cuart, select_mf, 5);</span><br><span> </span><br><span>        osmo_select_main(true);</span><br><span>      sleep(1);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696">change 15696</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/+/15696"/><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: I8f82e9108d0eae86bbe4535403ccc680b7379a0e </div>
<div style="display:none"> Gerrit-Change-Number: 15696 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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-MessageType: merged </div>