Messing around with H7A3

.gitignore

@@ -22,6 +22,7 @@ cov-int*
 /ninja/
 /obj/
 /patches/
+/test/
 /tools/
 /downloads/
 /debug/

.vscode/settings.json

@@ -7,7 +7,9 @@
         "rth_trackback.h": "c",
         "platform.h": "c",
         "timer.h": "c",
-        "bus.h": "c"
+        "bus.h": "c",
+        "system.h": "c",
+        "system_stm32h7xx.h": "c"
     },
     "editor.tabSize": 4,
     "editor.insertSpaces": true,

.vscode/tasks.json

@@ -18,24 +18,35 @@
             "type": "shell",
             "command": "make AOCODARCH7DUAL",
             "group": {
-                "kind": "build",
-                "isDefault": true
+                "kind": "build"
             },
             "problemMatcher": [],
             "options": {
                 "cwd": "${workspaceFolder}/build"
             }
-        }
-        ,
+        },
         {
             "label": "CMAKE Update",
             "type": "shell",
-            "command": "cmake ..",
+            "command": "cmake -DWARNINGS_AS_ERRORS=ON ..",
             "group": "build",
             "problemMatcher": [],
             "options": {
                 "cwd": "${workspaceFolder}/build"
             }
+        },
+        {
+            "label": "Build TESTH7A3",
+            "type": "shell",
+            "command": "make TESTH7A3",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [],
+            "options": {
+                "cwd": "${workspaceFolder}/build"
+            }
         }
     ]
-}
+}

cmake/at32.cmake

@@ -8,7 +8,7 @@ option(SEMIHOSTING "Enable semihosting")
 
 message("-- DEBUG_HARDFAULTS: ${DEBUG_HARDFAULTS}, SEMIHOSTING: ${SEMIHOSTING}")
 
-set(CMSIS_DIR "${MAIN_LIB_DIR}/lib/main/AT32F43x/Drivers/CMSIS")
+set(CMSIS_DIR "${MAIN_LIB_DIR}/main/AT32F43x/Drivers/CMSIS")
 set(CMSIS_INCLUDE_DIR "${CMSIS_DIR}/cm4/core_support")
 # DSP use common
 set(CMSIS_DSP_DIR "${MAIN_LIB_DIR}/main/CMSIS/DSP")

cmake/stm32.cmake

@@ -2,6 +2,7 @@ include(stm32-bootloader)
 include(stm32f4)
 include(stm32f7)
 include(stm32h7)
+include(stm32h7a)
 
 include(CMakeParseArguments)
 
@@ -10,34 +11,10 @@ option(SEMIHOSTING "Enable semihosting")
 
 message("-- DEBUG_HARDFAULTS: ${DEBUG_HARDFAULTS}, SEMIHOSTING: ${SEMIHOSTING}")
 
-set(CMSIS_DIR "${MAIN_LIB_DIR}/main/CMSIS")
-set(CMSIS_INCLUDE_DIR "${CMSIS_DIR}/Core/Include")
-set(CMSIS_DSP_DIR "${MAIN_LIB_DIR}/main/CMSIS/DSP")
-set(CMSIS_DSP_INCLUDE_DIR "${CMSIS_DSP_DIR}/Include")
-
-set(CMSIS_DSP_SRC
-    BasicMathFunctions/arm_scale_f32.c
-    BasicMathFunctions/arm_sub_f32.c
-    BasicMathFunctions/arm_mult_f32.c
-    BasicMathFunctions/arm_offset_f32.c
-    TransformFunctions/arm_rfft_fast_f32.c
-    TransformFunctions/arm_cfft_f32.c
-    TransformFunctions/arm_rfft_fast_init_f32.c
-    TransformFunctions/arm_cfft_radix8_f32.c
-    TransformFunctions/arm_bitreversal2.S
-    CommonTables/arm_common_tables.c
-    ComplexMathFunctions/arm_cmplx_mag_f32.c
-    StatisticsFunctions/arm_max_f32.c
-    StatisticsFunctions/arm_rms_f32.c
-    StatisticsFunctions/arm_std_f32.c
-    StatisticsFunctions/arm_mean_f32.c
-)
-list(TRANSFORM CMSIS_DSP_SRC PREPEND "${CMSIS_DSP_DIR}/Source/")
-
 set(STM32_STARTUP_DIR "${MAIN_SRC_DIR}/startup")
 
 main_sources(STM32_VCP_SRC
-    drivers/serial_usb_vcp.c
+    #drivers/serial_usb_vcp.c
     drivers/usb_io.c
 )
 
