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

[S] Change in libosmocore[master]: io_uring: add some more source code comments/docs

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35061?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: io_uring: add some more source code comments/docs ...................................................................... io_uring: add some more source code comments/docs Change-Id: I8ba77a18b51f67a9edbd1fa488b9791f8bf6e40a --- M src/core/osmo_io.c M src/core/osmo_io_internal.h M src/core/osmo_io_uring.c 3 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/35061/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35061?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: I8ba77a18b51f67a9edbd1fa488b9791f8bf6e40a Gerrit-Change-Number: 35061 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: rename unsupported SCTP mode to OSMO_IO_FD_MODE_SCTP_RECVMSG...

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35062?usp=email ) Change subject: osmo_io: rename unsupported SCTP mode to OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND ...................................................................... Patch Set 1: (1 comment) File include/osmocom/core/osmo_io.h: https://gerrit.osmocom.org/c/libosmocore/+/35062/comment/3c4d4f9d_c84334bb PS1, Line 25: OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG > Don't we need to add a backwards compatibility alias? this enum value was not supported (it would assert if you ever used it) and not used by any application layer code yet. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35062?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: Ie2d1c7ce6f211dbe025a0e843ad733443102ea15 Gerrit-Change-Number: 35062 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 16:28:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email ) Change subject: gtp: Add net GTP cause values and a function to check for success ...................................................................... Patch Set 1: (1 comment) File gtp/gtp.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12540): https://gerrit.osmocom.org/c/osmo-ggsn/+/35084/comment/bee74660_30f4796a PS1, Line 142: static inline bool gtp_cause_successful(uint8_t cause) { open brace '{' following function definitions go on the next line -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 Gerrit-Change-Number: 35084 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 21 Nov 2023 16:16:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email ) Change subject: gtp: Add net GTP cause values and a function to check for success ...................................................................... gtp: Add net GTP cause values and a function to check for success According to the spec the upf/pgw can accept a modified pdp context from the request e.g. if an ipv4/6 context was requested, but only ipv4 is availiable. Introduce a function that checks all cause values that are considered successful. See also: 3GPP TS 29.060 Ch 7.3.2 Related: OS#6268 Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 --- M gtp/gtp.h 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/84/35084/1 diff --git a/gtp/gtp.h b/gtp/gtp.h index ede6f73..256bbbd 100644 --- a/gtp/gtp.h +++ b/gtp/gtp.h @@ -103,7 +103,9 @@ #define GTPCAUSE_049 49 /* Cause values reserved for GPRS charging protocol use (See GTP' in GSM 12.15) 49-63 */ #define GTPCAUSE_064 64 /* For future use 64-127 */ #define GTPCAUSE_ACC_REQ 128 /* Request accepted */ -#define GTPCAUSE_129 129 /* For future use 129-176 */ +#define GTPCAUSE_NEW_PDP_NET_PREF 129 /* New PDP type due to network preference */ +#define GTPCAUSE_NEW_PDP_ADDR_BEAR 130 /* New PDP type due to single address bearer only */ +#define GTPCAUSE_131 131 /* For future use 131-176 */ #define GTPCAUSE_177 177 /* Cause values reserved for GPRS charging protocol use (See GTP' In GSM 12.15) 177-191 */ #define GTPCAUSE_NON_EXIST 192 /* Non-existent */ #define GTPCAUSE_INVALID_MESSAGE 193 /* Invalid message format */ @@ -137,6 +139,12 @@ #define GTPCAUSE_221 221 /* For Future Use 221-240 */ #define GTPCAUSE_241 241 /* Cause Values Reserved For Gprs Charging Protocol Use (See Gtp' In Gsm 12.15) 241-255 */ +static inline bool gtp_cause_successful(uint8_t cause) { + return cause == GTPCAUSE_ACC_REQ || + cause == GTPCAUSE_NEW_PDP_NET_PREF || + cause == GTPCAUSE_NEW_PDP_ADDR_BEAR; +} + struct ul66_t; struct ul16_t; struct pdp_t; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 Gerrit-Change-Number: 35084 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: soft_uart: allow manually flushing the receive buffer

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35064?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: soft_uart: allow manually flushing the receive buffer ...................................................................... soft_uart: allow manually flushing the receive buffer Change-Id: Id600a2db99e6cb84866cbdcfcd4f78265e067291 Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/libosmocore.map M src/core/soft_uart.c 3 files changed, 19 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h index df2faac..15cea81 100644 --- a/include/osmocom/core/soft_uart.h +++ b/include/osmocom/core/soft_uart.h @@ -92,3 +92,4 @@ int osmo_soft_uart_tx_ubits(struct osmo_soft_uart *suart, ubit_t *ubits, size_t n_ubits); int osmo_soft_uart_set_status(struct osmo_soft_uart *suart, unsigned int status); +void osmo_soft_uart_flush_rx(struct osmo_soft_uart *suart); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index e6a1866..ae8a068 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -448,6 +448,7 @@ osmo_soft_uart_rx_ubits; osmo_soft_uart_tx_ubits; osmo_soft_uart_set_status; +osmo_soft_uart_flush_rx; osmo_stat_item_dec; osmo_stat_item_flush; osmo_stat_item_for_each_group; diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index 238425a..400ce5a 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -72,8 +72,9 @@ * Receiver *************************************************************************/ -/* flush the receive buffer + allocate new one, as needed */ -static void suart_flush_rx(struct osmo_soft_uart *suart) +/*! Flush the receive buffer, passing ownership of the msgb to the .rx_cb(). + * \param[in] suart soft-UART instance holding the receive buffer. */ +void osmo_soft_uart_flush_rx(struct osmo_soft_uart *suart) { if ((suart->rx.msg && msgb_length(suart->rx.msg)) || suart->rx.flags) { osmo_timer_del(&suart->rx.timer); @@ -101,7 +102,7 @@ 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) { - suart_flush_rx(suart); + osmo_soft_uart_flush_rx(suart); } } @@ -173,7 +174,7 @@ static void suart_rx_timer_cb(void *data) { struct osmo_soft_uart *suart = data; - suart_flush_rx(suart); + osmo_soft_uart_flush_rx(suart); } /*! Feed a number of unpacked bits into the soft-UART receiver. @@ -349,7 +350,7 @@ if (suart->cfg.rx_buf_size > cfg->rx_buf_size || suart->cfg.rx_timeout_ms > cfg->rx_timeout_ms) { - suart_flush_rx(suart); + osmo_soft_uart_flush_rx(suart); } suart->cfg = *cfg; @@ -366,7 +367,7 @@ int osmo_soft_uart_set_rx(struct osmo_soft_uart *suart, bool enable) { if (!enable && suart->rx.running) { - suart_flush_rx(suart); + osmo_soft_uart_flush_rx(suart); suart->rx.running = false; suart->rx.flow_state = SUART_FLOW_ST_IDLE; } else if (enable && !suart->rx.running) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35064?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: Id600a2db99e6cb84866cbdcfcd4f78265e067291 Gerrit-Change-Number: 35064 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: soft_uart: fix Rx buffer flushing logic in suart_rx_ch()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35065?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: soft_uart: fix Rx buffer flushing logic in suart_rx_ch() ...................................................................... soft_uart: fix Rx buffer flushing logic in suart_rx_ch() Whenever we encounter a parity and/or a framing error, we should call the .rx_cb() immediately, even if this was the first character in the receive buffer. Change-Id: I73fab1a5c196d2dbdfe98b0c20d8dadbd22f4f64 Related: OS#4396 --- M src/core/soft_uart.c M tests/soft_uart/soft_uart_test.ok 2 files changed, 33 insertions(+), 11 deletions(-) Approvals: osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index 400ce5a..058512d 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -97,12 +97,13 @@ 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) { + if (msg_len >= suart->cfg.rx_buf_size || suart->rx.flags) { + /* either the buffer is full, or we hit a parity and/or a framing error */ + osmo_soft_uart_flush_rx(suart); + } else if (msg_len == 1) { + /* first character in new message: start timer */ 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) { - osmo_soft_uart_flush_rx(suart); } } diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok index 7453d66..e670a0e 100644 --- a/tests/soft_uart/soft_uart_test.ok +++ b/tests/soft_uart/soft_uart_test.ok @@ -18,7 +18,8 @@ test_rx_exec() @ 96: flush the Rx buffer suart_rx_cb(flags=00): 4f ======== test_rx(): testing 8-N-1 (framing errors) -suart_rx_cb(flags=01): 00 aa +suart_rx_cb(flags=01): 00 +suart_rx_cb(flags=01): aa test_rx_exec() @ 41: flush the Rx buffer suart_rx_cb(flags=00): ff ======== test_rx(): testing 8-N-2 (HELLO) @@ -38,22 +39,28 @@ test_rx_exec() @ 112: flush the Rx buffer suart_rx_cb(flags=00): 4f ======== test_rx(): testing 8-N-2 (framing errors) -suart_rx_cb(flags=01): 00 aa +suart_rx_cb(flags=01): 00 +suart_rx_cb(flags=01): aa +suart_rx_cb(flags=01): 55 test_rx_exec() @ 57: flush the Rx buffer -suart_rx_cb(flags=00): 55 ff +suart_rx_cb(flags=00): ff ======== test_rx(): testing 8-E-1 (invalid parity) -suart_rx_cb(flags=02): 00 01 -test_rx_exec() @ 49: flush the Rx buffer +suart_rx_cb(flags=02): 00 +suart_rx_cb(flags=02): 01 suart_rx_cb(flags=02): ff +test_rx_exec() @ 49: flush the Rx buffer +suart_rx_cb(flags=02): ======== test_rx(): testing 8-E-1 (valid parity) test_rx_exec() @ 63: flush the Rx buffer suart_rx_cb(flags=00): 00 ff aa 55 test_rx_exec() @ 120: flush the Rx buffer suart_rx_cb(flags=00): 80 e0 f8 fe ======== test_rx(): testing 8-O-1 (invalid parity) -suart_rx_cb(flags=02): 00 01 -test_rx_exec() @ 42: flush the Rx buffer +suart_rx_cb(flags=02): 00 +suart_rx_cb(flags=02): 01 suart_rx_cb(flags=02): ff +test_rx_exec() @ 42: flush the Rx buffer +suart_rx_cb(flags=02): ======== test_rx(): testing 8-O-1 (valid parity) test_rx_exec() @ 63: flush the Rx buffer suart_rx_cb(flags=00): 00 ff aa 55 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35065?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: I73fab1a5c196d2dbdfe98b0c20d8dadbd22f4f64 Gerrit-Change-Number: 35065 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

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

