November 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-e1d[master]: Automatically reset RIFO on underrun/overflow

by manawyrm

Attention is currently required from: jolly, tnt. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email ) Change subject: Automatically reset RIFO on underrun/overflow ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id7ccbfbdb288990c01f185dec79a1022a68b4748 Gerrit-Change-Number: 34554 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 16 Nov 2023 09:49:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: [WIP] soft_uart: implement OSMO_SUART_RX_MODE_N_FRAMES

by fixeria

fixeria 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 2: (1 comment) Patchset: PS2: WTF, this is definitely not the new unit test because it's added in next commit. ``` ERROR: files left in build directory after distclean: ./tests/core make[1]: *** [Makefile:1036: distcleancheck] Error 1 ``` -- 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-Comment-Date: Thu, 16 Nov 2023 09:33:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: implement the transmitter

by fixeria

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 year, 7 months

1
0
0 0

[L] Change in libosmocore[master]: core: Add software UART implementation

by fixeria

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 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: [WIP] soft_uart: implement OSMO_SUART_RX_MODE_N_FRAMES

by fixeria

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 year, 7 months

1
0
0 0

[L] Change in libosmocore[master]: soft_uart: add unit tests for the receiver and transmitter

by fixeria

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 year, 7 months

1
0
0 0

[L] Change in libosmocore[master]: core: Add software UART implementation

by Jenkins Builder

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 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: [WIP] soft_uart: implement OSMO_SUART_RX_MODE_N_FRAMES

by Jenkins Builder

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 year, 7 months

1
0
0 0

[L] Change in libosmocore[master]: core: Add software UART implementation

by fixeria

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 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: implement the transmitter

by fixeria

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 year, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2023