@@ -69,8 +46,8 @@ main_sources(STM32_MSC_SDCARD_SRC
 )
 
 set(STM32_INCLUDE_DIRS
-    "${CMSIS_INCLUDE_DIR}"
-    "${CMSIS_DSP_INCLUDE_DIR}"
+    #"${CMSIS_INCLUDE_DIR}"
+    #"${CMSIS_DSP_INCLUDE_DIR}"
     "${MAIN_SRC_DIR}/target"
 )
 
@@ -359,7 +336,7 @@ function(target_stm32)
     add_stm32_executable(
         NAME ${name}
         FILENAME ${binary_name}
-        SOURCES ${target_sources} ${msc_sources} ${CMSIS_DSP_SRC} ${COMMON_SRC}
+        SOURCES ${target_sources} ${msc_sources} ${COMMON_SRC}
         COMPILE_DEFINITIONS ${target_definitions}
         COMPILE_OPTIONS ${args_COMPILE_OPTIONS}
         INCLUDE_DIRECTORIES ${target_include_directories}

cmake/stm32f4.cmake

@@ -7,6 +7,9 @@ set(STM32F4_CMSIS_DEVICE_DIR "${MAIN_LIB_DIR}/main/STM32F4/Drivers/CMSIS/Device/
 set(STM32F4_CMSIS_DRIVERS_DIR "${MAIN_LIB_DIR}/main/STM32F4/Drivers/CMSIS")
 set(STM32F4_VCP_DIR "${MAIN_SRC_DIR}/vcpf4")
 
+set(STM32F4_CMSIS_DIR "${MAIN_LIB_DIR}/main/CMSIS")
+set(STM32F4_CMSIS_INCLUDE_DIR "${STM32F4_CMSIS_DIR}/Core/Include")
+
 set(STM32F4_STDPERIPH_SRC_EXCLUDES
     stm32f4xx_can.c
     stm32f4xx_cec.c
@@ -29,6 +32,29 @@ set(STM32F4_STDPERIPH_SRC_EXCLUDES
     stm32f4xx_spdifrx.c
 )
 
+set(CMSIS_DSP_DIR "${MAIN_LIB_DIR}/main/CMSIS/DSP")
+set(CMSIS_DSP_INCLUDE_DIR "${CMSIS_DSP_DIR}/Include")
+
+set(CMSIS_DSP_SRC
+    BasicMathFunctions/arm_scale_f32.c
+    BasicMathFunctions/arm_sub_f32.c
+    BasicMathFunctions/arm_mult_f32.c
+    BasicMathFunctions/arm_offset_f32.c
+    TransformFunctions/arm_rfft_fast_f32.c
+    TransformFunctions/arm_cfft_f32.c
+    TransformFunctions/arm_rfft_fast_init_f32.c
+    TransformFunctions/arm_cfft_radix8_f32.c
+    TransformFunctions/arm_bitreversal2.S
+    CommonTables/arm_common_tables.c
+    ComplexMathFunctions/arm_cmplx_mag_f32.c
+    StatisticsFunctions/arm_max_f32.c
+    StatisticsFunctions/arm_rms_f32.c
+    StatisticsFunctions/arm_std_f32.c
+    StatisticsFunctions/arm_mean_f32.c
+)
+
+list(TRANSFORM CMSIS_DSP_SRC PREPEND "${CMSIS_DSP_DIR}/Source/")
+
 set(STM32F4_STDPERIPH_SRC_DIR "${STM32F4_STDPERIPH_DIR}/src")
 glob_except(STM32F4_STDPERIPH_SRC "${STM32F4_STDPERIPH_SRC_DIR}/*.c" "${STM32F4_STDPERIPH_SRC_EXCLUDES}")
 
@@ -82,10 +108,10 @@ set(STM32F4_DEFINITIONS
 
 function(target_stm32f4xx)
     target_stm32(
-        SOURCES ${STM32_STDPERIPH_SRC} ${STM32F4_SRC}
+        SOURCES ${STM32_STDPERIPH_SRC} ${STM32F4_SRC} ${CMSIS_DSP_SRC}
         COMPILE_DEFINITIONS ${STM32F4_DEFINITIONS}
         COMPILE_OPTIONS ${CORTEX_M4F_COMMON_OPTIONS} ${CORTEX_M4F_COMPILE_OPTIONS}
-        INCLUDE_DIRECTORIES ${STM32F4_INCLUDE_DIRS}
+        INCLUDE_DIRECTORIES ${STM32F4_INCLUDE_DIRS} ${CMSIS_DSP_INCLUDE_DIR} ${STM32F4_CMSIS_INCLUDE_DIR}
         LINK_OPTIONS ${CORTEX_M4F_COMMON_OPTIONS} ${CORTEX_M4F_LINK_OPTIONS}
 
         MSC_SOURCES ${STM32F4_USBMSC_SRC} ${STM32F4_MSC_SRC}

cmake/stm32f7.cmake

@@ -2,6 +2,8 @@ include(cortex-m7)
 include(stm32f7-usb)
 
 set(STM32F7_HAL_DIR "${MAIN_LIB_DIR}/main/STM32F7/Drivers/STM32F7xx_HAL_Driver")
+set(STM32F7_CMSIS_DIR "${MAIN_LIB_DIR}/main/CMSIS")
+set(STM32F7_CMSIS_INCLUDE_DIR "${STM32F7_CMSIS_DIR}/Core/Include")
 
 set(STM32F7_HAL_SRC
     stm32f7xx_hal.c
@@ -43,6 +45,30 @@ set(STM32F7_HAL_SRC
 )
 list(TRANSFORM STM32F7_HAL_SRC PREPEND "${STM32F7_HAL_DIR}/Src/")
 
+
+set(STM32F7_CMSIS_DSP_DIR "${MAIN_LIB_DIR}/main/CMSIS/DSP")
+set(STM32F7_CMSIS_DSP_INCLUDE_DIR "${STM32F7_CMSIS_DSP_DIR}/Include")
+
+set(STM32F7_CMSIS_DSP_SRC
+    BasicMathFunctions/arm_scale_f32.c
+    BasicMathFunctions/arm_sub_f32.c
+    BasicMathFunctions/arm_mult_f32.c
+    BasicMathFunctions/arm_offset_f32.c
+    TransformFunctions/arm_rfft_fast_f32.c
+    TransformFunctions/arm_cfft_f32.c
+    TransformFunctions/arm_rfft_fast_init_f32.c
+    TransformFunctions/arm_cfft_radix8_f32.c
+    TransformFunctions/arm_bitreversal2.S
+    CommonTables/arm_common_tables.c
+    ComplexMathFunctions/arm_cmplx_mag_f32.c
+    StatisticsFunctions/arm_max_f32.c
+    StatisticsFunctions/arm_rms_f32.c
+    StatisticsFunctions/arm_std_f32.c
+    StatisticsFunctions/arm_mean_f32.c
+)
+
+list(TRANSFORM STM32F7_CMSIS_DSP_SRC PREPEND "${STM32F7_CMSIS_DSP_DIR}/Source/")
+
 set(STM32F7_CMSIS_DEVICE_DIR "${MAIN_LIB_DIR}/main/STM32F7/Drivers/CMSIS/Device/ST/STM32F7xx")
 
 set(STM32F7_VCP_DIR "${MAIN_SRC_DIR}/vcp_hal")
@@ -91,10 +117,10 @@ set(STM32F7_DEFINITIONS
 
 function(target_stm32f7xx)
     target_stm32(
-        SOURCES ${STM32F7_HAL_SRC} ${STM32F7_SRC}
+        SOURCES ${STM32F7_HAL_SRC} ${STM32F7_SRC} ${STM32F7_CMSIS_DSP_SRC}
         COMPILE_DEFINITIONS ${STM32F7_DEFINITIONS}
         COMPILE_OPTIONS ${CORTEX_M7_COMMON_OPTIONS} ${CORTEX_M7_COMPILE_OPTIONS}
-        INCLUDE_DIRECTORIES ${STM32F7_INCLUDE_DIRS}
+        INCLUDE_DIRECTORIES ${STM32F7_INCLUDE_DIRS} ${STM32F7_CMSIS_DSP_INCLUDE_DIR} ${STM32F7_CMSIS_INCLUDE_DIR}
         LINK_OPTIONS ${CORTEX_M7_COMMON_OPTIONS} ${CORTEX_M7_LINK_OPTIONS}
 
         MSC_SOURCES ${STM32F7_USBMSC_SRC} ${STM32F7_MSC_SRC}

cmake/stm32h7.cmake

@@ -3,6 +3,30 @@ include(stm32h7-usb)
 
 set(STM32H7_CMSIS_DEVICE_DIR "${MAIN_LIB_DIR}/main/STM32H7/Drivers/CMSIS/Device/ST/STM32H7xx")
 set(STM32H7_HAL_DIR "${MAIN_LIB_DIR}/main/STM32H7/Drivers/STM32H7xx_HAL_Driver")
+set(STM32H7_CMSIS_DIR "${MAIN_LIB_DIR}/main/STM32H7/Drivers/CMSIS")
+set(STM32H7_CMSIS_INCLUDE_DIR "${STM32H7_CMSIS_DIR}/Core/Include")
+set(STM32H7_CMSIS_DSP_DIR "${MAIN_LIB_DIR}/main/STM32H7/Drivers/CMSIS/DSP")
+set(STM32H7_CMSIS_DSP_INCLUDE_DIR "${STM32H7_CMSIS_DSP_DIR}/Include")
+
+set(STM32H7_CMSIS_DSP_SRC
+    BasicMathFunctions/arm_scale_f32.c
+    BasicMathFunctions/arm_sub_f32.c
+    BasicMathFunctions/arm_mult_f32.c
+    BasicMathFunctions/arm_offset_f32.c
+    TransformFunctions/arm_rfft_fast_f32.c
+    TransformFunctions/arm_cfft_f32.c
+    TransformFunctions/arm_rfft_fast_init_f32.c
+    TransformFunctions/arm_cfft_radix8_f32.c
+    TransformFunctions/arm_bitreversal2.S
+    CommonTables/arm_common_tables.c
+    ComplexMathFunctions/arm_cmplx_mag_f32.c
+    StatisticsFunctions/arm_max_f32.c
+    StatisticsFunctions/arm_rms_f32.c
+    StatisticsFunctions/arm_std_f32.c
+    StatisticsFunctions/arm_mean_f32.c
+)
+
+list(TRANSFORM STM32H7_CMSIS_DSP_SRC PREPEND "${STM32H7_CMSIS_DSP_DIR}/Source/")
 
 set(STM32H7_HAL_SRC
     stm32h7xx_hal.c
@@ -88,8 +112,8 @@ set(STM32H7_HAL_SRC
     stm32h7xx_hal_tim_ex.c
     stm32h7xx_hal_uart.c
     stm32h7xx_hal_uart_ex.c
-#    stm32h7xx_hal_usart.c
-#    stm32h7xx_hal_usart_ex.c
+    stm32h7xx_hal_usart.c
+    stm32h7xx_hal_usart_ex.c
 #    stm32h7xx_hal_wwdg.c
 #    stm32h7xx_ll_adc.c
 #    stm32h7xx_ll_bdma.c
@@ -106,7 +130,7 @@ set(STM32H7_HAL_SRC
 #    stm32h7xx_ll_hrtim.c
     stm32h7xx_ll_i2c.c
 #    stm32h7xx_ll_lptim.c
-#    stm32h7xx_ll_lpuart.c
+    stm32h7xx_ll_lpuart.c
 #    stm32h7xx_ll_mdma.c
 #    stm32h7xx_ll_opamp.c
 #    stm32h7xx_ll_pwr.c
@@ -117,7 +141,7 @@ set(STM32H7_HAL_SRC
     stm32h7xx_ll_spi.c
 #    stm32h7xx_ll_swpmi.c
     stm32h7xx_ll_tim.c
-#    stm32h7xx_ll_usart.c
+    stm32h7xx_ll_usart.c
     stm32h7xx_ll_usb.c
 #    stm32h7xx_ll_utils.c
 )
@@ -136,6 +160,8 @@ list(TRANSFORM STM32H7_VCP_SRC PREPEND "${STM32H7_VCP_DIR}/")
 set(STM32H7_INCLUDE_DIRS
     ${STM32H7_HAL_DIR}/Inc
     ${STM32H7_CMSIS_DEVICE_DIR}/Include
+    ${STM32H7_CMSIS_INCLUDE_DIR}
+    ${STM32H7_CMSIS_DSP_INCLUDE_DIR}
 )
 
 main_sources(STM32H7_SRC
@@ -177,7 +203,7 @@ set(STM32H7_DEFINITIONS
 
 function(target_stm32h7xx)
     target_stm32(
-        SOURCES ${STM32H7_HAL_SRC} ${STM32H7_SRC}
+        SOURCES ${STM32H7_HAL_SRC} ${STM32H7_SRC} ${STM32H7_CMSIS_DSP_SRC}
         COMPILE_DEFINITIONS ${STM32H7_DEFINITIONS}
         COMPILE_OPTIONS ${CORTEX_M7_COMMON_OPTIONS} ${CORTEX_M7_COMPILE_OPTIONS}
         INCLUDE_DIRECTORIES ${STM32H7_INCLUDE_DIRS}
@@ -222,4 +248,3 @@ macro(define_target_stm32h7 subfamily size)
 endmacro()
 
 define_target_stm32h7(43 i)
-define_target_stm32h7(A3 i)

cmake/stm32h7a-usb.cmake

@@ -0,0 +1,41 @@
+set(STM32H7A_USBCORE_DIR "${MAIN_LIB_DIR}/main/STM32H7/Middlewares/ST/STM32_USB_Device_Library/Core")
+set(STM32H7A_USBCORE_SRC
+    usbd_core.c
+    usbd_ctlreq.c
+    usbd_ioreq.c
+)
+list(TRANSFORM STM32H7A_USBCORE_SRC PREPEND "${STM32H7A_USBCORE_DIR}/Src/")
+
+set(STM32H7A_USBCDC_DIR "${MAIN_LIB_DIR}/main/STM32H7/Middlewares/ST/STM32_USB_Device_Library/Class/CDC")
+set(STM32H7A_USBCDC_SRC
+    usbd_cdc.c
+)
+list(TRANSFORM STM32H7A_USBCDC_SRC PREPEND "${STM32H7A_USBCDC_DIR}/Src/")
+
+set(STM32H7A_USBHID_DIR "${MAIN_LIB_DIR}/main/STM32H7/Middlewares/ST/STM32_USB_Device_Library/Class/HID")
+set(STM32H7A_USBHID_SRC
+    usbd_hid.c
+)
+list(TRANSFORM STM32H7A_USBHID_SRC PREPEND "${STM32H7A_USBHID_DIR}/Src/")
+
+set(STM32H7A_USBMSC_DIR "${MAIN_LIB_DIR}/main/STM32H7/Middlewares/ST/STM32_USB_Device_Library/Class/MSC")
+set(STM32H7A_USBMSC_SRC
+    usbd_msc.c
+    usbd_msc_bot.c
+    usbd_msc_data.c
+    usbd_msc_scsi.c
+)
+list(TRANSFORM STM32H7A_USBMSC_SRC PREPEND "${STM32H7A_USBMSC_DIR}/Src/")
+
+set(STM32H7A_USB_INCLUDE_DIRS
+    "${STM32H7A_USBCORE_DIR}/Inc"
+    "${STM32H7A_USBCDC_DIR}/Inc"
+    "${STM32H7A_USBHID_DIR}/Inc"
+    "${STM32H7A_USBMSC_DIR}/Inc"
+)
+
+list(APPEND STM32H7A_USB_SRC ${STM32H7A_USBCORE_SRC})
+list(APPEND STM32H7A_USB_SRC ${STM32H7A_USBCDC_SRC})
+list(APPEND STM32H7A_USB_SRC ${STM32H7A_USBHID_SRC})
+#XXX: Not working yet
+#list(APPEND STM32H7A_USB_SRC ${STM32H7A_USBMSC_SRC})