summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiFiPhile <[email protected]>2023-12-12 22:35:05 +0100
committerhenneboi <[email protected]>2023-12-13 14:32:23 +0100
commitf3d713ac7336913a68326eae5a7e146ec2cd22c3 (patch)
treeb2b584a0ae2391184fdc3e0afb8aad45201ca226
parent93c40b6966db53ce70f4bea6b8a72bf2986ac180 (diff)
Fix CI & typo.
-rw-r--r--hw/bsp/stm32g0/boards/stm32g0b1nucleo/board.h2
-rw-r--r--hw/bsp/stm32h5/boards/stm32h573i-dk/board.h2
-rw-r--r--hw/bsp/stm32h5/family.mk4
-rw-r--r--src/common/tusb_mcu.h1
-rw-r--r--src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c7
-rw-r--r--src/portable/st/stm32_fsdev/dcd_stm32_fsdev_pvt_st.h4
-rw-r--r--tools/get_deps.py1
7 files changed, 8 insertions, 13 deletions
diff --git a/hw/bsp/stm32g0/boards/stm32g0b1nucleo/board.h b/hw/bsp/stm32g0/boards/stm32g0b1nucleo/board.h
index ae0820529..9ebaf73f0 100644
--- a/hw/bsp/stm32g0/boards/stm32g0b1nucleo/board.h
+++ b/hw/bsp/stm32g0/boards/stm32g0b1nucleo/board.h
@@ -2,7 +2,7 @@
* The MIT License (MIT)
*
* 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
* of this software and associated documentation files (the "Software"), to deal
diff --git a/hw/bsp/stm32h5/boards/stm32h573i-dk/board.h b/hw/bsp/stm32h5/boards/stm32h573i-dk/board.h
index 01834f151..a8808e32b 100644
--- a/hw/bsp/stm32h5/boards/stm32h573i-dk/board.h
+++ b/hw/bsp/stm32h5/boards/stm32h573i-dk/board.h
@@ -2,7 +2,7 @@
* The MIT License (MIT)
*
* 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
* of this software and associated documentation files (the "Software"), to deal
diff --git a/hw/bsp/stm32h5/family.mk b/hw/bsp/stm32h5/family.mk
index e04e08d80..2fd95ecec 100644
--- a/hw/bsp/stm32h5/family.mk
+++ b/hw/bsp/stm32h5/family.mk
@@ -11,9 +11,9 @@ CPU_CORE ?= cortex-m33
# Compiler Flags
# --------------
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 += \
-D__ARMCC_VERSION=0
diff --git a/src/common/tusb_mcu.h b/src/common/tusb_mcu.h
index 9c4083031..e589c4c86 100644
--- a/src/common/tusb_mcu.h
+++ b/src/common/tusb_mcu.h
@@ -214,7 +214,6 @@
#define TUP_USBIP_FSDEV
#define TUP_USBIP_FSDEV_STM32
#define TUP_DCD_ENDPOINT_MAX 8
-
#elif TU_CHECK_MCU(OPT_MCU_STM32G4)
// Device controller
diff --git a/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c b/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
index b0a00b7ee..21cd3da26 100644
--- a/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
+++ b/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
@@ -357,11 +357,9 @@ void dcd_int_enable (uint8_t rhport)
#else
NVIC_EnableIRQ(USB_UCPD1_2_IRQn);
#endif
-
-
+
#elif CFG_TUSB_MCU == OPT_MCU_STM32H5
NVIC_EnableIRQ(USB_DRD_FS_IRQn);
-
#elif CFG_TUSB_MCU == OPT_MCU_STM32WB
NVIC_EnableIRQ(USB_HP_IRQn);
@@ -419,10 +417,9 @@ void dcd_int_disable(uint8_t rhport)
#else
NVIC_DisableIRQ(USB_UCPD1_2_IRQn);
#endif
-
+
#elif CFG_TUSB_MCU == OPT_MCU_STM32H5
NVIC_DisableIRQ(USB_DRD_FS_IRQn);
-
#elif CFG_TUSB_MCU == OPT_MCU_STM32WB
NVIC_DisableIRQ(USB_HP_IRQn);
diff --git a/src/portable/st/stm32_fsdev/dcd_stm32_fsdev_pvt_st.h b/src/portable/st/stm32_fsdev/dcd_stm32_fsdev_pvt_st.h
index 0db426e50..b71e4f498 100644
--- a/src/portable/st/stm32_fsdev/dcd_stm32_fsdev_pvt_st.h
+++ b/src/portable/st/stm32_fsdev/dcd_stm32_fsdev_pvt_st.h
@@ -137,8 +137,8 @@
#define USB_EPADDR_FIELD USB_CHEP_ADDR
#define USB_CNTR_LPMODE USB_CNTR_SUSPRDY
#define USB_CNTR_FSUSP USB_CNTR_SUSPEN
-
-
+
+
#elif CFG_TUSB_MCU == OPT_MCU_STM32WB
#include "stm32wbxx.h"
#define PMA_LENGTH (1024u)
diff --git a/tools/get_deps.py b/tools/get_deps.py
index cda4fc8da..38ff81412 100644
--- a/tools/get_deps.py
+++ b/tools/get_deps.py
@@ -98,7 +98,6 @@ deps_optional = {
'hw/mcu/st/cmsis_device_h5': ['https://github.com/STMicroelectronics/cmsis_device_h5.git',
'62b2cb0fbfe10c5791ee469bbde7b397c2fea8f5',
'stm32h5'],
-
'hw/mcu/st/cmsis_device_l0': ['https://github.com/STMicroelectronics/cmsis_device_l0.git',
'06748ca1f93827befdb8b794402320d94d02004f',
'stm32l0'],