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

Change in osmo-e1d[master]: Differentiate between icE1usb and e1-tracer in log/vty output

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29962 ) Change subject: Differentiate between icE1usb and e1-tracer in log/vty output ...................................................................... Differentiate between icE1usb and e1-tracer in log/vty output Now that we support the e1-tracer in addition to icE1usb, let's differentiate in the log output. Change-Id: Iea647b12d86c97cfacbc3df43010b9b94f0a97c7 --- M src/usb.c M src/vty.c 2 files changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/62/29962/1 diff --git a/src/usb.c b/src/usb.c index 35e1894..fc461c4 100644 --- a/src/usb.c +++ b/src/usb.c @@ -825,6 +825,10 @@ libusb_device_handle *devh; int line_nr = 0; int i, j, ret; + const char *hwname = "icE1usb"; + + if (is_tracer) + hwname = "e1-tracer"; ret = libusb_open(dev, &devh); if (ret) { @@ -853,7 +857,7 @@ /* try to find the matching interface config created by the vty */ intf = e1d_find_intf_by_usb_serial(e1d, serial_str); if (intf) { - LOGP(DE1D, LOGL_INFO, "Configuration for icE1usb serial '%s' found\n", serial_str); + LOGP(DE1D, LOGL_INFO, "Configuration for %s serial '%s' found\n", hwname, serial_str); auto_create_lines = false; if (intf->drv_data) { LOGP(DE1D, LOGL_ERROR, "New device with serial '%s', but E1 interface %u busy\n", @@ -865,8 +869,8 @@ intf_data->devh = devh; intf->drv_data = intf_data; } else { - LOGP(DE1D, LOGL_NOTICE, "No configuration for icE1usb serial '%s' found, " - "auto-generating it\n", serial_str); + LOGP(DE1D, LOGL_NOTICE, "No configuration for %s serial '%s' found, " + "auto-generating it\n", hwname, serial_str); auto_create_lines = true; intf_data = talloc_zero(e1d->ctx, struct e1_usb_intf_data); intf_data->devh = devh; @@ -888,7 +892,7 @@ ret = libusb_get_active_config_descriptor(dev, &cd); if (ret) { - LOGP(DE1D, LOGL_ERROR, "Failed to talk to usb device: %s\n", libusb_strerror(ret)); + LOGP(DE1D, LOGL_ERROR, "Failed to talk to %s usb device: %s\n", hwname, libusb_strerror(ret)); intf_data->devh = NULL; talloc_free(intf_data); if (auto_create_lines) diff --git a/src/vty.c b/src/vty.c index d3433da..6507937 100644 --- a/src/vty.c +++ b/src/vty.c @@ -242,7 +242,7 @@ } DEFUN(cfg_e1d_if_icE1usb, cfg_e1d_if_icE1usb_cmd, "interface <0-255> icE1usb", - "Configure an icE1usb E1 interface\n" + "Configure an icE1usb/e1-tracer E1 interface\n" "E1 Interface Number\n") { struct e1_intf *intf; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iea647b12d86c97cfacbc3df43010b9b94f0a97c7 Gerrit-Change-Number: 29962 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Fix missing quotes for possibly unresolved variables in shell test-st...

by fixeria

