summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorBrent Kowal <[email protected]>2024-07-25 09:08:37 -0400
committerBrent Kowal <[email protected]>2024-07-25 09:08:37 -0400
commit5122d6d109f8c4b31b6cbe29c685fad30a8961fe (patch)
treef45efc716882a885d776a30f79c11fef9e41735f /hw
parent13f5f20c981cc54baa8438e275524db03fb79e94 (diff)
Combined DCD MUSB implementations
Combined the new MAX32 MUSB implementation with the existing (TI) implementation to provide generic code base for working the MUSB DCD peripheral. - Added abstraction calls for FIFO setup, EP registers, Ctrl registers and interrupt setup. - Combined TM4C and MSP432E into a single header file. - Created musb_max32.h, and removed the MAX32 specific C implementation. - Updated MAX32 build system to use dcd_musb.c. - Added MAX32 conditions for cdc_dual_ports example descriptors missed during first testing.
Diffstat (limited to 'hw')
-rw-r--r--hw/bsp/max32650/family.cmake2
-rw-r--r--hw/bsp/max32650/family.mk2
-rw-r--r--hw/bsp/max32666/family.cmake2
-rw-r--r--hw/bsp/max32666/family.mk2
-rw-r--r--hw/bsp/max32690/family.cmake2
-rw-r--r--hw/bsp/max32690/family.mk2
-rw-r--r--hw/bsp/max78002/family.cmake2
-rw-r--r--hw/bsp/max78002/family.mk2
8 files changed, 8 insertions, 8 deletions
diff --git a/hw/bsp/max32650/family.cmake b/hw/bsp/max32650/family.cmake
index 129d99af8..92b68a1cd 100644
--- a/hw/bsp/max32650/family.cmake
+++ b/hw/bsp/max32650/family.cmake
@@ -132,7 +132,7 @@ function(family_configure_example TARGET RTOS)
# Add TinyUSB target and port source
family_add_tinyusb(${TARGET} OPT_MCU_MAX32650 ${RTOS})
target_sources(${TARGET}-tinyusb PUBLIC
- ${TOP}/src/portable/analog/max32/dcd_max32.c
+ ${TOP}/src/portable/mentor/musb/dcd_musb.c
)
target_compile_options(${TARGET} PRIVATE
-Wno-error=strict-prototypes
diff --git a/hw/bsp/max32650/family.mk b/hw/bsp/max32650/family.mk
index 0718523c3..359261216 100644
--- a/hw/bsp/max32650/family.mk
+++ b/hw/bsp/max32650/family.mk
@@ -62,7 +62,7 @@ flash: $(DEFAULT_FLASH)
# -----------------
PERIPH_SRC = $(TOP)/$(MAX32_PERIPH)/Source
SRC_C += \
- src/portable/analog/max32/dcd_max32.c \
+ src/portable/mentor/musb/dcd_musb.c \
$(MAX32_CMSIS)/Device/Maxim/MAX32650/Source/heap.c \
$(MAX32_CMSIS)/Device/Maxim/MAX32650/Source/system_max32650.c \
$(MAX32_CMSIS)/Device/Maxim/MAX32650/Source/header_MAX32650.c \
diff --git a/hw/bsp/max32666/family.cmake b/hw/bsp/max32666/family.cmake
index ef2a2bb63..eb9d2175f 100644
--- a/hw/bsp/max32666/family.cmake
+++ b/hw/bsp/max32666/family.cmake
@@ -127,7 +127,7 @@ function(family_configure_example TARGET RTOS)
# Add TinyUSB target and port source
family_add_tinyusb(${TARGET} OPT_MCU_MAX32666 ${RTOS})
target_sources(${TARGET}-tinyusb PUBLIC
- ${TOP}/src/portable/analog/max32/dcd_max32.c
+ ${TOP}/src/portable/mentor/musb/dcd_musb.c
)
target_compile_options(${TARGET} PRIVATE
-Wno-error=strict-prototypes
diff --git a/hw/bsp/max32666/family.mk b/hw/bsp/max32666/family.mk
index 31f81f014..720d994ef 100644
--- a/hw/bsp/max32666/family.mk
+++ b/hw/bsp/max32666/family.mk
@@ -57,7 +57,7 @@ flash-msdk: $(BUILD)/$(PROJECT).elf
# -----------------
PERIPH_SRC = $(TOP)/$(MAX32_PERIPH)/Source
SRC_C += \
- src/portable/analog/max32/dcd_max32.c \
+ src/portable/mentor/musb/dcd_musb.c \
$(MAX32_CMSIS)/Device/Maxim/MAX32665/Source/heap.c \
$(MAX32_CMSIS)/Device/Maxim/MAX32665/Source/system_max32665.c \
$(PERIPH_SRC)/SYS/mxc_assert.c \
diff --git a/hw/bsp/max32690/family.cmake b/hw/bsp/max32690/family.cmake
index d7a562956..2a9422dbe 100644
--- a/hw/bsp/max32690/family.cmake
+++ b/hw/bsp/max32690/family.cmake
@@ -132,7 +132,7 @@ function(family_configure_example TARGET RTOS)
# Add TinyUSB target and port source
family_add_tinyusb(${TARGET} OPT_MCU_MAX32690 ${RTOS})
target_sources(${TARGET}-tinyusb PUBLIC
- ${TOP}/src/portable/analog/max32/dcd_max32.c
+ ${TOP}/src/portable/mentor/musb/dcd_musb.c
)
target_compile_options(${TARGET} PRIVATE
-Wno-error=strict-prototypes
diff --git a/hw/bsp/max32690/family.mk b/hw/bsp/max32690/family.mk
index 9360a07c6..c533cf4a4 100644
--- a/hw/bsp/max32690/family.mk
+++ b/hw/bsp/max32690/family.mk
@@ -64,7 +64,7 @@ flash-msdk: $(BUILD)/$(PROJECT).elf
# -----------------
PERIPH_SRC = $(TOP)/$(MAX32_PERIPH)/Source
SRC_C += \
- src/portable/analog/max32/dcd_max32.c \
+ src/portable/mentor/musb/dcd_musb.c \
$(MAX32_CMSIS)/Device/Maxim/MAX32690/Source/heap.c \
$(MAX32_CMSIS)/Device/Maxim/MAX32690/Source/system_max32690.c \
$(PERIPH_SRC)/SYS/mxc_assert.c \
diff --git a/hw/bsp/max78002/family.cmake b/hw/bsp/max78002/family.cmake
index 83fd3007f..090f1da43 100644
--- a/hw/bsp/max78002/family.cmake
+++ b/hw/bsp/max78002/family.cmake
@@ -137,7 +137,7 @@ function(family_configure_example TARGET RTOS)
# Add TinyUSB target and port source
family_add_tinyusb(${TARGET} OPT_MCU_MAX78002 ${RTOS})
target_sources(${TARGET}-tinyusb PUBLIC
- ${TOP}/src/portable/analog/max32/dcd_max32.c
+ ${TOP}/src/portable/mentor/musb/dcd_musb.c
)
target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
target_compile_options(${TARGET}-tinyusb PRIVATE
diff --git a/hw/bsp/max78002/family.mk b/hw/bsp/max78002/family.mk
index 8df8517da..5297815de 100644
--- a/hw/bsp/max78002/family.mk
+++ b/hw/bsp/max78002/family.mk
@@ -60,7 +60,7 @@ flash-msdk: $(BUILD)/$(PROJECT).elf
# -----------------
PERIPH_SRC = $(TOP)/$(MAX32_PERIPH)/Source
SRC_C += \
- src/portable/analog/max32/dcd_max32.c \
+ src/portable/mentor/musb/dcd_musb.c \
$(MAX32_CMSIS)/Device/Maxim/MAX78002/Source/heap.c \
$(MAX32_CMSIS)/Device/Maxim/MAX78002/Source/system_max78002.c \
$(PERIPH_SRC)/SYS/mxc_assert.c \