Merge pull request #68 from RebelTechnology/feature/usbd-startup-refactor

v22.4.rc1

Author: pingdynasty

ACDC/ACDC.ioc

@@ -148,17 +148,16 @@ Mcu.IP15=TIM4
 Mcu.IP16=TIM8
 Mcu.IP17=UART5
 Mcu.IP18=UART7
-Mcu.IP19=USB_DEVICE
+Mcu.IP19=USB_OTG_FS
 Mcu.IP2=DEBUG
-Mcu.IP20=USB_OTG_FS
 Mcu.IP3=DMA
 Mcu.IP4=FMC
 Mcu.IP5=FREERTOS
 Mcu.IP6=NVIC
 Mcu.IP7=QUADSPI
 Mcu.IP8=RCC
 Mcu.IP9=SAI1
-Mcu.IPNb=21
+Mcu.IPNb=20
 Mcu.Name=STM32H743IIKx
 Mcu.Package=UFBGA176
 Mcu.Pin0=PE3
@@ -176,7 +175,6 @@ Mcu.Pin108=PB11
 Mcu.Pin109=VP_FREERTOS_VS_CMSIS_V1
 Mcu.Pin11=PE5
 Mcu.Pin110=VP_SYS_VS_Systick
-Mcu.Pin111=VP_USB_DEVICE_VS_USB_DEVICE_AUDIO_FS
 Mcu.Pin12=PE6
 Mcu.Pin13=PB7
 Mcu.Pin14=PB6
@@ -273,7 +271,7 @@ Mcu.Pin96=PD8
 Mcu.Pin97=PA3
 Mcu.Pin98=PA7
 Mcu.Pin99=PB1
-Mcu.PinsNb=112
+Mcu.PinsNb=111
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32H743IIKx
@@ -532,8 +530,8 @@ ProjectManager.FreePins=true
 ProjectManager.HalAssertFull=true
 ProjectManager.HeapSize=0x200
 ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=true
-ProjectManager.LibraryCopy=1
+ProjectManager.LastFirmware=false
+ProjectManager.LibraryCopy=2
 ProjectManager.MainLocation=Core/Src
 ProjectManager.NoMain=false
 ProjectManager.PreviousToolchain=
@@ -545,7 +543,7 @@ ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=Other Toolchains (GPDSC)
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-SystemClock_Config-RCC-false-HAL-false,4-MX_QUADSPI_Init-QUADSPI-false-HAL-true,5-MX_FMC_Init-FMC-false-HAL-true,6-MX_SAI1_Init-SAI1-false-HAL-true,7-MX_ADC1_Init-ADC1-false-HAL-true,8-MX_SPI2_Init-SPI2-false-HAL-true,9-MX_SPI3_Init-SPI3-false-HAL-true,10-MX_TIM2_Init-TIM2-false-HAL-true,11-MX_TIM4_Init-TIM4-false-HAL-true,12-MX_UART5_Init-UART5-false-HAL-true,13-MX_UART7_Init-UART7-false-HAL-true,14-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false,15-MX_TIM8_Init-TIM8-false-HAL-true,16-MX_TIM3_Init-TIM3-false-HAL-true,0-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-SystemClock_Config-RCC-false-HAL-false,4-MX_QUADSPI_Init-QUADSPI-false-HAL-true,5-MX_FMC_Init-FMC-false-HAL-true,6-MX_SAI1_Init-SAI1-false-HAL-true,7-MX_ADC1_Init-ADC1-false-HAL-true,8-MX_SPI2_Init-SPI2-false-HAL-true,9-MX_SPI3_Init-SPI3-false-HAL-true,10-MX_TIM2_Init-TIM2-false-HAL-true,11-MX_TIM4_Init-TIM4-false-HAL-true,12-MX_UART5_Init-UART5-false-HAL-true,13-MX_UART7_Init-UART7-false-HAL-true,14-MX_TIM8_Init-TIM8-false-HAL-true,15-MX_TIM3_Init-TIM3-false-HAL-true,16-MX_USB_OTG_FS_PCD_Init-USB_OTG_FS-false-HAL-true,0-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true
 QUADSPI.ClockPrescaler=9
 QUADSPI.FifoThreshold=4
 QUADSPI.FlashSize=22
@@ -863,20 +861,10 @@ TIM8.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2
 TIM8.IPParameters=Channel-PWM Generation1 CH1,Channel-PWM Generation2 CH2,Period,Prescaler
 TIM8.Period=1023
 TIM8.Prescaler=100
