diff options
| author | Ha Thach <[email protected]> | 2023-11-24 13:21:38 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-11-24 13:21:38 +0700 |
| commit | f03f60eae2894993373b48e2104bf02116bef1fa (patch) | |
| tree | ca928a5957eff4c73aee2a9454b5108cb2fe0496 /src/portable | |
| parent | d6b8b3515df4bb83b6038bd60260771e65af8de7 (diff) | |
| parent | b6059fa942897d3037e6dce2a6f4082b9f2ebb57 (diff) | |
Merge pull request #2278 from Krasutski/feature/ch32f20x
Add CH32F20x support
Diffstat (limited to 'src/portable')
| -rw-r--r-- | src/portable/wch/ch32_usbhs_reg.h (renamed from src/portable/wch/ch32v307/ch32_usbhs_reg.h) | 4 | ||||
| -rw-r--r-- | src/portable/wch/dcd_ch32_usbhs.c (renamed from src/portable/wch/ch32v307/dcd_usbhs.c) | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/portable/wch/ch32v307/ch32_usbhs_reg.h b/src/portable/wch/ch32_usbhs_reg.h index 5a2c1fbc9..9b956231f 100644 --- a/src/portable/wch/ch32v307/ch32_usbhs_reg.h +++ b/src/portable/wch/ch32_usbhs_reg.h @@ -1,7 +1,11 @@ #ifndef _USB_CH32_USBHS_REG_H #define _USB_CH32_USBHS_REG_H +#if (CFG_TUSB_MCU == OPT_MCU_CH32V307) #include <ch32v30x.h> +#elif (CFG_TUSB_MCU == OPT_MCU_CH32F20X) +#include <ch32f20x.h> +#endif /******************* GLOBAL ******************/ diff --git a/src/portable/wch/ch32v307/dcd_usbhs.c b/src/portable/wch/dcd_ch32_usbhs.c index 3ad011cff..1f1c0b876 100644 --- a/src/portable/wch/ch32v307/dcd_usbhs.c +++ b/src/portable/wch/dcd_ch32_usbhs.c @@ -26,11 +26,11 @@ #include "tusb_option.h" -#if CFG_TUD_ENABLED && (CFG_TUSB_MCU == OPT_MCU_CH32V307) +#if CFG_TUD_ENABLED && ((CFG_TUSB_MCU == OPT_MCU_CH32V307) || (CFG_TUSB_MCU == OPT_MCU_CH32F20X)) #include "device/dcd.h" #include "ch32_usbhs_reg.h" -#include "core_riscv.h" + // Max number of bi-directional endpoints including EP0 #define EP_MAX 16 @@ -73,7 +73,7 @@ void dcd_init(uint8_t rhport) { #if TUD_OPT_HIGH_SPEED USBHSD->CONTROL = USBHS_DMA_EN | USBHS_INT_BUSY_EN | USBHS_HIGH_SPEED; #else - #error OPT_MODE_FULL_SPEED not currently supported on CH32V307 + #error OPT_MODE_FULL_SPEED not currently supported on CH32 USBHSD->CONTROL = USBHS_DMA_EN | USBHS_INT_BUSY_EN | USBHS_FULL_SPEED; #endif |