Change in ...osmo-ccid-firmware[master]: card_uart_tx: Remove last argument (we always have the receiver active)
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 )
Change subject: card_uart_tx: Remove last argument (we always have the receiver
active)
..
card_uart_tx: Remove last argument (we always have the receiver active)
Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e
---
M ccid_common/cuart.c
M ccid_common/cuart.h
M ccid_common/iso7816_fsm.c
M ccid_host/cuart_driver_tty.c
M ccid_host/cuart_test.c
5 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c
index 393bf55..895717a 100644
--- a/ccid_common/cuart.c
+++ b/ccid_common/cuart.c
@@ -75,7 +75,7 @@
return rc;
}
-int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len,
bool rx_after_complete)
+int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len)
{
OSMO_ASSERT(cuart);
OSMO_ASSERT(cuart->driver);
@@ -87,7 +87,7 @@
/* disable receiver to avoid receiving what we transmit */
card_uart_ctrl(cuart, CUART_CTL_RX, false);
- return cuart->driver->ops->async_tx(cuart, data, len,
rx_after_complete);
+ return cuart->driver->ops->async_tx(cuart, data, len);
}
int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len)
diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h
index c28209f..790c277 100644
--- a/ccid_common/cuart.h
+++ b/ccid_common/cuart.h
@@ -30,7 +30,7 @@
struct card_uart_ops {
int (*open)(struct card_uart *cuart, const char *device_name);
int (*close)(struct card_uart *cuart);
- int (*async_tx)(struct card_uart *cuart, const uint8_t *data, size_t
len, bool rx_after_complete);
+ int (*async_tx)(struct card_uart *cuart, const uint8_t *data, size_t
len);
int (*async_rx)(struct card_uart *cuart, uint8_t *data, size_t len);
int (*ctrl)(struct card_uart *cuart, enum card_uart_ctl ctl, bool
enable);
@@ -93,7 +93,7 @@
int card_uart_close(struct card_uart *cuart);
/*! Schedule (asynchronous) transmit data via UART; optionally enable Rx after
completion */
-int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len,
bool rx_after_complete);
+int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len);
/*! Schedule (asynchronous) receive data via UART (after CUART_E_RX_COMPLETE)
*/
int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len);
diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c
index f8fe14a..f20cbcd 100644
--- a/ccid_common/iso7816_fsm.c
+++ b/ccid_common/iso7816_fsm.c
@@ -809,7 +809,7 @@
LOGPFSML(fi, LOGL_DEBUG, "Transmitting TPDU header %s via
UART\n",
osmo_hexdump_nospc((uint8_t *) tpduh, sizeof(*tpduh)));
osmo_fsm_inst_state_chg(fi, TPDU_S_TX_HDR, 0, 0);
- card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh), true);
+ card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh));
break;
default:
OSMO_ASSERT(0);
@@ -855,7 +855,7 @@
} else if (byte == tpduh->ins) {
if (msgb_l2len(tfp->tpdu)) {
/* transmit all remaining bytes */
- card_uart_tx(ip->uart, msgb_l2(tfp->tpdu),
msgb_l2len(tfp->tpdu), true);
+ card_uart_tx(ip->uart, msgb_l2(tfp->tpdu),
msgb_l2len(tfp->tpdu));
osmo_fsm_inst_state_chg(fi,
TPDU_S_TX_REMAINING, 0, 0);
} else {
card_uart_set_rx_threshold(ip->uart, tpduh->p3);
diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c
index 7fc8d3a..3695b58 100644
--- a/ccid_host/cuart_driver_tty.c
+++ b/ccid_host/cuart_driver_tty.c
@@ -220,7 +220,7 @@
return 0;
}
-static int tty_uart_async_tx(struct card_uart *cuart, const uint8_t *data,
size_t len, bool rx_after)
+static int tty_uart_async_tx(struct card_uart *cuart, const uint8_t *data,
size_t len)
{
OSMO_ASSERT(cuart->driver == _uart_driver);
diff --git a/ccid_host/cuart_test.c b/ccid_host/cuart_test.c
index 0ed6614..d4d8faf 100644
--- a/ccid_host/cuart_test.c
+++ b/ccid_host/cuart_test.c
@@ -44,7 +44,7 @@
static void test_apdu(void)
{
const uint8_t select_mf[] = "\xa0\xa4\x04\x00\x02\x3f\x00";
- card_uart_tx(_cuart, select_mf, 5, true);
+ card_uart_tx(_cuart, select_mf, 5);
osmo_select_main(true);
sleep(1);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e
Change in ...osmo-ccid-firmware[master]: card_uart_tx: Remove last argument (we always have the receiver active)
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 ) Change subject: card_uart_tx: Remove last argument (we always have the receiver active) .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e Gerrit-Change-Number: 15696 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Oct 2019 16:35:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: card_uart_tx: Remove last argument (we always have the receiver active)
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 to look at the new patch set (#6). Change subject: card_uart_tx: Remove last argument (we always have the receiver active) .. card_uart_tx: Remove last argument (we always have the receiver active) Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e --- M ccid_common/cuart.c M ccid_common/cuart.h M ccid_common/iso7816_fsm.c M ccid_host/cuart_driver_tty.c M ccid_host/cuart_test.c 5 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/96/15696/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e Gerrit-Change-Number: 15696 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ccid-firmware[master]: card_uart_tx: Remove last argument (we always have the receiver active)
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 to look at the new patch set (#2). Change subject: card_uart_tx: Remove last argument (we always have the receiver active) .. card_uart_tx: Remove last argument (we always have the receiver active) Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e --- M ccid_common/cuart.c M ccid_common/cuart.h M ccid_common/iso7816_fsm.c M ccid_host/cuart_driver_tty.c M ccid_host/cuart_test.c 5 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/96/15696/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e Gerrit-Change-Number: 15696 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ccid-firmware[master]: card_uart_tx: Remove last argument (we always have the receiver active)
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696
Change subject: card_uart_tx: Remove last argument (we always have the receiver
active)
..
card_uart_tx: Remove last argument (we always have the receiver active)
Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e
---
M ccid/cuart.c
M ccid/cuart.h
M ccid/cuart_driver_tty.c
M ccid/cuart_test.c
M ccid/iso7816_fsm.c
5 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/96/15696/1
diff --git a/ccid/cuart.c b/ccid/cuart.c
index 393bf55..895717a 100644
--- a/ccid/cuart.c
+++ b/ccid/cuart.c
@@ -75,7 +75,7 @@
return rc;
}
-int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len,
bool rx_after_complete)
+int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len)
{
OSMO_ASSERT(cuart);
OSMO_ASSERT(cuart->driver);
@@ -87,7 +87,7 @@
/* disable receiver to avoid receiving what we transmit */
card_uart_ctrl(cuart, CUART_CTL_RX, false);
- return cuart->driver->ops->async_tx(cuart, data, len,
rx_after_complete);
+ return cuart->driver->ops->async_tx(cuart, data, len);
}
int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len)
diff --git a/ccid/cuart.h b/ccid/cuart.h
index c28209f..790c277 100644
--- a/ccid/cuart.h
+++ b/ccid/cuart.h
@@ -30,7 +30,7 @@
struct card_uart_ops {
int (*open)(struct card_uart *cuart, const char *device_name);
int (*close)(struct card_uart *cuart);
- int (*async_tx)(struct card_uart *cuart, const uint8_t *data, size_t
len, bool rx_after_complete);
+ int (*async_tx)(struct card_uart *cuart, const uint8_t *data, size_t
len);
int (*async_rx)(struct card_uart *cuart, uint8_t *data, size_t len);
int (*ctrl)(struct card_uart *cuart, enum card_uart_ctl ctl, bool
enable);
@@ -93,7 +93,7 @@
int card_uart_close(struct card_uart *cuart);
/*! Schedule (asynchronous) transmit data via UART; optionally enable Rx after
completion */
-int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len,
bool rx_after_complete);
+int card_uart_tx(struct card_uart *cuart, const uint8_t *data, size_t len);
/*! Schedule (asynchronous) receive data via UART (after CUART_E_RX_COMPLETE)
*/
int card_uart_rx(struct card_uart *cuart, uint8_t *data, size_t len);
diff --git a/ccid/cuart_driver_tty.c b/ccid/cuart_driver_tty.c
index 7fc8d3a..3695b58 100644
--- a/ccid/cuart_driver_tty.c
+++ b/ccid/cuart_driver_tty.c
@@ -220,7 +220,7 @@
return 0;
}
-static int tty_uart_async_tx(struct card_uart *cuart, const uint8_t *data,
size_t len, bool rx_after)
+static int tty_uart_async_tx(struct card_uart *cuart, const uint8_t *data,
size_t len)
{
OSMO_ASSERT(cuart->driver == _uart_driver);
diff --git a/ccid/cuart_test.c b/ccid/cuart_test.c
index 0ed6614..d4d8faf 100644
--- a/ccid/cuart_test.c
+++ b/ccid/cuart_test.c
@@ -44,7 +44,7 @@
static void test_apdu(void)
{
const uint8_t select_mf[] = "\xa0\xa4\x04\x00\x02\x3f\x00";
- card_uart_tx(_cuart, select_mf, 5, true);
+ card_uart_tx(_cuart, select_mf, 5);
osmo_select_main(true);
sleep(1);
diff --git a/ccid/iso7816_fsm.c b/ccid/iso7816_fsm.c
index f8fe14a..f20cbcd 100644
--- a/ccid/iso7816_fsm.c
+++ b/ccid/iso7816_fsm.c
@@ -809,7 +809,7 @@
LOGPFSML(fi, LOGL_DEBUG, "Transmitting TPDU header %s via
UART\n",
osmo_hexdump_nospc((uint8_t *) tpduh, sizeof(*tpduh)));
osmo_fsm_inst_state_chg(fi, TPDU_S_TX_HDR, 0, 0);
- card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh), true);
+ card_uart_tx(ip->uart, (uint8_t *) tpduh, sizeof(*tpduh));
break;
default:
OSMO_ASSERT(0);
@@ -855,7 +855,7 @@
} else if (byte == tpduh->ins) {
if (msgb_l2len(tfp->tpdu)) {
/* transmit all remaining bytes */
- card_uart_tx(ip->uart, msgb_l2(tfp->tpdu),
msgb_l2len(tfp->tpdu), true);
+ card_uart_tx(ip->uart, msgb_l2(tfp->tpdu),
msgb_l2len(tfp->tpdu));
osmo_fsm_inst_state_chg(fi,
TPDU_S_TX_REMAINING, 0, 0);
} else {
card_uart_set_rx_threshold(ip->uart, tpduh->p3);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15696
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I8f82e9108d0eae86bbe4535403ccc680b7379a0e
Gerrit-Change-Number: 15696
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
