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

[S] Change in osmocom-bb[master]: firmware/layer1: avoid 'for' loop initial declarations

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35080?usp=email ) Change subject: firmware/layer1: avoid 'for' loop initial declarations ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35080?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6c65fbead4e612c81728e9c6601d5f2107616ee6 Gerrit-Change-Number: 35080 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 11:49:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: fix pulling a small number of Tx bits

by laforge

Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35076?usp=email ) Change subject: soft_uart: fix pulling a small number of Tx bits ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35076?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: I454c8786697a6f2389d56b350e6e20ca953fe859 Gerrit-Change-Number: 35076 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 11:48:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: demonstrate a problem with osmo_soft_uart_tx_ubits()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35074?usp=email ) Change subject: soft_uart: demonstrate a problem with osmo_soft_uart_tx_ubits() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35074?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: Icfee378f0fdc5e32fe9ce0afab5f75bc278653a9 Gerrit-Change-Number: 35074 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 11:47:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: implement OSMO_SUART_PARITY_{MARK,SPACE}

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35067?usp=email ) Change subject: soft_uart: implement OSMO_SUART_PARITY_{MARK,SPACE} ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35067?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: I4c8fe5bfdcc2f4eb52c259d1e62d06684cd8f823 Gerrit-Change-Number: 35067 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 11:47:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: soft_uart: fix handling of num_data_bits < 8

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35066?usp=email ) Change subject: soft_uart: fix handling of num_data_bits < 8 ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35066?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: Ife13b1f2d9063ba7253d01523ca9ecb15e9eaf07 Gerrit-Change-Number: 35066 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 11:47:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

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