Attention is currently required from: arehbein. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29961 ) Change subject: Fix missing quotes for possibly unresolved variables in shell test-statements ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7e7f4f95d1a7cc886360c733908c63a2843b0906 Gerrit-Change-Number: 29961 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Nov 2022 08:20:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1ctl.c: remove unused headers

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29955 ) Change subject: trxcon: l1ctl.c: remove unused headers ...................................................................... trxcon: l1ctl.c: remove unused headers Change-Id: Ie2f320bf2ce9296db2c016d6ed7ddb54985e4089 --- M src/host/trxcon/src/l1ctl.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 5f1e610..87bfe74 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -26,14 +26,12 @@ #include <stdlib.h> #include <stdint.h> #include <string.h> -#include <assert.h> #include <arpa/inet.h> #include <osmocom/core/fsm.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/select.h> #include <osmocom/gsm/gsm0502.h> #include <osmocom/gsm/gsm_utils.h> -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie2f320bf2ce9296db2c016d6ed7ddb54985e4089 Gerrit-Change-Number: 29955 Gerrit-PatchSet: 1 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-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: fix wrong format specifier used in trx_if_cmd_setfh()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29939 ) Change subject: trxcon: fix wrong format specifier used in trx_if_cmd_setfh() ...................................................................... trxcon: fix wrong format specifier used in trx_if_cmd_setfh() Change-Id: Ie2d5621ebd31440ad6e1242cb990f1556a481248 Fixes: CID#282868, CID#282866 --- M src/host/trxcon/src/trx_if.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 6ae00f3..7f3ce08 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -474,7 +474,7 @@ rc = snprintf(ptr, ma_buf_len, "%u %u ", rx_freq * 100, tx_freq * 100); if (rc < 0 || rc > ma_buf_len) { /* Prevent buffer overflow */ LOGPFSML(trx->fi, LOGL_ERROR, "Not enough room to encode " - "Mobile Allocation (N=%zu)\n", cmdp->ma_len); + "Mobile Allocation (N=%u)\n", cmdp->ma_len); return -ENOSPC; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie2d5621ebd31440ad6e1242cb990f1556a481248 Gerrit-Change-Number: 29939 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-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: handle RACH.cnf via TRXCON_EV_TX_ACCESS_BURST_CNF

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29960 ) Change subject: trxcon: handle RACH.cnf via TRXCON_EV_TX_ACCESS_BURST_CNF ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I64de7d4e8137041b373a9920296553fbfe8386d4 Gerrit-Change-Number: 29960 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: Wed, 02 Nov 2022 08:00:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1sched_handle_data_cnf(): make the cnf struct scoped

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29959 ) Change subject: trxcon: l1sched_handle_data_cnf(): make the cnf struct scoped ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I526116c2a20970aee7881e19e283e083bc6b1911 Gerrit-Change-Number: 29959 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: Wed, 02 Nov 2022 08:00:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: handle DATA.cnf/TRAFFIC.cnf via TRXCON_EV_TX_DATA_CNF

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29958 ) Change subject: trxcon: handle DATA.cnf/TRAFFIC.cnf via TRXCON_EV_TX_DATA_CNF ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ica7a25f0bf8c7f89037a776d711ac641c57c9ad5 Gerrit-Change-Number: 29958 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: Wed, 02 Nov 2022 07:59:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: merge TRXCON_EV_TX_TRAFFIC_* with TRXCON_EV_TX_DATA_*

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29957 ) Change subject: trxcon: merge TRXCON_EV_TX_TRAFFIC_* with TRXCON_EV_TX_DATA_* ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8c2b3274f32d4d52424512d988b93d6233dd09a0 Gerrit-Change-Number: 29957 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: Wed, 02 Nov 2022 07:59:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: compose struct l1ctl_info_dl in l1ctl_tx_dt_ind()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29956 ) Change subject: trxcon: compose struct l1ctl_info_dl in l1ctl_tx_dt_ind() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie57d86ffd9ea7c44187aafba0df1f519d1c523fb Gerrit-Change-Number: 29956 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: Wed, 02 Nov 2022 07:58:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: fix wrong format specifier used in trx_if_cmd_setfh()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29939 ) Change subject: trxcon: fix wrong format specifier used in trx_if_cmd_setfh() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie2d5621ebd31440ad6e1242cb990f1556a481248 Gerrit-Change-Number: 29939 Gerrit-PatchSet: 3 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: Wed, 02 Nov 2022 07:58:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1ctl.c: remove unused headers

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29955 ) Change subject: trxcon: l1ctl.c: remove unused headers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie2f320bf2ce9296db2c016d6ed7ddb54985e4089 Gerrit-Change-Number: 29955 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: Wed, 02 Nov 2022 07:58:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: drop sched->clock_cb(), expose l1sched_trigger()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29954 ) Change subject: trxcon: drop sched->clock_cb(), expose l1sched_trigger() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ied0eed6d514acabb94d819b2f9485868390c0f24 Gerrit-Change-Number: 29954 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: Wed, 02 Nov 2022 07:57:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: tune sched_clck related logging levels

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29940 ) Change subject: trxcon: tune sched_clck related logging levels ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iad57d2d7158c6ff037630acaa08ae3b9940448e2 Gerrit-Change-Number: 29940 Gerrit-PatchSet: 3 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: Wed, 02 Nov 2022 07:56:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 ) Change subject: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode ...................................................................... fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode Initially it was a good choice to keep the LIU driver in the host software (easier debugging/changes). However, we never really needed it to do anything but initialization of the LIU. So in order to avoid having to teach osmo-e1d or other software the details about the LIU initialization, let's do this from the firmware *if* the e1d compatible USB configuration is used. Closes: OS#5733 Change-Id: Id2217ff4573c4eebd816318128f256e85fb3c3bd --- M firmware/ice40-riscv/e1-tracer/Makefile A firmware/ice40-riscv/e1-tracer/idt82v2081.c A firmware/ice40-riscv/e1-tracer/idt82v2081.h A firmware/ice40-riscv/e1-tracer/idt82v2081_no2spi.c A firmware/ice40-riscv/e1-tracer/idt82v2081_regs.h M firmware/ice40-riscv/e1-tracer/usb_e1.c 6 files changed, 314 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/firmware/ice40-riscv/e1-tracer/Makefile b/firmware/ice40-riscv/e1-tracer/Makefile index 030501e..5fa38fa 100644 --- a/firmware/ice40-riscv/e1-tracer/Makefile +++ b/firmware/ice40-riscv/e1-tracer/Makefile @@ -47,6 +47,8 @@ HEADERS_app=\ config.h \ e1.h \ + idt82v2081.h \ + idt82v2081_regs.h \ misc.h \ usb_str_app.gen.h \ $(NULL) @@ -54,6 +56,8 @@ SOURCES_app=\ e1.c \ fw_app.c \ + idt82v2081.c \ + idt82v2081_no2spi.c \ misc.c \ usb_desc_app.c \ usb_e1.c \ diff --git a/firmware/ice40-riscv/e1-tracer/idt82v2081.c b/firmware/ice40-riscv/e1-tracer/idt82v2081.c new file mode 100644 index 0000000..9233292 --- /dev/null +++ b/firmware/ice40-riscv/e1-tracer/idt82v2081.c @@ -0,0 +1,140 @@ +/* (C) 2019 by Harald Welte <laforge(a)osmocom.org> + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + * 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 <stdint.h> + +#include "idt82v2081.h" +#include "idt82v2081_regs.h" + +/*! \brief Set or clear some (masked) bits inside a register + * \param[in] e4k reference to the tuner + * \param[in] reg number of the register + * \param[in] mask bit-mask of the value + * \param[in] val data value to be written to register + * \returns 0 on success, negative in case of error + */ +static int idt82_reg_set_bit_mask(struct idt82 *idt, uint8_t reg, + uint8_t mask, uint8_t val) +{ + uint8_t tmp = idt82_reg_read(idt, reg); + + if ((tmp & mask) == val) + return 0; + + return idt82_reg_write(idt, reg, (tmp & ~mask) | (val & mask)); +} + +int idt82_termination(struct idt82 *idt, enum idt82_term term) +{ + uint8_t puls, scal; + + idt82_reg_set_bit_mask(idt, IDT_REG_TERM, term | (term << IDT_TERM_T_SHIFT), + IDT_TERM_T_MASK | IDT_TERM_R_MASK); + + switch (idt->mode) { + case IDT_MODE_E1: + if (term == IDT_TERM_INT_75) + puls = 0; + else + puls = 1; + scal = 0x21; + break; + case IDT_MODE_T1: + /* FIXME: different length! */ + puls = 2; + scal = 0x36; + break; + case IDT_MODE_J1: + puls = 7; + scal = 0x36; + break; + default: + return -1; + } + + idt82_reg_set_bit_mask(idt, IDT_REG_TCF1, puls, IDT_TCF1_PULS_MASK); + idt82_reg_set_bit_mask(idt, IDT_REG_TCF2, scal, IDT_TCF2_SCAL_MASK); + + idt->term = term; + + return 0; +} + +int idt82_mode(struct idt82 *idt, enum idt82_mode mode) +{ + switch (mode) { + case IDT_MODE_E1: + idt82_reg_set_bit_mask(idt, IDT_REG_GCF, IDT_GCF_T1E1_E1, + IDT_GCF_T1E1_MASK); + break; + case IDT_MODE_T1: + case IDT_MODE_J1: + idt82_reg_set_bit_mask(idt, IDT_REG_GCF, IDT_GCF_T1E1_T1, + IDT_GCF_T1E1_MASK); + break; + } + idt->mode = mode; + + return 0; +} + +int idt82_get_errcount(struct idt82 *idt) +{ + uint16_t ret; + int rc; + + rc = idt82_reg_read(idt, IDT_REG_CNT0); + if (rc < 0) + return rc; + + ret = rc; + + rc = idt82_reg_read(idt, IDT_REG_CNT1); + if (rc < 0) + return rc; + + ret |= (rc << 8); + + return ret; +} + +/* return in dB, range is return value ... (value + 2) */ +int idt82_get_line_att(struct idt82 *idt) +{ + int rc; + + rc = idt82_reg_read(idt, IDT_REG_STAT1); + if (rc < 0) + return rc; + + return (rc & IDT_STAT1_ATT_MASK)*2; +} + +int idt82_init(struct idt82 *idt, bool monitor) +{ + idt82_reg_write(idt, IDT_REG_RST, 0x00); /* Reset to defaults */ + + idt82_mode(idt, IDT_MODE_E1); + idt82_termination(idt, IDT_TERM_INT_120); + + idt82_reg_write(idt, IDT_REG_TCF0, 0x10); /* Disable TX */ + + if (monitor) + idt82_reg_write(idt, IDT_REG_RCF2, 0x19); /* 22 dB monitor mode */ + + return 0; +} + diff --git a/firmware/ice40-riscv/e1-tracer/idt82v2081.h b/firmware/ice40-riscv/e1-tracer/idt82v2081.h new file mode 100644 index 0000000..1c930b1 --- /dev/null +++ b/firmware/ice40-riscv/e1-tracer/idt82v2081.h @@ -0,0 +1,35 @@ +#pragma once + +#include <stdbool.h> +#include <stdint.h> + +enum idt82_term { + IDT_TERM_INT_75 = 0, + IDT_TERM_INT_120, + IDT_TERM_INT_100, + IDT_TERM_INT_110, + IDT_TERM_EXT, +}; + +enum idt82_mode { + IDT_MODE_E1 = 0, + IDT_MODE_T1, + IDT_MODE_J1, +}; + +struct idt82 { + enum idt82_mode mode; + enum idt82_term term; + void *priv; + uint8_t cs; +}; + +int idt82_termination(struct idt82 *idt, enum idt82_term term); +int idt82_mode(struct idt82 *idt, enum idt82_mode mode); +int idt82_get_errcount(struct idt82 *idt); +int idt82_get_line_att(struct idt82 *idt); +int idt82_init(struct idt82 *idt, bool monitor); + +/* callbacks into transport */ +int idt82_reg_write(struct idt82 *idt, uint8_t reg, uint8_t val); +int idt82_reg_read(struct idt82 *idt, uint8_t reg); diff --git a/firmware/ice40-riscv/e1-tracer/idt82v2081_no2spi.c b/firmware/ice40-riscv/e1-tracer/idt82v2081_no2spi.c new file mode 100644 index 0000000..7a236ea --- /dev/null +++ b/firmware/ice40-riscv/e1-tracer/idt82v2081_no2spi.c @@ -0,0 +1,48 @@ +/* (C) 2019 by Harald Welte <laforge(a)osmocom.org> + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + * 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 <errno.h> +#include <stdint.h> +#include <stdlib.h> + +#include "idt82v2081.h" +#include "spi.h" + +/* Adaption layer between idt82 driver and no2fpga SPI */ + +/* backend function for core idt82 driver */ +int idt82_reg_read(struct idt82 *idt, uint8_t reg) +{ + uint8_t cmd = reg | 0x20; + uint8_t rv; + struct spi_xfer_chunk xfer[2] = { + { .data = (void *)&cmd, .len = 1, .read = false, .write = true, }, + { .data = (void *)&rv, .len = 1, .read = true, .write = false, }, + }; + spi_xfer(SPI_CS_LIU(idt->cs), xfer, 2); + return rv; +} + +/* backend function for core idt82 driver */ +int idt82_reg_write(struct idt82 *idt, uint8_t reg, uint8_t val) +{ + uint8_t cmd[2] = { reg, val }; + struct spi_xfer_chunk xfer[2] = { + { .data = (void *)cmd, .len = 2, .read = false, .write = true, }, + }; + spi_xfer(SPI_CS_LIU(idt->cs), xfer, 1); + return 0; +} diff --git a/firmware/ice40-riscv/e1-tracer/idt82v2081_regs.h b/firmware/ice40-riscv/e1-tracer/idt82v2081_regs.h new file mode 100644 index 0000000..679ed90 --- /dev/null +++ b/firmware/ice40-riscv/e1-tracer/idt82v2081_regs.h @@ -0,0 +1,81 @@ +#ifndef _IDT82_REGS_H +#define _IDT82_REGS_H + +/* Section 4.1 of Data Sheet */ +enum idt82v2081_reg { + IDT_REG_ID, /* control */ + IDT_REG_RST, + IDT_REG_GCF, + IDT_REG_TERM, + IDT_REG_JACF, + IDT_REG_TCF0, /* Tx path control */ + IDT_REG_TCF1, + IDT_REG_TCF2, + IDT_REG_TCF3, + IDT_REG_TCF4, + IDT_REG_RCF0, /* Rx path control */ + IDT_REG_RCF1, + IDT_REG_RCF2, + IDT_REG_MAINT0, /* Net Diag Ctrl */ + IDT_REG_MAINT1, + IDT_REG_MAINT2, + IDT_REG_MAINT3, + IDT_REG_MAINT4, + IDT_REG_MAINT5, + IDT_REG_MAINT6, + IDT_REG_INTM0, /* Interrupt Control */ + IDT_REG_INTM1, + IDT_REG_INTES, + IDT_REG_STAT0, /* Line Status */ + IDT_REG_STAT1, + IDT_REG_INTS0, /* Interrupt Status */ + IDT_REG_INTS1, + IDT_REG_CNT0, /* Counter */ + IDT_REG_CNT1, +}; + +#define IDT_GCF_T1E1_E1 (0 << 2) +#define IDT_GCF_T1E1_T1 (1 << 2) +#define IDT_GCF_T1E1_MASK (1 << 2) + +#define IDT_TERM_T_SHIFT 3 +#define IDT_TERM_T_MASK (7 << IDT_TERM_T_SHIFT) +#define IDT_TERM_R_SHIFT 0 +#define IDT_TERM_R_MASK (7 << IDT_TERM_R_SHIFT) + +#define IDT_TCF1_PULS_MASK 0xF + +#define IDT_TCF2_SCAL_MASK 0x3F + +#define IDT_RCF2_MG_MASK 3 +#define IDT_RCF2_UPDW_SHIFT 2 +#define IDT_RCF2_UPDW_MASK (3 << IDT_TERM_INT_75) +#define IDT_RCF2_SLICE_SHIFT 4 +#define IDT_RCF2_SLICE_MASK (3 << IDT_RCF2_SLICE_SHIFT) + +#define IDT_INTM0_EQ (1 << 7) /* equalizer out of range */ +#define IDT_INTM0_IBLBA (1 << 6) /* in-band LB act detect */ +#define IDT_INTM0_IBLBD (1 << 5) /* in-band LB deact detect */ +#define IDT_INTM0_PRBS (1 << 4) /* prbs sync signal detect */ +#define IDT_INTM0_TCLK (1 << 3) /* tclk loss */ +#define IDT_INTM0_DF (1 << 2) /* driver failure */ +#define IDT_INTM0_AIS (1 << 1) /* Alarm Indication Signal */ +#define IDT_INTM0_LOS (1 << 0) /* Loss Of Signal */ + +#define IDT_INTM1_DAC_OV (1 << 7) /* DAC arithmetic overflow */ +#define IDT_INTM1_JA_OV (1 << 6) /* JA overflow */ +#define IDT_INTM1_JA_UD (1 << 5) /* JA underflow */ +#define IDT_INTM1_ERR (1 << 4) /* PRBS/QRBS logic error detect */ +#define IDT_INTM1_EXZ (1 << 3) /* Receive excess zeros */ +#define IDT_INTM1_CV (1 << 2) /* Receive error */ +#define IDT_INTM1_TIMER (1 << 1) /* One second timer expiration */ +#define IDT_INTM1_CNT (1 << 0) /* Counter overflow */ + +/* STAT0 == INTES == INTS0 == INTM0 */ + +/* INTS1 == INTM1 */ + +#define IDT_STAT1_RLP (1 << 5) +#define IDT_STAT1_ATT_MASK 0x1F + +#endif /* _IDT82_REGS_H */ diff --git a/firmware/ice40-riscv/e1-tracer/usb_e1.c b/firmware/ice40-riscv/e1-tracer/usb_e1.c index f3f1538..3507b82 100644 --- a/firmware/ice40-riscv/e1-tracer/usb_e1.c +++ b/firmware/ice40-riscv/e1-tracer/usb_e1.c @@ -16,10 +16,12 @@ #include "console.h" #include "e1.h" #include "misc.h" +#include "idt82v2081.h" struct { bool running[2]; int in_bdi[2]; + struct idt82 idt82[2]; } g_usb_e1; @@ -213,6 +215,7 @@ disable_chan(base->bInterfaceNumber); break; case 1: + idt82_init(&g_usb_e1.idt82[base->bInterfaceNumber], true); enable_chan(base->bInterfaceNumber); break; default: @@ -266,6 +269,9 @@ { /* Clear state */ memset(&g_usb_e1, 0x00, sizeof(g_usb_e1)); + /* make sure we use the right SPI channel for the respective IDT82 */ + g_usb_e1.idt82[0].cs = 0; + g_usb_e1.idt82[1].cs = 1; /* Install driver */ usb_register_function_driver(&_e1_drv); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id2217ff4573c4eebd816318128f256e85fb3c3bd Gerrit-Change-Number: 29949 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: e1_start/e1_stop of individual channel

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 ) Change subject: fw/e1-tracer: e1_start/e1_stop of individual channel ...................................................................... fw/e1-tracer: e1_start/e1_stop of individual channel Let's split the starting and stopping between the two channels. This is a preparation for a future e1d-compatible mode where each channel (direction) has its own USB interface and hence must be individually started/stopped. Related: OS#5733 Change-Id: I7492325352222269bf0ba1346511c7dfa99c4f64 --- M firmware/ice40-riscv/e1-tracer/e1.c M firmware/ice40-riscv/e1-tracer/e1.h M firmware/ice40-riscv/e1-tracer/usb_e1.c 3 files changed, 21 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/e1-tracer/e1.c b/firmware/ice40-riscv/e1-tracer/e1.c index dc2ae11..e3ae1ef 100644 --- a/firmware/ice40-riscv/e1-tracer/e1.c +++ b/firmware/ice40-riscv/e1-tracer/e1.c @@ -2,6 +2,7 @@ * e1.c * * Copyright (C) 2019-2020 Sylvain Munaut <tnt(a)246tNt.com> + * Copyright (C) 2022 Harald Welte <laforge(a)osmocom.org> * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -276,53 +277,36 @@ } void -e1_start(void) +e1_start(int chan) { /* Reset FIFOs */ #ifdef BIGBUF - e1f_reset(&g_e1.rx[0].fifo, 0, 1024); - e1f_reset(&g_e1.rx[1].fifo, 1024, 1024); + e1f_reset(&g_e1.rx[chan].fifo, 0, 1024); #else - e1f_reset(&g_e1.rx[0].fifo, 0, 128); - e1f_reset(&g_e1.rx[1].fifo, 128, 128); + e1f_reset(&g_e1.rx[chan].fifo, 0, 128); #endif - /* Enable Rx0 */ - g_e1.rx[0].cr = E1_RX_CR_OVFL_CLR | + /* Enable Rx */ + g_e1.rx[chan].cr = E1_RX_CR_OVFL_CLR | E1_RX_CR_MODE_MFA | E1_RX_CR_ENABLE; - e1_regs->rx[0].csr = g_e1.rx[0].cr; - - /* Enable Rx1 */ - g_e1.rx[1].cr = E1_RX_CR_OVFL_CLR | - E1_RX_CR_MODE_MFA | - E1_RX_CR_ENABLE; - e1_regs->rx[1].csr = g_e1.rx[1].cr; + e1_regs->rx[chan].csr = g_e1.rx[chan].cr; /* State */ - g_e1.rx[0].state = BOOT; - g_e1.rx[0].in_flight = 0; - g_e1.rx[0].flags = 0; - - g_e1.rx[1].state = BOOT; - g_e1.rx[1].in_flight = 0; - g_e1.rx[1].flags = 0; + g_e1.rx[chan].state = BOOT; + g_e1.rx[chan].in_flight = 0; + g_e1.rx[chan].flags = 0; } void -e1_stop() +e1_stop(int chan) { - /* Disable RX0 */ - g_e1.rx[0].cr = 0; - e1_regs->rx[0].csr = g_e1.rx[0].cr; - - /* Disable RX1 */ - g_e1.rx[1].cr = 0; - e1_regs->rx[1].csr = g_e1.rx[1].cr; + /* Disable RX */ + g_e1.rx[chan].cr = 0; + e1_regs->rx[chan].csr = g_e1.rx[0].cr; /* State */ - g_e1.rx[0].state = IDLE; - g_e1.rx[1].state = IDLE; + g_e1.rx[chan].state = IDLE; } diff --git a/firmware/ice40-riscv/e1-tracer/e1.h b/firmware/ice40-riscv/e1-tracer/e1.h index b99c682..a310ffd 100644 --- a/firmware/ice40-riscv/e1-tracer/e1.h +++ b/firmware/ice40-riscv/e1-tracer/e1.h @@ -8,8 +8,8 @@ #pragma once void e1_init(); -void e1_start(); -void e1_stop(); +void e1_start(int chan); +void e1_stop(int chan); void e1_poll(void); diff --git a/firmware/ice40-riscv/e1-tracer/usb_e1.c b/firmware/ice40-riscv/e1-tracer/usb_e1.c index 3c577a4..80522e2 100644 --- a/firmware/ice40-riscv/e1-tracer/usb_e1.c +++ b/firmware/ice40-riscv/e1-tracer/usb_e1.c @@ -149,7 +149,8 @@ g_usb_e1.running = false; /* Stop E1 */ - e1_stop(); + e1_stop(0); + e1_stop(1); /* Disable end-points */ usb_ep_regs[1].in.status = 0; @@ -187,7 +188,8 @@ usb_ep_regs[2].in.bd[1].csr = 0; /* Start E1 */ - e1_start(); + e1_start(0); + e1_start(1); } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7492325352222269bf0ba1346511c7dfa99c4f64 Gerrit-Change-Number: 29947 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible m...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 ) Change subject: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" ...................................................................... fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" This adds a second USB configuration to the e1-tracer firmware. This configuration is closer to the USB configuration of an icE1usb and hence paves the way for using osmo-e1d with the tracer. The main conceptual difference between the existing "legacy" configuration and this new "e1d compatible" configuration is to have two USB interfaces, one for each direction of the traced E1 interface. Each interface has its own separate two altsettings, one for the disabled and one for the enabled state. Unmodified osmo-e1d will not work straight away with this, as it expects ISO OUT and ISU Feedback endpoints, which a pure rx-only tracing device of course doesn't have. Related: OS#5733 Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff --- M firmware/ice40-riscv/e1-tracer/usb_desc_app.c M firmware/ice40-riscv/e1-tracer/usb_e1.c M firmware/ice40-riscv/e1-tracer/usb_str_app.txt 3 files changed, 220 insertions(+), 67 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/e1-tracer/usb_desc_app.c b/firmware/ice40-riscv/e1-tracer/usb_desc_app.c index 5109000..e9aa9d6 100644 --- a/firmware/ice40-riscv/e1-tracer/usb_desc_app.c +++ b/firmware/ice40-riscv/e1-tracer/usb_desc_app.c @@ -13,10 +13,9 @@ #define num_elem(a) (sizeof(a) / sizeof(a[0])) +/* Legacy Configuration */ static const struct { - /* Configuration */ struct usb_conf_desc conf; - /* E1 */ struct { struct { @@ -30,7 +29,6 @@ struct usb_ep_desc ep_data_in1; } __attribute__ ((packed)) on; } __attribute__ ((packed)) e1; - /* DFU Runtime */ struct { struct usb_intf_desc intf; @@ -130,8 +128,117 @@ }, }; +/* "icE1usb" compatible Configuration */ +static const struct { + struct usb_conf_desc conf; + /* Interface / Direction A */ + struct { + struct { + struct usb_intf_desc intf; + } __attribute__ ((packed)) off; + struct { + struct usb_intf_desc intf; + struct usb_ep_desc ep_data_in0; + } __attribute__ ((packed)) on; + } __attribute__ ((packed)) a; + /* Interface / Direction B */ + struct { + struct { + struct usb_intf_desc intf; + } __attribute__ ((packed)) off; + struct { + struct usb_intf_desc intf; + struct usb_ep_desc ep_data_in1; + } __attribute__ ((packed)) on; + } __attribute__ ((packed)) b; +} __attribute__ ((packed)) _app_conf_desc_e1d = { + .conf = { + .bLength = sizeof(struct usb_conf_desc), + .bDescriptorType = USB_DT_CONF, + .wTotalLength = sizeof(_app_conf_desc_e1d), + .bNumInterfaces = 3, + .bConfigurationValue = 2, + .iConfiguration = 7, + .bmAttributes = 0x80, + .bMaxPower = 0x32, /* 100 mA */ + }, + .a = { + .off = { + .intf = { + .bLength = sizeof(struct usb_intf_desc), + .bDescriptorType = USB_DT_INTF, + .bInterfaceNumber = 0, + .bAlternateSetting = 0, + .bNumEndpoints = 0, + .bInterfaceClass = 0xff, + .bInterfaceSubClass = 0xe1, + .bInterfaceProtocol = 0x00, + .iInterface = 8, + }, + }, + .on = { + .intf = { + .bLength = sizeof(struct usb_intf_desc), + .bDescriptorType = USB_DT_INTF, + .bInterfaceNumber = 0, + .bAlternateSetting = 1, + .bNumEndpoints = 1, + .bInterfaceClass = 0xff, + .bInterfaceSubClass = 0xe1, + .bInterfaceProtocol = 0x00, + .iInterface = 8, + }, + .ep_data_in0 = { + .bLength = sizeof(struct usb_ep_desc), + .bDescriptorType = USB_DT_EP, + .bEndpointAddress = 0x81, + .bmAttributes = 0x05, + .wMaxPacketSize = 388, + .bInterval = 1, + }, + }, + }, + .b = { + .off = { + .intf = { + .bLength = sizeof(struct usb_intf_desc), + .bDescriptorType = USB_DT_INTF, + .bInterfaceNumber = 1, + .bAlternateSetting = 0, + .bNumEndpoints = 0, + .bInterfaceClass = 0xff, + .bInterfaceSubClass = 0xe1, + .bInterfaceProtocol = 0x00, + .iInterface = 9, + }, + }, + .on = { + .intf = { + .bLength = sizeof(struct usb_intf_desc), + .bDescriptorType = USB_DT_INTF, + .bInterfaceNumber = 1, + .bAlternateSetting = 1, + .bNumEndpoints = 1, + .bInterfaceClass = 0xff, + .bInterfaceSubClass = 0xe1, + .bInterfaceProtocol = 0x00, + .iInterface = 9, + }, + .ep_data_in1 = { + .bLength = sizeof(struct usb_ep_desc), + .bDescriptorType = USB_DT_EP, + .bEndpointAddress = 0x82, + .bmAttributes = 0x05, + .wMaxPacketSize = 388, + .bInterval = 1, + }, + }, + }, +}; + static const struct usb_conf_desc * const _conf_desc_array[] = { &_app_conf_desc.conf, + &_app_conf_desc_e1d.conf, }; static const struct usb_dev_desc _dev_desc = { diff --git a/firmware/ice40-riscv/e1-tracer/usb_e1.c b/firmware/ice40-riscv/e1-tracer/usb_e1.c index 80522e2..f3f1538 100644 --- a/firmware/ice40-riscv/e1-tracer/usb_e1.c +++ b/firmware/ice40-riscv/e1-tracer/usb_e1.c @@ -2,6 +2,7 @@ * usb_e1.c * * Copyright (C) 2019-2020 Sylvain Munaut <tnt(a)246tNt.com> + * Copyright (C) 2022 Harald Welte <laforge(a)osmocom.org> * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -17,7 +18,7 @@ #include "misc.h" struct { - bool running; + bool running[2]; int in_bdi[2]; } g_usb_e1; @@ -35,12 +36,12 @@ int chan; int bdi; - if (!g_usb_e1.running) - return; - /* EP[1-2] IN */ for (chan=0; chan<2; chan++) { + if (!g_usb_e1.running[chan]) + continue; + bdi = g_usb_e1.in_bdi[chan]; while ((usb_ep_regs[1+chan].in.bd[bdi].csr & USB_BD_STATE_MSK) != USB_BD_STATE_RDY_DATA) @@ -112,12 +113,17 @@ return NULL; } + +static const struct usb_conf_desc *last_conf; + enum usb_fnd_resp _e1_set_conf(const struct usb_conf_desc *conf) { const struct usb_intf_desc *intf; printf("e1 set_conf %08x\n", conf); + + last_conf = conf; if (!conf) return USB_FND_SUCCESS; @@ -133,81 +139,118 @@ return USB_FND_SUCCESS; } +static void +disable_chan(int chan) +{ + /* Already stopped ? */ + if (!g_usb_e1.running[chan]) + return; + + /* Update state */ + g_usb_e1.running[chan] = false; + + /* Stop E1 */ + e1_stop(chan); + + /* Disable end-points */ + usb_ep_regs[chan+1].in.status = 0; +} + +static void +enable_chan(int chan) +{ + /* Already running ? */ + if (g_usb_e1.running[chan]) + return; + + /* Update state */ + g_usb_e1.running[chan] = true; + + /* Reset buffer pointers */ + g_usb_e1.in_bdi[chan] = 0; + + /* Configure EP1 IN / EP2 IN */ + usb_ep_regs[chan+1].in.status = USB_EP_TYPE_ISOC | USB_EP_BD_DUAL; /* Type=Isochronous, dual buffered */ + + /* EP1 IN: Prepare two buffers */ + usb_ep_regs[chan+1].in.bd[0].ptr = 256 + (chan * 2 + 0) * 388; + usb_ep_regs[chan+1].in.bd[0].csr = 0; + + usb_ep_regs[chan+1].in.bd[1].ptr = 256 + (chan * 2 + 1) * 388; + usb_ep_regs[chan+1].in.bd[1].csr = 0; + + /* Start E1 */ + e1_start(chan); +} + enum usb_fnd_resp _e1_set_intf(const struct usb_intf_desc *base, const struct usb_intf_desc *sel) { - if (base->bInterfaceNumber != 0) - return USB_FND_CONTINUE; + if (!last_conf || last_conf->bConfigurationValue == 1) { + /* Legacy Configuration */ - if (sel->bAlternateSetting == 0) - { - /* Already stopped ? */ - if (!g_usb_e1.running) - return USB_FND_SUCCESS; + if (base->bInterfaceNumber != 0) + return USB_FND_CONTINUE; - /* Update state */ - g_usb_e1.running = false; + if (sel->bAlternateSetting == 0) { + disable_chan(0); + disable_chan(1); + } else if (sel->bAlternateSetting == 1) { + enable_chan(0); + enable_chan(1); + } else { + /* Unknown */ + return USB_FND_ERROR; + } + } else if (last_conf && last_conf->bConfigurationValue == 2) { + /* e1d compatible configuration */ - /* Stop E1 */ - e1_stop(0); - e1_stop(1); - - /* Disable end-points */ - usb_ep_regs[1].in.status = 0; - usb_ep_regs[2].in.status = 0; - } - else if (sel->bAlternateSetting == 1) - { - /* Already running ? */ - if (g_usb_e1.running) - return USB_FND_SUCCESS; - - /* Update state */ - g_usb_e1.running = true; - - /* Reset buffer pointers */ - g_usb_e1.in_bdi[0] = 0; - g_usb_e1.in_bdi[1] = 0; - - /* Configure EP1 IN / EP2 IN */ - usb_ep_regs[1].in.status = USB_EP_TYPE_ISOC | USB_EP_BD_DUAL; /* Type=Isochronous, dual buffered */ - usb_ep_regs[2].in.status = USB_EP_TYPE_ISOC | USB_EP_BD_DUAL; /* Type=Isochronous, dual buffered */ - - /* EP1 IN: Prepare two buffers */ - usb_ep_regs[1].in.bd[0].ptr = 256 + 0 * 388; - usb_ep_regs[1].in.bd[0].csr = 0; - - usb_ep_regs[1].in.bd[1].ptr = 256 + 1 * 388; - usb_ep_regs[1].in.bd[1].csr = 0; - - /* EP2 IN: Prepare two buffers */ - usb_ep_regs[2].in.bd[0].ptr = 256 + 2 * 388; - usb_ep_regs[2].in.bd[0].csr = 0; - - usb_ep_regs[2].in.bd[1].ptr = 256 + 3 * 388; - usb_ep_regs[2].in.bd[1].csr = 0; - - /* Start E1 */ - e1_start(0); - e1_start(1); - } - else - { - /* Unknown */ + switch (base->bInterfaceNumber) { + case 0: + case 1: + switch (sel->bAlternateSetting) { + case 0: + disable_chan(base->bInterfaceNumber); + break; + case 1: + enable_chan(base->bInterfaceNumber); + break; + default: + /* Unknown */ + return USB_FND_ERROR; + } + break; + default: + return USB_FND_CONTINUE; + } + } else { return USB_FND_ERROR; } - return USB_FND_SUCCESS; } enum usb_fnd_resp _e1_get_intf(const struct usb_intf_desc *base, uint8_t *alt) { - if (base->bInterfaceNumber != 0) - return USB_FND_CONTINUE; + if (!last_conf || last_conf->bConfigurationValue == 1) { + /* Legacy configuration */ + if (base->bInterfaceNumber != 0) + return USB_FND_CONTINUE; - *alt = g_usb_e1.running ? 1 : 0; + *alt = g_usb_e1.running[0] && g_usb_e1.running[1] ? 1 : 0; + } else if (last_conf && last_conf->bConfigurationValue == 2) { + /* e1d compatible configuration */ + switch (base->bInterfaceNumber) { + case 0: + case 1: + *alt = g_usb_e1.running[base->bInterfaceNumber] ? 1 : 0; + break; + default: + return USB_FND_CONTINUE; + } + } else + return USB_FND_CONTINUE; return USB_FND_SUCCESS; } diff --git a/firmware/ice40-riscv/e1-tracer/usb_str_app.txt b/firmware/ice40-riscv/e1-tracer/usb_str_app.txt index 0482e91..45ac005 100644 --- a/firmware/ice40-riscv/e1-tracer/usb_str_app.txt +++ b/firmware/ice40-riscv/e1-tracer/usb_str_app.txt @@ -1,6 +1,9 @@ 0000000000000000 osmocom e1-tracer -Main +Legacy E1 DFU runtime +osmo-e1d compatible +E1 Direction A +E1 Direction B -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff Gerrit-Change-Number: 29948 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Fix missing quotes for possibly unresolved variables in shell test-st...

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29961 ) Change subject: Fix missing quotes for possibly unresolved variables in shell test-statements ...................................................................... Fix missing quotes for possibly unresolved variables in shell test-statements Related: OS#5736 Change-Id: I7e7f4f95d1a7cc886360c733908c63a2843b0906 --- M ttcn3-dumpcap-start.sh M ttcn3-tcpdump-start.sh 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/29961/1 diff --git a/ttcn3-dumpcap-start.sh b/ttcn3-dumpcap-start.sh index 3aec9b9..eb390fd 100755 --- a/ttcn3-dumpcap-start.sh +++ b/ttcn3-dumpcap-start.sh @@ -30,7 +30,7 @@ kill_rm_pidfile $PIDFILE_NETCAT kill_rm_pidfile $PIDFILE_PCAP -if [ ! -x $DUMPCAP ]; then +if [ ! -x "$DUMPCAP" ]; then echo "Missing required dumpcap binary at ${DUMPCAP}" exit 31 fi diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 0ce07cd..8433c80 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -35,7 +35,7 @@ CMD="sudo $TCPDUMP -U" fi -if [ -x $DUMPCAP ]; then +if [ -x "$DUMPCAP" ]; then CAP_ERR="1" if [ -x /sbin/setcap ]; then # N. B: this check requires libcap2-bin package -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7e7f4f95d1a7cc886360c733908c63a2843b0906 Gerrit-Change-Number: 29961 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: handle RACH.cnf via TRXCON_EV_TX_ACCESS_BURST_CNF

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29960 ) Change subject: trxcon: handle RACH.cnf via TRXCON_EV_TX_ACCESS_BURST_CNF ...................................................................... trxcon: handle RACH.cnf via TRXCON_EV_TX_ACCESS_BURST_CNF Change-Id: I64de7d4e8137041b373a9920296553fbfe8386d4 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 5 files changed, 33 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/29960/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index eb67bee..deeb318 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -22,4 +22,4 @@ int l1ctl_tx_dt_conf(struct l1ctl_client *l1c, const struct trxcon_param_tx_data_cnf *cnf); int l1ctl_tx_rach_conf(struct l1ctl_client *l1c, - uint16_t band_arfcn, uint32_t fn); + const struct trxcon_param_tx_access_burst_cnf *cnf); diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 5af2122..117f3fd 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -26,6 +26,7 @@ TRXCON_EV_SET_TCH_MODE_REQ, TRXCON_EV_SET_PHY_CONFIG_REQ, TRXCON_EV_TX_ACCESS_BURST_REQ, + TRXCON_EV_TX_ACCESS_BURST_CNF, TRXCON_EV_UPDATE_SACCH_CACHE_REQ, TRXCON_EV_DEDICATED_ESTABLISH_REQ, TRXCON_EV_DEDICATED_RELEASE_REQ, @@ -126,6 +127,12 @@ bool is_11bit; }; +/* param of TRXCON_EV_TX_ACCESS_BURST_CNF */ +struct trxcon_param_tx_access_burst_cnf { + uint16_t band_arfcn; + uint32_t frame_nr; +}; + /* param of TRXCON_EV_DEDICATED_ESTABLISH_REQ */ struct trxcon_param_dedicated_establish_req { uint8_t chan_nr; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index b9805eb..890e4d2 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -263,20 +263,20 @@ } int l1ctl_tx_rach_conf(struct l1ctl_client *l1c, - uint16_t band_arfcn, uint32_t fn) + const struct trxcon_param_tx_access_burst_cnf *cnf) { - struct l1ctl_info_dl *dl; struct msgb *msg; msg = l1ctl_alloc_msg(L1CTL_RACH_CONF); if (msg == NULL) return -ENOMEM; - dl = put_dl_info_hdr(msg, NULL); - memset(dl, 0x00, sizeof(*dl)); + const struct l1ctl_info_dl dl_hdr = { + .band_arfcn = htons(cnf->band_arfcn), + .frame_nr = htonl(cnf->frame_nr), + }; - dl->band_arfcn = htons(band_arfcn); - dl->frame_nr = htonl(fn); + put_dl_info_hdr(msg, &dl_hdr); return l1ctl_client_send(l1c, msg); } diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index b6bd56d..9522a49 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -278,10 +278,14 @@ case L1SCHED_DT_OTHER: if (L1SCHED_PRIM_IS_RACH(lchan->prim)) { const struct l1sched_ts_prim_rach *rach; + struct trxcon_param_tx_access_burst_cnf cnf = { + .band_arfcn = trxcon->l1p.band_arfcn, + .frame_nr = fn, + }; + + rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_ACCESS_BURST_CNF, &cnf); rach = (struct l1sched_ts_prim_rach *)lchan->prim->payload; - - rc = l1ctl_tx_rach_conf(trxcon->l2if, trxcon->l1p.band_arfcn, fn); if (lchan->prim->type == L1SCHED_PRIM_RACH11) { ra_buf[0] = (uint8_t)(rach->ra >> 3); ra_buf[1] = (uint8_t)(rach->ra & 0x07); diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 676c060..4ee824c 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -256,6 +256,9 @@ case TRXCON_EV_TX_ACCESS_BURST_REQ: handle_tx_access_burst_req(fi, data); break; + case TRXCON_EV_TX_ACCESS_BURST_CNF: + l1ctl_tx_rach_conf(trxcon->l2if, (const struct trxcon_param_tx_access_burst_cnf *)data); + break; case TRXCON_EV_SET_CCCH_MODE_REQ: { struct trxcon_param_set_ccch_tch_mode_req *req = data; @@ -356,6 +359,9 @@ case TRXCON_EV_TX_ACCESS_BURST_REQ: handle_tx_access_burst_req(fi, data); break; + case TRXCON_EV_TX_ACCESS_BURST_CNF: + l1ctl_tx_rach_conf(trxcon->l2if, (const struct trxcon_param_tx_access_burst_cnf *)data); + break; case TRXCON_EV_DEDICATED_RELEASE_REQ: l1sched_reset(trxcon->sched, false); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); @@ -463,6 +469,9 @@ case TRXCON_EV_TX_ACCESS_BURST_REQ: handle_tx_access_burst_req(fi, data); break; + case TRXCON_EV_TX_ACCESS_BURST_CNF: + l1ctl_tx_rach_conf(trxcon->l2if, (const struct trxcon_param_tx_access_burst_cnf *)data); + break; case TRXCON_EV_RX_DATA_IND: { const struct trxcon_param_rx_data_ind *ind = data; @@ -540,6 +549,7 @@ .in_event_mask = S(TRXCON_EV_RX_DATA_IND) | S(TRXCON_EV_SET_CCCH_MODE_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) + | S(TRXCON_EV_TX_ACCESS_BURST_CNF) | S(TRXCON_EV_DEDICATED_ESTABLISH_REQ), .action = &trxcon_st_bcch_ccch_action, }, @@ -550,6 +560,7 @@ | S(TRXCON_ST_BCCH_CCCH), .in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) + | S(TRXCON_EV_TX_ACCESS_BURST_CNF) | S(TRXCON_EV_SET_TCH_MODE_REQ) | S(TRXCON_EV_TX_DATA_REQ) | S(TRXCON_EV_TX_DATA_CNF) @@ -564,6 +575,7 @@ | S(TRXCON_ST_BCCH_CCCH), .in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) + | S(TRXCON_EV_TX_ACCESS_BURST_CNF) | S(TRXCON_EV_RX_DATA_IND), .action = &trxcon_st_packet_data_action, }, @@ -582,6 +594,7 @@ OSMO_VALUE_STRING(TRXCON_EV_SET_TCH_MODE_REQ), OSMO_VALUE_STRING(TRXCON_EV_SET_PHY_CONFIG_REQ), OSMO_VALUE_STRING(TRXCON_EV_TX_ACCESS_BURST_REQ), + OSMO_VALUE_STRING(TRXCON_EV_TX_ACCESS_BURST_CNF), OSMO_VALUE_STRING(TRXCON_EV_UPDATE_SACCH_CACHE_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ), -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I64de7d4e8137041b373a9920296553fbfe8386d4 Gerrit-Change-Number: 29960 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1sched_handle_data_cnf(): make the cnf struct scoped

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29959 ) Change subject: trxcon: l1sched_handle_data_cnf(): make the cnf struct scoped ...................................................................... trxcon: l1sched_handle_data_cnf(): make the cnf struct scoped Change-Id: I526116c2a20970aee7881e19e283e083bc6b1911 Related: OS#5599 --- M src/host/trxcon/src/trxcon.c 1 file changed, 12 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/59/29959/1 diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 6b5bdb5..b6bd56d 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -247,6 +247,7 @@ const struct l1sched_lchan_desc *lchan_desc; struct l1sched_state *sched = lchan->ts->sched; struct trxcon_inst *trxcon = sched->priv; + bool is_traffic = false; const uint8_t *data; uint8_t ra_buf[2]; size_t data_len; @@ -254,24 +255,26 @@ lchan_desc = &l1sched_lchan_desc[lchan->type]; - struct trxcon_param_tx_data_cnf cnf = { - /* .traffic is set below */ - .chan_nr = lchan_desc->chan_nr | lchan->ts->index, - .link_id = lchan_desc->link_id, - .band_arfcn = trxcon->l1p.band_arfcn, - .frame_nr = fn, - }; - switch (dt) { case L1SCHED_DT_TRAFFIC: case L1SCHED_DT_PACKET_DATA: - cnf.traffic = true; + is_traffic = true; /* fall-through */ case L1SCHED_DT_SIGNALING: + { + struct trxcon_param_tx_data_cnf cnf = { + .traffic = is_traffic, + .chan_nr = lchan_desc->chan_nr | lchan->ts->index, + .link_id = lchan_desc->link_id, + .band_arfcn = trxcon->l1p.band_arfcn, + .frame_nr = fn, + }; + rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_DATA_CNF, &cnf); data_len = lchan->prim->payload_len; data = lchan->prim->payload; break; + } case L1SCHED_DT_OTHER: if (L1SCHED_PRIM_IS_RACH(lchan->prim)) { const struct l1sched_ts_prim_rach *rach; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I526116c2a20970aee7881e19e283e083bc6b1911 Gerrit-Change-Number: 29959 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: merge TRXCON_EV_TX_TRAFFIC_* with TRXCON_EV_TX_DATA_*

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29957 ) Change subject: trxcon: merge TRXCON_EV_TX_TRAFFIC_* with TRXCON_EV_TX_DATA_* ...................................................................... trxcon: merge TRXCON_EV_TX_TRAFFIC_* with TRXCON_EV_TX_DATA_* It's not really necessary to handle signalling and traffic via different events, so let's reduce complexity by merging them. Change-Id: I8c2b3274f32d4d52424512d988b93d6233dd09a0 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 5 files changed, 31 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/57/29957/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index 70d804f..0d55ff1 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -17,8 +17,8 @@ int l1ctl_tx_reset_conf(struct l1ctl_client *l1c, uint8_t type); int l1ctl_tx_reset_ind(struct l1ctl_client *l1c, uint8_t type); -int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, bool traffic, - const struct trxcon_param_rx_traffic_data_ind *ind); +int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, + const struct trxcon_param_rx_data_ind *ind); int l1ctl_tx_dt_conf(struct l1ctl_client *l1c, struct l1ctl_info_dl *data, bool traffic); int l1ctl_tx_rach_conf(struct l1ctl_client *l1c, diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 37e3f14..9c641df 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -29,8 +29,6 @@ TRXCON_EV_UPDATE_SACCH_CACHE_REQ, TRXCON_EV_DEDICATED_ESTABLISH_REQ, TRXCON_EV_DEDICATED_RELEASE_REQ, - TRXCON_EV_TX_TRAFFIC_REQ, - TRXCON_EV_RX_TRAFFIC_IND, TRXCON_EV_TX_DATA_REQ, TRXCON_EV_RX_DATA_IND, TRXCON_EV_CRYPTO_REQ, @@ -84,16 +82,18 @@ }; }; -/* param of TRXCON_EV_TX_{TRAFFIC,DATA}_REQ */ -struct trxcon_param_tx_traffic_data_req { +/* param of TRXCON_EV_TX_DATA_REQ */ +struct trxcon_param_tx_data_req { + bool traffic; uint8_t chan_nr; uint8_t link_id; size_t data_len; const uint8_t *data; }; -/* param of TRXCON_EV_RX_{TRAFFIC,DATA}_IND */ -struct trxcon_param_rx_traffic_data_ind { +/* param of TRXCON_EV_RX_DATA_IND */ +struct trxcon_param_rx_data_ind { + bool traffic; uint8_t chan_nr; uint8_t link_id; uint16_t band_arfcn; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 5baac1f..7a35d59 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -232,13 +232,12 @@ /** * Handles both L1CTL_DATA_IND and L1CTL_TRAFFIC_IND. */ -int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, bool traffic, - const struct trxcon_param_rx_traffic_data_ind *ind) +int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, + const struct trxcon_param_rx_data_ind *ind) { struct msgb *msg; - msg = l1ctl_alloc_msg(traffic ? - L1CTL_TRAFFIC_IND : L1CTL_DATA_IND); + msg = l1ctl_alloc_msg(ind->traffic ? L1CTL_TRAFFIC_IND : L1CTL_DATA_IND); if (msg == NULL) return -ENOMEM; @@ -637,7 +636,8 @@ ul = (struct l1ctl_info_ul *) msg->l1h; msg->l2h = ul->payload; - struct trxcon_param_tx_traffic_data_req req = { + struct trxcon_param_tx_data_req req = { + .traffic = traffic, .chan_nr = ul->chan_nr, .link_id = ul->link_id & 0x40, .data_len = msgb_l2len(msg), @@ -650,10 +650,7 @@ switch (fi->state) { case TRXCON_ST_DEDICATED: - if (traffic) - osmo_fsm_inst_dispatch(fi, TRXCON_EV_TX_TRAFFIC_REQ, &req); - else - osmo_fsm_inst_dispatch(fi, TRXCON_EV_TX_DATA_REQ, &req); + osmo_fsm_inst_dispatch(fi, TRXCON_EV_TX_DATA_REQ, &req); break; default: if (!traffic && req.link_id == 0x40) /* only for SACCH */ diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 0bbb602..039195b 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -197,7 +197,8 @@ lchan_desc = &l1sched_lchan_desc[lchan->type]; - struct trxcon_param_rx_traffic_data_ind ind = { + struct trxcon_param_rx_data_ind ind = { + /* .traffic is set below */ .chan_nr = lchan_desc->chan_nr | lchan->ts->index, .link_id = lchan_desc->link_id, .band_arfcn = trxcon->l1p.band_arfcn, @@ -211,10 +212,10 @@ }; switch (dt) { - case L1SCHED_DT_TRAFFIC: case L1SCHED_DT_PACKET_DATA: - rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_RX_TRAFFIC_IND, &ind); - break; + case L1SCHED_DT_TRAFFIC: + ind.traffic = true; + /* fall-through */ case L1SCHED_DT_SIGNALING: rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_RX_DATA_IND, &ind); break; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 0e005a3..fb375c4 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -88,7 +88,7 @@ } case TRXCON_EV_UPDATE_SACCH_CACHE_REQ: { - const struct trxcon_param_tx_traffic_data_req *req = data; + const struct trxcon_param_tx_data_req *req = data; if (req->link_id != L1SCHED_CH_LID_SACCH) { LOGPFSML(fi, LOGL_ERROR, "Unexpected link_id=0x%02x\n", req->link_id); @@ -340,12 +340,8 @@ break; } case TRXCON_EV_RX_DATA_IND: - { - const struct trxcon_param_rx_traffic_data_ind *ind = data; - - l1ctl_tx_dt_ind(trxcon->l2if, false, ind); + l1ctl_tx_dt_ind(trxcon->l2if, (const struct trxcon_param_rx_data_ind *)data); break; - } default: OSMO_ASSERT(0); } @@ -433,10 +429,9 @@ } break; } - case TRXCON_EV_TX_TRAFFIC_REQ: case TRXCON_EV_TX_DATA_REQ: { - const struct trxcon_param_tx_traffic_data_req *req = data; + const struct trxcon_param_tx_data_req *req = data; struct l1sched_ts_prim *prim; prim = l1sched_prim_push(trxcon->sched, L1SCHED_PRIM_DATA, @@ -448,14 +443,9 @@ } break; } - case TRXCON_EV_RX_TRAFFIC_IND: case TRXCON_EV_RX_DATA_IND: - { - const struct trxcon_param_rx_traffic_data_ind *ind = data; - - l1ctl_tx_dt_ind(trxcon->l2if, event == TRXCON_EV_RX_TRAFFIC_IND, ind); + l1ctl_tx_dt_ind(trxcon->l2if, (const struct trxcon_param_rx_data_ind *)data); break; - } default: OSMO_ASSERT(0); } @@ -470,12 +460,16 @@ case TRXCON_EV_TX_ACCESS_BURST_REQ: handle_tx_access_burst_req(fi, data); break; - case TRXCON_EV_RX_TRAFFIC_IND: - LOGPFSML(fi, LOGL_NOTICE, "Rx PDTCH/D message\n"); - break; case TRXCON_EV_RX_DATA_IND: - LOGPFSML(fi, LOGL_NOTICE, "Rx PTCCH/D message\n"); + { + const struct trxcon_param_rx_data_ind *ind = data; + + if (ind->link_id == 0x00) + LOGPFSML(fi, LOGL_NOTICE, "Rx PDTCH/D message\n"); + else + LOGPFSML(fi, LOGL_NOTICE, "Rx PTCCH/D message\n"); break; + } case TRXCON_EV_DEDICATED_RELEASE_REQ: l1sched_reset(trxcon->sched, false); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); @@ -554,8 +548,6 @@ .in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_SET_TCH_MODE_REQ) - | S(TRXCON_EV_TX_TRAFFIC_REQ) - | S(TRXCON_EV_RX_TRAFFIC_IND) | S(TRXCON_EV_TX_DATA_REQ) | S(TRXCON_EV_RX_DATA_IND) | S(TRXCON_EV_CRYPTO_REQ), @@ -568,7 +560,6 @@ | S(TRXCON_ST_BCCH_CCCH), .in_event_mask = S(TRXCON_EV_DEDICATED_RELEASE_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) - | S(TRXCON_EV_RX_TRAFFIC_IND) | S(TRXCON_EV_RX_DATA_IND), .action = &trxcon_st_packet_data_action, }, @@ -590,8 +581,6 @@ OSMO_VALUE_STRING(TRXCON_EV_UPDATE_SACCH_CACHE_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ), - OSMO_VALUE_STRING(TRXCON_EV_TX_TRAFFIC_REQ), - OSMO_VALUE_STRING(TRXCON_EV_RX_TRAFFIC_IND), OSMO_VALUE_STRING(TRXCON_EV_TX_DATA_REQ), OSMO_VALUE_STRING(TRXCON_EV_RX_DATA_IND), OSMO_VALUE_STRING(TRXCON_EV_CRYPTO_REQ), -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8c2b3274f32d4d52424512d988b93d6233dd09a0 Gerrit-Change-Number: 29957 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: handle DATA.cnf/TRAFFIC.cnf via TRXCON_EV_TX_DATA_CNF

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29958 ) Change subject: trxcon: handle DATA.cnf/TRAFFIC.cnf via TRXCON_EV_TX_DATA_CNF ...................................................................... trxcon: handle DATA.cnf/TRAFFIC.cnf via TRXCON_EV_TX_DATA_CNF We already handle DATA.req/TRAFFIC.req via TRXCON_EV_TX_DATA_REQ, so let's handle the respective *.cnf messages via the FSM too. Change-Id: Ica7a25f0bf8c7f89037a776d711ac641c57c9ad5 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 5 files changed, 33 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/58/29958/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index 0d55ff1..eb67bee 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -20,6 +20,6 @@ int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, const struct trxcon_param_rx_data_ind *ind); int l1ctl_tx_dt_conf(struct l1ctl_client *l1c, - struct l1ctl_info_dl *data, bool traffic); + const struct trxcon_param_tx_data_cnf *cnf); int l1ctl_tx_rach_conf(struct l1ctl_client *l1c, uint16_t band_arfcn, uint32_t fn); diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 9c641df..5af2122 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -30,6 +30,7 @@ TRXCON_EV_DEDICATED_ESTABLISH_REQ, TRXCON_EV_DEDICATED_RELEASE_REQ, TRXCON_EV_TX_DATA_REQ, + TRXCON_EV_TX_DATA_CNF, TRXCON_EV_RX_DATA_IND, TRXCON_EV_CRYPTO_REQ, }; @@ -91,6 +92,15 @@ const uint8_t *data; }; +/* param of TRXCON_EV_TX_DATA_CNF */ +struct trxcon_param_tx_data_cnf { + bool traffic; + uint8_t chan_nr; + uint8_t link_id; + uint16_t band_arfcn; + uint32_t frame_nr; +}; + /* param of TRXCON_EV_RX_DATA_IND */ struct trxcon_param_rx_data_ind { bool traffic; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 7a35d59..b9805eb 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -285,8 +285,8 @@ /** * Handles both L1CTL_DATA_CONF and L1CTL_TRAFFIC_CONF. */ -int l1ctl_tx_dt_conf(struct l1ctl_client *l1c, - struct l1ctl_info_dl *data, bool traffic) +int l1ctl_tx_dt_conf(struct l1ctl_client *l1c, bool traffic, + struct trxcon_param_tx_data_cnf *cnf) { struct msgb *msg; @@ -295,8 +295,15 @@ if (msg == NULL) return -ENOMEM; + const struct l1ctl_info_dl dl_hdr = { + .chan_nr = cnf->chan_nr, + .link_id = cnf->link_id, + .frame_nr = htonl(cnf->frame_nr), + .band_arfcn = htons(cnf->band_arfcn), + }; + /* Copy DL frame header from source message */ - put_dl_info_hdr(msg, data); + put_dl_info_hdr(msg, &dl_hdr); return l1ctl_client_send(l1c, msg); } diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 039195b..6b5bdb5 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -47,7 +47,6 @@ #include <osmocom/bb/trxcon/logging.h> #include <osmocom/bb/trxcon/l1ctl.h> #include <osmocom/bb/trxcon/l1ctl_server.h> -#include <osmocom/bb/trxcon/l1ctl_proto.h> #include <osmocom/bb/l1sched/l1sched.h> #define COPYRIGHT \ @@ -248,7 +247,6 @@ const struct l1sched_lchan_desc *lchan_desc; struct l1sched_state *sched = lchan->ts->sched; struct trxcon_inst *trxcon = sched->priv; - struct l1ctl_info_dl dl_hdr; const uint8_t *data; uint8_t ra_buf[2]; size_t data_len; @@ -256,22 +254,21 @@ lchan_desc = &l1sched_lchan_desc[lchan->type]; - dl_hdr = (struct l1ctl_info_dl) { + struct trxcon_param_tx_data_cnf cnf = { + /* .traffic is set below */ .chan_nr = lchan_desc->chan_nr | lchan->ts->index, .link_id = lchan_desc->link_id, - .frame_nr = htonl(fn), - .band_arfcn = htons(trxcon->l1p.band_arfcn), + .band_arfcn = trxcon->l1p.band_arfcn, + .frame_nr = fn, }; switch (dt) { case L1SCHED_DT_TRAFFIC: case L1SCHED_DT_PACKET_DATA: - rc = l1ctl_tx_dt_conf(trxcon->l2if, &dl_hdr, true); - data_len = lchan->prim->payload_len; - data = lchan->prim->payload; - break; + cnf.traffic = true; + /* fall-through */ case L1SCHED_DT_SIGNALING: - rc = l1ctl_tx_dt_conf(trxcon->l2if, &dl_hdr, false); + rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_DATA_CNF, &cnf); data_len = lchan->prim->payload_len; data = lchan->prim->payload; break; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index fb375c4..676c060 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -443,6 +443,9 @@ } break; } + case TRXCON_EV_TX_DATA_CNF: + l1ctl_tx_dt_conf(trxcon->l2if, (const struct trxcon_param_tx_data_cnf *)data); + break; case TRXCON_EV_RX_DATA_IND: l1ctl_tx_dt_ind(trxcon->l2if, (const struct trxcon_param_rx_data_ind *)data); break; @@ -549,6 +552,7 @@ | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_SET_TCH_MODE_REQ) | S(TRXCON_EV_TX_DATA_REQ) + | S(TRXCON_EV_TX_DATA_CNF) | S(TRXCON_EV_RX_DATA_IND) | S(TRXCON_EV_CRYPTO_REQ), .action = &trxcon_st_dedicated_action, @@ -582,6 +586,7 @@ OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ), OSMO_VALUE_STRING(TRXCON_EV_TX_DATA_REQ), + OSMO_VALUE_STRING(TRXCON_EV_TX_DATA_CNF), OSMO_VALUE_STRING(TRXCON_EV_RX_DATA_IND), OSMO_VALUE_STRING(TRXCON_EV_CRYPTO_REQ), { 0, NULL } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ica7a25f0bf8c7f89037a776d711ac641c57c9ad5 Gerrit-Change-Number: 29958 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1ctl.c: remove unused headers

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29955 ) Change subject: trxcon: l1ctl.c: remove unused headers ...................................................................... trxcon: l1ctl.c: remove unused headers Change-Id: Ie2f320bf2ce9296db2c016d6ed7ddb54985e4089 --- M src/host/trxcon/src/l1ctl.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/55/29955/1 diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 5f1e610..87bfe74 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -26,14 +26,12 @@ #include <stdlib.h> #include <stdint.h> #include <string.h> -#include <assert.h> #include <arpa/inet.h> #include <osmocom/core/fsm.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/select.h> #include <osmocom/gsm/gsm0502.h> #include <osmocom/gsm/gsm_utils.h> -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie2f320bf2ce9296db2c016d6ed7ddb54985e4089 Gerrit-Change-Number: 29955 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: compose struct l1ctl_info_dl in l1ctl_tx_dt_ind()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29956 ) Change subject: trxcon: compose struct l1ctl_info_dl in l1ctl_tx_dt_ind() ...................................................................... trxcon: compose struct l1ctl_info_dl in l1ctl_tx_dt_ind() The trxcon_fsm should not be dealing with the L1CTL protocol, so let's better hand over the trxcon_param_rx_traffic_data_ind to l1ctl_tx_dt_ind() and compose the l1ctl_info_dl there. Change-Id: Ie57d86ffd9ea7c44187aafba0df1f519d1c523fb Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 5 files changed, 22 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/56/29956/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index 9518bb9..70d804f 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -17,10 +17,8 @@ int l1ctl_tx_reset_conf(struct l1ctl_client *l1c, uint8_t type); int l1ctl_tx_reset_ind(struct l1ctl_client *l1c, uint8_t type); -int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, - const struct l1ctl_info_dl *dl_info, - const uint8_t *l2, size_t l2_len, - bool traffic); +int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, bool traffic, + const struct trxcon_param_rx_traffic_data_ind *ind); int l1ctl_tx_dt_conf(struct l1ctl_client *l1c, struct l1ctl_info_dl *data, bool traffic); int l1ctl_tx_rach_conf(struct l1ctl_client *l1c, diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 9aa5e55..37e3f14 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -96,6 +96,7 @@ struct trxcon_param_rx_traffic_data_ind { uint8_t chan_nr; uint8_t link_id; + uint16_t band_arfcn; uint32_t frame_nr; int16_t toa256; int8_t rssi; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 87bfe74..5baac1f 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -232,26 +232,32 @@ /** * Handles both L1CTL_DATA_IND and L1CTL_TRAFFIC_IND. */ -int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, - const struct l1ctl_info_dl *dl_info, - const uint8_t *l2, size_t l2_len, - bool traffic) +int l1ctl_tx_dt_ind(struct l1ctl_client *l1c, bool traffic, + const struct trxcon_param_rx_traffic_data_ind *ind) { struct msgb *msg; - uint8_t *msg_l2; msg = l1ctl_alloc_msg(traffic ? L1CTL_TRAFFIC_IND : L1CTL_DATA_IND); if (msg == NULL) return -ENOMEM; - put_dl_info_hdr(msg, dl_info); + const struct l1ctl_info_dl dl_hdr = { + .chan_nr = ind->chan_nr, + .link_id = ind->link_id, + .frame_nr = htonl(ind->frame_nr), + .band_arfcn = htons(ind->band_arfcn), + .fire_crc = ind->data_len > 0 ? 0 : 2, + .rx_level = dbm2rxlev(ind->rssi), + .num_biterr = ind->n_errors, + /* TODO: set proper .snr */ + }; + + put_dl_info_hdr(msg, &dl_hdr); /* Copy the L2 payload if preset */ - if (l2 && l2_len > 0) { - msg_l2 = (uint8_t *) msgb_put(msg, l2_len); - memcpy(msg_l2, l2, l2_len); - } + if (ind->data && ind->data_len > 0) + memcpy(msgb_put(msg, ind->data_len), ind->data, ind->data_len); /* Put message to upper layers */ return l1ctl_client_send(l1c, msg); diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 764f717..0bbb602 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -200,6 +200,7 @@ struct trxcon_param_rx_traffic_data_ind ind = { .chan_nr = lchan_desc->chan_nr | lchan->ts->index, .link_id = lchan_desc->link_id, + .band_arfcn = trxcon->l1p.band_arfcn, .frame_nr = meas->fn, .toa256 = meas->toa256, .rssi = meas->rssi, diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 58a749e..0e005a3 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -23,8 +23,6 @@ #include <string.h> #include <errno.h> -#include <arpa/inet.h> - #include <osmocom/core/fsm.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> @@ -34,7 +32,6 @@ #include <osmocom/bb/trxcon/logging.h> #include <osmocom/bb/trxcon/l1ctl.h> #include <osmocom/bb/trxcon/l1ctl_server.h> -#include <osmocom/bb/trxcon/l1ctl_proto.h> #include <osmocom/bb/l1sched/l1sched.h> #include <osmocom/bb/l1sched/logging.h> @@ -345,18 +342,8 @@ case TRXCON_EV_RX_DATA_IND: { const struct trxcon_param_rx_traffic_data_ind *ind = data; - const struct l1ctl_info_dl dl_hdr = { - .chan_nr = ind->chan_nr, - .link_id = ind->link_id, - .frame_nr = htonl(ind->frame_nr), - .band_arfcn = htons(trxcon->l1p.band_arfcn), - .fire_crc = ind->data_len > 0 ? 0 : 2, - .rx_level = dbm2rxlev(ind->rssi), - .num_biterr = ind->n_errors, - /* TODO: set proper .snr */ - }; - l1ctl_tx_dt_ind(trxcon->l2if, &dl_hdr, ind->data, ind->data_len, false); + l1ctl_tx_dt_ind(trxcon->l2if, false, ind); break; } default: @@ -465,20 +452,8 @@ case TRXCON_EV_RX_DATA_IND: { const struct trxcon_param_rx_traffic_data_ind *ind = data; - const struct l1ctl_info_dl dl_hdr = { - .chan_nr = ind->chan_nr, - .link_id = ind->link_id, - .frame_nr = htonl(ind->frame_nr), - .band_arfcn = htons(trxcon->l1p.band_arfcn), - .fire_crc = ind->data_len > 0 ? 0 : 2, - .rx_level = dbm2rxlev(ind->rssi), - .num_biterr = ind->n_errors, - /* TODO: set proper .snr */ - }; - l1ctl_tx_dt_ind(trxcon->l2if, &dl_hdr, - ind->data, ind->data_len, - event == TRXCON_EV_RX_TRAFFIC_IND); + l1ctl_tx_dt_ind(trxcon->l2if, event == TRXCON_EV_RX_TRAFFIC_IND, ind); break; } default: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie57d86ffd9ea7c44187aafba0df1f519d1c523fb Gerrit-Change-Number: 29956 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: drop sched->clock_cb(), expose l1sched_trigger()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29954 ) Change subject: trxcon: drop sched->clock_cb(), expose l1sched_trigger() ...................................................................... trxcon: drop sched->clock_cb(), expose l1sched_trigger() It does not make sense to call function sched_frame_clck_cb() via a configurable pointer in the l1sched_state. Make this function public (thus rename) and call it directly. Remove the .clock_cb. Having l1sched_trigger() globally available makes it possible to call this function directly, bypassing the internal timer driven clock module. This is needed for the integration with osmo-trx-ms. Change-Id: Ied0eed6d514acabb94d819b2f9485868390c0f24 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_clck.c M src/host/trxcon/src/sched_trx.c 3 files changed, 9 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/54/29954/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 9686562..3eadbbf 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -372,8 +372,6 @@ uint32_t fn_counter_lost; /*! Frame callback timer */ struct osmo_timer_list clock_timer; - /*! Frame callback */ - void (*clock_cb)(struct l1sched_state *sched); /*! List of timeslots maintained by this scheduler */ struct l1sched_ts *ts[TRX_TS_COUNT]; /*! SACCH cache (common for all lchans) */ @@ -490,8 +488,10 @@ void l1sched_lchan_meas_push(struct l1sched_lchan_state *lchan, const struct l1sched_meas_set *meas); void l1sched_lchan_meas_avg(struct l1sched_lchan_state *lchan, unsigned int n); +/* Clock and Downlink scheduling trigger */ int l1sched_clck_handle(struct l1sched_state *sched, uint32_t fn); void l1sched_clck_reset(struct l1sched_state *sched); +void l1sched_trigger(struct l1sched_state *sched); /* External L1 API, must be implemented by the API user */ int l1sched_handle_config_req(struct l1sched_state *sched, diff --git a/src/host/trxcon/src/sched_clck.c b/src/host/trxcon/src/sched_clck.c index f08156c..ccafd7b 100644 --- a/src/host/trxcon/src/sched_clck.c +++ b/src/host/trxcon/src/sched_clck.c @@ -81,9 +81,8 @@ GSM_TDMA_FN_INC(sched->fn_counter_proc); - /* Call frame callback */ - if (sched->clock_cb) - sched->clock_cb(sched); + /* Trigger the scheduler */ + l1sched_trigger(sched); } osmo_timer_schedule(&sched->clock_timer, 0, @@ -95,9 +94,8 @@ { sched->fn_counter_proc = fn; - /* Call frame callback */ - if (sched->clock_cb) - sched->clock_cb(sched); + /* Trigger the scheduler */ + l1sched_trigger(sched); /* Schedule first FN clock */ sched->clock = *tv_now; @@ -177,9 +175,8 @@ while (fn != sched->fn_counter_proc) { GSM_TDMA_FN_INC(sched->fn_counter_proc); - /* Call frame callback */ - if (sched->clock_cb) - sched->clock_cb(sched); + /* Trigger the scheduler */ + l1sched_trigger(sched); } /* Schedule next FN to be transmitted */ diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index be1f820..c36b7de 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -85,7 +85,7 @@ static void l1sched_a5_burst_enc(struct l1sched_lchan_state *lchan, struct l1sched_burst_req *br); -static void sched_frame_clck_cb(struct l1sched_state *sched) +void l1sched_trigger(struct l1sched_state *sched) { struct l1sched_burst_req br[TRX_TS_COUNT]; const struct l1sched_tdma_frame *frame; @@ -199,7 +199,6 @@ *sched = (struct l1sched_state) { /* .clock_timer is set up in l1sched_clck_correct() */ - .clock_cb = &sched_frame_clck_cb, .fn_counter_advance = cfg->fn_advance, .priv = priv, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ied0eed6d514acabb94d819b2f9485868390c0f24 Gerrit-Change-Number: 29954 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 ) Change subject: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id2217ff4573c4eebd816318128f256e85fb3c3bd Gerrit-Change-Number: 29949 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:05:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible m...

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 ) Change subject: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff Gerrit-Change-Number: 29948 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:05:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: e1_start/e1_stop of individual channel

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 ) Change subject: fw/e1-tracer: e1_start/e1_stop of individual channel ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7492325352222269bf0ba1346511c7dfa99c4f64 Gerrit-Change-Number: 29947 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:05:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29953 ) Change subject: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2) ...................................................................... usb.c: Bail out of e1-tracer doesn't accept set_configuration(2) This likely means it's not an e1-tracer after all, or it's an old firmware that doesn't yet expose the e1d-compatible USB configuration. Related: OS#5734 Change-Id: If5a9bc20084d84885d5d97b4f982e94801612d24 --- M src/usb.c 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Verified tnt: Looks good to me, approved diff --git a/src/usb.c b/src/usb.c index dc89bb0..35e1894 100644 --- a/src/usb.c +++ b/src/usb.c @@ -876,8 +876,13 @@ } /* we have prior knowledge that the e1-tracer firmware configuration 2 is the e1d compatible mode. */ - if (is_tracer) - libusb_set_configuration(devh, 2); + if (is_tracer) { + if (libusb_set_configuration(devh, 2) != LIBUSB_SUCCESS) { + LOGP(DE1D, LOGL_ERROR, "Cannot set configuration 2 of e1-tracer device. Maybe too old firmware?\n"); + libusb_close(devh); + return -EIO; + } + } INIT_LLIST_HEAD(&intf_data->ctrl_inprogress); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If5a9bc20084d84885d5d97b4f982e94801612d24 Gerrit-Change-Number: 29953 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2)

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29953 ) Change subject: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2) ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If5a9bc20084d84885d5d97b4f982e94801612d24 Gerrit-Change-Number: 29953 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:04:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: osmo-e1d-pipe: Add command line option for --force open of timeslot

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29952 ) Change subject: osmo-e1d-pipe: Add command line option for --force open of timeslot ...................................................................... osmo-e1d-pipe: Add command line option for --force open of timeslot This exposes the existing capability of force-opening a timeslot via a command-line argument. Related: OS#5735 Change-Id: Ieefc89f2e48e9124ae744a587739ff3948110944 --- M src/e1d-ts-pipe.c 1 file changed, 14 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Verified tnt: Looks good to me, approved diff --git a/src/e1d-ts-pipe.c b/src/e1d-ts-pipe.c index 2928e85..99b7c55 100644 --- a/src/e1d-ts-pipe.c +++ b/src/e1d-ts-pipe.c @@ -1,6 +1,6 @@ /* E1 timeslot "pipe" utility: Open a 64k timeslot of osmo-e1d and connect to stdin/stdout * - * (C) 2020 by Harald Welte <laforge(a)osmocom.org> + * (C) 2020-2022 by Harald Welte <laforge(a)osmocom.org> * * All Rights Reserved * @@ -22,6 +22,7 @@ */ #include <stdint.h> +#include <stdbool.h> #include <stdio.h> #include <unistd.h> #include <errno.h> @@ -40,6 +41,7 @@ static struct osmo_e1dp_client *g_client; static struct osmo_fd ts_ofd; static enum osmo_e1dp_ts_mode g_mode = E1DP_TSMODE_RAW; +static bool g_force = false; static int outfd = 1; static int infd = 0; @@ -47,7 +49,11 @@ static int ts_open(uint8_t intf_nr, uint8_t line_nr, uint8_t ts_nr, enum osmo_e1dp_ts_mode mode, uint16_t bufsize) { - int rc = osmo_e1dp_client_ts_open(g_client, intf_nr, line_nr, ts_nr, mode, bufsize); + int rc; + if (g_force) + rc = osmo_e1dp_client_ts_open_force(g_client, intf_nr, line_nr, ts_nr, mode, bufsize); + else + rc = osmo_e1dp_client_ts_open(g_client, intf_nr, line_nr, ts_nr, mode, bufsize); if (rc < 0) fprintf(stderr, "Cannot open e1d timeslot %u:%u:%u\n", intf_nr, line_nr, ts_nr); return rc; @@ -118,6 +124,7 @@ " -l --line <0-255> E1 Line Number\n" " -t --timeslot <0-31> E1 Timeslot Number\n" " -m --mode (RAW|HDLC-FCS) E1 Timeslot Mode\n" + " -f --force Force open of the timeslot (may disconnect other client)\n" " -r --read FILE Read from FILE instead of STDIN\n" ); } @@ -145,12 +152,13 @@ { "line", 1, 0, 'l' }, { "timeslot", 1, 0, 't' }, { "mode", 1, 0, 'm' }, + { "force", 0, 0, 'f' }, { "read", 1, 0, 'r' }, { "read-bufsize", 1, 0, 'b' }, { 0,0,0,0 } }; - c = getopt_long(argc, argv, "hp:i:l:t:m:r:b:", long_options, &option_index); + c = getopt_long(argc, argv, "hp:i:l:t:m:fr:b:", long_options, &option_index); if (c == -1) break; @@ -178,6 +186,9 @@ } g_mode = rc; break; + case 'f': + g_force = true; + break; case 'r': rc = open(optarg, 0, O_RDONLY); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ieefc89f2e48e9124ae744a587739ff3948110944 Gerrit-Change-Number: 29952 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: osmo-e1d-pipe: Add command line option for --force open of timeslot

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29952 ) Change subject: osmo-e1d-pipe: Add command line option for --force open of timeslot ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ieefc89f2e48e9124ae744a587739ff3948110944 Gerrit-Change-Number: 29952 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:04:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: ctl: Prevent clients from opening TS0

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29951 ) Change subject: ctl: Prevent clients from opening TS0 ...................................................................... ctl: Prevent clients from opening TS0 This doesn't work, as the mux_demux.c code doesn't pass the TS0 bitstream to users anyway. So let's reject clients attempting this. Change-Id: Idb2d20da7de72dad38ae2fccdd7630677d0f0cc8 --- M src/ctl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/ctl.c b/src/ctl.c index b5fdee4..54d37c5 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -45,7 +45,7 @@ static struct e1_ts * _e1d_get_ts(struct e1_line *line, uint8_t ts) { - if (ts < 32) + if (ts > 0 && ts < 32) return &line->ts[ts]; else if (ts == E1DP_TS_SUPERCHAN) return &line->superchan; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Idb2d20da7de72dad38ae2fccdd7630677d0f0cc8 Gerrit-Change-Number: 29951 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: support for e1-tracer hardware

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29950 ) Change subject: support for e1-tracer hardware ...................................................................... support for e1-tracer hardware Recent work on the e1-tracer firmware is introducing a set of USB descriptors (as configuration 2) that are mostly compatible to how osmo-e1d talks to icE1usb. The main difference is that there's only one ISO IN endpoint per USB interface, and no ISO OUT or ISU FB endpoints. So we introduce some minor adjustments here to accommodate that. Related: OS#5733 Closes: OS#5734 Change-Id: I855e18c0f229bd473123f96303e60ab2de90677f --- M src/usb.c 1 file changed, 45 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/usb.c b/src/usb.c index c8ad97f..dc89bb0 100644 --- a/src/usb.c +++ b/src/usb.c @@ -2,6 +2,7 @@ * usb.c * * (C) 2019 by Sylvain Munaut <tnt(a)246tNt.com> + * (C) 2022 by Harald Welte <laforge(a)gnumonks.org> * * All Rights Reserved * @@ -42,6 +43,7 @@ #define USB_VID 0x1d50 #define USB_PID 0x6145 +#define USB_PID_TRACER 0x6151 libusb_context *g_usb = NULL; @@ -809,7 +811,7 @@ // --------------------------------------------------------------------------- static int -_e1_usb_open_device(struct e1_daemon *e1d, struct libusb_device *dev) +_e1_usb_open_device(struct e1_daemon *e1d, struct libusb_device *dev, bool is_tracer) { struct e1_intf *intf; struct e1_line *line; @@ -873,6 +875,10 @@ osmo_talloc_replace_string(intf, &intf->usb.serial_str, serial_str); } + /* we have prior knowledge that the e1-tracer firmware configuration 2 is the e1d compatible mode. */ + if (is_tracer) + libusb_set_configuration(devh, 2); + INIT_LLIST_HEAD(&intf_data->ctrl_inprogress); ret = libusb_get_active_config_descriptor(dev, &cd); @@ -892,8 +898,13 @@ continue; id = &cd->interface[i].altsetting[1]; - if ((id->bInterfaceClass != 0xff) || (id->bInterfaceSubClass != 0xe1) || (id->bNumEndpoints < 3)) - continue; + if (is_tracer) { + if ((id->bInterfaceClass != 0xff) || (id->bInterfaceSubClass != 0xe1) || (id->bNumEndpoints < 1)) + continue; + } else { + if ((id->bInterfaceClass != 0xff) || (id->bInterfaceSubClass != 0xe1) || (id->bNumEndpoints < 3)) + continue; + } line = e1_intf_find_line(intf, line_nr); if (line) { @@ -933,9 +944,16 @@ } } - if (!line_data->ep_in || !line_data->ep_out || !line_data->ep_fb || !line_data->pkt_size) { - LOGP(DE1D, LOGL_ERROR, "Failed to use interface %d\n", id->bInterfaceNumber); - goto next_interface; + if (is_tracer) { + if (!line_data->ep_in || !line_data->pkt_size) { + LOGP(DE1D, LOGL_ERROR, "Failed to use interface %d\n", id->bInterfaceNumber); + goto next_interface; + } + } else { + if (!line_data->ep_in || !line_data->ep_out || !line_data->ep_fb || !line_data->pkt_size) { + LOGP(DE1D, LOGL_ERROR, "Failed to use interface %d\n", id->bInterfaceNumber); + goto next_interface; + } } if (!line) { @@ -966,13 +984,18 @@ } /* Create data flows and start the line */ - line_data->flow_in = e1uf_create(line, e1_usb_xfer_in, line_data->ep_in, 4, line_data->pkt_size, 4); - line_data->flow_out = e1uf_create(line, e1_usb_xfer_out, line_data->ep_out, 4, line_data->pkt_size, 4); - line_data->flow_fb = e1uf_create(line, e1_usb_xfer_fb, line_data->ep_fb, 2, 3, 1); + /* all supported devices have an IN endpoint */ + line_data->flow_in = e1uf_create(line, e1_usb_xfer_in, line_data->ep_in, 4, line_data->pkt_size, 4); e1uf_start(line_data->flow_in); - e1uf_start(line_data->flow_out); - e1uf_start(line_data->flow_fb); + + /* e1-tracer has no OUT or FEEDBACK endpoint */ + if (!is_tracer) { + line_data->flow_out = e1uf_create(line, e1_usb_xfer_out, line_data->ep_out, 4, line_data->pkt_size, 4); + e1uf_start(line_data->flow_out); + line_data->flow_fb = e1uf_create(line, e1_usb_xfer_fb, line_data->ep_fb, 2, 3, 1); + e1uf_start(line_data->flow_fb); + } if (line_data->ep_int) resubmit_irq(line); @@ -1028,10 +1051,19 @@ if (ret) continue; - if ((desc.idVendor != USB_VID) || (desc.idProduct != USB_PID)) + if (desc.idVendor != USB_VID) continue; - _e1_usb_open_device(e1d, dev_list[i]); + switch (desc.idProduct) { + case USB_PID: + _e1_usb_open_device(e1d, dev_list[i], false); + break; + case USB_PID_TRACER: + _e1_usb_open_device(e1d, dev_list[i], true); + break; + default: + continue; + } } libusb_free_device_list(dev_list, 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I855e18c0f229bd473123f96303e60ab2de90677f Gerrit-Change-Number: 29950 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: ctl: Prevent clients from opening TS0

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29951 ) Change subject: ctl: Prevent clients from opening TS0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Idb2d20da7de72dad38ae2fccdd7630677d0f0cc8 Gerrit-Change-Number: 29951 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:04:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: support for e1-tracer hardware

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29950 ) Change subject: support for e1-tracer hardware ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I855e18c0f229bd473123f96303e60ab2de90677f Gerrit-Change-Number: 29950 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:04:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible m...

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 ) Change subject: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" ...................................................................... Patch Set 3: (2 comments) Patchset: PS3: I've also removed the second USB functional descriptor. At least dfu-util seems to work fine if only the first configuration has that descriptor - even after an application has done set_configuration(2) before calling dfu-util. File firmware/ice40-riscv/e1-tracer/usb_desc_app.c: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948/comment/23238bfc_39b1… PS2, Line 190: .wMaxPacketSize = 0, > Actually, in icE1usb, we transitioned to have the EP not even listed in the "Off" interface state, s […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff Gerrit-Change-Number: 29948 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:03:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: e1_start/e1_stop of individual channel

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 ) Change subject: fw/e1-tracer: e1_start/e1_stop of individual channel ...................................................................... Patch Set 2: (1 comment) File firmware/ice40-riscv/e1-tracer/e1.c: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947/comment/b23e9daa_0e20… PS1, Line 280: e1_start_one(uint8_t chan) > I wouldn't rename it. […] ok, adjusted accordingly. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7492325352222269bf0ba1346511c7dfa99c4f64 Gerrit-Change-Number: 29947 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 21:02:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: e1_start/e1_stop of individual channel

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, tnt, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 to look at the new patch set (#2). Change subject: fw/e1-tracer: e1_start/e1_stop of individual channel ...................................................................... fw/e1-tracer: e1_start/e1_stop of individual channel Let's split the starting and stopping between the two channels. This is a preparation for a future e1d-compatible mode where each channel (direction) has its own USB interface and hence must be individually started/stopped. Related: OS#5733 Change-Id: I7492325352222269bf0ba1346511c7dfa99c4f64 --- M firmware/ice40-riscv/e1-tracer/e1.c M firmware/ice40-riscv/e1-tracer/e1.h M firmware/ice40-riscv/e1-tracer/usb_e1.c 3 files changed, 21 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/47/29947/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7492325352222269bf0ba1346511c7dfa99c4f64 Gerrit-Change-Number: 29947 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible m...

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, tnt, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 to look at the new patch set (#3). Change subject: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" ...................................................................... fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" This adds a second USB configuration to the e1-tracer firmware. This configuration is closer to the USB configuration of an icE1usb and hence paves the way for using osmo-e1d with the tracer. The main conceptual difference between the existing "legacy" configuration and this new "e1d compatible" configuration is to have two USB interfaces, one for each direction of the traced E1 interface. Each interface has its own separate two altsettings, one for the disabled and one for the enabled state. Unmodified osmo-e1d will not work straight away with this, as it expects ISO OUT and ISU Feedback endpoints, which a pure rx-only tracing device of course doesn't have. Related: OS#5733 Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff --- M firmware/ice40-riscv/e1-tracer/usb_desc_app.c M firmware/ice40-riscv/e1-tracer/usb_e1.c M firmware/ice40-riscv/e1-tracer/usb_str_app.txt 3 files changed, 220 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/48/29948/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff Gerrit-Change-Number: 29948 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2)

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29953 ) Change subject: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If5a9bc20084d84885d5d97b4f982e94801612d24 Gerrit-Change-Number: 29953 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 20:22:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: osmo-e1d-pipe: Add command line option for --force open of timeslot

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29952 ) Change subject: osmo-e1d-pipe: Add command line option for --force open of timeslot ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ieefc89f2e48e9124ae744a587739ff3948110944 Gerrit-Change-Number: 29952 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 20:21:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 ) Change subject: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id2217ff4573c4eebd816318128f256e85fb3c3bd Gerrit-Change-Number: 29949 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 19:29:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible m...

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 ) Change subject: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" ...................................................................... Patch Set 2: (1 comment) File firmware/ice40-riscv/e1-tracer/usb_desc_app.c: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948/comment/c9d3f3b5_9600… PS2, Line 190: .wMaxPacketSize = 0, Actually, in icE1usb, we transitioned to have the EP not even listed in the "Off" interface state, so I'd go with the same thing here. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff Gerrit-Change-Number: 29948 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 19:24:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: e1_start/e1_stop of individual channel

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 ) Change subject: fw/e1-tracer: e1_start/e1_stop of individual channel ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File firmware/ice40-riscv/e1-tracer/e1.c: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947/comment/242f894f_2584… PS1, Line 280: e1_start_one(uint8_t chan) I wouldn't rename it. In icE1usb we have e1_start(int port) and ultimately I'd like e1.{c,h} to be shared between the two. (usb_e1 will most likely stay separate because there'll be too much difference there, but the driver for the E1 hw shouln't be all that different ultimately) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7492325352222269bf0ba1346511c7dfa99c4f64 Gerrit-Change-Number: 29947 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 19:22:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible m...

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 ) Change subject: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File firmware/ice40-riscv/e1-tracer/usb_e1.c: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948/comment/f5a5b4db_25cc… PS2, Line 173: usb_ep_regs[chan+1].in.status = USB_EP_TYPE_ISOC | USB_EP_BD_DUAL; /* Type=Isochronous, dual buffered */ I know you're just copying things around ATM, but really this should at some point be removed to use the usb_ep_reconf helper like in the _e1_set_intf from icE1usb firmware. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff Gerrit-Change-Number: 29948 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 19:17:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-msc[master]: libosmonetify SMPP

