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

Change in osmo-dev[master]: net: make terminal configurable in config file

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27033 ) Change subject: net: make terminal configurable in config file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I0afb6b0242c399334a2c37f18a5d26d5beeabedc Gerrit-Change-Number: 27033 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:48:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-dev[master]: net/templates/.editorconfig: new file

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27032 ) Change subject: net/templates/.editorconfig: new file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ieeb67a10c7b7c27a5e0e9dbc8399fe2add9f34d4 Gerrit-Change-Number: 27032 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:48:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-dev[master]: net/templates/osmo-bsc-nat.cfg: add addressbooks

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27031 ) Change subject: net/templates/osmo-bsc-nat.cfg: add addressbooks ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia396cc677ceffa3fa86da5460f6c890b5f714059 Gerrit-Change-Number: 27031 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:48:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-dev[master]: net: run.sh: tweak quit logic

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27037 ) Change subject: net: run.sh: tweak quit logic ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I've never seen this. maybe something is piping data to stdin and the read keeps getting data that is != "q"? you could try a 'cat' before the 'while read', i.e. flush any stdin data up to then. -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iebb799493f76fd57f24b15c998ded2bd8e284e6b Gerrit-Change-Number: 27037 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:48:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-dev[master]: net: run.sh: support tmux as terminal

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27036 ) Change subject: net: run.sh: support tmux as terminal ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iaef08fb3cb3c6f58cd8490a631e177a03af9c974 Gerrit-Change-Number: 27036 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:44:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-dev[master]: net: run.sh: support tmux as terminal

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27036 ) Change subject: net: run.sh: support tmux as terminal ...................................................................... Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-dev/+/27036/comment/784f946d_eabf60de PS1, Line 12: automatically scroll to the bottom really? not my terminal. i even had the problem occasionally that when i keep the terminal scrolled up to past logging, that an osmo program would halt because the log pipe was stalling. (AFAIK that's been fixed on the osmo side.) But i can definitely scroll up all i want, it only jumps to the bottom when i hit a key or i think when the backscroll buffer is full, which obviously i set very very large, 10k or even 100k lines. i remember tmux doing this weird jumping to the bottom very occasionally, which i found so annoying that i went back to preferring single terminals instead of tmux windows. Patchset: PS1: nice!! i always wanted this but didn't have the grit to actually do it. opening all the terminals was a quick hack really. i was going to say now that we can drop everything else and just use tmux as the only option. (but then again, it can be quite convenient to use the window manager's window navigation and not having to type tmux combinations. also i wish tmux would allow showing backscroll using 'shift-pgUp' or just pgUp, it is so much easier to type and i'm really used to that.) btw, it has been quite a long time that i last used the osmo-dev/net scripts to run a network. i currently don't test with hardware at all. good to see that it is still useful. -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iaef08fb3cb3c6f58cd8490a631e177a03af9c974 Gerrit-Change-Number: 27036 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:44:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-e1d[master]: Proper libusb error reporting in all error paths

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27040 ) Change subject: Proper libusb error reporting in all error paths ...................................................................... Proper libusb error reporting in all error paths ... using libusb_strerror(). Change-Id: Id205f1cf1bbccd83b789f8ab31fe1d5d4e1fb8a9 --- M src/usb.c 1 file changed, 32 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve 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 8194faf..747b9c5 100644 --- a/src/usb.c +++ b/src/usb.c @@ -237,8 +237,10 @@ ); rv = libusb_submit_transfer(xfr); - if (rv) - LOGPLI(flow->line, DE1D, LOGL_ERROR, "Failed to resubmit buffer for transfer\n"); + if (rv) { + LOGPLI(flow->line, DE1D, LOGL_ERROR, "EP %02x Failed to resubmit buffer for transfer: %s\n", + flow->ep, libusb_strerror(rv)); + } } static struct e1_usb_flow * @@ -307,9 +309,11 @@ ); rv = libusb_submit_transfer(xfr); - - if (rv) + if (rv) { + LOGPLI(flow->line, DE1D, LOGL_ERROR, "EP %02x: Error submitting transfer %d: %s\n", + flow->ep, i, libusb_strerror(rv)); return rv; + } flow->entries[i].xfr = xfr; } @@ -418,10 +422,17 @@ struct e1_usb_line_data *ld = (struct e1_usb_line_data *) line->drv_data; struct e1_usb_intf_data *id = (struct e1_usb_intf_data *) line->intf->drv_data; struct libusb_transfer *xfr = libusb_alloc_transfer(0); + int rv; libusb_fill_interrupt_transfer(xfr, id->devh, ld->ep_int, ld->irq.buf, sizeof(ld->irq.buf), interrupt_ep_cb, line, 0); - return libusb_submit_transfer(xfr); + rv = libusb_submit_transfer(xfr); + if (rv != LIBUSB_SUCCESS) { + LOGPLI(line, DE1D, LOGL_ERROR, "EP %02x: Error submitting IRQ transfer: %s\n", + ld->ep_int, libusb_strerror(rv)); + } + + return rv; } // --------------------------------------------------------------------------- @@ -487,8 +498,11 @@ libusb_fill_control_transfer(xfr, id->devh, ucx->buffer, ctrl_xfer_compl_cb, ucx, 3000); rc = libusb_submit_transfer(xfr); - if (rc != 0) + if (rc != 0) { + LOGPLI(line, DE1D, LOGL_ERROR, "Error submitting control transfer: %s\n", + libusb_strerror(rc)); goto free_xfr; + } llist_add_tail(&ucx->list, &ld->ctrl_inprogress); @@ -598,8 +612,11 @@ libusb_fill_control_transfer(xfr, id->devh, ucx->buffer, ctrl_xfer_intf_compl_cb, ucx, 3000); rc = libusb_submit_transfer(xfr); - if (rc != 0) + if (rc != 0) { + LOGPIF(intf, DE1D, LOGL_ERROR, "Error submitting control transfer: %s\n", + libusb_strerror(rc)); goto free_xfr; + } llist_add_tail(&ucx->list, &id->ctrl_inprogress); @@ -772,13 +789,13 @@ ret = libusb_open(dev, &devh); if (ret) { - LOGP(DE1D, LOGL_ERROR, "Failed to open usb device\n"); + LOGP(DE1D, LOGL_ERROR, "Failed to open usb device: %s\n", libusb_strerror(ret)); return ret; } ret = libusb_get_device_descriptor(dev, &dd); if (ret) { - LOGP(DE1D, LOGL_ERROR, "Failed to get device descriptor\n"); + LOGP(DE1D, LOGL_ERROR, "Failed to get device descriptor: %s\n", libusb_strerror(ret)); libusb_close(devh); return ret; } @@ -789,7 +806,7 @@ * away with it. */ ret = libusb_get_string_descriptor_ascii(devh, dd.iSerialNumber, (uint8_t *)serial_str, sizeof(serial_str)); if (ret < 0) { - LOGP(DE1D, LOGL_ERROR, "Failed to get iSerialNumber string descriptor\n"); + LOGP(DE1D, LOGL_ERROR, "Failed to get iSerialNumber string descriptor: %s\n", libusb_strerror(ret)); libusb_close(devh); return ret; } @@ -823,7 +840,7 @@ ret = libusb_get_active_config_descriptor(dev, &cd); if (ret) { - LOGP(DE1D, LOGL_ERROR, "Failed to talk to usb device\n"); + LOGP(DE1D, LOGL_ERROR, "Failed to talk to usb device: %s\n", libusb_strerror(ret)); intf_data->devh = NULL; talloc_free(intf_data); if (auto_create_lines) @@ -853,13 +870,15 @@ /* Get interface and set it up */ ret = libusb_claim_interface(devh, id->bInterfaceNumber); if (ret) { - LOGP(DE1D, LOGL_ERROR, "Failed to claim interface %d\n", id->bInterfaceNumber); + LOGP(DE1D, LOGL_ERROR, "Failed to claim interface %d:%s\n", id->bInterfaceNumber, + libusb_strerror(ret)); goto next_interface; } ret = libusb_set_interface_alt_setting(devh, id->bInterfaceNumber, 1); if (ret) { - LOGP(DE1D, LOGL_ERROR, "Failed to set interface %d altsetting\n", id->bInterfaceNumber); + LOGP(DE1D, LOGL_ERROR, "Failed to set interface %d altsetting:%s\n", id->bInterfaceNumber, + libusb_strerror(ret)); goto next_interface; } 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id205f1cf1bbccd83b789f8ab31fe1d5d4e1fb8a9 Gerrit-Change-Number: 27040 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-e1d[master]: GPS-DO support for icE1usb hardware

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27020 ) Change subject: GPS-DO support for icE1usb hardware ...................................................................... GPS-DO support for icE1usb hardware This adds support for monitoring the GPS-DO that is built-in to the icE1usb device. It assumes a very recent firmware with GPS-DO control moved to a separate USB interface, i.e. after osmo-e1-hardware.git Change-Id Icd6555a14896c38626fb147b78af44ff719f2254 is merged. Change-Id: If5e2a6b2dae0290ce3186009e68f618049ebf5ff --- M src/ice1usb_proto.h M src/usb.c M src/usb.h M src/vty.c 4 files changed, 316 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/ice1usb_proto.h b/src/ice1usb_proto.h index d0d7304..3170d55 100644 --- a/src/ice1usb_proto.h +++ b/src/ice1usb_proto.h @@ -23,8 +23,54 @@ ICE1USB_DEV_CAP_GPSDO, }; +/*********************************************************************** + * Control Endpoint / GPS-DO Interface Requests + ***********************************************************************/ -/* Interface Requests */ +#define ICE1USB_INTF_GET_GPSDO_STATUS 0x10 +#define ICE1USB_INTF_GET_GPSDO_MODE 0x12 /*!< uint8_t */ +#define ICE1USB_INTF_SET_GPSDO_MODE 0x13 /*!< wValue = mode */ +#define ICE1USB_INTF_GET_GPSDO_TUNE 0x14 /*!< data = struct e1usb_gpsdo_tune */ +#define ICE1USB_INTF_SET_GPSDO_TUNE 0x15 /*!< data = struct e1usb_gpsdo_tune */ + +enum ice1usb_gpsdo_mode { + ICE1USB_GPSDO_MODE_DISABLED = 0, + ICE1USB_GPSDO_MODE_AUTO = 1, +}; + +enum ice1usb_gpsdo_antenna_state { + ICE1USB_GPSDO_ANT_UNKNOWN = 0, + ICE1USB_GPSDO_ANT_OK = 1, + ICE1USB_GPSDO_ANT_OPEN = 2, + ICE1USB_GPSDO_ANT_SHORT = 3, +}; + +enum ice1usb_gpsdo_state { + ICE1USB_GPSDO_STATE_DISABLED = 0, + ICE1USB_GPSDO_STATE_CALIBRATE = 1, + ICE1USB_GPSDO_STATE_HOLD_OVER = 2, + ICE1USB_GPSDO_STATE_TUNE_COARSE = 3, + ICE1USB_GPSDO_STATE_TUNE_FINE = 4, +}; + +struct e1usb_gpsdo_tune { + uint16_t coarse; + uint16_t fine; +} __attribute__((packed)); + +struct e1usb_gpsdo_status { + uint8_t state; + uint8_t antenna_state; /*!< Antenna state */ + uint8_t valid_fix; /*!< Valid GPS Fix (0/1) */ + uint8_t mode; /*!< Current configured operating mode */ + struct e1usb_gpsdo_tune tune; /*!< Current VCXO tuning values */ + uint32_t freq_est; /*!< Latest frequency estimate measurement */ +} __attribute__((packed)); + + +/*********************************************************************** + * Control Endpoint / E1 Interface Requests + ***********************************************************************/ /*! returns a bit-mask of optional device capabilities (see enum e1usb_intf_capability) */ #define ICE1USB_INTF_GET_CAPABILITIES 0x01 @@ -32,6 +78,7 @@ #define ICE1USB_INTF_GET_TX_CFG 0x03 /*!< struct ice1usb_tx_config */ #define ICE1USB_INTF_SET_RX_CFG 0x04 /*!< struct ice1usb_rx_config */ #define ICE1USB_INTF_GET_RX_CFG 0x05 /*!< struct ice1usb_rx_config */ +#define ICE1USB_INTF_GET_ERRORS 0x06 /*!< struct ice1usb_irq_err */ //enum e1usb_intf_capability { }; diff --git a/src/usb.c b/src/usb.c index c8920e5..8194faf 100644 --- a/src/usb.c +++ b/src/usb.c @@ -30,6 +30,7 @@ #include <osmocom/core/isdnhdlc.h> #include <osmocom/core/utils.h> +#include <osmocom/core/bit32gen.h> #include <osmocom/usb/libusb.h> #include <libusb.h> @@ -84,6 +85,15 @@ struct e1_usb_intf_data { libusb_device_handle *devh; + + struct { + uint8_t if_num; + struct osmo_timer_list poll_timer; + struct e1usb_gpsdo_status last_status; + } gpsdo; + + /* list of in-progress CTRL operations */ + struct llist_head ctrl_inprogress; }; @@ -415,7 +425,7 @@ } // --------------------------------------------------------------------------- -// Control transfers +// Control transfers (USB interface == E1 line level) // --------------------------------------------------------------------------- struct e1_usb_ctrl_xfer { @@ -445,6 +455,10 @@ libusb_free_transfer(xfr); } +// --------------------------------------------------------------------------- +// Control transfers (USB device == E1 interface level) +// --------------------------------------------------------------------------- + /* generic helper for async transmission of control endpoint requests */ static int _e1_usb_line_send_ctrl(struct e1_line *line, uint8_t bmReqType, uint8_t bReq, uint16_t wValue, @@ -518,6 +532,224 @@ sizeof(rx_cfg)); } +struct e1_usb_ctrl_xfer_intf { + struct e1_intf *intf; + struct llist_head list; + /* 8 bytes control setup packet, remainder for data */ + uint8_t buffer[8 + sizeof(struct e1usb_gpsdo_status)]; +}; + +static void _e1_usb_intf_gpsdo_status_cb(struct e1_intf *intf, const uint8_t *data, size_t len); + +static void +ctrl_xfer_intf_compl_cb(struct libusb_transfer *xfr) +{ + struct e1_usb_ctrl_xfer_intf *ucx = xfr->user_data; + struct libusb_control_setup *setup; + + switch (xfr->status) { + case LIBUSB_TRANSFER_COMPLETED: + setup = (struct libusb_control_setup *) ucx->buffer; + LOGPIF(ucx->intf, DE1D, LOGL_DEBUG, "CTRL transfer completed successfully: %s\n", + osmo_hexdump(ucx->buffer, 8+xfr->actual_length)); + switch (setup->bRequest) { + case ICE1USB_INTF_GET_GPSDO_STATUS: + _e1_usb_intf_gpsdo_status_cb(ucx->intf, ucx->buffer+8, xfr->actual_length); + break; + default: + break; + } + break; + default: + LOGPIF(ucx->intf, DE1D, LOGL_ERROR, "CTRL transfer completed unsuccessfully %d\n", + xfr->status); + break; + } + llist_del(&ucx->list); + talloc_free(ucx); + libusb_free_transfer(xfr); +} + + +/* generic helper for async transmission of control endpoint requests */ +static int +_e1_usb_intf_send_ctrl(struct e1_intf *intf, uint8_t bmReqType, uint8_t bReq, uint16_t wValue, + const uint8_t *data, size_t data_len) +{ + struct e1_usb_ctrl_xfer_intf *ucx = talloc_zero(intf, struct e1_usb_ctrl_xfer_intf); + struct e1_usb_intf_data *id = (struct e1_usb_intf_data *) intf->drv_data; + struct libusb_transfer *xfr; + int rc; + + if (!ucx) + return -ENOMEM; + + OSMO_ASSERT(sizeof(ucx->buffer) >= 8+data_len); + ucx->intf = intf; + libusb_fill_control_setup(ucx->buffer, bmReqType, bReq, wValue, id->gpsdo.if_num, data_len); + if (data && data_len) + memcpy(ucx->buffer+8, data, data_len); + + xfr = libusb_alloc_transfer(0); + if (!xfr) { + rc = -ENOMEM; + goto free_ucx; + } + + libusb_fill_control_transfer(xfr, id->devh, ucx->buffer, ctrl_xfer_intf_compl_cb, ucx, 3000); + rc = libusb_submit_transfer(xfr); + if (rc != 0) + goto free_xfr; + + llist_add_tail(&ucx->list, &id->ctrl_inprogress); + + return 0; + +free_xfr: + libusb_free_transfer(xfr); +free_ucx: + talloc_free(ucx); + + return rc; +} + +int +e1_usb_ctrl_set_gpsdo_mode(struct e1_intf *intf, enum ice1usb_gpsdo_mode gpsdo_mode) +{ + const uint16_t bmReqType = LIBUSB_RECIPIENT_INTERFACE | LIBUSB_REQUEST_TYPE_VENDOR | + LIBUSB_ENDPOINT_OUT; + return _e1_usb_intf_send_ctrl(intf, bmReqType, ICE1USB_INTF_SET_GPSDO_MODE, 0, + (uint8_t *)&gpsdo_mode, sizeof(gpsdo_mode)); +} + +int +e1_usb_ctrl_set_gpsdo_tune(struct e1_intf *intf, const struct e1usb_gpsdo_tune *gpsdo_tune) +{ + const uint16_t bmReqType = LIBUSB_RECIPIENT_INTERFACE | LIBUSB_REQUEST_TYPE_VENDOR | + LIBUSB_ENDPOINT_OUT; + return _e1_usb_intf_send_ctrl(intf, bmReqType, ICE1USB_INTF_SET_GPSDO_TUNE, 0, + (uint8_t *)gpsdo_tune, sizeof(gpsdo_tune)); +} + +int +e1_usb_ctrl_get_gpsdo_status(struct e1_intf *intf) +{ + const uint16_t bmReqType = LIBUSB_RECIPIENT_INTERFACE | LIBUSB_REQUEST_TYPE_VENDOR | + LIBUSB_ENDPOINT_IN; + return _e1_usb_intf_send_ctrl(intf, bmReqType, ICE1USB_INTF_GET_GPSDO_STATUS, 0, + NULL, sizeof(struct e1usb_gpsdo_status)); +} + +// --------------------------------------------------------------------------- +// GPS-DO +// --------------------------------------------------------------------------- + +static const struct value_string ice1usb_gpsdo_mode_str[] = { + { ICE1USB_GPSDO_MODE_DISABLED, "DISABLED" }, + { ICE1USB_GPSDO_MODE_AUTO, "AUTO" }, + { 0, NULL } +}; + +static const struct value_string ice1usb_gpsdo_antenna_state_str[] = { + { ICE1USB_GPSDO_ANT_UNKNOWN, "UNKNOWN" }, + { ICE1USB_GPSDO_ANT_OK, "OK" }, + { ICE1USB_GPSDO_ANT_OPEN, "OPEN" }, + { ICE1USB_GPSDO_ANT_SHORT, "SHORT" }, + { 0, NULL } +}; + +static const struct value_string ice1usb_gpsdo_state_str[] = { + { ICE1USB_GPSDO_STATE_DISABLED, "DISABLED" }, + { ICE1USB_GPSDO_STATE_CALIBRATE, "CALIBRATE" }, + { ICE1USB_GPSDO_STATE_HOLD_OVER, "HOLD_OVER" }, + { ICE1USB_GPSDO_STATE_TUNE_COARSE, "TUNE_COARSE" }, + { ICE1USB_GPSDO_STATE_TUNE_FINE, "TUNE_FINE" }, + { 0, NULL } +}; + +int +e1_usb_intf_gpsdo_state_string(char *buf, size_t len, const struct e1_intf *intf) +{ + struct e1_usb_intf_data *id = intf->drv_data; + struct e1usb_gpsdo_status *last_st = &id->gpsdo.last_status; + + OSMO_ASSERT(intf->drv == E1_DRIVER_USB); + + return snprintf(buf, len, "mode=%s, fix=%s, state=%s antenna=%s, tune=%u/%u, freq_est=%u", + get_value_string(ice1usb_gpsdo_mode_str, last_st->mode), + last_st->valid_fix ? "TRUE" : "FALSE", + get_value_string(ice1usb_gpsdo_state_str, last_st->state), + get_value_string(ice1usb_gpsdo_antenna_state_str, last_st->antenna_state), + libusb_le16_to_cpu(last_st->tune.coarse), libusb_le16_to_cpu(last_st->tune.fine), + osmo_load32le(&last_st->freq_est)); +} + +static void +_e1_usb_intf_gpsdo_status_cb(struct e1_intf *intf, const uint8_t *data, size_t len) +{ + struct e1_usb_intf_data *id = intf->drv_data; + struct e1usb_gpsdo_status *last_st = &id->gpsdo.last_status; + const struct e1usb_gpsdo_status *st; + + if (len < sizeof(*st)) { + LOGPIF(intf, DE1D, LOGL_ERROR, "GPSDO status %zu < %zu!\n", len, sizeof(*st)); + return; + } + st = (const struct e1usb_gpsdo_status *) data; + + if (st->state != last_st->state) { + LOGPIF(intf, DE1D, LOGL_NOTICE, "GPSDO state change: %s -> %s\n", + get_value_string(ice1usb_gpsdo_state_str, last_st->state), + get_value_string(ice1usb_gpsdo_state_str, st->state)); + } + + if (st->antenna_state != last_st->antenna_state) { + int level = LOGL_NOTICE; + switch (st->antenna_state) { + case ICE1USB_GPSDO_ANT_OPEN: + case ICE1USB_GPSDO_ANT_SHORT: + level = LOGL_ERROR; + break; + default: + level = LOGL_NOTICE; + } + LOGPIF(intf, DE1D, level, "GPS antenna status change: %s -> %s\n", + get_value_string(ice1usb_gpsdo_antenna_state_str, last_st->antenna_state), + get_value_string(ice1usb_gpsdo_antenna_state_str, st->antenna_state)); + } + + if (st->valid_fix != last_st->valid_fix) { + if (st->valid_fix) + LOGPIF(intf, DE1D, LOGL_NOTICE, "GPS Fix achieved\n"); + else + LOGPIF(intf, DE1D, LOGL_ERROR, "GPS Fix LOST\n"); + } + + /* update our state */ + memcpy(last_st, st, sizeof(*last_st)); +} + +static void +_e1_usb_gpsdo_poll_cb(void *data) +{ + struct e1_intf *intf = (struct e1_intf *) data; + struct e1_usb_intf_data *id = intf->drv_data; + + /* issue a control endpoint request, further processing is when it completes */ + e1_usb_ctrl_get_gpsdo_status(intf); + + osmo_timer_schedule(&id->gpsdo.poll_timer, 1, 0); +} + +static void +_e1_usb_gpsdo_init(struct e1_intf *intf) +{ + struct e1_usb_intf_data *id = intf->drv_data; + + osmo_timer_setup(&id->gpsdo.poll_timer, &_e1_usb_gpsdo_poll_cb, intf); + osmo_timer_schedule(&id->gpsdo.poll_timer, 1, 0); +} + // --------------------------------------------------------------------------- // Init / Probing // --------------------------------------------------------------------------- @@ -587,6 +819,8 @@ osmo_talloc_replace_string(intf, &intf->usb.serial_str, serial_str); } + INIT_LLIST_HEAD(&intf_data->ctrl_inprogress); + ret = libusb_get_active_config_descriptor(dev, &cd); if (ret) { LOGP(DE1D, LOGL_ERROR, "Failed to talk to usb device\n"); @@ -690,6 +924,20 @@ line_nr++; } + /* find the GPS-DO interface (if any) */ + for (i = 0; i < cd->bNumInterfaces; i++) { + if (cd->interface[i].num_altsetting != 1) + continue; + + id = &cd->interface[i].altsetting[0]; + if ((id->bInterfaceClass == 0xff) && (id->bInterfaceSubClass == 0xe1) && + (id->bInterfaceProtocol == 0xd0)) { + intf_data->gpsdo.if_num = id->bInterfaceNumber; + _e1_usb_gpsdo_init(intf); + break; + } + } + return 0; } diff --git a/src/usb.h b/src/usb.h index 7142686..41b4b2e 100644 --- a/src/usb.h +++ b/src/usb.h @@ -12,4 +12,10 @@ int e1_usb_ctrl_set_rx_cfg(struct e1_line *line, enum ice1usb_rx_mode mode); +int e1_usb_ctrl_set_gpsdo_mode(struct e1_intf *intf, enum ice1usb_gpsdo_mode gpsdo_mode); +int e1_usb_ctrl_set_gpsdo_tune(struct e1_intf *intf, const struct e1usb_gpsdo_tune *gpsdo_tune); +int e1_usb_ctrl_get_gpsdo_status(struct e1_intf *intf); + +int e1_usb_intf_gpsdo_state_string(char *buf, size_t len, const struct e1_intf *intf); + int e1_usb_probe(struct e1_daemon *e1d); diff --git a/src/vty.c b/src/vty.c index fca56a4..9d518d4 100644 --- a/src/vty.c +++ b/src/vty.c @@ -38,6 +38,7 @@ #include <osmocom/e1d/proto.h> #include "e1d.h" +#include "usb.h" struct e1_daemon *vty_e1d; @@ -75,8 +76,20 @@ static void vty_dump_intf(struct vty *vty, const struct e1_intf *intf) { + char buf[128]; + vty_out(vty, "Interface #%u (%s), Driver: %s%s", intf->id, intf_serno(intf), get_value_string(e1_driver_names, intf->drv), VTY_NEWLINE); + + /* TODO: put this behind some call-back */ + switch (intf->drv) { + case E1_DRIVER_USB: + e1_usb_intf_gpsdo_state_string(buf, sizeof(buf), intf); + vty_out(vty, " GPS-DO: %s%s", buf, VTY_NEWLINE); + break; + default: + break; + } } DEFUN(show_intf, show_intf_cmd, "show interface [<0-255>]", 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If5e2a6b2dae0290ce3186009e68f618049ebf5ff Gerrit-Change-Number: 27020 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-dev[master]: net: run.sh: write wrapper command to shell script

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27035 ) Change subject: net: run.sh: write wrapper command to shell script ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File net/templates/run.sh: https://gerrit.osmocom.org/c/osmo-dev/+/27035/comment/5060fb64_c06d7eca PS1, Line 43: wrapperdir="wrappers" i'd prefer a single 'run' dir and keep both the launcher scripts as well as pids in it. (i'd call them launchers, nevermind) -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I15760d706b20628421c10a16514120f442d5477f Gerrit-Change-Number: 27035 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:29:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-dev[master]: net: run.sh: store all spawned pids in files

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27034 ) Change subject: net: run.sh: store all spawned pids in files ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: the weird hoops one has to jump through in shell generally often makes me consider rewriting things in python -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I379ef71de2f1ab0ac4a28064e5cf9e275c4c61e9 Gerrit-Change-Number: 27034 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:24:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022