- gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: soft_uart: implement the transmitter
by fixeria 16 Nov '23

16 Nov '23

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35044?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: soft_uart: implement the transmitter ...................................................................... soft_uart: implement the transmitter Change-Id: Ibcd9643227e5616efd8bbd7a1430feda6fcef45c Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/soft_uart.c 2 files changed, 104 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/35044/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35044?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcd9643227e5616efd8bbd7a1430feda6fcef45c Gerrit-Change-Number: 35044 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[L] Change in libosmocore[master]: core: Add software UART implementation
by fixeria 16 Nov '23

16 Nov '23

Attention is currently required from: fixeria, laforge. fixeria has uploaded a new patch set (#3) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/libosmocore/+/30763?usp=email ) The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: core: Add software UART implementation ...................................................................... core: Add software UART implementation This patch brings a Work-in-Progress implementation of the software UART (Universal Asynchronous Receiver/Transmitter) to libosmocore. Not only it will be useful in the context of retro-networking, but also it's needed for the MS-side CSD implementation (see OS#4396). It should be noted that the definition of struct osmo_soft_uart is intentionally kept private, since the API is not stable yet. Currently, the following limitations apply: * Only the receiver part is implemented, the transmitter is TBD. * Parity checking is not implemented in the receiver part. * Software flow control is not implemented. These missing components will be addressed in subsequent patches. Change-Id: I2ca95963fd5852ddb89bdd35b86b31489127fe84 --- M include/osmocom/core/Makefile.am A include/osmocom/core/soft_uart.h M src/core/Makefile.am M src/core/libosmocore.map A src/core/soft_uart.c 5 files changed, 388 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/30763/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30763?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ca95963fd5852ddb89bdd35b86b31489127fe84 Gerrit-Change-Number: 30763 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmocore[master]: [WIP] soft_uart: implement OSMO_SUART_RX_MODE_N_FRAMES
by fixeria 16 Nov '23

16 Nov '23

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35045?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: [WIP] soft_uart: implement OSMO_SUART_RX_MODE_N_FRAMES ...................................................................... [WIP] soft_uart: implement OSMO_SUART_RX_MODE_N_FRAMES This is a hack allowing us to examine the receiver's internal buffer without having to wait for a timeout to expire. I am not sure if such mode would be useful for anything else. Maybe adding API to access the Rx msgb would be a more flexible solution? Change-Id: Ib3249a06c84f3ddb2723d0787db51873c4707d81 Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/soft_uart.c 2 files changed, 67 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/35045/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35045?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib3249a06c84f3ddb2723d0787db51873c4707d81 Gerrit-Change-Number: 35045 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[L] Change in libosmocore[master]: soft_uart: add unit tests for the receiver and transmitter
by fixeria 16 Nov '23

16 Nov '23

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35046?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: soft_uart: add unit tests for the receiver and transmitter ...................................................................... soft_uart: add unit tests for the receiver and transmitter Change-Id: Icdfa0c644548964d37940c32dc9dcfcfc53c3a19 Related: OS#4396 --- M tests/Makefile.am A tests/soft_uart/soft_uart_test.c A tests/soft_uart/soft_uart_test.ok M tests/testsuite.at 4 files changed, 284 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/35046/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35046?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icdfa0c644548964d37940c32dc9dcfcfc53c3a19 Gerrit-Change-Number: 35046 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[L] Change in libosmocore[master]: core: Add software UART implementation
by Jenkins Builder 16 Nov '23

16 Nov '23

Attention is currently required from: laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30763?usp=email ) Change subject: core: Add software UART implementation ...................................................................... Patch Set 2: (2 comments) File src/core/soft_uart.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12426): https://gerrit.osmocom.org/c/libosmocore/+/30763/comment/b0170fb0_f662a3f6 PS2, Line 160: for (size_t i = 0; i < n_ubits; i++) { braces {} are not necessary for single statement blocks Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12426): https://gerrit.osmocom.org/c/libosmocore/+/30763/comment/f508a9e9_5c625910 PS2, Line 196: for (size_t i = 0; i < n_ubits; i++) { braces {} are not necessary for single statement blocks -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30763?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ca95963fd5852ddb89bdd35b86b31489127fe84 Gerrit-Change-Number: 30763 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 16 Nov 2023 09:06:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: [WIP] soft_uart: implement OSMO_SUART_RX_MODE_N_FRAMES
by Jenkins Builder 16 Nov '23

