retronetworking
/
osmo-e1-hardware
mirror of https://gerrit.osmocom.org/osmo-e1-hardware
13
0
Fork 0
Code Issues Projects Releases Wiki Activity

firmware/ice40-riscv: Update no2usb core and fixup for API changes 

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: Ia6bda410e2529858cb86827e186bb099b9b87799
This commit is contained in:
Sylvain Munaut 2020-10-29 13:17:11 +01:00
parent bc59615ebc
commit 4ea7d27764
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/ice40-riscv/e1-tracer/usb_desc_app.c
View File

@ -6,6 +6,7 @@
*/ */
#include <no2usb/usb_proto.h> #include <no2usb/usb_proto.h>
#include <no2usb/usb_dfu_proto.h>
#include <no2usb/usb.h> #include <no2usb/usb.h>
#define NULL ((void*)0) #define NULL ((void*)0)
@ -48,7 +49,7 @@ static const struct {
/* DFU Runtime */ /* DFU Runtime */
struct { struct {
struct usb_intf_desc intf; struct usb_intf_desc intf;
struct usb_dfu_desc func; struct usb_dfu_func_desc func;
} __attribute__ ((packed)) dfu; } __attribute__ ((packed)) dfu;
} __attribute__ ((packed)) _app_conf_desc = { } __attribute__ ((packed)) _app_conf_desc = {
.conf = { .conf = {
@ -211,8 +212,8 @@ static const struct {
.iInterface = 8, .iInterface = 8,
}, },
.func = { .func = {
.bLength = sizeof(struct usb_dfu_desc), .bLength = sizeof(struct usb_dfu_func_desc),
.bDescriptorType = USB_DT_DFU, .bDescriptorType = USB_DFU_DT_FUNC,
.bmAttributes = 0x0d, .bmAttributes = 0x0d,
.wDetachTimeOut = 1000, .wDetachTimeOut = 1000,
.wTransferSize = 4096, .wTransferSize = 4096,

7
firmware/ice40-riscv/icE1usb/usb_desc_app.c
View File

@ -6,6 +6,7 @@
*/ */
#include <no2usb/usb_proto.h> #include <no2usb/usb_proto.h>
#include <no2usb/usb_dfu_proto.h>
#include <no2usb/usb.h> #include <no2usb/usb.h>
#define NULL ((void*)0) #define NULL ((void*)0)
@ -50,7 +51,7 @@ static const struct {
/* DFU Runtime */ /* DFU Runtime */
struct { struct {
struct usb_intf_desc intf; struct usb_intf_desc intf;
struct usb_dfu_desc func; struct usb_dfu_func_desc func;
} __attribute__ ((packed)) dfu; } __attribute__ ((packed)) dfu;
} __attribute__ ((packed)) _app_conf_desc = { } __attribute__ ((packed)) _app_conf_desc = {
.conf = { .conf = {
@ -229,8 +230,8 @@ static const struct {
.iInterface = 8, .iInterface = 8,
}, },
.func = { .func = {
.bLength = sizeof(struct usb_dfu_desc), .bLength = sizeof(struct usb_dfu_func_desc),
.bDescriptorType = USB_DT_DFU, .bDescriptorType = USB_DFU_DT_FUNC,
.bmAttributes = 0x0d, .bmAttributes = 0x0d,
.wDetachTimeOut = 1000, .wDetachTimeOut = 1000,
.wTransferSize = 4096, .wTransferSize = 4096,

2
gateware/cores/no2usb

@ -1 +1 @@
Subproject commit 2f9da04313d6b4b0441cf0d0d2facc19f06438a8 Subproject commit 620047a69f744d861d423d91d048b047302f6250