From eeb6b501ff01e95acef081f22b11491de6d29d2e Mon Sep 17 00:00:00 2001 From: Ha Thach Date: Thu, 3 Jun 2021 02:00:29 +0700 Subject: [PATCH] fix qtpy rp2040 uart rx rev B (#466) also add static check for USB DPRAM --- src/boards/include/boards/adafruit_qtpy_rp2040.h | 2 +- src/rp2040/hardware_structs/include/hardware/structs/usb.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/boards/include/boards/adafruit_qtpy_rp2040.h b/src/boards/include/boards/adafruit_qtpy_rp2040.h index c273ddc..299249d 100644 --- a/src/boards/include/boards/adafruit_qtpy_rp2040.h +++ b/src/boards/include/boards/adafruit_qtpy_rp2040.h @@ -30,7 +30,7 @@ #endif #ifndef PICO_DEFAULT_UART_RX_PIN -#define PICO_DEFAULT_UART_RX_PIN 9 +#define PICO_DEFAULT_UART_RX_PIN 5 #endif //------------- LED -------------// diff --git a/src/rp2040/hardware_structs/include/hardware/structs/usb.h b/src/rp2040/hardware_structs/include/hardware/structs/usb.h index 5c3c453..0254e61 100644 --- a/src/rp2040/hardware_structs/include/hardware/structs/usb.h +++ b/src/rp2040/hardware_structs/include/hardware/structs/usb.h @@ -79,6 +79,7 @@ typedef struct { } usb_device_dpram_t; static_assert(sizeof(usb_device_dpram_t) == USB_DPRAM_MAX, ""); +static_assert(offsetof(usb_device_dpram_t, epx_data) == 0x180, ""); typedef struct { // 4K of DPSRAM at beginning. Note this supports 8, 16, and 32 bit accesses @@ -108,6 +109,7 @@ typedef struct { } usb_host_dpram_t; static_assert(sizeof(usb_host_dpram_t) == USB_DPRAM_MAX, ""); +static_assert(offsetof(usb_host_dpram_t, epx_data) == 0x180, ""); typedef struct { io_rw_32 dev_addr_ctrl;