16 Nov '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35045?usp=email ) Change subject: [WIP] soft_uart: implement OSMO_SUART_RX_MODE_N_FRAMES ...................................................................... Patch Set 1: (1 comment) File src/core/soft_uart.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12421): https://gerrit.osmocom.org/c/libosmocore/+/35045/comment/fa1af3f2_d8acd214 PS1, Line 112: * b) when a parity/framing error is occured. */ 'occured' may be misspelled - perhaps 'occurred'? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35045?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib3249a06c84f3ddb2723d0787db51873c4707d81 Gerrit-Change-Number: 35045 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 16 Nov 2023 09:06:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: core: Add software UART implementation
by fixeria 16 Nov '23

16 Nov '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30763?usp=email ) Change subject: core: Add software UART implementation ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30763?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ca95963fd5852ddb89bdd35b86b31489127fe84 Gerrit-Change-Number: 30763 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 16 Nov 2023 09:02:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: soft_uart: implement the transmitter
by fixeria 16 Nov '23

16 Nov '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35044?usp=email ) Change subject: soft_uart: implement the transmitter ...................................................................... soft_uart: implement the transmitter Change-Id: Ibcd9643227e5616efd8bbd7a1430feda6fcef45c Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/soft_uart.c 2 files changed, 104 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/35044/1 diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h index df14648..6088922 100644 --- a/include/osmocom/core/soft_uart.h +++ b/include/osmocom/core/soft_uart.h @@ -53,6 +53,8 @@ uint8_t num_stop_bits; /*! parity mode (none, even, odd) */ enum osmo_soft_uart_parity_mode parity_mode; + /*! size of transmit buffer */ + unsigned int tx_buf_size; /*! size of receive buffer; UART will buffer up to that number of characters * before calling the receive call-back */ unsigned int rx_buf_size; @@ -85,5 +87,5 @@ int osmo_soft_uart_rx_ubits(struct osmo_soft_uart *suart, const ubit_t *ubits, size_t n_ubits); int osmo_soft_uart_tx_ubits(struct osmo_soft_uart *suart, ubit_t *ubits, size_t n_ubits); -void osmo_soft_uart_tx(struct osmo_soft_uart *suart, struct msgb *tx_data); +size_t osmo_soft_uart_tx(struct osmo_soft_uart *suart, const uint8_t *data, size_t data_len); int osmo_soft_uart_set_status(struct osmo_soft_uart *suart, unsigned int status); diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index d92b8bc..9b6ca05 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -2,6 +2,7 @@ * Software UART implementation. */ /* * (C) 2022 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * * All Rights Reserved * @@ -52,8 +53,14 @@ bool running; uint8_t bit_count; uint8_t shift_reg; - struct msgb *msg; - struct llist_head queue; + struct { + uint8_t *buf; + unsigned int rpos; + unsigned int wpos; + unsigned int pending; + } rb; + ubit_t parity_bit; /* 0 (even) / 1 (odd) */ + enum suart_flow_state flow_state; } tx; }; @@ -62,6 +69,7 @@ .num_data_bits = 8, .num_stop_bits = 1, .parity_mode = OSMO_SUART_PARITY_NONE, + .tx_buf_size = 1024, .rx_buf_size = 1024, .rx_timeout_ms = 100, .priv = NULL, @@ -194,29 +202,90 @@ * Transmitter *************************************************************************/ -/*! Enqueue the given message buffer into the transmit queue of the soft-UART. +/*! Append data to the transmit buffer of the soft-UART. * \param[in] suart soft-UART instance for transmitting data. - * \param[in] tx_data message buffer containing to be transmitted data. */ -void osmo_soft_uart_tx(struct osmo_soft_uart *suart, struct msgb *tx_data) + * \param[in] data data to be transmitted. + * \param[in] data_len number of characters to be transmitted. + * \returns Number of characters appended, equal to or less than data_len. */ +size_t osmo_soft_uart_tx(struct osmo_soft_uart *suart, + const uint8_t *data, size_t data_len) { - if (!suart->tx.msg) - suart->tx.msg = tx_data; - else - msgb_enqueue(&suart->tx.queue, tx_data); + size_t len; + + len = OSMO_MIN(data_len, suart->cfg.tx_buf_size - suart->tx.rb.pending); + for (size_t i = 0; i < len; i++) { + if (suart->tx.rb.wpos >= suart->cfg.tx_buf_size) + suart->tx.rb.wpos = 0; + suart->tx.rb.buf[suart->tx.rb.wpos++] = data[i]; + } + + suart->tx.rb.pending += len; + return len; } /* pull a single bit out of the UART transmitter */ static inline ubit_t osmo_uart_tx_bit(struct osmo_soft_uart *suart) { + ubit_t tx_bit; + if (!suart->tx.running) return 1; - if (suart->tx.bit_count == 0) { - /* do we have anything to transmit? */ - /* FIXME */ + switch (suart->tx.flow_state) { + case SUART_FLOW_ST_IDLE: + tx_bit = 1; + if (suart->tx.rb.pending) { + if (suart->tx.rb.rpos >= suart->cfg.tx_buf_size) + suart->tx.rb.rpos = 0; + suart->tx.shift_reg = suart->tx.rb.buf[suart->tx.rb.rpos++]; + suart->tx.rb.pending--; + suart->tx.flow_state = SUART_FLOW_ST_DATA; + suart->tx.bit_count = 0; + suart->tx.parity_bit = 0; + tx_bit = 0; + } + break; + case SUART_FLOW_ST_DATA: + tx_bit = suart->tx.shift_reg & 1; + suart->tx.parity_bit ^= tx_bit; + suart->tx.shift_reg >>= 1; + suart->tx.bit_count++; + if (suart->tx.bit_count >= suart->cfg.num_data_bits) { + /* we have transmitted all data bits */ + if (suart->cfg.parity_mode != OSMO_SUART_PARITY_NONE) + suart->tx.flow_state = SUART_FLOW_ST_PARITY; + else + suart->tx.flow_state = SUART_FLOW_ST_STOP; + } + break; + case SUART_FLOW_ST_PARITY: + switch (suart->cfg.parity_mode) { + case OSMO_SUART_PARITY_EVEN: + /* number of 1-bits (in both data and parity) shall be even */ + tx_bit = suart->tx.parity_bit; + break; + case OSMO_SUART_PARITY_ODD: + /* number of 1-bits (in both data and parity) shall be odd */ + tx_bit = !suart->tx.parity_bit; + break; + case OSMO_SUART_PARITY_NONE: /* shall not happen */ + default: + OSMO_ASSERT(0); + } + + suart->tx.flow_state = SUART_FLOW_ST_STOP; + break; + case SUART_FLOW_ST_STOP: + tx_bit = 1; + suart->tx.bit_count++; + if (suart->tx.bit_count >= (suart->cfg.num_data_bits + suart->cfg.num_stop_bits)) { + /* we have transmitted all stop bits, we're done */ + suart->tx.flow_state = SUART_FLOW_ST_IDLE; + } + break; } - /* FIXME */ - return 1; + + return tx_bit; } /*! Pull a number of unpacked bits out of the soft-UART transmitter. @@ -297,7 +366,6 @@ suart->cfg = *cfg; osmo_timer_setup(&suart->rx.timer, suart_rx_timer_cb, suart); - INIT_LLIST_HEAD(&suart->tx.queue); return 0; } @@ -329,10 +397,17 @@ int osmo_soft_uart_set_tx(struct osmo_soft_uart *suart, bool enable) { if (!enable && suart->tx.running) { - /* FIXME: Tx */ + suart->tx.rb.wpos = 0; + suart->tx.rb.rpos = 0; + suart->tx.rb.pending = 0; suart->tx.running = false; + suart->tx.flow_state = SUART_FLOW_ST_IDLE; } else if (enable && !suart->tx.running) { + if (suart->tx.rb.buf == NULL) + suart->tx.rb.buf = talloc_size(suart, suart->cfg.tx_buf_size); + OSMO_ASSERT(suart->tx.rb.buf != NULL); suart->tx.running = true; + suart->tx.flow_state = SUART_FLOW_ST_IDLE; } return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35044?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcd9643227e5616efd8bbd7a1430feda6fcef45c Gerrit-Change-Number: 35044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: [WIP] soft_uart: implement OSMO_SUART_RX_MODE_N_FRAMES
by fixeria 16 Nov '23

