refactor: refactor usb.h

refactor: move usb.h to inc/ subfolder

Makefile

@@ -40,7 +40,7 @@ MODULE      ?= libusb_stm32.a
 CFLAGS      ?= $(CFLAGS.$(MCU))
 CFLAGS2      = -mthumb -Os -std=gnu99
 DEFINES     ?= $(DEFINES.$(MCU)) FORCE_C_DRIVER
-INCLUDES    ?= $(CMSISDEV)/ST $(CMSISCORE) .
+INCLUDES    ?= $(CMSISDEV)/ST $(CMSISCORE) inc
 SOURCES      = $(wildcard src/*.c) $(wildcard src/*.S)
 OBJECTS      = $(addsuffix .o, $(basename $(SOURCES)))
 ARFLAGS     ?= -cvq

demo/cdc_loop.c

@@ -17,7 +17,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "usb.h"
-#include "inc/usb_cdc.h"
+#include "usb_cdc.h"
 
 #define CDC_EP0_SIZE    0x08
 #define CDC_RXD_EP      0x01

usb.h → inc/usb.h

@@ -28,47 +28,40 @@
     defined(STM32L452xx) || defined(STM32L462xx) || \
     defined(STM32F042x6) || defined(STM32F048xx) || \
     defined(STM32F070x6) || defined(STM32F070xB) || \
-    defined(STM32F072xB) || defined(STM32F078xx) \
+    defined(STM32F072xB) || defined(STM32F078xx)
 
     #define USE_STMV0_DRIVER
 
-    #if (defined(FORCE_ASM_DRIVER) || defined(STM32L052xx)) && !defined(FORCE_C_DRIVER)
-        #define USE_STMV0A_DRIVER
-    #endif
-
 #elif defined(STM32L1)
     #define USE_STMV1_DRIVER
-    #if (defined(FORCE_ASM_DRIVER) || defined(STM32L100xC)) && !defined(FORCE_C_DRIVER)
-        #define USE_STMV1A_DRIVER
-    #endif
+
 #elif defined(STM32L476xx)
     #define USE_STMV2_DRIVER
+
 #elif defined(STM32F102x6) || defined(STM32F102xB) || \
       defined(STM32F103x6) || defined(STM32F103xB) || \
       defined(STM32F103xE) || defined(STM32F103xG) || \
       defined(STM32F302x8) || defined(STM32F302xC) || defined(STM32F302xE) || \
       defined(STM32F303xC) || defined(STM32F303xE) || \
       defined(STM32F373xC)
-    #define USE_STMV3_DRIVER
-    #if (defined(FORCE_ASM_DRIVER) || defined(STM32F103x6)) && !defined(FORCE_C_DRIVER)
-        #define USE_STMV3A_DRIVER
-    #endif
+
+      #define USE_STMV3_DRIVER
 
 #else
     #error Unsupported STM32 family
 #endif
 
 
-#include "inc/usbd_core.h"
+#include "usbd_core.h"
 #if !defined(__ASSEMBLER__)
-    #include "inc/usb_std.h"
-    #if defined(USE_STMV0A_DRIVER)
+    #include "usb_std.h"
+    #if defined(USE_STMV0_DRIVER) && defined(USBD_ASM_DRIVER)
         extern const struct usbd_driver usb_stmv0a;
         #define usbd_hw usb_stmv0a
     #elif defined(USE_STMV0_DRIVER)
         extern const struct usbd_driver usb_stmv0;
         #define usbd_hw usb_stmv0
-    #elif defined(USE_STMV1A_DRIVER)
+    #elif defined(USE_STMV1_DRIVER) && defined(USBD_ASM_DRIVER)
         extern const struct usbd_driver usb_stmv1a;
         #define usbd_hw usb_stmv1a
     #elif defined(USE_STMV1_DRIVER)
@@ -77,7 +70,7 @@
     #elif defined(USE_STMV2_DRIVER)
         extern const struct usbd_driver usb_stmv2;
         #define usbd_hw usb_stmv2
-    #elif defined(USE_STMV3A_DRIVER)
+    #elif defined(USE_STMV3_DRIVER) && defined(USBD_ASM_DRIVER)
         extern const struct usbd_driver usb_stmv3a;
         #define usbd_hw usb_stmv3a
     #elif defined(USE_STMV3_DRIVER)

src/usb_32v0.c

@@ -16,7 +16,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "stm32.h"
-#include "../usb.h"
+#include "usb.h"
 
 #if defined(USE_STMV0_DRIVER)
 

src/usb_32v0A.S

@@ -17,7 +17,7 @@
     #define __ASSEMBLER__
 #endif
 
-#include "../usb.h"
+#include "usb.h"
 #if defined(USE_STMV0_DRIVER)
 #include "memmap.inc"
 

src/usb_32v1.c

@@ -16,7 +16,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "stm32.h"
-#include "../usb.h"
+#include "usb.h"
 
 #if defined(USE_STMV1_DRIVER)
 

src/usb_32v1A.S

@@ -17,7 +17,7 @@
     #define __ASSEMBLER__
 #endif
 
-#include "../usb.h"
+#include "usb.h"
 #if defined(USE_STMV1_DRIVER)
 #include "memmap.inc"
 

src/usb_32v2.c

@@ -16,7 +16,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "stm32.h"
-#include "../usb.h"
+#include "usb.h"
 
 #if defined(USE_STMV2_DRIVER)
 

src/usb_32v3.c

@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "stm32.h"
-#include "../usb.h"
+#include "usb.h"
 
 #if defined(USE_STMV3_DRIVER)
 

src/usb_32v3A.S

@@ -17,7 +17,7 @@
     #define __ASSEMBLER__
 #endif
 
-#include "../usb.h"
+#include "usb.h"
 #if defined(USE_STMV3_DRIVER)
 #include "memmap.inc"
 

src/usbd_core.c

@@ -16,7 +16,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "../usb.h"
+#include "usb.h"
 
 #define _MIN(a, b) ((a) < (b)) ? (a) : (b)