initial USB modification

Author: Jan Kamidra

targets/TARGET_STM/TARGET_STM32U0/PeripheralNames.h

@@ -124,11 +124,7 @@ typedef enum {
 } PWMName;
 
 typedef enum {
-#if defined USB_DRD_FS_BASE 
-    USB_FS = (int)USB_DRD_FS_BASE
-#else
     USB_FS = (int)USB_DRD_BASE
-#endif
 } USBName;
 
 

targets/TARGET_STM/USBPhyHw.h

@@ -31,7 +31,7 @@
 
 #if !defined(MBED_CONF_TARGET_USB_SPEED)
 
-#if defined (USB)
+#if defined (USB) || defined(USB_DRD_FS)
 #define MBED_CONF_TARGET_USB_SPEED USE_USB_NO_OTG
 #elif defined(USB_OTG_FS)
 #define MBED_CONF_TARGET_USB_SPEED USE_USB_OTG_FS
@@ -49,17 +49,17 @@
 #define USBHAL_IRQn  USB_LP_CAN_RX0_IRQn
 #elif defined(TARGET_STM32L5)
 #define USBHAL_IRQn  USB_FS_IRQn
+#elif defined(TARGET_STM32U0)
+#define USBHAL_IRQn USB_DRD_FS_IRQn
 #else
 #define USBHAL_IRQn  USB_IRQn
-#endif
+#endif /* #if defined(TARGET_STM32F1) | */
 
 #elif (MBED_CONF_TARGET_USB_SPEED == USE_USB_OTG_FS)
 #define USBHAL_IRQn  OTG_FS_IRQn
-
 #else
 #define USBHAL_IRQn  OTG_HS_IRQn
-
-#endif
+#endif /* #if MBED_CONF_TARGET_USB_SPEED == USE_USB_NO_OTG */
 
 #define NB_ENDPOINT  8
 

targets/TARGET_STM/USBPhy_STM32.cpp

@@ -243,7 +243,7 @@ void USBPhyHw::init(USBPhyEvents *events)
 #if (MBED_CONF_TARGET_USB_SPEED == USE_USB_OTG_HS)
     hpcd.Instance = USB_OTG_HS;
     hpcd.Init.phy_itface = PCD_PHY_ULPI;
-    hpcd.Init.Sof_enable = 1;
+    hpcd.Init.Sof_enable = ENABLE;
     hpcd.Init.dma_enable = DISABLE;
     hpcd.Init.vbus_sensing_enable = ENABLE;
     hpcd.Init.use_external_vbus = DISABLE;
@@ -287,7 +287,7 @@ void USBPhyHw::init(USBPhyEvents *events)
 #elif (MBED_CONF_TARGET_USB_SPEED == USE_USB_OTG_FS)
     hpcd.Instance = USB_OTG_FS;
     hpcd.Init.phy_itface = PCD_PHY_EMBEDDED;
-    hpcd.Init.Sof_enable = 1;
+    hpcd.Init.Sof_enable = ENABLE;
     hpcd.Init.speed = PCD_SPEED_FULL;
 
     __HAL_RCC_USB_OTG_FS_CLK_ENABLE();
@@ -302,7 +302,12 @@ void USBPhyHw::init(USBPhyEvents *events)
     map = PinMap_USB_FS;
 
 #elif (MBED_CONF_TARGET_USB_SPEED == USE_USB_NO_OTG)
+#if defined(USB_DRD_FS)
+    hpcd.Instance = USB_DRD_FS;
+    hpcd.Init.Sof_enable = ENABLE;
+#else
     hpcd.Instance = USB;
+#endif
     hpcd.Init.phy_itface = PCD_PHY_EMBEDDED;
     hpcd.Init.speed = PCD_SPEED_FULL;
 

targets/targets.json5

@@ -4786,6 +4786,10 @@ mode is recommended for target MCUs with small amounts of flash and RAM.",
             "i2c_timing_value_algo": {
                 "help": "If value was set to true I2C timing algorithm is enabled. Enabling may leads to performance issue. Keeping this false and changing system clock will trigger assert.)",
                 "value": false
+            },
+            "usb_speed": {
+                "help": "USE_USB_OTG_FS or USE_USB_OTG_HS or USE_USB_HS_IN_FS",
+                "value": "USE_USB_NO_OTG"
             }
         },
         "overrides": {
@@ -4798,7 +4802,7 @@ mode is recommended for target MCUs with small amounts of flash and RAM.",
             "MPU",
             "ANALOGOUT",
             "TRNG",
-            "USB"
+            "USBDEVICE"
         ],
         "is_mcu_family_target": true
     },