- gerrit-log - lists.osmocom.org

Change in osmo-iuh[master]: iu_helpers: check length before accessing buf

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26855 ) Change subject: iu_helpers: check length before accessing buf ...................................................................... iu_helpers: check length before accessing buf in ranap_transp_layer_addr_decode() we access the buffer buf before checking the length field. This can lead to a segfault when the buffer has a length of 0. Change-Id: I983f6e5e4cee47b3f5719829e1310b8e2e33ffaf --- M src/iu_helpers.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26855/1 diff --git a/src/iu_helpers.c b/src/iu_helpers.c index 392622f..62f5c22 100644 --- a/src/iu_helpers.c +++ b/src/iu_helpers.c @@ -113,7 +113,7 @@ buf = trasp_layer_addr->buf; len = trasp_layer_addr->size; - if (buf[0] == 0x35 && len >= 7) + if (len >= 7 && buf[0] == 0x35) rc = inet_ntop(AF_INET, buf + 3, addr, addr_len); else if (len > 3) rc = inet_ntop(AF_INET, buf, addr, addr_len); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I983f6e5e4cee47b3f5719829e1310b8e2e33ffaf Gerrit-Change-Number: 26855 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

3
3
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: add port number argument to e1_tick_read()

by tnt

tnt has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21732 ) Change subject: icE1usb fw: add port number argument to e1_tick_read() ...................................................................... Abandoned Superseeded -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21732 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: I0f4548b5623a7eaf74af3076c301e029bb3933da Gerrit-Change-Number: 21732 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: abandon

3 years, 5 months

1
0
0 0