by laforge

Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35046?usp=email ) Change subject: soft_uart: add unit tests for the receiver and transmitter ...................................................................... Patch Set 6: Code-Review+2 (1 comment) Patchset: PS6: only cosmetich changes from v4, whcih already had 2x +1 -- 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: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 11:47:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: soft_uart: split osmo_soft_uart_enable()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35020?usp=email ) Change subject: soft_uart: split osmo_soft_uart_enable() ...................................................................... soft_uart: split osmo_soft_uart_enable() The problem with a single function controlling both Rx and Tx is that enabling/disabling one of the directions requires knowing state of the other one. In other words, disabling Tx requires knowing the state of Rx, which may be inconvenient. Change-Id: Ieacc7e639304eeb14fdb298c7e14d772c136ca6e Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/libosmocore.map M src/core/soft_uart.c 3 files changed, 35 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved jolly: Looks good to me, but someone else must approve diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h index 4f9c1fc..71846ed 100644 --- a/include/osmocom/core/soft_uart.h +++ b/include/osmocom/core/soft_uart.h @@ -77,7 +77,8 @@ struct osmo_soft_uart *osmo_soft_uart_alloc(void *ctx, const char *name); void osmo_soft_uart_free(struct osmo_soft_uart *suart); int osmo_soft_uart_configure(struct osmo_soft_uart *suart, const struct osmo_soft_uart_cfg *cfg); -int osmo_soft_uart_enable(struct osmo_soft_uart *suart, bool rx, bool tx); +int osmo_soft_uart_set_rx(struct osmo_soft_uart *suart, bool enable); +int osmo_soft_uart_set_tx(struct osmo_soft_uart *suart, bool enable); 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); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 142e4c4..e2aef39 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -442,7 +442,8 @@ osmo_soft_uart_alloc; osmo_soft_uart_free; osmo_soft_uart_configure; -osmo_soft_uart_enable; +osmo_soft_uart_set_rx; +osmo_soft_uart_set_tx; osmo_soft_uart_rx_ubits; osmo_soft_uart_tx_ubits; osmo_soft_uart_tx; diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index e6dfe3d..2f09845 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -281,26 +281,34 @@ return 0; } -/*! Enable/disable receiver and/or transmitter of the given soft-UART. +/*! Enable/disable receiver of the given soft-UART. * \param[in] suart soft-UART instance to be re-configured. - * \param[in] rx enable/disable state of the receiver. - * \param[in] tx enable/disable state of the transmitter. + * \param[in] enable enable/disable state of the receiver. * \returns 0 on success; negative on error. */ -int osmo_soft_uart_enable(struct osmo_soft_uart *suart, bool rx, bool tx) +int osmo_soft_uart_set_rx(struct osmo_soft_uart *suart, bool enable) { - if (!rx && suart->rx.running) { + if (!enable && suart->rx.running) { suart_flush_rx(suart); suart->rx.running = false; - } else if (rx && !suart->rx.running) { + } else if (enable && !suart->rx.running) { if (!suart->rx.msg) suart->rx.msg = msgb_alloc_c(suart, suart->cfg.rx_buf_size, "soft_uart rx"); suart->rx.running = true; } - if (!tx && suart->tx.running) { + return 0; +} + +/*! Enable/disable transmitter of the given soft-UART. + * \param[in] suart soft-UART instance to be re-configured. + * \param[in] enable enable/disable state of the transmitter. + * \returns 0 on success; negative on error. */ +int osmo_soft_uart_set_tx(struct osmo_soft_uart *suart, bool enable) +{ + if (!enable && suart->tx.running) { /* FIXME: Tx */ suart->tx.running = false; - } else if (tx && !suart->tx.running) { + } else if (enable && !suart->tx.running) { suart->tx.running = true; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35020?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: Ieacc7e639304eeb14fdb298c7e14d772c136ca6e Gerrit-Change-Number: 35020 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: soft_uart: make osmo_soft_uart_alloc() accept *cfg

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35021?usp=email ) Change subject: soft_uart: make osmo_soft_uart_alloc() accept *cfg ...................................................................... soft_uart: make osmo_soft_uart_alloc() accept *cfg Let the API user pass their own default config when allocating a soft-UART. Make the default config publicly accessible. Change-Id: I7e78d60c747a8805064d5e4bacfd47a30bc65cba Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/libosmocore.map M src/core/soft_uart.c 3 files changed, 25 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h index 71846ed..2b9d67f 100644 --- a/include/osmocom/core/soft_uart.h +++ b/include/osmocom/core/soft_uart.h @@ -72,9 +72,12 @@ void (*status_change_cb)(void *priv, unsigned int status); }; +extern const struct osmo_soft_uart_cfg osmo_soft_uart_default_cfg; + struct osmo_soft_uart; -struct osmo_soft_uart *osmo_soft_uart_alloc(void *ctx, const char *name); +struct osmo_soft_uart *osmo_soft_uart_alloc(void *ctx, const char *name, + const struct osmo_soft_uart_cfg *cfg); void osmo_soft_uart_free(struct osmo_soft_uart *suart); int osmo_soft_uart_configure(struct osmo_soft_uart *suart, const struct osmo_soft_uart_cfg *cfg); int osmo_soft_uart_set_rx(struct osmo_soft_uart *suart, bool enable); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index e2aef39..a9d25fb 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -439,6 +439,7 @@ osmo_sock_set_priority; osmo_sock_unix_init; osmo_sock_unix_init_ofd; +osmo_soft_uart_default_cfg; osmo_soft_uart_alloc; osmo_soft_uart_free; osmo_soft_uart_configure; diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index 2f09845..5b58848 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -50,15 +50,12 @@ }; /*! Default soft-UART configuration (8-N-1) */ -static struct osmo_soft_uart_cfg suart_default_cfg = { +const struct osmo_soft_uart_cfg osmo_soft_uart_default_cfg = { .num_data_bits = 8, .num_stop_bits = 1, .parity_mode = OSMO_SUART_PARITY_NONE, .rx_buf_size = 1024, .rx_timeout_ms = 100, - .priv = NULL, - .rx_cb = NULL, - .status_change_cb = NULL, }; /************************************************************************* @@ -226,14 +223,18 @@ /*! Allocate a soft-UART instance. * \param[in] ctx parent talloc context. * \param[in] name name of the soft-UART instance. + * \param[in] cfg initial configuration of the soft-UART instance. * \returns pointer to allocated soft-UART instance; NULL on error. */ -struct osmo_soft_uart *osmo_soft_uart_alloc(void *ctx, const char *name) +struct osmo_soft_uart *osmo_soft_uart_alloc(void *ctx, const char *name, + const struct osmo_soft_uart_cfg *cfg) { struct osmo_soft_uart *suart = talloc_zero(ctx, struct osmo_soft_uart); if (!suart) return NULL; suart->name = talloc_strdup(suart, name); - suart->cfg = suart_default_cfg; + + OSMO_ASSERT(cfg != NULL); + suart->cfg = *cfg; return suart; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35021?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: I7e78d60c747a8805064d5e4bacfd47a30bc65cba Gerrit-Change-Number: 35021 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: rework osmo_uart_rx_bit() to use flow state

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35022?usp=email ) Change subject: soft_uart: rework osmo_uart_rx_bit() to use flow state ...................................................................... soft_uart: rework osmo_uart_rx_bit() to use flow state Change-Id: I40ab5d12b6f7087daa51405468f5c4ea639561ea Related: OS#4396 --- M src/core/soft_uart.c 1 file changed, 55 insertions(+), 38 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index 5b58848..c7c8020 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -26,6 +26,14 @@ #include <osmocom/core/timer.h> #include <osmocom/core/soft_uart.h> +/*! Rx/Tx flow state of a soft-UART */ +enum suart_flow_state { + SUART_FLOW_ST_IDLE, /*!< waiting for a start bit or Tx data */ + SUART_FLOW_ST_DATA, /*!< receiving/transmitting data bits */ + SUART_FLOW_ST_PARITY, /*!< receiving/transmitting parity bits */ + SUART_FLOW_ST_STOP, /*!< receiving/transmitting stop bits */ +}; + /*! Internal state of a soft-UART */ struct osmo_soft_uart { struct osmo_soft_uart_cfg cfg; @@ -39,6 +47,7 @@ unsigned int flags; unsigned int status; struct osmo_timer_list timer; + enum suart_flow_state flow_state; } rx; struct { bool running; @@ -98,50 +107,46 @@ /* receive a single bit */ static inline void osmo_uart_rx_bit(struct osmo_soft_uart *suart, const ubit_t bit) { - unsigned int num_parity_bits = 0; - if (!suart->rx.running) return; - if (suart->rx.bit_count == 0) { - /* start bit is 0. Wait if there is none */ - if (bit == 0) { - /* START bit */ - suart->rx.flags = 0; + switch (suart->rx.flow_state) { + case SUART_FLOW_ST_IDLE: + if (bit == 0) { /* start bit condition */ + suart->rx.flow_state = SUART_FLOW_ST_DATA; + suart->rx.flags = 0x00; suart->rx.shift_reg = 0; - suart->rx.bit_count++; - } - return; - } - - if (suart->cfg.parity_mode != OSMO_SUART_PARITY_NONE) - num_parity_bits = 1; - - suart->rx.bit_count++; - if (suart->rx.bit_count <= 1 + suart->cfg.num_data_bits) { - /* DATA bit */ - suart->rx.shift_reg = suart->rx.shift_reg >> 1; - if (bit) - suart->rx.shift_reg |= 0x80; - } else if (suart->cfg.parity_mode != OSMO_SUART_PARITY_NONE && - suart->rx.bit_count == 1 + suart->cfg.num_data_bits + 1) { - /* PARITY bit */ - suart->rx.parity_bit = bit; - /* TODO: verify parity */ - //suart->rx.flags |= OSMO_SUART_F_PARITY_ERROR; - } else if (suart->rx.bit_count <= - 1 + suart->cfg.num_data_bits + num_parity_bits + suart->cfg.num_stop_bits) { - /* STOP bit */ - if (bit != 1) { - fprintf(stderr, "framing error: stop bit %u != 1\n", suart->rx.bit_count); - suart->rx.flags |= OSMO_SUART_F_FRAMING_ERROR; - } - - if (suart->rx.bit_count == 1 + suart->cfg.num_data_bits + num_parity_bits + suart->cfg.num_stop_bits) { - //printf("Rx: 0x%02x %c\n", suart->rx.shift_reg, suart->rx.shift_reg); - suart_rx_ch(suart, suart->rx.shift_reg); suart->rx.bit_count = 0; } + break; + case SUART_FLOW_ST_DATA: + suart->rx.bit_count++; + suart->rx.shift_reg >>= 1; + if (bit != 0) + suart->rx.shift_reg |= 0x80; + if (suart->rx.bit_count >= suart->cfg.num_data_bits) { + /* we have accumulated enough data bits */ + if (suart->cfg.parity_mode != OSMO_SUART_PARITY_NONE) + suart->rx.flow_state = SUART_FLOW_ST_PARITY; + else + suart->rx.flow_state = SUART_FLOW_ST_STOP; + } + break; + case SUART_FLOW_ST_PARITY: + /* TODO: actually verify parity */ + suart->rx.flow_state = SUART_FLOW_ST_STOP; + break; + case SUART_FLOW_ST_STOP: + suart->rx.bit_count++; + if (bit != 1) + suart->rx.flags |= OSMO_SUART_F_FRAMING_ERROR; + + if (suart->rx.bit_count >= (suart->cfg.num_data_bits + suart->cfg.num_stop_bits)) { + /* we have accumulated enough stop bits */ + suart_rx_ch(suart, suart->rx.shift_reg); + suart->rx.flow_state = SUART_FLOW_ST_IDLE; + } + break; } } @@ -291,10 +296,12 @@ if (!enable && suart->rx.running) { suart_flush_rx(suart); suart->rx.running = false; + suart->rx.flow_state = SUART_FLOW_ST_IDLE; } else if (enable && !suart->rx.running) { if (!suart->rx.msg) suart->rx.msg = msgb_alloc_c(suart, suart->cfg.rx_buf_size, "soft_uart rx"); suart->rx.running = true; + suart->rx.flow_state = SUART_FLOW_ST_IDLE; } return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35022?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: I40ab5d12b6f7087daa51405468f5c4ea639561ea Gerrit-Change-Number: 35022 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: soft_uart: implement parity checking for the receiver

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35023?usp=email ) Change subject: soft_uart: implement parity checking for the receiver ...................................................................... soft_uart: implement parity checking for the receiver Change-Id: I28be2ca19d423447a718fb518566d52ae1967ec7 Related: OS#4396 --- M src/core/soft_uart.c 1 file changed, 31 insertions(+), 3 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index c7c8020..d8ce9d9 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -43,7 +43,7 @@ uint8_t bit_count; uint8_t shift_reg; struct msgb *msg; - ubit_t parity_bit; + ubit_t parity_bit; /* 0 (even) / 1 (odd) */ unsigned int flags; unsigned int status; struct osmo_timer_list timer; @@ -117,13 +117,16 @@ suart->rx.flags = 0x00; suart->rx.shift_reg = 0; suart->rx.bit_count = 0; + suart->rx.parity_bit = 0; } break; case SUART_FLOW_ST_DATA: suart->rx.bit_count++; suart->rx.shift_reg >>= 1; - if (bit != 0) + if (bit != 0) { + suart->rx.parity_bit = !suart->rx.parity_bit; /* flip */ suart->rx.shift_reg |= 0x80; + } if (suart->rx.bit_count >= suart->cfg.num_data_bits) { /* we have accumulated enough data bits */ if (suart->cfg.parity_mode != OSMO_SUART_PARITY_NONE) @@ -133,7 +136,22 @@ } break; case SUART_FLOW_ST_PARITY: - /* TODO: actually verify parity */ + switch (suart->cfg.parity_mode) { + case OSMO_SUART_PARITY_EVEN: + /* number of 1-bits (in both data and parity) shall be even */ + if (suart->rx.parity_bit != bit) + suart->rx.flags |= OSMO_SUART_F_PARITY_ERROR; + break; + case OSMO_SUART_PARITY_ODD: + /* number of 1-bits (in both data and parity) shall be odd */ + if (suart->rx.parity_bit == bit) + suart->rx.flags |= OSMO_SUART_F_PARITY_ERROR; + break; + case OSMO_SUART_PARITY_NONE: /* shall not happen */ + default: + OSMO_ASSERT(0); + } + suart->rx.flow_state = SUART_FLOW_ST_STOP; break; case SUART_FLOW_ST_STOP: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35023?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: I28be2ca19d423447a718fb518566d52ae1967ec7 Gerrit-Change-Number: 35023 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2023