-USB_DEVICE.CLASS_NAME_FS=AUDIO
-USB_DEVICE.IPParameters=VirtualMode-AUDIO_FS,VirtualModeFS,CLASS_NAME_FS,VID-AUDIO_FS,MANUFACTURER_STRING-AUDIO_FS,PID_AUDIO_FS,PRODUCT_STRING_AUDIO_FS
-USB_DEVICE.MANUFACTURER_STRING-AUDIO_FS=Rebel Technology
-USB_DEVICE.PID_AUDIO_FS=0xDADA
-USB_DEVICE.PRODUCT_STRING_AUDIO_FS=OWL-ACDC
-USB_DEVICE.VID-AUDIO_FS=0x1209
-USB_DEVICE.VirtualMode-AUDIO_FS=Audio
-USB_DEVICE.VirtualModeFS=Audio_FS
 USB_OTG_FS.IPParameters=VirtualMode
 USB_OTG_FS.VirtualMode=Device_Only
 VP_FREERTOS_VS_CMSIS_V1.Mode=CMSIS_V1
 VP_FREERTOS_VS_CMSIS_V1.Signal=FREERTOS_VS_CMSIS_V1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
-VP_USB_DEVICE_VS_USB_DEVICE_AUDIO_FS.Mode=AUDIO_FS
-VP_USB_DEVICE_VS_USB_DEVICE_AUDIO_FS.Signal=USB_DEVICE_VS_USB_DEVICE_AUDIO_FS
 board=custom

ACDC/Core/Inc/hardware.h

@@ -4,13 +4,17 @@
 #define OWL_XIBECA
 #define HARDWARE_ID                  XIBECA_HARDWARE
 #define HARDWARE_VERSION             "AC/DC"
+#define USBD_PRODUCT_STRING_FSHS     "OWL-ACDC"
+
 /* #define NO_EXTERNAL_RAM */
 /* #define NO_CCM_RAM */
 #define DMA_RAM                      __attribute__ ((section (".dmadata")))
 
 /* note that with H750, PLUS_RAM may be used by firmware */
 #define USE_PLUS_RAM
 
+#define USE_FAST_POW_RESOURCES
+
 #ifdef NDEBUG
 #define USE_ICACHE
 #define USE_DCACHE

ACDC/Core/Src/ACDC.cpp

@@ -7,6 +7,8 @@
 #include "message.h"
 #include "Codec.h"
 #include "flash.h"
+#include "Storage.h"
+#include "ServiceCall.h"
 
 #define XIBECA_PIN3  GPIOD, GPIO_PIN_2
 #define XIBECA_PIN4  GPIOG, GPIO_PIN_10
@@ -182,3 +184,30 @@ void onLoop(void){
     setLed(i+5, getParameterValue(PARAMETER_BA+i));
   }
 }
+
+#ifdef USE_FAST_POW_RESOURCES
+uint32_t fast_log_table_size = 0;
+uint32_t fast_pow_table_size = 0;
+float fast_log_table[16384] __attribute__ ((section (".d2data")));
+uint32_t fast_pow_table[2048] __attribute__ ((section (".d2data")));
+void onResourceUpdate(){
+  Resource* res = storage.getResourceByName(SYSTEM_TABLE_LOG ".bin");
+  if(res && res->isValid()){
+    fast_log_table_size = std::min(res->getDataSize()/sizeof(float), 16384U);
+    storage.readResource(res->getHeader(), fast_log_table, 0, fast_log_table_size*sizeof(float));
+  }else{
+    fast_log_table_size = 0;
+  }
+  res = storage.getResourceByName(SYSTEM_TABLE_POW ".bin");
+  if(res && res->isValid()){
+    fast_pow_table_size = std::min(res->getDataSize()/sizeof(uint32_t), 2048U);
+    storage.readResource(res->getHeader(), fast_pow_table, 0, fast_pow_table_size*sizeof(uint32_t));
+  }else{
+    fast_pow_table_size = 0;
+  }
+  debugMessage("log/pow", fast_log_table_size, fast_pow_table_size);
+}
+#else
+#include "FastLogTable.h"
+#include "FastPowTable.h"
+#endif

ACDC/Core/Src/main.c

@@ -20,8 +20,6 @@
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
 #include "cmsis_os.h"
-#include "usb_device.h"
-#include "usb_device.h"
 
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
@@ -66,6 +64,8 @@ TIM_HandleTypeDef htim8;
 UART_HandleTypeDef huart5;
 UART_HandleTypeDef huart7;
 
