andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix CI & typo.

Browse Source
This commit is contained in:
HiFiPhile
2023-12-12 22:35:05 +01:00
committed by henneboi
parent 93c40b6966
commit f3d713ac73
7 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/bsp/stm32g0/boards/stm32g0b1nucleo/board.h
View File

@@ -2,7 +2,7 @@
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2020, Ha Thach (tinyusb.org) * Copyright (c) 2020, Ha Thach (tinyusb.org)
* Copyright (c) 2034, HiFiPhile * Copyright (c) 2023, HiFiPhile
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal

2
hw/bsp/stm32h5/boards/stm32h573i-dk/board.h
View File

@@ -2,7 +2,7 @@
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2020, Ha Thach (tinyusb.org) * Copyright (c) 2020, Ha Thach (tinyusb.org)
* Copyright (c) 2034, HiFiPhile * Copyright (c) 2023, HiFiPhile
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal

4
hw/bsp/stm32h5/family.mk
View File

@@ -11,9 +11,9 @@ CPU_CORE ?= cortex-m33
# Compiler Flags # Compiler Flags
# -------------- # --------------
CFLAGS += \ CFLAGS += \
-DCFG_TUSB_MCU=OPT_MCU_STM32H5 -DCFG_TUSB_MCU=OPT_MCU_STM32H5
# workaround to fix a build issue due to a wrong define check in hal, this define must be removed as soon as the repo is fixed # workaround to fix a build issue due to a wrong define check in hal, this define must be removed as soon as the repo is fixed
CFLAGS += \ CFLAGS += \
-D__ARMCC_VERSION=0 -D__ARMCC_VERSION=0

1
src/common/tusb_mcu.h
View File

@@ -214,7 +214,6 @@
#define TUP_USBIP_FSDEV #define TUP_USBIP_FSDEV
#define TUP_USBIP_FSDEV_STM32 #define TUP_USBIP_FSDEV_STM32
#define TUP_DCD_ENDPOINT_MAX 8 #define TUP_DCD_ENDPOINT_MAX 8
#elif TU_CHECK_MCU(OPT_MCU_STM32G4) #elif TU_CHECK_MCU(OPT_MCU_STM32G4)
// Device controller // Device controller

7
src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
View File

@@ -357,11 +357,9 @@ void dcd_int_enable (uint8_t rhport)
#else #else
NVIC_EnableIRQ(USB_UCPD1_2_IRQn); NVIC_EnableIRQ(USB_UCPD1_2_IRQn);
#endif #endif
#elif CFG_TUSB_MCU == OPT_MCU_STM32H5 #elif CFG_TUSB_MCU == OPT_MCU_STM32H5
NVIC_EnableIRQ(USB_DRD_FS_IRQn); NVIC_EnableIRQ(USB_DRD_FS_IRQn);
#elif CFG_TUSB_MCU == OPT_MCU_STM32WB #elif CFG_TUSB_MCU == OPT_MCU_STM32WB
NVIC_EnableIRQ(USB_HP_IRQn); NVIC_EnableIRQ(USB_HP_IRQn);
@@ -419,10 +417,9 @@ void dcd_int_disable(uint8_t rhport)
#else #else
NVIC_DisableIRQ(USB_UCPD1_2_IRQn); NVIC_DisableIRQ(USB_UCPD1_2_IRQn);
#endif #endif
#elif CFG_TUSB_MCU == OPT_MCU_STM32H5 #elif CFG_TUSB_MCU == OPT_MCU_STM32H5
NVIC_DisableIRQ(USB_DRD_FS_IRQn); NVIC_DisableIRQ(USB_DRD_FS_IRQn);
#elif CFG_TUSB_MCU == OPT_MCU_STM32WB #elif CFG_TUSB_MCU == OPT_MCU_STM32WB
NVIC_DisableIRQ(USB_HP_IRQn); NVIC_DisableIRQ(USB_HP_IRQn);

4
src/portable/st/stm32_fsdev/dcd_stm32_fsdev_pvt_st.h
View File

@@ -137,8 +137,8 @@
#define USB_EPADDR_FIELD USB_CHEP_ADDR #define USB_EPADDR_FIELD USB_CHEP_ADDR
#define USB_CNTR_LPMODE USB_CNTR_SUSPRDY #define USB_CNTR_LPMODE USB_CNTR_SUSPRDY
#define USB_CNTR_FSUSP USB_CNTR_SUSPEN #define USB_CNTR_FSUSP USB_CNTR_SUSPEN
#elif CFG_TUSB_MCU == OPT_MCU_STM32WB #elif CFG_TUSB_MCU == OPT_MCU_STM32WB
#include "stm32wbxx.h" #include "stm32wbxx.h"
#define PMA_LENGTH (1024u) #define PMA_LENGTH (1024u)

1
tools/get_deps.py
View File

@@ -98,7 +98,6 @@ deps_optional = {
'hw/mcu/st/cmsis_device_h5': ['https://github.com/STMicroelectronics/cmsis_device_h5.git', 'hw/mcu/st/cmsis_device_h5': ['https://github.com/STMicroelectronics/cmsis_device_h5.git',
'62b2cb0fbfe10c5791ee469bbde7b397c2fea8f5', '62b2cb0fbfe10c5791ee469bbde7b397c2fea8f5',
'stm32h5'], 'stm32h5'],
'hw/mcu/st/cmsis_device_l0': ['https://github.com/STMicroelectronics/cmsis_device_l0.git', 'hw/mcu/st/cmsis_device_l0': ['https://github.com/STMicroelectronics/cmsis_device_l0.git',
'06748ca1f93827befdb8b794402320d94d02004f', '06748ca1f93827befdb8b794402320d94d02004f',
'stm32l0'], 'stm32l0'],