Merge pull request #3734 from ARMmbed/revert-3684-TARGET_STM_USB_CONFIG

Revert "Target stm usb config"

Author: sg-

features/unsupported/USBDevice/USBDevice/TARGET_STM/USBHAL_STM32.cpp

@@ -15,16 +15,9 @@
 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-/* TARGET NOT STM does not support this HAL */
-#ifndef TARGET_STM
-#define USBSTM_HAL_UNSUPPORTED
-#endif
-/* F4 famlily wihtout USB_STM_HAL use another HAL*/
-#if defined(TARGET_STM) && defined(TARGET_STM32F4) && !defined(USB_STM_HAL)
-#define USBSTM_HAL_UNSUPPORTED
-#endif
+#if (defined (USB_STM_HAL) && defined(TARGET_STM32F4)) \
+|| defined(TARGET_STM32F2) || defined (TARGET_STM32F7) || defined (TARGET_STM32F3) || defined (TARGET_STM32L4)
 
-#ifndef USBSTM_HAL_UNSUPPORTED
 #include "USBHAL.h"
 #include "pinmap.h"
 /* mbed endpoint definition to hal definition   */

targets/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303ZE/USBHAL_STM32F303ZE.h renamed to features/unsupported/USBDevice/USBDevice/TARGET_STM/USBHAL_STM32F303ZE.h

@@ -16,4 +16,26 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#ifdef TARGET_STM32F303ZE
+#include "USBHAL_STM32F303ZE.h"
+#endif
+
+#if defined(TARGET_STM32F207ZG) || \
+    defined(TARGET_STM32F401RE) || \
+    defined(TARGET_STM32F407VG) || \
+    defined(TARGET_STM32F411RE) || \
+    defined(TARGET_STM32F412ZG) || \
+    defined(TARGET_STM32F429ZI) || \
+    defined(TARGET_STM32F446ZE) || \
+    defined(TARGET_STM32F746ZG) || \
+    defined(TARGET_STM32F767ZI)
 #include "USBHAL_STM_144_64pins.h"
+#endif
+
+#ifdef TARGET_STM32L476VG
+#include "USBHAL_STM32L476VG.h"
+#endif
+
+#ifdef TARGET_STM32F769NI
+#include "USBHAL_STM32F769NI.h"
+#endif

targets/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F769NI/USBHAL_STM32F769NI.h renamed to features/unsupported/USBDevice/USBDevice/TARGET_STM/USBHAL_STM32F769NI.h

@@ -45,7 +45,7 @@ typedef enum {
 #include "USBEndpoints_KL25Z.h"
 #elif !defined(USB_STM_HAL) && defined(TARGET_STM32F4)
 #include "USBEndpoints_STM32F4.h"
-#elif defined (TARGET_STM32F4) || defined (TARGET_STM32F2) || defined (TARGET_STM32F7) || defined (TARGET_STM32F3) || defined(TARGET_STM32L4) || defined(TARGET_STM32F1)
+#elif defined (TARGET_STM32F4) || defined (TARGET_STM32F2) || defined (TARGET_STM32F7) || defined (TARGET_STM32F3) || defined(TARGET_STM32L4)
 #include "USBEndpoints_STM32.h"
 #elif defined (TARGET_RZ_A1H) || defined (TARGET_VK_RZ_A1H)
 #include "USBEndpoints_RZ_A1H.h"

targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/USBHAL_STM32L476VG.h renamed to features/unsupported/USBDevice/USBDevice/TARGET_STM/USBHAL_STM32L476VG.h

@@ -130,7 +130,7 @@ class USBHAL {
     bool (USBHAL::*epCallback[10 - 2])(void);
 #elif (defined(TARGET_STM32F4) && !defined(USB_STM_HAL)) || defined(TARGET_NUMAKER_PFM_M453)
     bool (USBHAL::*epCallback[8 - 2])(void);
-#elif defined(TARGET_STM)
+#elif defined(TARGET_STM32F4) || defined(TARGET_STM32F3) || defined (TARGET_STM32F2)|| defined(TARGET_STM32L4) || defined(TARGET_STM32F7)
     PCD_HandleTypeDef hpcd;
 #elif defined(TARGET_NUMAKER_PFM_NUC472)
     bool (USBHAL::*epCallback[14 - 2])(void);