Change in osmo-msc[master]: ran_msg_iu.c: Set proper codec in Assignment Complete

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/26806 ) Change subject: ran_msg_iu.c: Set proper codec in Assignment Complete ...................................................................... ran_msg_iu.c: Set proper codec in Assignment Complete We need to set the codec as present in order for msc_a_up_call_assignment_complete() to configure properly the CN-side of he leg with the IUFP codec, which should be the desired default in order to avoid transcoding. Change-Id: Ib8086462239e2df748cf47ea7b37a07f1f3b85a8 --- M src/libmsc/ran_msg_iu.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/06/26806/1 diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c index c10df4d..ee1d0a5 100644 --- a/src/libmsc/ran_msg_iu.c +++ b/src/libmsc/ran_msg_iu.c @@ -153,7 +153,8 @@ .msg_type = RAN_MSG_ASSIGNMENT_COMPLETE, .msg_name = "RANAP RAB Assignment Response", .assignment_complete = { - .codec = CODEC_AMR_8000_1, + .codec_present = true, + .codec = CODEC_IUFP, }, }; if (osmo_sockaddr_str_from_str(&ran_dec_msg->assignment_complete.remote_rtp, addr, port)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/26806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib8086462239e2df748cf47ea7b37a07f1f3b85a8 Gerrit-Change-Number: 26806 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

3
3
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Don't expose some E1 helper functions globally

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26831 ) Change subject: icE1usb fw: Don't expose some E1 helper functions globally ...................................................................... icE1usb fw: Don't expose some E1 helper functions globally Not used anywhere and really shouldn't be Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I1e339d1b8faecffba5f8d73588b376edc7a75a96 --- M firmware/ice40-riscv/icE1usb/e1.c M firmware/ice40-riscv/icE1usb/e1.h 2 files changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/31/26831/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index f5e367e..59be063 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -21,13 +21,13 @@ static volatile struct e1_core * const e1_regs = (void *)(E1_CORE_BASE); static volatile uint8_t * const e1_data = (void *)(E1_DATA_BASE); -unsigned int +static unsigned int e1_data_ofs(int mf, int frame, int ts) { return (mf << 9) | (frame << 5) | ts; } -volatile uint8_t * +static volatile uint8_t * e1_data_ptr(int mf, int frame, int ts) { return &e1_data[e1_data_ofs(mf, frame, ts)]; diff --git a/firmware/ice40-riscv/icE1usb/e1.h b/firmware/ice40-riscv/icE1usb/e1.h index 4394638..4cbb6e5 100644 --- a/firmware/ice40-riscv/icE1usb/e1.h +++ b/firmware/ice40-riscv/icE1usb/e1.h @@ -28,9 +28,6 @@ const struct e1_error_count *e1_get_error_count(void); -volatile uint8_t *e1_data_ptr(int mf, int frame, int ts); -unsigned int e1_data_ofs(int mf, int frame, int ts); - enum e1_platform_led { E1P_LED_GREEN = 0, E1P_LED_YELLOW = 1, -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26831 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: I1e339d1b8faecffba5f8d73588b376edc7a75a96 Gerrit-Change-Number: 26831 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Remove useless variable in main loop

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26833 ) Change subject: icE1usb fw: Remove useless variable in main loop ...................................................................... icE1usb fw: Remove useless variable in main loop Left over from early testing code ... Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I242bbcd42ba96f56bf12bbe57537f3a72a44767b --- M firmware/ice40-riscv/icE1usb/fw_app.c 1 file changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/33/26833/1 diff --git a/firmware/ice40-riscv/icE1usb/fw_app.c b/firmware/ice40-riscv/icE1usb/fw_app.c index eebc21f..39173f2 100644 --- a/firmware/ice40-riscv/icE1usb/fw_app.c +++ b/firmware/ice40-riscv/icE1usb/fw_app.c @@ -64,7 +64,6 @@ void main() { - bool e1_active = false; int cmd = 0; /* Init console IO */ @@ -103,7 +102,6 @@ /* Start */ e1_init(0, 0); - e1_active = true; led_state(true); usb_connect(); @@ -153,9 +151,7 @@ usb_poll(); /* E1 poll */ - if (e1_active) { - e1_poll(); - usb_e1_run(); - } + e1_poll(); + usb_e1_run(); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26833 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: I242bbcd42ba96f56bf12bbe57537f3a72a44767b Gerrit-Change-Number: 26833 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Misc cosmetic cleanup in e1.{c,h} / usb_e1.c

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26832 ) Change subject: icE1usb fw: Misc cosmetic cleanup in e1.{c,h} / usb_e1.c ...................................................................... icE1usb fw: Misc cosmetic cleanup in e1.{c,h} / usb_e1.c Moving things around, comments, spacing, ... nothing functional. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Icc2a6ef6b03c89dd92e661a01d219e42dbf7067d --- M firmware/ice40-riscv/icE1usb/e1.c M firmware/ice40-riscv/icE1usb/e1.h M firmware/ice40-riscv/icE1usb/usb_e1.c 3 files changed, 26 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/32/26832/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index 59be063..6a4c73c 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -18,9 +18,16 @@ #include "led.h" // FIXME +// HW access +// --------- + static volatile struct e1_core * const e1_regs = (void *)(E1_CORE_BASE); static volatile uint8_t * const e1_data = (void *)(E1_DATA_BASE); + +// Helpers +// ------- + static unsigned int e1_data_ofs(int mf, int frame, int ts) { @@ -33,6 +40,7 @@ return &e1_data[e1_data_ofs(mf, frame, ts)]; } + // FIFOs // ----- /* Note: FIFO works at 'frame' level (i.e. 32 bytes) */ @@ -98,7 +106,6 @@ return (ofs >> 4); } - /* Debug */ static void e1f_debug(struct e1_fifo *fifo, const char *name) @@ -207,7 +214,6 @@ } - // Main logic // ---------- @@ -232,12 +238,11 @@ int in_flight; enum e1_pipe_state state; } tx; + struct e1_error_count errors; } g_e1; - - void e1_init(uint16_t rx_cr, uint16_t tx_cr) { @@ -285,8 +290,6 @@ e1_regs->rx.csr = g_e1.rx.cr; } -#include "dma.h" - unsigned int e1_rx_need_data(unsigned int usb_addr, unsigned int max_frames, unsigned int *pos) { diff --git a/firmware/ice40-riscv/icE1usb/e1.h b/firmware/ice40-riscv/icE1usb/e1.h index 4cbb6e5..9ceffdd 100644 --- a/firmware/ice40-riscv/icE1usb/e1.h +++ b/firmware/ice40-riscv/icE1usb/e1.h @@ -7,6 +7,9 @@ #pragma once + +/* control */ + void e1_init(uint16_t rx_cr, uint16_t tx_cr); void e1_poll(void); void e1_debug_print(bool data); @@ -14,6 +17,17 @@ void e1_tx_config(uint16_t cr); void e1_rx_config(uint16_t cr); + +/* data flow */ + +unsigned int e1_rx_need_data(unsigned int usb_addr, unsigned int max_len, unsigned int *pos); +unsigned int e1_tx_feed_data(unsigned int usb_addr, unsigned int len); +unsigned int e1_tx_level(void); +unsigned int e1_rx_level(void); + + +/* error reporting */ + #define E1_ERR_F_ALIGN_ERR 0x01 #define E1_ERR_F_LOS 0x02 #define E1_ERR_F_RAI 0x04 @@ -28,6 +42,9 @@ const struct e1_error_count *e1_get_error_count(void); + +/* external function provided by the platform; used by E1 driver to control LEDs */ + enum e1_platform_led { E1P_LED_GREEN = 0, E1P_LED_YELLOW = 1, @@ -40,6 +57,5 @@ E1P_LED_ST_BLINK_FAST = 3 }; -/* external function provided by the platform; used by E1 driver to control LEDs */ extern void e1_platform_led_set(uint8_t port, enum e1_platform_led led, enum e1_platform_led_state state); diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index b4d8839..34ade71 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -15,7 +15,6 @@ #include "console.h" #include "misc.h" #include "e1.h" -#include "e1_hw.h" #include "ice1usb_proto.h" @@ -41,13 +40,6 @@ }; -/* Hack */ -unsigned int e1_rx_need_data(unsigned int usb_addr, unsigned int max_len, unsigned int *pos); -unsigned int e1_tx_feed_data(unsigned int usb_addr, unsigned int len); -unsigned int e1_tx_level(void); -unsigned int e1_rx_level(void); -/* ---- */ - static void _usb_fill_feedback_ep(void) { -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26832 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: Icc2a6ef6b03c89dd92e661a01d219e42dbf7067d Gerrit-Change-Number: 26832 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Vendor requests to other interface than 0 are not errors

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26834 ) Change subject: icE1usb fw: Vendor requests to other interface than 0 are not errors ...................................................................... icE1usb fw: Vendor requests to other interface than 0 are not errors They might be used somewhere else ... just don't handle them, but let someone else potentially do it. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ie1bce4565d14d6635d4a32c2a08f64728132a75e --- M firmware/ice40-riscv/icE1usb/usb_e1.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/34/26834/1 diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index 34ade71..09b428c 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -375,7 +375,7 @@ return _e1_ctrl_req_dev(req, xfer); case USB_REQ_RCPT_INTF: if (req->wIndex != 0) - return USB_FND_ERROR; + return USB_FND_CONTINUE; return _e1_ctrl_req_intf(req, xfer); case USB_REQ_RCPT_EP: case USB_REQ_RCPT_OTHER: -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26834 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: Ie1bce4565d14d6635d4a32c2a08f64728132a75e Gerrit-Change-Number: 26834 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Use #define's in descriptors for interface/endpoints ID

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26830 ) Change subject: icE1usb fw: Use #define's in descriptors for interface/endpoints ID ...................................................................... icE1usb fw: Use #define's in descriptors for interface/endpoints ID This way they can be used in other parts of the code more easily. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I565d9a43bc26b99bc385b46522e7da6a207b2412 --- M firmware/ice40-riscv/icE1usb/Makefile M firmware/ice40-riscv/icE1usb/usb_desc_app.c A firmware/ice40-riscv/icE1usb/usb_desc_ids.h 3 files changed, 34 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/30/26830/1 diff --git a/firmware/ice40-riscv/icE1usb/Makefile b/firmware/ice40-riscv/icE1usb/Makefile index 1c92edb..a8d18c9 100644 --- a/firmware/ice40-riscv/icE1usb/Makefile +++ b/firmware/ice40-riscv/icE1usb/Makefile @@ -48,6 +48,7 @@ config.h \ e1.h \ misc.h \ + usb_desc_ids.h \ usb_str_app.gen.h \ $(NULL) diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_app.c b/firmware/ice40-riscv/icE1usb/usb_desc_app.c index 246e70f..ec01854 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_app.c +++ b/firmware/ice40-riscv/icE1usb/usb_desc_app.c @@ -10,6 +10,8 @@ #include <no2usb/usb_dfu_proto.h> #include <no2usb/usb.h> +#include "usb_desc_ids.h" + #define NULL ((void*)0) #define num_elem(a) (sizeof(a) / sizeof(a[0])) @@ -63,11 +65,7 @@ .bLength = sizeof(struct usb_conf_desc), .bDescriptorType = USB_DT_CONF, .wTotalLength = sizeof(_app_conf_desc), -#if 0 - .bNumInterfaces = 4, -#else - .bNumInterfaces = 2, -#endif + .bNumInterfaces = USB_INTF_NUM, .bConfigurationValue = 1, .iConfiguration = 4, .bmAttributes = 0x80, @@ -78,7 +76,7 @@ .intf = { .bLength = sizeof(struct usb_intf_desc), .bDescriptorType = USB_DT_INTF, - .bInterfaceNumber = 0, + .bInterfaceNumber = USB_INTF_E1(0), .bAlternateSetting = 0, .bNumEndpoints = 1, .bInterfaceClass = 0xff, @@ -89,7 +87,7 @@ .ep_interrupt = { .bLength = sizeof(struct usb_ep_desc), .bDescriptorType = USB_DT_EP, - .bEndpointAddress = 0x83, + .bEndpointAddress = USB_EP_E1_INT(0), .bmAttributes = 0x03, .wMaxPacketSize = 10, .bInterval = 3, @@ -99,7 +97,7 @@ .intf = { .bLength = sizeof(struct usb_intf_desc), .bDescriptorType = USB_DT_INTF, - .bInterfaceNumber = 0, + .bInterfaceNumber = USB_INTF_E1(0), .bAlternateSetting = 1, .bNumEndpoints = 4, .bInterfaceClass = 0xff, @@ -110,7 +108,7 @@ .ep_data_in = { .bLength = sizeof(struct usb_ep_desc), .bDescriptorType = USB_DT_EP, - .bEndpointAddress = 0x82, + .bEndpointAddress = USB_EP_E1_IN(0), .bmAttributes = 0x05, .wMaxPacketSize = 388, .bInterval = 1, @@ -118,7 +116,7 @@ .ep_data_out = { .bLength = sizeof(struct usb_ep_desc), .bDescriptorType = USB_DT_EP, - .bEndpointAddress = 0x01, + .bEndpointAddress = USB_EP_E1_OUT(0), .bmAttributes = 0x05, .wMaxPacketSize = 388, .bInterval = 1, @@ -126,7 +124,7 @@ .ep_fb = { .bLength = sizeof(struct usb_ep_desc), .bDescriptorType = USB_DT_EP, - .bEndpointAddress = 0x81, + .bEndpointAddress = USB_EP_E1_FB(0), .bmAttributes = 0x11, .wMaxPacketSize = 8, .bInterval = 3, @@ -134,7 +132,7 @@ .ep_interrupt = { .bLength = sizeof(struct usb_ep_desc), .bDescriptorType = USB_DT_EP, - .bEndpointAddress = 0x83, + .bEndpointAddress = USB_EP_E1_INT(0), .bmAttributes = 0x03, .wMaxPacketSize = 10, .bInterval = 3, @@ -146,7 +144,7 @@ .intf_ctl = { .bLength = sizeof(struct usb_intf_desc), .bDescriptorType = USB_DT_INTF, - .bInterfaceNumber = 1, + .bInterfaceNumber = USB_INTF_GPS_CDC_CTL, .bAlternateSetting = 0, .bNumEndpoints = 1, .bInterfaceClass = USB_CLS_CDC_CONTROL, @@ -176,7 +174,7 @@ .ep_ctl = { .bLength = sizeof(struct usb_ep_desc), .bDescriptorType = USB_DT_EP, - .bEndpointAddress = 0x84, + .bEndpointAddress = USB_EP_GPS_CDC_CTL, .bmAttributes = 0x03, .wMaxPacketSize = 64, .bInterval = 0x40, @@ -184,7 +182,7 @@ .intf_data = { .bLength = sizeof(struct usb_intf_desc), .bDescriptorType = USB_DT_INTF, - .bInterfaceNumber = 2, + .bInterfaceNumber = USB_INTF_GPS_CDC_DATA, .bAlternateSetting = 0, .bNumEndpoints = 2, .bInterfaceClass = USB_CLS_CDC_DATA, @@ -195,7 +193,7 @@ .ep_data_out = { .bLength = sizeof(struct usb_ep_desc), .bDescriptorType = USB_DT_EP, - .bEndpointAddress = 0x05, + .bEndpointAddress = USB_EP_GPS_CDC_OUT, .bmAttributes = 0x02, .wMaxPacketSize = 64, .bInterval = 0x00, @@ -203,7 +201,7 @@ .ep_data_in = { .bLength = sizeof(struct usb_ep_desc), .bDescriptorType = USB_DT_EP, - .bEndpointAddress = 0x85, + .bEndpointAddress = USB_EP_GPS_CDC_IN, .bmAttributes = 0x02, .wMaxPacketSize = 64, .bInterval = 0x00, @@ -214,11 +212,7 @@ .intf = { .bLength = sizeof(struct usb_intf_desc), .bDescriptorType = USB_DT_INTF, -#if 0 - .bInterfaceNumber = 3, -#else - .bInterfaceNumber = 1, -#endif + .bInterfaceNumber = USB_INTF_DFU, .bAlternateSetting = 0, .bNumEndpoints = 0, .bInterfaceClass = 0xfe, diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h new file mode 100644 index 0000000..2247f84 --- /dev/null +++ b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h @@ -0,0 +1,17 @@ +/* + * usb_desc_ids.h + * + * Copyright (C) 2022 Sylvain Munaut <tnt(a)246tNt.com> + * SPDX-License-Identifier: LGPL-3.0-or-later + */ + +#pragma once + +#define USB_INTF_E1(p) (0 + (p)) +#define USB_INTF_DFU 1 +#define USB_INTF_NUM 2 + +#define USB_EP_E1_IN(p) (0x82 + (3 * (p))) +#define USB_EP_E1_OUT(p) (0x01 + (3 * (p))) +#define USB_EP_E1_FB(p) (0x81 + (3 * (p))) +#define USB_EP_E1_INT(p) (0x83 + (3 * (p))) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26830 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: I565d9a43bc26b99bc385b46522e7da6a207b2412 Gerrit-Change-Number: 26830 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-e1-hardware[master]: gateware/cores: Update USB core

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26826 ) Change subject: gateware/cores: Update USB core ...................................................................... gateware/cores: Update USB core Mostly to get firmware code improvement and fixes Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ifacacd15f989aa51c04433cfb0bdaee7f848b658 --- M gateware/cores/no2usb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/26/26826/1 diff --git a/gateware/cores/no2usb b/gateware/cores/no2usb index 0e940d4..e9d1fbb 160000 --- a/gateware/cores/no2usb +++ b/gateware/cores/no2usb @@ -1 +1 @@ -Subproject commit 0e940d4da592cd27c351de2a4c5639f391d86b4d +Subproject commit e9d1fbb8a1796444091cd8a39e2a4318530b4daf -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26826 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: Ifacacd15f989aa51c04433cfb0bdaee7f848b658 Gerrit-Change-Number: 26826 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-e1-hardware[master]: common fw: Add a 'panic' handler

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26827 ) Change subject: common fw: Add a 'panic' handler ...................................................................... common fw: Add a 'panic' handler Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ice3f338abfe3d361da875c3233b8a052bd6aa2c2 --- M firmware/ice40-riscv/common/utils.c M firmware/ice40-riscv/common/utils.h 2 files changed, 53 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/27/26827/1 diff --git a/firmware/ice40-riscv/common/utils.c b/firmware/ice40-riscv/common/utils.c index 67b292f..1ac111b 100644 --- a/firmware/ice40-riscv/common/utils.c +++ b/firmware/ice40-riscv/common/utils.c @@ -5,9 +5,15 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ +#include <stdarg.h> #include <stdint.h> #include <stdbool.h> +#include "console.h" +#include "led.h" +#include "mini-printf.h" +#include "misc.h" + char * hexstr(void *d, int n, bool space) { @@ -29,3 +35,47 @@ return buf; } + + +void +_panic(const char *file, int lineno, const char *fmt, ...) +{ + char buf[256]; + va_list va; + int l; + + /* Fast hard red blinking led */ + led_state(true); + led_color(255, 0, 8); + led_breathe(false, 0, 0); + led_blink(true, 75, 75); + + /* Prepare buffer */ + l = mini_snprintf(buf, 255, "PANIC @ %s:%d = ", file, lineno); + + va_start(va, fmt); + l += mini_vsnprintf(buf+l, 255-l, fmt, va); + va_end(va); + + buf[l] = '\n'; + buf[l+1] = '\0'; + + /* Print once */ + puts(buf); + + /* Loop waiting for commands */ + while (1) { + int cmd = getchar_nowait(); + + switch (cmd) { + case 'b': + /* Reboot */ + reboot(2); + break; + case ' ': + /* Print error again */ + puts(buf); + break; + } + } +} diff --git a/firmware/ice40-riscv/common/utils.h b/firmware/ice40-riscv/common/utils.h index fc898f8..03359ae 100644 --- a/firmware/ice40-riscv/common/utils.h +++ b/firmware/ice40-riscv/common/utils.h @@ -10,3 +10,6 @@ #include <stdbool.h> char *hexstr(void *d, int n, bool space); + +void _panic(const char *file, int lineno, const char *fmt, ...); +#define panic(fmt, ...) _panic(__FILE__, __LINE__, fmt, ##__VA_ARGS__) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26827 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: Ice3f338abfe3d361da875c3233b8a052bd6aa2c2 Gerrit-Change-Number: 26827 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

2025

2024

2023

2022

gerrit-log