+PCD_HandleTypeDef hpcd_USB_OTG_FS;
+
 SDRAM_HandleTypeDef hsdram1;
 
 osThreadId defaultTaskHandle;
@@ -90,6 +90,7 @@ static void MX_UART5_Init(void);
 static void MX_UART7_Init(void);
 static void MX_TIM8_Init(void);
 static void MX_TIM3_Init(void);
+static void MX_USB_OTG_FS_PCD_Init(void);
 void StartDefaultTask(void const * argument);
 
 /* USER CODE BEGIN PFP */
@@ -176,6 +177,7 @@ int main(void)
   MX_UART7_Init();
   MX_TIM8_Init();
   MX_TIM3_Init();
+  MX_USB_OTG_FS_PCD_Init();
   /* USER CODE BEGIN 2 */
 
 #ifdef USE_EXTERNAL_RAM
@@ -951,6 +953,42 @@ static void MX_UART7_Init(void)
 
 }
 
+/**
+  * @brief USB_OTG_FS Initialization Function
+  * @param None
+  * @retval None
+  */
+static void MX_USB_OTG_FS_PCD_Init(void)
+{
+
+  /* USER CODE BEGIN USB_OTG_FS_Init 0 */
+
+  /* USER CODE END USB_OTG_FS_Init 0 */
+
+  /* USER CODE BEGIN USB_OTG_FS_Init 1 */
+
+  /* USER CODE END USB_OTG_FS_Init 1 */
+  hpcd_USB_OTG_FS.Instance = USB_OTG_FS;
+  hpcd_USB_OTG_FS.Init.dev_endpoints = 9;
+  hpcd_USB_OTG_FS.Init.speed = PCD_SPEED_FULL;
+  hpcd_USB_OTG_FS.Init.dma_enable = DISABLE;
+  hpcd_USB_OTG_FS.Init.phy_itface = PCD_PHY_EMBEDDED;
+  hpcd_USB_OTG_FS.Init.Sof_enable = DISABLE;
+  hpcd_USB_OTG_FS.Init.low_power_enable = DISABLE;
+  hpcd_USB_OTG_FS.Init.lpm_enable = DISABLE;
+  hpcd_USB_OTG_FS.Init.battery_charging_enable = ENABLE;
+  hpcd_USB_OTG_FS.Init.vbus_sensing_enable = ENABLE;
+  hpcd_USB_OTG_FS.Init.use_dedicated_ep1 = DISABLE;
+  if (HAL_PCD_Init(&hpcd_USB_OTG_FS) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN USB_OTG_FS_Init 2 */
+
+  /* USER CODE END USB_OTG_FS_Init 2 */
+
+}
+
 /**
   * Enable DMA controller clock
   */
@@ -1182,8 +1220,6 @@ static void MX_GPIO_Init(void)
 /* USER CODE END Header_StartDefaultTask */
 void StartDefaultTask(void const * argument)
 {
-  /* init code for USB_DEVICE */
-  MX_USB_DEVICE_Init();
   /* USER CODE BEGIN 5 */
 
   setup();

ACDC/Core/Src/stm32h7xx_hal_msp.c

@@ -799,6 +799,95 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
 
 }
 
+/**
+* @brief PCD MSP Initialization
+* This function configures the hardware resources used in this example
+* @param hpcd: PCD handle pointer
+* @retval None
+*/
+void HAL_PCD_MspInit(PCD_HandleTypeDef* hpcd)
+{
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(hpcd->Instance==USB_OTG_FS)
+  {
+  /* USER CODE BEGIN USB_OTG_FS_MspInit 0 */
+
+  /* USER CODE END USB_OTG_FS_MspInit 0 */
+  /** Initializes the peripherals clock
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USB;
+    PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+  /** Enable USB Voltage detector
+  */
+    HAL_PWREx_EnableUSBVoltageDetector();
+
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    /**USB_OTG_FS GPIO Configuration
+    PA12     ------> USB_OTG_FS_DP
+    PA11     ------> USB_OTG_FS_DM
+    PA9     ------> USB_OTG_FS_VBUS
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_12|GPIO_PIN_11;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+    GPIO_InitStruct.Alternate = GPIO_AF10_OTG1_FS;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    GPIO_InitStruct.Pin = GPIO_PIN_9;
+    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    /* Peripheral clock enable */
+    __HAL_RCC_USB_OTG_FS_CLK_ENABLE();
+    /* USB_OTG_FS interrupt Init */
+    HAL_NVIC_SetPriority(OTG_FS_IRQn, 5, 0);
+    HAL_NVIC_EnableIRQ(OTG_FS_IRQn);
+  /* USER CODE BEGIN USB_OTG_FS_MspInit 1 */
+
+  /* USER CODE END USB_OTG_FS_MspInit 1 */
+  }
+
+}
+
+/**
+* @brief PCD MSP De-Initialization
+* This function freeze the hardware resources used in this example
+* @param hpcd: PCD handle pointer
+* @retval None
+*/
+void HAL_PCD_MspDeInit(PCD_HandleTypeDef* hpcd)
+{
+  if(hpcd->Instance==USB_OTG_FS)
+  {
+  /* USER CODE BEGIN USB_OTG_FS_MspDeInit 0 */
+
+  /* USER CODE END USB_OTG_FS_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_USB_OTG_FS_CLK_DISABLE();
+
+    /**USB_OTG_FS GPIO Configuration
+    PA12     ------> USB_OTG_FS_DP
+    PA11     ------> USB_OTG_FS_DM
+    PA9     ------> USB_OTG_FS_VBUS
+    */
+    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_12|GPIO_PIN_11|GPIO_PIN_9);
+
+    /* USB_OTG_FS interrupt DeInit */
+    HAL_NVIC_DisableIRQ(OTG_FS_IRQn);
+  /* USER CODE BEGIN USB_OTG_FS_MspDeInit 1 */
+
+  /* USER CODE END USB_OTG_FS_MspDeInit 1 */
+  }
+
+}
+
 static uint32_t FMC_Initialized = 0;
 
 static void HAL_FMC_MspInit(void){

ACDC/Core/Src/stm32h7xx_it.c

@@ -58,7 +58,6 @@
 /* USER CODE END 0 */
 
 /* External variables --------------------------------------------------------*/
-extern PCD_HandleTypeDef hpcd_USB_OTG_FS;
 extern DMA_HandleTypeDef hdma_adc1;
 extern ADC_HandleTypeDef hadc1;
 extern QSPI_HandleTypeDef hqspi;
@@ -68,6 +67,7 @@ extern SAI_HandleTypeDef hsai_BlockA1;
 extern SAI_HandleTypeDef hsai_BlockB1;
 extern DMA_HandleTypeDef hdma_spi3_tx;
 extern SPI_HandleTypeDef hspi3;
+extern PCD_HandleTypeDef hpcd_USB_OTG_FS;
 /* USER CODE BEGIN EV */
 
 /* USER CODE END EV */

ACDC/Makefile

@@ -2,33 +2,26 @@ PROJECT = ACDC
 BUILDROOT = .
 OPENWARE ?= $(BUILDROOT)/..
 
-LDSCRIPT = $(OPENWARE)/Hardware/xibeca.ld
-include $(OPENWARE)/Hardware/owl3.mk
+include $(OPENWARE)/Hardware/xibeca.mk
 
 C_SRC = $(wildcard Core/Src/*.c)
 CPP_SRC = $(wildcard Core/Src/*.cpp)
 C_SRC += $(OPENWARE)/Source/pcm3168a.c
-C_SRC += $(OPENWARE)/Source/usbd_audio.c
 C_SRC += $(OPENWARE)/Source/sdram-as4cXm32.c
 C_SRC += $(OPENWARE)/Source/flash-qspi.c
-S_SRC = $(BUILDROOT)/Core/Src/startup_stm32h743xx.s
-C_SRC += $(BUILDROOT)/USB_DEVICE/App/usb_device.c
-C_SRC += $(BUILDROOT)/USB_DEVICE/App/usbd_desc.c
-C_SRC += $(BUILDROOT)/USB_DEVICE/Target/usbd_conf.c
 
 include $(OPENWARE)/Hardware/sources.mk
 
 C_SRC += $(C_SRC_SAI)
-# C_SRC += $(C_SRC_DAC)
 C_SRC += $(C_SRC_SDRAM)
-C_SRC += $(C_SRC_USBD)
-# C_SRC += $(C_SRC_USBH)
 C_SRC += $(C_SRC_DSP)
 C_SRC += $(C_SRC_OS)
 C_SRC += $(C_SRC_UART)
 C_SRC += $(C_SRC_I2C)
 C_SRC += $(C_SRC_QSPI)
 C_SRC += $(C_SRC_MDMA)
+C_SRC += $(C_SRC_USBD)
+C_SRC += $(C_SRC_USBD_AUDIO)
 
 include $(OPENWARE)/Hardware/h7.mk