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

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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022