16 Nov '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35045?usp=email ) Change subject: [WIP] soft_uart: implement OSMO_SUART_RX_MODE_N_FRAMES ...................................................................... [WIP] soft_uart: implement OSMO_SUART_RX_MODE_N_FRAMES This is a hack allowing us to examine the receiver's internal buffer without having to wait for a timeout to expire. I am not sure if such mode would be useful for anything else. Maybe adding API to access the Rx msgb would be a more flexible solution? Change-Id: Ib3249a06c84f3ddb2723d0787db51873c4707d81 Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/soft_uart.c 2 files changed, 67 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/35045/1 diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h index 6088922..19af0cf 100644 --- a/include/osmocom/core/soft_uart.h +++ b/include/osmocom/core/soft_uart.h @@ -45,6 +45,14 @@ }; #endif +/*! Rx data pulling mode */ +enum osmo_soft_uart_rx_mode { + /*! the .rx_cb() is called on timeout */ + OSMO_SUART_RX_MODE_TIMEOUT, + /*! the .rx_cb() is called on a specified number of UART frames */ + OSMO_SUART_RX_MODE_N_FRAMES, +}; + /* configuration for a soft-uart */ struct osmo_soft_uart_cfg { /*! number of data bits (typically 5, 6, 7 or 8) */ @@ -53,14 +61,25 @@ uint8_t num_stop_bits; /*! parity mode (none, even, odd) */ enum osmo_soft_uart_parity_mode parity_mode; + /*! size of transmit buffer */ unsigned int tx_buf_size; - /*! size of receive buffer; UART will buffer up to that number of characters - * before calling the receive call-back */ + /*! size of receive buffer */ unsigned int rx_buf_size; - /*! receive timeout; UART will flush receive buffer via the receive call-back - * after indicated number of milli-seconds even if it is not full yet */ - unsigned int rx_timeout_ms; + + /*! Rx data pulling mode */ + enum osmo_soft_uart_rx_mode rx_pull_mode; + /*! Rx data pulling parameters */ + union { + /*! receive timeout for OSMO_SUART_RX_MODE_TIMEOUT; UART will flush receive + * buffer via the receive call-back after indicated number of milli-seconds + * even if it is not full yet. */ + unsigned int rx_timeout_ms; + /*! number of received UART frames for OSMO_SUART_RX_MODE_N_FRAMES; UART + * will flush receive buffer via the receive call-back after indicated number + * of UART frames had been received. */ + unsigned int rx_n_uart_frames; + } rx_pull_param; /*! opaque application-private data; passed to call-backs */ void *priv; diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index 9b6ca05..c7179a6 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -47,6 +47,7 @@ unsigned int flags; unsigned int status; struct osmo_timer_list timer; + unsigned int n_uart_frames; enum suart_flow_state flow_state; } rx; struct { @@ -71,7 +72,8 @@ .parity_mode = OSMO_SUART_PARITY_NONE, .tx_buf_size = 1024, .rx_buf_size = 1024, - .rx_timeout_ms = 100, + .rx_pull_mode = OSMO_SUART_RX_MODE_TIMEOUT, + .rx_pull_param = { .rx_timeout_ms = 100 }, .priv = NULL, .rx_cb = NULL, .status_change_cb = NULL, @@ -105,12 +107,29 @@ msgb_put_u8(suart->rx.msg, ch); msg_len = msgb_length(suart->rx.msg); - /* first character in new message: start timer */ - if (msg_len == 1) { - osmo_timer_schedule(&suart->rx.timer, suart->cfg.rx_timeout_ms / 1000, - (suart->cfg.rx_timeout_ms % 1000) * 1000); - } else if (msg_len >= suart->cfg.rx_buf_size || suart->rx.flags) { + /* flush immediately: + * a) when the Rx buffer gets full; + * b) when a parity/framing error is occured. */ + if (msg_len >= suart->cfg.rx_buf_size || suart->rx.flags) { suart_flush_rx(suart); + return; + } + + switch (suart->cfg.rx_pull_mode) { + case OSMO_SUART_RX_MODE_TIMEOUT: + /* first character in new message: start timer */ + if (msg_len == 1) { + unsigned int rx_timeout_ms = suart->cfg.rx_pull_param.rx_timeout_ms; + osmo_timer_schedule(&suart->rx.timer, rx_timeout_ms / 1000, + (rx_timeout_ms % 1000) * 1000); + } + break; + case OSMO_SUART_RX_MODE_N_FRAMES: + if (suart->rx.n_uart_frames >= suart->cfg.rx_pull_param.rx_n_uart_frames) { + suart->rx.n_uart_frames = 0; + suart_flush_rx(suart); + } + break; } } @@ -171,6 +190,7 @@ if (suart->rx.bit_count >= (suart->cfg.num_data_bits + suart->cfg.num_stop_bits)) { /* we have accumulated enough stop bits */ + suart->rx.n_uart_frames++; suart_rx_ch(suart, suart->rx.shift_reg); suart->rx.flow_state = SUART_FLOW_ST_IDLE; } @@ -358,10 +378,12 @@ if (cfg->rx_buf_size == 0) return -EINVAL; +#if 0 if (suart->cfg.rx_buf_size > cfg->rx_buf_size || suart->cfg.rx_timeout_ms > cfg->rx_timeout_ms) { suart_flush_rx(suart); } +#endif suart->cfg = *cfg; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35045?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib3249a06c84f3ddb2723d0787db51873c4707d81 Gerrit-Change-Number: 35045 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in libosmocore[master]: soft_uart: add unit tests for the receiver and transmitter
by fixeria 16 Nov '23