by msuraev

Attention is currently required from: laforge, pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28849 ) Change subject: libosmonetify SMPP ...................................................................... Patch Set 56: (1 comment) This change is ready for review. File src/libsmpputil/smpp_smsc.c: https://gerrit.osmocom.org/c/osmo-msc/+/28849/comment/233c9056_ab586d2b PS49, Line 238: if (esme->use < 0) > Done Actually changing this check makes half of TTCN3 tests fail so I'd rather not mess with resource counting. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Idc2e60af1010783e555e61b114ae61f55a89d890 Gerrit-Change-Number: 28849 Gerrit-PatchSet: 56 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Nov 2022 19:08:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29953 ) Change subject: usb.c: Bail out of e1-tracer doesn't accept set_configuration(2) ...................................................................... usb.c: Bail out of e1-tracer doesn't accept set_configuration(2) This likely means it's not an e1-tracer after all, or it's an old firmware that doesn't yet expose the e1d-compatible USB configuration. Related: OS#5734 Change-Id: If5a9bc20084d84885d5d97b4f982e94801612d24 --- M src/usb.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/53/29953/1 diff --git a/src/usb.c b/src/usb.c index dc89bb0..35e1894 100644 --- a/src/usb.c +++ b/src/usb.c @@ -876,8 +876,13 @@ } /* we have prior knowledge that the e1-tracer firmware configuration 2 is the e1d compatible mode. */ - if (is_tracer) - libusb_set_configuration(devh, 2); + if (is_tracer) { + if (libusb_set_configuration(devh, 2) != LIBUSB_SUCCESS) { + LOGP(DE1D, LOGL_ERROR, "Cannot set configuration 2 of e1-tracer device. Maybe too old firmware?\n"); + libusb_close(devh); + return -EIO; + } + } INIT_LLIST_HEAD(&intf_data->ctrl_inprogress); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If5a9bc20084d84885d5d97b4f982e94801612d24 Gerrit-Change-Number: 29953 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: osmo-e1d-pipe: Add command line option for --force open of timeslot

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29952 ) Change subject: osmo-e1d-pipe: Add command line option for --force open of timeslot ...................................................................... osmo-e1d-pipe: Add command line option for --force open of timeslot This exposes the existing capability of force-opening a timeslot via a command-line argument. Related: OS#5735 Change-Id: Ieefc89f2e48e9124ae744a587739ff3948110944 --- M src/e1d-ts-pipe.c 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/52/29952/1 diff --git a/src/e1d-ts-pipe.c b/src/e1d-ts-pipe.c index 2928e85..99b7c55 100644 --- a/src/e1d-ts-pipe.c +++ b/src/e1d-ts-pipe.c @@ -1,6 +1,6 @@ /* E1 timeslot "pipe" utility: Open a 64k timeslot of osmo-e1d and connect to stdin/stdout * - * (C) 2020 by Harald Welte <laforge(a)osmocom.org> + * (C) 2020-2022 by Harald Welte <laforge(a)osmocom.org> * * All Rights Reserved * @@ -22,6 +22,7 @@ */ #include <stdint.h> +#include <stdbool.h> #include <stdio.h> #include <unistd.h> #include <errno.h> @@ -40,6 +41,7 @@ static struct osmo_e1dp_client *g_client; static struct osmo_fd ts_ofd; static enum osmo_e1dp_ts_mode g_mode = E1DP_TSMODE_RAW; +static bool g_force = false; static int outfd = 1; static int infd = 0; @@ -47,7 +49,11 @@ static int ts_open(uint8_t intf_nr, uint8_t line_nr, uint8_t ts_nr, enum osmo_e1dp_ts_mode mode, uint16_t bufsize) { - int rc = osmo_e1dp_client_ts_open(g_client, intf_nr, line_nr, ts_nr, mode, bufsize); + int rc; + if (g_force) + rc = osmo_e1dp_client_ts_open_force(g_client, intf_nr, line_nr, ts_nr, mode, bufsize); + else + rc = osmo_e1dp_client_ts_open(g_client, intf_nr, line_nr, ts_nr, mode, bufsize); if (rc < 0) fprintf(stderr, "Cannot open e1d timeslot %u:%u:%u\n", intf_nr, line_nr, ts_nr); return rc; @@ -118,6 +124,7 @@ " -l --line <0-255> E1 Line Number\n" " -t --timeslot <0-31> E1 Timeslot Number\n" " -m --mode (RAW|HDLC-FCS) E1 Timeslot Mode\n" + " -f --force Force open of the timeslot (may disconnect other client)\n" " -r --read FILE Read from FILE instead of STDIN\n" ); } @@ -145,12 +152,13 @@ { "line", 1, 0, 'l' }, { "timeslot", 1, 0, 't' }, { "mode", 1, 0, 'm' }, + { "force", 0, 0, 'f' }, { "read", 1, 0, 'r' }, { "read-bufsize", 1, 0, 'b' }, { 0,0,0,0 } }; - c = getopt_long(argc, argv, "hp:i:l:t:m:r:b:", long_options, &option_index); + c = getopt_long(argc, argv, "hp:i:l:t:m:fr:b:", long_options, &option_index); if (c == -1) break; @@ -178,6 +186,9 @@ } g_mode = rc; break; + case 'f': + g_force = true; + break; case 'r': rc = open(optarg, 0, O_RDONLY); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ieefc89f2e48e9124ae744a587739ff3948110944 Gerrit-Change-Number: 29952 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: support for e1-tracer hardware

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29950 ) Change subject: support for e1-tracer hardware ...................................................................... Patch Set 1: (1 comment) File src/usb.c: https://gerrit.osmocom.org/c/osmo-e1d/+/29950/comment/7a857754_6695fc18 PS1, Line 993: if (!is_tracer) { > I would just test on if (line_data->ep_out) and if (line_data->ep_fb) rather than is_tracer. […] that unfortunately then would also be true for the existing/legacy USB descriptors of e1-tracer with old firmware. Ok, now with the set_configuration(2) above, that shouldn't happen anymore. Probably best to at least check that the set_configuation succeeds, as otherwise we have an old e1-tracer with the old interface and osmo-e1d would happily open half of the endpoints of the legacy interface :( -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I855e18c0f229bd473123f96303e60ab2de90677f Gerrit-Change-Number: 29950 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 17:12:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: support for e1-tracer hardware

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29950 ) Change subject: support for e1-tracer hardware ...................................................................... Patch Set 1: Code-Review+1 (2 comments) Patchset: PS1: Minor recommended change, but I'm not opposed to merging as-is. File src/usb.c: https://gerrit.osmocom.org/c/osmo-e1d/+/29950/comment/c0b18293_ed3b9adb PS1, Line 993: if (!is_tracer) { I would just test on if (line_data->ep_out) and if (line_data->ep_fb) rather than is_tracer. A bit of a nit pick but it's more consistent with the ep_int test and also in the future if e1d is tracing, it's one less things to change. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I855e18c0f229bd473123f96303e60ab2de90677f Gerrit-Change-Number: 29950 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 16:34:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

2024

2023

2022

gerrit-log November 2022