firmware/ice40-riscv: Update no2usb core and fixup for API changes
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Change-Id: Ia6bda410e2529858cb86827e186bb099b9b87799
diff --git a/firmware/ice40-riscv/e1-tracer/usb_desc_app.c b/firmware/ice40-riscv/e1-tracer/usb_desc_app.c
index 176ec12..fb0e50d 100644
--- a/firmware/ice40-riscv/e1-tracer/usb_desc_app.c
+++ b/firmware/ice40-riscv/e1-tracer/usb_desc_app.c
@@ -6,6 +6,7 @@
*/
#include <no2usb/usb_proto.h>
+#include <no2usb/usb_dfu_proto.h>
#include <no2usb/usb.h>
#define NULL ((void*)0)
@@ -48,7 +49,7 @@
/* DFU Runtime */
struct {
struct usb_intf_desc intf;
- struct usb_dfu_desc func;
+ struct usb_dfu_func_desc func;
} __attribute__ ((packed)) dfu;
} __attribute__ ((packed)) _app_conf_desc = {
.conf = {
@@ -211,8 +212,8 @@
.iInterface = 8,
},
.func = {
- .bLength = sizeof(struct usb_dfu_desc),
- .bDescriptorType = USB_DT_DFU,
+ .bLength = sizeof(struct usb_dfu_func_desc),
+ .bDescriptorType = USB_DFU_DT_FUNC,
.bmAttributes = 0x0d,
.wDetachTimeOut = 1000,
.wTransferSize = 4096,
diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_app.c b/firmware/ice40-riscv/icE1usb/usb_desc_app.c
index 98f2830..d6c274a 100644
--- a/firmware/ice40-riscv/icE1usb/usb_desc_app.c
+++ b/firmware/ice40-riscv/icE1usb/usb_desc_app.c
@@ -6,6 +6,7 @@
*/
#include <no2usb/usb_proto.h>
+#include <no2usb/usb_dfu_proto.h>
#include <no2usb/usb.h>
#define NULL ((void*)0)
@@ -50,7 +51,7 @@
/* DFU Runtime */
struct {
struct usb_intf_desc intf;
- struct usb_dfu_desc func;
+ struct usb_dfu_func_desc func;
} __attribute__ ((packed)) dfu;
} __attribute__ ((packed)) _app_conf_desc = {
.conf = {
@@ -229,8 +230,8 @@
.iInterface = 8,
},
.func = {
- .bLength = sizeof(struct usb_dfu_desc),
- .bDescriptorType = USB_DT_DFU,
+ .bLength = sizeof(struct usb_dfu_func_desc),
+ .bDescriptorType = USB_DFU_DT_FUNC,
.bmAttributes = 0x0d,
.wDetachTimeOut = 1000,
.wTransferSize = 4096,
diff --git a/gateware/cores/no2usb b/gateware/cores/no2usb
index 2f9da04..620047a 160000
--- a/gateware/cores/no2usb
+++ b/gateware/cores/no2usb
@@ -1 +1 @@
-Subproject commit 2f9da04313d6b4b0441cf0d0d2facc19f06438a8
+Subproject commit 620047a69f744d861d423d91d048b047302f6250