16 Nov '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35046?usp=email ) Change subject: soft_uart: add unit tests for the receiver and transmitter ...................................................................... soft_uart: add unit tests for the receiver and transmitter Change-Id: Icdfa0c644548964d37940c32dc9dcfcfc53c3a19 Related: OS#4396 --- M tests/Makefile.am A tests/soft_uart/soft_uart_test.c A tests/soft_uart/soft_uart_test.ok M tests/testsuite.at 4 files changed, 283 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/35046/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 5f4914e..af17e50 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -55,6 +55,7 @@ v110/ra1_test \ gsm44021/frame_csd_test \ osmo_io/osmo_io_test \ + soft_uart/soft_uart_test \ $(NULL) if ENABLE_MSGFILE @@ -375,6 +376,8 @@ osmo_io_osmo_io_test_SOURCES = osmo_io/osmo_io_test.c +soft_uart_soft_uart_test_SOURCES = soft_uart/soft_uart_test.c + # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac @@ -693,6 +696,8 @@ osmo_io/osmo_io_test \ >$(srcdir)/osmo_io/osmo_io_test.ok \ 2>$(srcdir)/osmo_io/osmo_io_test.err + soft_uart/soft_uart_test \ + >$(srcdir)/soft_uart/soft_uart.ok check-local: atconfig $(TESTSUITE) diff --git a/tests/soft_uart/soft_uart_test.c b/tests/soft_uart/soft_uart_test.c new file mode 100644 index 0000000..54d02b1 --- /dev/null +++ b/tests/soft_uart/soft_uart_test.c @@ -0,0 +1,211 @@ +/* + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <stdio.h> +#include <stdint.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/soft_uart.h> + +static void suart_rx_cb(void *priv, struct msgb *msg, unsigned int flags) +{ + fprintf(stdout, "%s(flags=%02x): %s\n", + __func__, flags, msgb_hexdump(msg)); + msgb_free(msg); +} + +static const struct osmo_soft_uart_cfg suart_default_cfg = { + .num_data_bits = 8, + .num_stop_bits = 1, + .parity_mode = OSMO_SUART_PARITY_NONE, + .tx_buf_size = 1024, + .rx_buf_size = 1024, + .rx_pull_mode = OSMO_SUART_RX_MODE_N_FRAMES, + .rx_pull_param = { .rx_n_uart_frames = 1 }, + .rx_cb = &suart_rx_cb, +}; + +static void test_rx_exec(struct osmo_soft_uart *suart, + const char *input) +{ + for (unsigned int i = 0; input[i] != '\0'; i++) { + ubit_t ubit; + + switch (input[i]) { + case '0': + case '1': + ubit = input[i] - '0'; + osmo_soft_uart_rx_ubits(suart, &ubit, 1); + break; + case ' ': /* padding */ + continue; + default: + printf("%s() @ %u: unknown opcode '%c'\n", + __func__, i, input[i]); + break; + } + } +} + +static void test_rx(void) +{ + struct osmo_soft_uart_cfg cfg; + struct osmo_soft_uart *suart; + + suart = osmo_soft_uart_alloc(NULL, &suart_default_cfg); + OSMO_ASSERT(suart != NULL); + + osmo_soft_uart_set_rx(suart, true); + + printf("======== %s(): testing 8-N-1\n", __func__); + test_rx_exec(suart, + "111111111111" /* no data */ + "0 00010010 1" /* 'H' */ + "0 10100010 1" /* 'E' */ + "111111111111" /* no data */ + "0 00110010 1" /* 'L' */ + "0 00110010 1" /* 'L' */ + "111111111111" /* no data */ + "0 11110010 1" /* 'O' */ + ); + + printf("======== %s(): testing 8-N-2\n", __func__); + cfg = suart_default_cfg; + cfg.num_stop_bits = 2; + osmo_soft_uart_configure(suart, &cfg); + test_rx_exec(suart, + "1111111111111" /* no data */ + "0 00010010 11" /* 'H' */ + "0 10100010 11" /* 'E' */ + "0 00110010 11" /* 'L' */ + "0 00110010 11" /* 'L' */ + "0 11110010 11" /* 'O' */ + "1111111111111" /* no data */ + "1111111111111" /* no data */ + ); + + + printf("======== %s(): testing 8-E-1\n", __func__); + cfg = suart_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_EVEN; + osmo_soft_uart_configure(suart, &cfg); + test_rx_exec(suart, + "0 00000000 1 1" /* invalid parity (odd) */ + "0 10000000 0 1" /* invalid parity (odd) */ + "0 11111111 1 1" /* invalid parity (odd) */ + "0 00000000 0 1" + "0 11111111 0 1" + "0 01010101 0 1" + "0 10101010 0 1" + "0 00000001 1 1" + "0 00000111 1 1" + "0 00011111 1 1" + "0 01111111 1 1" + ); + + printf("======== %s(): testing 8-O-1\n", __func__); + cfg = suart_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_ODD; + osmo_soft_uart_configure(suart, &cfg); + test_rx_exec(suart, + "0 00000000 0 1" /* invalid parity (even) */ + "0 10000000 1 1" /* invalid parity (even) */ + "0 11111111 0 1" /* invalid parity (even) */ + "0 00000000 1 1" + "0 11111111 1 1" + "0 01010101 1 1" + "0 10101010 1 1" + "0 00000001 0 1" + "0 00000111 0 1" + "0 00011111 0 1" + "0 01111111 0 1" + ); + + osmo_soft_uart_free(suart); +} + +static void test_tx_exec(struct osmo_soft_uart *suart, + const char *tx_data, size_t tx_data_len, + unsigned int n_bits) +{ + ubit_t tx_buf[64]; + + OSMO_ASSERT((tx_data_len * n_bits) <= sizeof(tx_buf)); + + osmo_soft_uart_tx(suart, (const uint8_t *)tx_data, tx_data_len); + osmo_soft_uart_tx_ubits(suart, &tx_buf[0], n_bits * tx_data_len); + + printf("%s():", __func__); + for (size_t i = 0; i < (tx_data_len * n_bits); i += n_bits) + printf(" %s", osmo_ubit_dump(&tx_buf[i], n_bits)); + printf("\n"); +} + +static void test_tx_rx(void) +{ + struct osmo_soft_uart_cfg cfg; + struct osmo_soft_uart *suart; + + suart = osmo_soft_uart_alloc(NULL, &suart_default_cfg); + OSMO_ASSERT(suart != NULL); + + osmo_soft_uart_set_tx(suart, true); + + printf("======== %s(): testing 8-N-1\n", __func__); + test_tx_exec(suart, "\xde\xad\xbe\xef", 4, (1 + 8 + 1)); + test_tx_exec(suart, "\x00\xaa\x55\xff", 4, (1 + 8 + 1)); + + printf("======== %s(): testing 8-E-1\n", __func__); + cfg = suart_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_EVEN; + osmo_soft_uart_configure(suart, &cfg); + test_tx_exec(suart, "\xde\xad\xbe\xef", 4, (1 + 8 + 1 + 1)); + test_tx_exec(suart, "\x00\xaa\x55\xff", 4, (1 + 8 + 1 + 1)); + + printf("======== %s(): testing 8-O-1\n", __func__); + cfg = suart_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_ODD; + osmo_soft_uart_configure(suart, &cfg); + test_tx_exec(suart, "\xde\xad\xbe\xef", 4, (1 + 8 + 1 + 1)); + test_tx_exec(suart, "\x00\xaa\x55\xff", 4, (1 + 8 + 1 + 1)); + + printf("======== %s(): testing 8-N-2\n", __func__); + cfg = suart_default_cfg; + cfg.num_stop_bits = 2; + osmo_soft_uart_configure(suart, &cfg); + test_tx_exec(suart, "\xde\xad\xbe\xef", 4, (1 + 8 + 2)); + test_tx_exec(suart, "\x00\xaa\x55\xff", 4, (1 + 8 + 2)); + + printf("======== %s(): testing 6-N-1\n", __func__); + cfg = suart_default_cfg; + cfg.num_data_bits = 6; + osmo_soft_uart_configure(suart, &cfg); + test_tx_exec(suart, "\xde\xad\xbe\xef", 4, (1 + 6 + 1)); + test_tx_exec(suart, "\x00\xaa\x55\xff", 4, (1 + 6 + 1)); + + osmo_soft_uart_free(suart); +} + +int main(int argc, char **argv) +{ + test_rx(); + test_tx_rx(); + + return 0; +} diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok new file mode 100644 index 0000000..b9eb0fd --- /dev/null +++ b/tests/soft_uart/soft_uart_test.ok @@ -0,0 +1,51 @@ +======== test_rx(): testing 8-N-1 +suart_rx_cb(flags=00): 48 +suart_rx_cb(flags=00): 45 +suart_rx_cb(flags=00): 4c +suart_rx_cb(flags=00): 4c +suart_rx_cb(flags=00): 4f +======== test_rx(): testing 8-N-2 +suart_rx_cb(flags=00): 48 +suart_rx_cb(flags=00): 45 +suart_rx_cb(flags=00): 4c +suart_rx_cb(flags=00): 4c +suart_rx_cb(flags=00): 4f +======== test_rx(): testing 8-E-1 +suart_rx_cb(flags=02): 00 +suart_rx_cb(flags=02): 01 +suart_rx_cb(flags=02): ff +suart_rx_cb(flags=00): 00 +suart_rx_cb(flags=00): ff +suart_rx_cb(flags=00): aa +suart_rx_cb(flags=00): 55 +suart_rx_cb(flags=00): 80 +suart_rx_cb(flags=00): e0 +suart_rx_cb(flags=00): f8 +suart_rx_cb(flags=00): fe +======== test_rx(): testing 8-O-1 +suart_rx_cb(flags=02): 00 +suart_rx_cb(flags=02): 01 +suart_rx_cb(flags=02): ff +suart_rx_cb(flags=00): 00 +suart_rx_cb(flags=00): ff +suart_rx_cb(flags=00): aa +suart_rx_cb(flags=00): 55 +suart_rx_cb(flags=00): 80 +suart_rx_cb(flags=00): e0 +suart_rx_cb(flags=00): f8 +suart_rx_cb(flags=00): fe +======== test_tx_rx(): testing 8-N-1 +test_tx_exec(): 0011110111 0101101011 0011111011 0111101111 +test_tx_exec(): 0000000001 0010101011 0101010101 0111111111 +======== test_tx_rx(): testing 8-E-1 +test_tx_exec(): 00111101101 01011010111 00111110101 01111011111 +test_tx_exec(): 00000000001 00101010101 01010101001 01111111101 +======== test_tx_rx(): testing 8-O-1 +test_tx_exec(): 00111101111 01011010101 00111110111 01111011101 +test_tx_exec(): 00000000011 00101010111 01010101011 01111111111 +======== test_tx_rx(): testing 8-N-2 +test_tx_exec(): 00111101111 01011010111 00111110111 01111011111 +test_tx_exec(): 00000000011 00101010111 01010101011 01111111111 +======== test_tx_rx(): testing 6-N-1 +test_tx_exec(): 00111101 01011011 00111111 01111011 +test_tx_exec(): 00000001 00101011 01010101 01111111 diff --git a/tests/testsuite.at b/tests/testsuite.at index 73c3cdc..aacdad7 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -513,3 +513,9 @@ cat $abs_srcdir/osmo_io/osmo_io_test.err > experr AT_CHECK([$abs_top_builddir/tests/osmo_io/osmo_io_test], [0], [expout], [experr]) AT_CLEANUP + +AT_SETUP([soft_uart]) +AT_KEYWORDS([soft_uart]) +cat $abs_srcdir/soft_uart/soft_uart_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/soft_uart/soft_uart_test], [0], [expout], [ignore]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35046?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icdfa0c644548964d37940c32dc9dcfcfc53c3a19 Gerrit-Change-Number: 35046 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log