Switch to new HAL for USB

GrumpyOldPizza · May 23, 2020 · c845a3b · c845a3b
1 parent 7b230a4
commit c845a3b
Show file tree

Hide file tree

Showing 25 changed files with 16,374 additions and 11,253 deletions.
diff --git a/system/STM32L0xx/Lib/libstm32l052xx.a b/system/STM32L0xx/Lib/libstm32l052xx.a
diff --git a/system/STM32L0xx/Lib/libstm32l072xx.a b/system/STM32L0xx/Lib/libstm32l072xx.a
diff --git a/system/STM32L0xx/Lib/libstm32l082xx.a b/system/STM32L0xx/Lib/libstm32l082xx.a
diff --git a/system/STM32L0xx/Source/Makefile b/system/STM32L0xx/Source/Makefile
@@ -10,7 +10,7 @@ CFLAGS   = -mcpu=cortex-m0plus -mthumb -c -g -Os $(WARNINGS) -std=c99 -ffunction
 ASFLAGS  = -c -g -x assembler-with-cpp $(EXTRAS) $(DEFINES) $(INCLUDES)
 WARNINGS = -Wall -Wextra -Wno-unused-parameter
 EXTRAS   = -march=armv6-m -mthumb -mabi=aapcs -mfloat-abi=soft
-DEFINES  = -DUSBD_SOF_ENABLE=1 -DUSBD_LPM_ENABLE=0 -DUSBD_BCD_ENABLE=0
+DEFINES  = -DUSBD_LPM_ENABLE=0 -DUSBD_BCD_ENABLE=0
 INCLUDES = \
 	-I../../../system/CMSIS/Include \
 	-I../../../system/CMSIS/Device/ST/STM32L0xx/Include \
@@ -65,6 +65,7 @@ SRCS = \
 	./USB/Core/Src/usbd_ioreq.c \
 	./USB/HAL/Src/stm32l0xx_hal_pcd.c \
 	./USB/HAL/Src/stm32l0xx_hal_pcd_ex.c \
+	./USB/HAL/Src/stm32l0xx_ll_usb.c \
 	./USB/usbd_cdc_msc.c \
 	./USB/usbd_conf.c \
 	./USB/usbd_desc.c \

diff --git a/system/STM32L0xx/Source/USB/Core/Inc/usbd_core.h b/system/STM32L0xx/Source/USB/Core/Inc/usbd_core.h
@@ -107,9 +107,7 @@ USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef  *pdev, USBD_SpeedTypeDef
 USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef  *pdev);
 USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef  *pdev);
 
-#if (USBD_SOF_ENABLE == 1)
 USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef  *pdev);
-#endif
 USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum);
 USBD_StatusTypeDef USBD_LL_IsoOUTIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum);
 

diff --git a/system/STM32L0xx/Source/USB/Core/Inc/usbd_def.h b/system/STM32L0xx/Source/USB/Core/Inc/usbd_def.h
@@ -168,9 +168,7 @@ typedef struct _Device_cb
   /* Class Specific Endpoints*/
   uint8_t  (*DataIn)           (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);   
   uint8_t  (*DataOut)          (struct _USBD_HandleTypeDef *pdev , uint8_t epnum); 
-#if (USBD_SOF_ENABLE == 1)
   uint8_t  (*SOF)              (struct _USBD_HandleTypeDef *pdev); 
-#endif
   uint8_t  (*IsoINIncomplete)  (struct _USBD_HandleTypeDef *pdev , uint8_t epnum); 
   uint8_t  (*IsoOUTIncomplete) (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);   
 

diff --git a/system/STM32L0xx/Source/USB/Core/Src/usbd_core.c b/system/STM32L0xx/Source/USB/Core/Src/usbd_core.c
@@ -481,7 +481,6 @@ USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef  *pdev)
   return USBD_OK;
 }
 
-#if (USBD_SOF_ENABLE == 1)
 /**
 * @brief  USBD_SOF 
 *         Handle SOF event
@@ -500,7 +499,6 @@ USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef  *pdev)
   }
   return USBD_OK;
 }
-#endif
 
 /**
 * @brief  USBD_IsoINIncomplete 

diff --git a/system/STM32L0xx/Source/USB/HAL/Inc/Legacy/stm32_hal_legacy.h b/system/STM32L0xx/Source/USB/HAL/Inc/Legacy/stm32_hal_legacy.h