fixeria has submitted this change. ( 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, 460 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/Makefile.am b/tests/Makefile.am index 5f4914e..ce9726c 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 @@ -479,6 +482,7 @@ v110/ra1_test.ok \ gsm44021/frame_csd_test.ok \ osmo_io/osmo_io_test.ok osmo_io/osmo_io_test.err \ + soft_uart/soft_uart_test.ok \ $(NULL) if ENABLE_LIBSCTP @@ -693,6 +697,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..f5597f3 --- /dev/null +++ b/tests/soft_uart/soft_uart_test.c @@ -0,0 +1,302 @@ +/* + * (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 struct { + size_t data_len; + const uint8_t *data; +} g_tx_cb_cfg; + +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 void suart_tx_cb(void *priv, struct msgb *msg) +{ + size_t n_bytes; + + n_bytes = OSMO_MIN(g_tx_cb_cfg.data_len, msg->data_len); + if (g_tx_cb_cfg.data != NULL && n_bytes > 0) + memcpy(msgb_put(msg, n_bytes), g_tx_cb_cfg.data, n_bytes); + + fprintf(stdout, "%s(len=%u/%u): %s\n", + __func__, msg->len, msg->data_len, msgb_hexdump(msg)); +} + +static const struct osmo_soft_uart_cfg suart_test_default_cfg = { + .num_data_bits = 8, + .num_stop_bits = 1, + .parity_mode = OSMO_SUART_PARITY_NONE, + .rx_buf_size = 128, + .rx_cb = &suart_rx_cb, + .tx_cb = &suart_tx_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 'F': + printf("%s() @ %u: flush the Rx buffer\n", __func__, i); + osmo_soft_uart_flush_rx(suart); + 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, __func__, &suart_test_default_cfg); + OSMO_ASSERT(suart != NULL); + + osmo_soft_uart_set_rx(suart, true); + + printf("======== %s(): testing 8-N-1 (no data)\n", __func__); + test_rx_exec(suart, "F11111F11111F"); + + printf("======== %s(): testing 8-N-1 (fill up flush)\n", __func__); + cfg = suart_test_default_cfg; + cfg.rx_buf_size = 4; + osmo_soft_uart_configure(suart, &cfg); + test_rx_exec(suart, "11111" /* no data */ + "0 01111011 1" + "0 10110101 1" + "0 01111101 1" + "0 11110111 1" /* filled up, expect flush */ + "0 00000000 1" + "0 01010101 1" + "0 10101010 1" + "0 11111111 1" /* filled up, expect flush */ + "F" /* flush! (for sanity) */ + ); + + printf("======== %s(): testing 8-N-1 (HELLO)\n", __func__); + cfg = suart_test_default_cfg; + cfg.num_stop_bits = 1; + osmo_soft_uart_configure(suart, &cfg); + test_rx_exec(suart, "111111" /* no data */ + "0 00010010 1F" /* 'H', flush! */ + "0 10100010 1F" /* 'E', flush! */ + "1111111111111" /* no data */ + "0 00110010 1F" /* 'L', flush! */ + "0 00110010 1F" /* 'L', flush! */ + "1111111111111" /* no data */ + "0 11110010 1F" /* 'O', flush! */ + ); + + printf("======== %s(): testing 8-N-1 (framing errors)\n", __func__); + test_rx_exec(suart, "11111" /* no data */ + "0 00000000 0" /* stop bit != 1, expect flush */ + "0 01010101 0" /* stop bit != 1, expect flush */ + "0 11111111 1" /* stop bit == 1, recovery */ + "F" /* flush! */ + ); + + printf("======== %s(): testing 8-N-2 (HELLO)\n", __func__); + cfg = suart_test_default_cfg; + cfg.num_stop_bits = 2; + osmo_soft_uart_configure(suart, &cfg); + test_rx_exec(suart, "11111111" /* no data */ + "0 00010010 1F1F" /* 'H', flush! */ + "0 10100010 1F1F" /* 'E', flush! */ + "111111111111111" /* no data */ + "0 00110010 1F1F" /* 'L', flush! */ + "0 00110010 1F1F" /* 'L', flush! */ + "111111111111111" /* no data */ + "0 11110010 1F1F" /* 'O', flush! */ + ); + + printf("======== %s(): testing 8-N-2 (framing errors)\n", __func__); + test_rx_exec(suart, "11111" /* no data */ + "0 00000000 00" /* stop bit != 1, expect flush */ + "0 01010101 01" /* stop bit != 1, expect flush */ + "0 10101010 10" /* stop bit != 1, expect flush */ + "0 11111111 11" /* stop bit == 1, recovery */ + "F" /* flush! (for sanity) */ + ); + + + printf("======== %s(): testing 8-E-1 (invalid parity)\n", __func__); + cfg = suart_test_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_EVEN; + osmo_soft_uart_configure(suart, &cfg); + test_rx_exec(suart, "1111111" /* no data */ + "0 00000000 1 1" /* odd parity, expect flush */ + "0 10000000 0 1" /* odd parity, expect flush */ + "0 11111111 1 1" /* odd parity, expect flush */ + "F" /* flush! (for sanity) */ + ); + printf("======== %s(): testing 8-E-1 (valid parity)\n", __func__); + test_rx_exec(suart, "1111111" /* no data */ + "0 00000000 0 1" + "0 11111111 0 1" + "0 01010101 0 1" + "0 10101010 0 1" + "F" /* flush! */ + "0 00000001 1 1" + "0 00000111 1 1" + "0 00011111 1 1" + "0 01111111 1 1" + "F" /* flush! */ + ); + + printf("======== %s(): testing 8-O-1 (invalid parity)\n", __func__); + cfg = suart_test_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_ODD; + osmo_soft_uart_configure(suart, &cfg); + test_rx_exec(suart, + "0 00000000 0 1" /* even parity, expect flush */ + "0 10000000 1 1" /* even parity, expect flush */ + "0 11111111 0 1" /* even parity, expect flush */ + "F" /* flush! (for sanity) */ + ); + printf("======== %s(): testing 8-O-1 (valid parity)\n", __func__); + test_rx_exec(suart, "1111111" /* no data */ + "0 00000000 1 1" + "0 11111111 1 1" + "0 01010101 1 1" + "0 10101010 1 1" + "F" /* flush! */ + "0 00000001 0 1" + "0 00000111 0 1" + "0 00011111 0 1" + "0 01111111 0 1" + "F" /* flush! */ + ); + + osmo_soft_uart_free(suart); +} + +static void test_tx_rx_exec_one(struct osmo_soft_uart *suart, + size_t n_bits_total, size_t n_bits_frame) +{ + ubit_t tx_buf[n_bits_total]; + ubit_t *ptr = &tx_buf[0]; + int rc; + + rc = osmo_soft_uart_tx_ubits(suart, &tx_buf[0], n_bits_total); + OSMO_ASSERT(rc == 0); + + rc = osmo_soft_uart_rx_ubits(suart, &tx_buf[0], n_bits_total); + OSMO_ASSERT(rc == 0); + osmo_soft_uart_flush_rx(suart); + + printf("%s(n_bits_total=%zu):", __func__, n_bits_total); + while (n_bits_total > 0) { + size_t n_bits = OSMO_MIN(n_bits_frame, n_bits_total); + printf(" %s", osmo_ubit_dump(ptr, n_bits)); + n_bits_total -= n_bits; + ptr += n_bits; + } + printf("\n"); +} + +static void test_tx_rx_exec(struct osmo_soft_uart *suart, size_t n_bits_frame) +{ + const uint8_t tx_data[][4] = { + { 0xde, 0xad, 0xbe, 0xef }, + { 0x00, 0xaa, 0x55, 0xff }, + { 0x01, 0x02, 0x04, 0x08 }, + { 0x10, 0x20, 0x40, 0x80 }, + }; + + for (size_t i = 0; i < ARRAY_SIZE(tx_data); i++) { + g_tx_cb_cfg.data_len = 4; + g_tx_cb_cfg.data = tx_data[i]; + test_tx_rx_exec_one(suart, 4 * n_bits_frame, n_bits_frame); + } + + g_tx_cb_cfg.data_len = 0; + g_tx_cb_cfg.data = NULL; + test_tx_rx_exec_one(suart, 4 * n_bits_frame, n_bits_frame); +} + +static void test_tx_rx(void) +{ + struct osmo_soft_uart_cfg cfg; + struct osmo_soft_uart *suart; + + suart = osmo_soft_uart_alloc(NULL, __func__, &suart_test_default_cfg); + OSMO_ASSERT(suart != NULL); + + osmo_soft_uart_set_tx(suart, true); + osmo_soft_uart_set_rx(suart, true); + + printf("======== %s(): testing 8-N-1\n", __func__); + test_tx_rx_exec(suart, (1 + 8 + 1)); + + printf("======== %s(): testing 8-N-2\n", __func__); + cfg = suart_test_default_cfg; + cfg.num_stop_bits = 2; + osmo_soft_uart_configure(suart, &cfg); + test_tx_rx_exec(suart, (1 + 8 + 2)); + + printf("======== %s(): testing 8-E-1\n", __func__); + cfg = suart_test_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_EVEN; + osmo_soft_uart_configure(suart, &cfg); + test_tx_rx_exec(suart, (1 + 8 + 1 + 1)); + + printf("======== %s(): testing 8-O-1\n", __func__); + cfg = suart_test_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_ODD; + osmo_soft_uart_configure(suart, &cfg); + test_tx_rx_exec(suart, (1 + 8 + 1 + 1)); + + printf("======== %s(): testing 6-N-1\n", __func__); + cfg = suart_test_default_cfg; + cfg.num_data_bits = 6; + osmo_soft_uart_configure(suart, &cfg); + test_tx_rx_exec(suart, (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..7453d66 --- /dev/null +++ b/tests/soft_uart/soft_uart_test.ok @@ -0,0 +1,136 @@ +======== test_rx(): testing 8-N-1 (no data) +test_rx_exec() @ 0: flush the Rx buffer +test_rx_exec() @ 6: flush the Rx buffer +test_rx_exec() @ 12: flush the Rx buffer +======== test_rx(): testing 8-N-1 (fill up flush) +suart_rx_cb(flags=00): de ad be ef +suart_rx_cb(flags=00): 00 aa 55 ff +test_rx_exec() @ 101: flush the Rx buffer +======== test_rx(): testing 8-N-1 (HELLO) +test_rx_exec() @ 18: flush the Rx buffer +suart_rx_cb(flags=00): 48 +test_rx_exec() @ 31: flush the Rx buffer +suart_rx_cb(flags=00): 45 +test_rx_exec() @ 57: flush the Rx buffer +suart_rx_cb(flags=00): 4c +test_rx_exec() @ 70: flush the Rx buffer +suart_rx_cb(flags=00): 4c +test_rx_exec() @ 96: flush the Rx buffer +suart_rx_cb(flags=00): 4f +======== test_rx(): testing 8-N-1 (framing errors) +suart_rx_cb(flags=01): 00 aa +test_rx_exec() @ 41: flush the Rx buffer +suart_rx_cb(flags=00): ff +======== test_rx(): testing 8-N-2 (HELLO) +test_rx_exec() @ 20: flush the Rx buffer +test_rx_exec() @ 22: flush the Rx buffer +suart_rx_cb(flags=00): 48 +test_rx_exec() @ 35: flush the Rx buffer +test_rx_exec() @ 37: flush the Rx buffer +suart_rx_cb(flags=00): 45 +test_rx_exec() @ 65: flush the Rx buffer +test_rx_exec() @ 67: flush the Rx buffer +suart_rx_cb(flags=00): 4c +test_rx_exec() @ 80: flush the Rx buffer +test_rx_exec() @ 82: flush the Rx buffer +suart_rx_cb(flags=00): 4c +test_rx_exec() @ 110: flush the Rx buffer +test_rx_exec() @ 112: flush the Rx buffer +suart_rx_cb(flags=00): 4f +======== test_rx(): testing 8-N-2 (framing errors) +suart_rx_cb(flags=01): 00 aa +test_rx_exec() @ 57: flush the Rx buffer +suart_rx_cb(flags=00): 55 ff +======== test_rx(): testing 8-E-1 (invalid parity) +suart_rx_cb(flags=02): 00 01 +test_rx_exec() @ 49: flush the Rx buffer +suart_rx_cb(flags=02): ff +======== test_rx(): testing 8-E-1 (valid parity) +test_rx_exec() @ 63: flush the Rx buffer +suart_rx_cb(flags=00): 00 ff aa 55 +test_rx_exec() @ 120: flush the Rx buffer +suart_rx_cb(flags=00): 80 e0 f8 fe +======== test_rx(): testing 8-O-1 (invalid parity) +suart_rx_cb(flags=02): 00 01 +test_rx_exec() @ 42: flush the Rx buffer +suart_rx_cb(flags=02): ff +======== test_rx(): testing 8-O-1 (valid parity) +test_rx_exec() @ 63: flush the Rx buffer +suart_rx_cb(flags=00): 00 ff aa 55 +test_rx_exec() @ 120: flush the Rx buffer +suart_rx_cb(flags=00): 80 e0 f8 fe +======== test_tx_rx(): testing 8-N-1 +suart_tx_cb(len=4/4): de ad be ef +suart_rx_cb(flags=00): de ad be ef +test_tx_rx_exec_one(n_bits_total=40): 0011110111 0101101011 0011111011 0111101111 +suart_tx_cb(len=4/4): 00 aa 55 ff +suart_rx_cb(flags=00): 00 aa 55 ff +test_tx_rx_exec_one(n_bits_total=40): 0000000001 0010101011 0101010101 0111111111 +suart_tx_cb(len=4/4): 01 02 04 08 +suart_rx_cb(flags=00): 01 02 04 08 +test_tx_rx_exec_one(n_bits_total=40): 0100000001 0010000001 0001000001 0000100001 +suart_tx_cb(len=4/4): 10 20 40 80 +suart_rx_cb(flags=00): 10 20 40 80 +test_tx_rx_exec_one(n_bits_total=40): 0000010001 0000001001 0000000101 0000000011 +suart_tx_cb(len=0/4): +test_tx_rx_exec_one(n_bits_total=40): 1111111111 1111111111 1111111111 1111111111 +======== test_tx_rx(): testing 8-N-2 +suart_tx_cb(len=4/4): de ad be ef +suart_rx_cb(flags=00): de ad be ef +test_tx_rx_exec_one(n_bits_total=44): 00111101111 01011010111 00111110111 01111011111 +suart_tx_cb(len=4/4): 00 aa 55 ff +suart_rx_cb(flags=00): 00 aa 55 ff +test_tx_rx_exec_one(n_bits_total=44): 00000000011 00101010111 01010101011 01111111111 +suart_tx_cb(len=4/4): 01 02 04 08 +suart_rx_cb(flags=00): 01 02 04 08 +test_tx_rx_exec_one(n_bits_total=44): 01000000011 00100000011 00010000011 00001000011 +suart_tx_cb(len=4/4): 10 20 40 80 +suart_rx_cb(flags=00): 10 20 40 80 +test_tx_rx_exec_one(n_bits_total=44): 00000100011 00000010011 00000001011 00000000111 +suart_tx_cb(len=0/4): +test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111 +======== test_tx_rx(): testing 8-E-1 +suart_tx_cb(len=4/4): de ad be ef +suart_rx_cb(flags=00): de ad be ef +test_tx_rx_exec_one(n_bits_total=44): 00111101101 01011010111 00111110101 01111011111 +suart_tx_cb(len=4/4): 00 aa 55 ff +suart_rx_cb(flags=00): 00 aa 55 ff +test_tx_rx_exec_one(n_bits_total=44): 00000000001 00101010101 01010101001 01111111101 +suart_tx_cb(len=4/4): 01 02 04 08 +suart_rx_cb(flags=00): 01 02 04 08 +test_tx_rx_exec_one(n_bits_total=44): 01000000011 00100000011 00010000011 00001000011 +suart_tx_cb(len=4/4): 10 20 40 80 +suart_rx_cb(flags=00): 10 20 40 80 +test_tx_rx_exec_one(n_bits_total=44): 00000100011 00000010011 00000001011 00000000111 +suart_tx_cb(len=0/4): +test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111 +======== test_tx_rx(): testing 8-O-1 +suart_tx_cb(len=4/4): de ad be ef +suart_rx_cb(flags=00): de ad be ef +test_tx_rx_exec_one(n_bits_total=44): 00111101111 01011010101 00111110111 01111011101 +suart_tx_cb(len=4/4): 00 aa 55 ff +suart_rx_cb(flags=00): 00 aa 55 ff +test_tx_rx_exec_one(n_bits_total=44): 00000000011 00101010111 01010101011 01111111111 +suart_tx_cb(len=4/4): 01 02 04 08 +suart_rx_cb(flags=00): 01 02 04 08 +test_tx_rx_exec_one(n_bits_total=44): 01000000001 00100000001 00010000001 00001000001 +suart_tx_cb(len=4/4): 10 20 40 80 +suart_rx_cb(flags=00): 10 20 40 80 +test_tx_rx_exec_one(n_bits_total=44): 00000100001 00000010001 00000001001 00000000101 +suart_tx_cb(len=0/4): +test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111 +======== test_tx_rx(): testing 6-N-1 +suart_tx_cb(len=4/4): de ad be ef +suart_rx_cb(flags=00): 78 b4 f8 bc +test_tx_rx_exec_one(n_bits_total=32): 00111101 01011011 00111111 01111011 +suart_tx_cb(len=4/4): 00 aa 55 ff +suart_rx_cb(flags=00): 00 a8 54 fc +test_tx_rx_exec_one(n_bits_total=32): 00000001 00101011 01010101 01111111 +suart_tx_cb(len=4/4): 01 02 04 08 +suart_rx_cb(flags=00): 04 08 10 20 +test_tx_rx_exec_one(n_bits_total=32): 01000001 00100001 00010001 00001001 +suart_tx_cb(len=4/4): 10 20 40 80 +suart_rx_cb(flags=00): 40 80 00 00 +test_tx_rx_exec_one(n_bits_total=32): 00000101 00000011 00000001 00000001 +suart_tx_cb(len=0/4): +test_tx_rx_exec_one(n_bits_total=32): 11111111 11111111 11111111 11111111 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: 7 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

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

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35067?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: soft_uart: implement OSMO_SUART_PARITY_{MARK,SPACE} ...................................................................... soft_uart: implement OSMO_SUART_PARITY_{MARK,SPACE} Change-Id: I4c8fe5bfdcc2f4eb52c259d1e62d06684cd8f823 Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/soft_uart.c M tests/soft_uart/soft_uart_test.c M tests/soft_uart/soft_uart_test.ok 4 files changed, 72 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified 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 15cea81..2b108c4 100644 --- a/include/osmocom/core/soft_uart.h +++ b/include/osmocom/core/soft_uart.h @@ -29,6 +29,8 @@ OSMO_SUART_PARITY_NONE, OSMO_SUART_PARITY_EVEN, OSMO_SUART_PARITY_ODD, + OSMO_SUART_PARITY_MARK, /* always 1 */ + OSMO_SUART_PARITY_SPACE, /* always 0 */ _OSMO_SUART_PARITY_NUM }; diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index bc563ca..c94070f 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -153,6 +153,16 @@ if (suart->rx.parity_bit == bit) suart->rx.flags |= OSMO_SUART_F_PARITY_ERROR; break; + case OSMO_SUART_PARITY_MARK: + /* parity bit must always be 1 */ + if (bit != 1) + suart->rx.flags |= OSMO_SUART_F_PARITY_ERROR; + break; + case OSMO_SUART_PARITY_SPACE: + /* parity bit must always be 0 */ + if (bit != 0) + suart->rx.flags |= OSMO_SUART_F_PARITY_ERROR; + break; case OSMO_SUART_PARITY_NONE: /* shall not happen */ default: OSMO_ASSERT(0); @@ -238,6 +248,14 @@ /* number of 1-bits (in both data and parity) shall be odd */ tx_bit = !suart->tx.parity_bit; break; + case OSMO_SUART_PARITY_MARK: + /* parity bit must always be 1 */ + tx_bit = 1; + break; + case OSMO_SUART_PARITY_SPACE: + /* parity bit must always be 0 */ + tx_bit = 0; + break; case OSMO_SUART_PARITY_NONE: default: /* shall not happen */ OSMO_ASSERT(0); diff --git a/tests/soft_uart/soft_uart_test.c b/tests/soft_uart/soft_uart_test.c index f5597f3..ad876bd 100644 --- a/tests/soft_uart/soft_uart_test.c +++ b/tests/soft_uart/soft_uart_test.c @@ -284,6 +284,18 @@ osmo_soft_uart_configure(suart, &cfg); test_tx_rx_exec(suart, (1 + 8 + 1 + 1)); + printf("======== %s(): testing 8-M-1\n", __func__); + cfg = suart_test_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_MARK; + osmo_soft_uart_configure(suart, &cfg); + test_tx_rx_exec(suart, (1 + 8 + 1 + 1)); + + printf("======== %s(): testing 8-S-1\n", __func__); + cfg = suart_test_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_SPACE; + osmo_soft_uart_configure(suart, &cfg); + test_tx_rx_exec(suart, (1 + 8 + 1 + 1)); + printf("======== %s(): testing 6-N-1\n", __func__); cfg = suart_test_default_cfg; cfg.num_data_bits = 6; diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok index 118c547..e041104 100644 --- a/tests/soft_uart/soft_uart_test.ok +++ b/tests/soft_uart/soft_uart_test.ok @@ -126,6 +126,36 @@ test_tx_rx_exec_one(n_bits_total=44): 00000100001 00000010001 00000001001 00000000101 suart_tx_cb(len=0/4): test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111 +======== test_tx_rx(): testing 8-M-1 +suart_tx_cb(len=4/4): de ad be ef +suart_rx_cb(flags=00): de ad be ef +test_tx_rx_exec_one(n_bits_total=44): 00111101111 01011010111 00111110111 01111011111 +suart_tx_cb(len=4/4): 00 aa 55 ff +suart_rx_cb(flags=00): 00 aa 55 ff +test_tx_rx_exec_one(n_bits_total=44): 00000000011 00101010111 01010101011 01111111111 +suart_tx_cb(len=4/4): 01 02 04 08 +suart_rx_cb(flags=00): 01 02 04 08 +test_tx_rx_exec_one(n_bits_total=44): 01000000011 00100000011 00010000011 00001000011 +suart_tx_cb(len=4/4): 10 20 40 80 +suart_rx_cb(flags=00): 10 20 40 80 +test_tx_rx_exec_one(n_bits_total=44): 00000100011 00000010011 00000001011 00000000111 +suart_tx_cb(len=0/4): +test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111 +======== test_tx_rx(): testing 8-S-1 +suart_tx_cb(len=4/4): de ad be ef +suart_rx_cb(flags=00): de ad be ef +test_tx_rx_exec_one(n_bits_total=44): 00111101101 01011010101 00111110101 01111011101 +suart_tx_cb(len=4/4): 00 aa 55 ff +suart_rx_cb(flags=00): 00 aa 55 ff +test_tx_rx_exec_one(n_bits_total=44): 00000000001 00101010101 01010101001 01111111101 +suart_tx_cb(len=4/4): 01 02 04 08 +suart_rx_cb(flags=00): 01 02 04 08 +test_tx_rx_exec_one(n_bits_total=44): 01000000001 00100000001 00010000001 00001000001 +suart_tx_cb(len=4/4): 10 20 40 80 +suart_rx_cb(flags=00): 10 20 40 80 +test_tx_rx_exec_one(n_bits_total=44): 00000100001 00000010001 00000001001 00000000101 +suart_tx_cb(len=0/4): +test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111 ======== test_tx_rx(): testing 6-N-1 suart_tx_cb(len=4/4): de ad be ef suart_rx_cb(flags=00): 1e 2d 3e 2f -- 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: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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: fix handling of num_data_bits < 8

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35066?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: soft_uart: fix handling of num_data_bits < 8 ...................................................................... soft_uart: fix handling of num_data_bits < 8 Change-Id: Ife13b1f2d9063ba7253d01523ca9ecb15e9eaf07 Related: OS#4396 --- M src/core/soft_uart.c M tests/soft_uart/soft_uart_test.ok 2 files changed, 17 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved 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 058512d..bc563ca 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -136,6 +136,9 @@ suart->rx.flow_state = SUART_FLOW_ST_PARITY; else suart->rx.flow_state = SUART_FLOW_ST_STOP; + /* align the register if needed */ + if (suart->cfg.num_data_bits < 8) + suart->rx.shift_reg >>= (8 - suart->cfg.num_data_bits); } break; case SUART_FLOW_ST_PARITY: diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok index e670a0e..118c547 100644 --- a/tests/soft_uart/soft_uart_test.ok +++ b/tests/soft_uart/soft_uart_test.ok @@ -128,16 +128,16 @@ test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111 ======== test_tx_rx(): testing 6-N-1 suart_tx_cb(len=4/4): de ad be ef -suart_rx_cb(flags=00): 78 b4 f8 bc +suart_rx_cb(flags=00): 1e 2d 3e 2f test_tx_rx_exec_one(n_bits_total=32): 00111101 01011011 00111111 01111011 suart_tx_cb(len=4/4): 00 aa 55 ff -suart_rx_cb(flags=00): 00 a8 54 fc +suart_rx_cb(flags=00): 00 2a 15 3f test_tx_rx_exec_one(n_bits_total=32): 00000001 00101011 01010101 01111111 suart_tx_cb(len=4/4): 01 02 04 08 -suart_rx_cb(flags=00): 04 08 10 20 +suart_rx_cb(flags=00): 01 02 04 08 test_tx_rx_exec_one(n_bits_total=32): 01000001 00100001 00010001 00001001 suart_tx_cb(len=4/4): 10 20 40 80 -suart_rx_cb(flags=00): 40 80 00 00 +suart_rx_cb(flags=00): 10 20 00 00 test_tx_rx_exec_one(n_bits_total=32): 00000101 00000011 00000001 00000001 suart_tx_cb(len=0/4): test_tx_rx_exec_one(n_bits_total=32): 11111111 11111111 11111111 11111111 -- 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: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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

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

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35074?usp=email ) Change subject: soft_uart: demonstrate a problem with osmo_soft_uart_tx_ubits() ...................................................................... soft_uart: demonstrate a problem with osmo_soft_uart_tx_ubits() As can be seen, pulling a small number of bits at a time (smaller than a single UART frame would fit into) results in calling the .tx_cb() with a msgb having no room at all, and thus pulling the stop bits instead of the actual data. Change-Id: Icfee378f0fdc5e32fe9ce0afab5f75bc278653a9 Related: OS#4396 --- M tests/soft_uart/soft_uart_test.c M tests/soft_uart/soft_uart_test.ok 2 files changed, 123 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/soft_uart/soft_uart_test.c b/tests/soft_uart/soft_uart_test.c index ad876bd..522739a 100644 --- a/tests/soft_uart/soft_uart_test.c +++ b/tests/soft_uart/soft_uart_test.c @@ -305,10 +305,46 @@ osmo_soft_uart_free(suart); } +static void test_tx_rx_pull_n(unsigned int n) +{ + struct osmo_soft_uart *suart; + ubit_t tx_buf[32]; + int rc; + + suart = osmo_soft_uart_alloc(NULL, __func__, &suart_test_default_cfg); + OSMO_ASSERT(suart != NULL); + + osmo_soft_uart_set_tx(suart, true); + osmo_soft_uart_set_rx(suart, true); + + g_tx_cb_cfg.data = (void *)"\x55"; + g_tx_cb_cfg.data_len = 1; + + printf("======== %s(): pulling %lu bits (%u at a time)\n", __func__, sizeof(tx_buf), n); + for (unsigned int i = 0; i < sizeof(tx_buf); i += n) { + rc = osmo_soft_uart_tx_ubits(suart, &tx_buf[i], n); + OSMO_ASSERT(rc == 0); + } + printf("%s\n", osmo_ubit_dump(&tx_buf[0], sizeof(tx_buf))); + + printf("======== %s(): feeding %lu bits into the receiver\n", __func__, sizeof(tx_buf)); + rc = osmo_soft_uart_rx_ubits(suart, &tx_buf[0], sizeof(tx_buf)); + OSMO_ASSERT(rc == 0); + osmo_soft_uart_flush_rx(suart); + + osmo_soft_uart_free(suart); +} + int main(int argc, char **argv) { test_rx(); test_tx_rx(); + /* test pulling small number of bits at a time */ + test_tx_rx_pull_n(1); + test_tx_rx_pull_n(2); + test_tx_rx_pull_n(4); + test_tx_rx_pull_n(8); + return 0; } diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok index e041104..a160ad3 100644 --- a/tests/soft_uart/soft_uart_test.ok +++ b/tests/soft_uart/soft_uart_test.ok @@ -171,3 +171,75 @@ test_tx_rx_exec_one(n_bits_total=32): 00000101 00000011 00000001 00000001 suart_tx_cb(len=0/4): test_tx_rx_exec_one(n_bits_total=32): 11111111 11111111 11111111 11111111 +======== test_tx_rx_pull_n(): pulling 32 bits (1 at a time) +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +11111111111111111111111111111111 +======== test_tx_rx_pull_n(): feeding 32 bits into the receiver +======== test_tx_rx_pull_n(): pulling 32 bits (2 at a time) +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +11111111111111111111111111111111 +======== test_tx_rx_pull_n(): feeding 32 bits into the receiver +======== test_tx_rx_pull_n(): pulling 32 bits (4 at a time) +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +11111111111111111111111111111111 +======== test_tx_rx_pull_n(): feeding 32 bits into the receiver +======== test_tx_rx_pull_n(): pulling 32 bits (8 at a time) +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +suart_tx_cb(len=0/0): +11111111111111111111111111111111 +======== test_tx_rx_pull_n(): feeding 32 bits into the receiver -- 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: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2023