Removed stm32_internal.h; Changes for clean compile of STM32F3Discovery configuration with SPI and USB

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5630 42af7a65-404d-4744-a932-0658087f49c3

configs/cloudctrl/include/board.h

@@ -48,7 +48,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 #include <nuttx/arch.h>
 

configs/cloudctrl/src/up_autoleds.c

@@ -51,7 +51,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 /****************************************************************************

configs/cloudctrl/src/up_nsh.c

@@ -46,7 +46,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 /****************************************************************************

configs/cloudctrl/src/up_spi.c

@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI3)

configs/cloudctrl/src/up_usb.c

@@ -53,7 +53,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS

configs/cloudctrl/src/up_usbmsc.c

@@ -46,7 +46,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions

configs/cloudctrl/src/up_userleds.c

@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS

configs/fire-stm32v2/include/board.h

@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/fire-stm32v2/src/up_autoleds.c

@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 /****************************************************************************

configs/fire-stm32v2/src/up_nsh.c

@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 /****************************************************************************

configs/fire-stm32v2/src/up_selectlcd.c

@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 #ifdef CONFIG_STM32_FSMC

configs/fire-stm32v2/src/up_spi.c

@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)

configs/fire-stm32v2/src/up_usbdev.c

@@ -49,7 +49,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 /************************************************************************************

configs/fire-stm32v2/src/up_usbmsc.c

@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions

configs/fire-stm32v2/src/up_userleds.c

@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS

configs/hymini-stm32v/include/board.h

@@ -52,7 +52,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/hymini-stm32v/src/ssd1289.c

@@ -51,7 +51,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "hymini_stm32v-internal.h"
 
 #include "ssd1289.h"

configs/hymini-stm32v/src/up_leds.c

@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 /****************************************************************************

configs/hymini-stm32v/src/up_nsh.c

@@ -55,7 +55,7 @@
 #  include <nuttx/mmcsd.h>
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 /****************************************************************************

configs/hymini-stm32v/src/up_spi.c

@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)

configs/hymini-stm32v/src/up_ts.c

@@ -43,7 +43,6 @@
 #include <debug.h>
 
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "hymini_stm32v-internal.h"
 
 #include <nuttx/input/touchscreen.h>

configs/hymini-stm32v/src/up_usbdev.c

@@ -49,7 +49,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 /************************************************************************************

configs/hymini-stm32v/src/up_usbmsc.c

@@ -48,7 +48,7 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /* There is nothing to do here if SDIO support is not selected. */
 

configs/olimex-stm32-p107/include/board.h

@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Pre-processor Definitions

configs/shenzhou/include/board.h

@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 #include <nuttx/arch.h>
 

configs/shenzhou/src/up_autoleds.c

@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 /****************************************************************************

configs/shenzhou/src/up_ili93xx.c

@@ -128,7 +128,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "shenzhou-internal.h"
 
 /************************************************************************************

configs/shenzhou/src/up_nsh.c

@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 /****************************************************************************

configs/shenzhou/src/up_spi.c

@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI3)

configs/shenzhou/src/up_ssd1289.c

@@ -59,7 +59,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "shenzhou-internal.h"
 
 #ifdef CONFIG_LCD_SSD1289

configs/shenzhou/src/up_touchscreen.c

@@ -51,7 +51,7 @@
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/ads7843e.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 /****************************************************************************

configs/shenzhou/src/up_usb.c

@@ -52,7 +52,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenshou-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS

configs/shenzhou/src/up_usbmsc.c

@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions

configs/shenzhou/src/up_userleds.c

@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS

configs/stm3210e-eval/include/board.h

@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/stm3210e-eval/src/up_composite.c

@@ -49,7 +49,7 @@
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/composite.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /* There is nothing to do here if SDIO support is not selected. */
 

configs/stm3210e-eval/src/up_extmem.c

@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 /************************************************************************************

configs/stm3210e-eval/src/up_lcd.c

@@ -76,7 +76,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "stm3210e-internal.h"
 
 /**************************************************************************************

configs/stm3210e-eval/src/up_leds.c

@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 /****************************************************************************

configs/stm3210e-eval/src/up_nsh.c

@@ -55,7 +55,7 @@
 #  include <nuttx/mmcsd.h>
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions

configs/stm3210e-eval/src/up_spi.c

@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)

configs/stm3210e-eval/src/up_usbdev.c

@@ -49,7 +49,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 /************************************************************************************

configs/stm3210e-eval/src/up_usbmsc.c

@@ -48,7 +48,7 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /* There is nothing to do here if SDIO support is not selected. */
 

configs/stm3220g-eval/include/board.h

@@ -49,7 +49,7 @@
 
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/stm3220g-eval/src/up_autoleds.c

@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 #ifdef CONFIG_ARCH_LEDS

configs/stm3220g-eval/src/up_extmem.c

@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 /************************************************************************************

configs/stm3220g-eval/src/up_lcd.c

@@ -61,7 +61,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "stm3220g-internal.h"
 
 #if !defined(CONFIG_STM32_ILI9320_DISABLE) || !defined(CONFIG_STM32_ILI9325_DISABLE)

configs/stm3220g-eval/src/up_nsh.c

@@ -59,7 +59,7 @@
 #  include "stm32_usbhost.h"
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 /****************************************************************************

configs/stm3220g-eval/src/up_spi.c

@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)

configs/stm3220g-eval/src/up_stmpe811.c

@@ -51,7 +51,7 @@
 
 #include <arch/irq.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 /****************************************************************************

configs/stm3220g-eval/src/up_usb.c

@@ -52,7 +52,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS

configs/stm3220g-eval/src/up_userleds.c

@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS

configs/stm3240g-eval/include/board.h

@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/stm3240g-eval/src/up_autoleds.c

@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 #ifdef CONFIG_ARCH_LEDS

configs/stm3240g-eval/src/up_extmem.c

@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 /************************************************************************************

configs/stm3240g-eval/src/up_lcd.c

@@ -61,7 +61,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "stm3240g-internal.h"
 
 #if !defined(CONFIG_STM32_ILI9320_DISABLE) || !defined(CONFIG_STM32_ILI9325_DISABLE)

configs/stm3240g-eval/src/up_nsh.c

@@ -59,7 +59,7 @@
 #  include "stm32_usbhost.h"
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 /****************************************************************************

configs/stm3240g-eval/src/up_spi.c

@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)

configs/stm3240g-eval/src/up_stmpe811.c

@@ -51,7 +51,7 @@
 
 #include <arch/irq.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 /****************************************************************************

configs/stm3240g-eval/src/up_usb.c

@@ -52,7 +52,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS

configs/stm3240g-eval/src/up_userleds.c

@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS

configs/stm32f100rc_generic/include/board.h

@@ -46,7 +46,7 @@
 # include <stdint.h>
 #endif
 #include "stm32_rcc.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/stm32f100rc_generic/src/up_leds.c

@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f100rc_internal.h"
 
 /****************************************************************************

configs/stm32f3discovery/include/board.h

@@ -49,7 +49,7 @@
 
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/stm32f3discovery/src/Makefile

@@ -56,7 +56,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS +=  up_buttons.c
 endif
 
-ifeq ($(CONFIG_STM32_OTGFS),y)
+ifeq ($(CONFIG_STM32_USB),y)
 CSRCS += up_usb.c
 endif
 

configs/stm32f3discovery/src/stm32f3discovery-internal.h

@@ -158,23 +158,10 @@ void weak_function stm32_spiinitialize(void);
  *
  ****************************************************************************************************/
 
-#ifdef CONFIG_STM32_OTGFS
+#ifdef CONFIG_STM32_USB
 void weak_function stm32_usbinitialize(void);
 #endif
 
-/****************************************************************************************************
- * Name: stm32_usbhost_initialize
- *
- * Description:
- *   Called at application startup time to initialize the USB host functionality. This function will
- *   start a thread that will monitor for device connection/disconnection events.
- *
- ****************************************************************************************************/
-
-#if defined(CONFIG_STM32_OTGFS) && defined(CONFIG_USBHOST)
-int stm32_usbhost_initialize(void);
-#endif
-
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_INTERNAL_H */
 

configs/stm32f3discovery/src/up_boot.c

@@ -82,13 +82,12 @@ void stm32_boardinitialize(void)
     }
 #endif
 
-  /* Initialize USB if the 1) OTG FS controller is in the configuration and 2)
+  /* Initialize USB if the 1) USB device controller is in the configuration and 2)
    * disabled, and 3) the weak function stm32_usbinitialize() has been brought 
-   * the weak function stm32_usbinitialize() has been brought into the build.
-   * Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also selected.
+   * into the build. Presumeably either CONFIG_USBDEV is also selected.
    */
 
-#ifdef CONFIG_STM32_OTGFS
+#ifdef CONFIG_STM32_USB
   if (stm32_usbinitialize)
     {
       stm32_usbinitialize();

configs/stm32f3discovery/src/up_nsh.c

@@ -58,7 +58,7 @@
 #  include "stm32_usbhost.h"
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f3discovery-internal.h"
 
 /****************************************************************************

configs/stm32f3discovery/src/up_spi.c

@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f3discovery-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)

configs/stm32f3discovery/src/up_usb.c

@@ -52,83 +52,30 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f3discovery-internal.h"
 
-#ifdef CONFIG_STM32_OTGFS
+#ifdef CONFIG_STM32_USB
 
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
 
-#if defined(CONFIG_USBDEV) || defined(CONFIG_USBHOST)
+#ifdef CONFIG_USBDEV
 #  define HAVE_USB 1
 #else
-#  warning "CONFIG_STM32_OTGFS is enabled but neither CONFIG_USBDEV nor CONFIG_USBHOST"
+#  warning "CONFIG_STM32_USB is enabled but CONFIG_USBDEV is not"
 #  undef HAVE_USB
 #endif
 
-#ifndef CONFIG_USBHOST_DEFPRIO
-#  define CONFIG_USBHOST_DEFPRIO 50
-#endif
-
-#ifndef CONFIG_USBHOST_STACKSIZE
-#  define CONFIG_USBHOST_STACKSIZE 1024
-#endif
-
 /************************************************************************************
  * Private Data
  ************************************************************************************/
 
-#ifdef CONFIG_USBHOST
-static struct usbhost_driver_s *g_drvr;
-#endif
-
 /************************************************************************************
  * Private Functions
  ************************************************************************************/
 
-/************************************************************************************
- * Name: usbhost_waiter
- *
- * Description:
- *   Wait for USB devices to be connected.
- *
- ************************************************************************************/
-
-#ifdef CONFIG_USBHOST
-static int usbhost_waiter(int argc, char *argv[])
-{
-  bool connected = false;
-  int ret;
-
-  uvdbg("Running\n");
-  for (;;)
-    {
-      /* Wait for the device to change state */
-
-      ret = DRVR_WAIT(g_drvr, connected);
-      DEBUGASSERT(ret == OK);
-
-      connected = !connected;
-      uvdbg("%s\n", connected ? "connected" : "disconnected");
-
-      /* Did we just become connected? */
-
-      if (connected)
-        {
-          /* Yes.. enumerate the newly connected device */
-
-          (void)DRVR_ENUMERATE(g_drvr);
-        }
-    }
-
-  /* Keep the compiler from complaining */
-
-  return 0;
-}
-#endif
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -144,131 +91,24 @@ static int usbhost_waiter(int argc, char *argv[])
 
 void stm32_usbinitialize(void)
 {
-  /* The OTG FS has an internal soft pull-up.  No GPIO configuration is required */
-
-  /* Configure the OTG FS VBUS sensing GPIO, Power On, and Overcurrent GPIOs */
-
-#ifdef CONFIG_STM32_OTGFS
-  stm32_configgpio(GPIO_OTGFS_VBUS);
-  stm32_configgpio(GPIO_OTGFS_PWRON);
-  stm32_configgpio(GPIO_OTGFS_OVER);
-#endif
+  /* Does the STM32 F3 hava an external soft pull-up? */
 }
 
-/***********************************************************************************
- * Name: stm32_usbhost_initialize
- *
- * Description:
- *   Called at application startup time to initialize the USB host functionality.
- *   This function will start a thread that will monitor for device
- *   connection/disconnection events.
- *
- ***********************************************************************************/
-
-#ifdef CONFIG_USBHOST
-int stm32_usbhost_initialize(void)
-{
-  int pid;
-  int ret;
-
-  /* First, register all of the class drivers needed to support the drivers
-   * that we care about:
-   */
-
-  uvdbg("Register class drivers\n");
-  ret = usbhost_storageinit();
-  if (ret != OK)
-    {
-      udbg("Failed to register the mass storage class\n");
-    }
-
-  /* Then get an instance of the USB host interface */
-
-  uvdbg("Initialize USB host\n");
-  g_drvr = usbhost_initialize(0);
-  if (g_drvr)
-    {
-      /* Start a thread to handle device connection. */
-
-      uvdbg("Start usbhost_waiter\n");
-
-      pid = TASK_CREATE("usbhost", CONFIG_USBHOST_DEFPRIO,
-                        CONFIG_USBHOST_STACKSIZE,
-                        (main_t)usbhost_waiter, (FAR char * const *)NULL);
-      return pid < 0 ? -ENOEXEC : OK;
-    }
-
-  return -ENODEV;
-}
-#endif
-
-/***********************************************************************************
- * Name: stm32_usbhost_vbusdrive
- *
- * Description:
- *   Enable/disable driving of VBUS 5V output.  This function must be provided be
- *   each platform that implements the STM32 OTG FS host interface
- *
- *   "On-chip 5 V VBUS generation is not supported. For this reason, a charge pump 
- *    or, if 5 V are available on the application board, a basic power switch, must 
- *    be added externally to drive the 5 V VBUS line. The external charge pump can 
- *    be driven by any GPIO output. When the application decides to power on VBUS 
- *    using the chosen GPIO, it must also set the port power bit in the host port 
- *    control and status register (PPWR bit in OTG_FS_HPRT).
- *
- *   "The application uses this field to control power to this port, and the core 
- *    clears this bit on an overcurrent condition."
- *
- * Input Parameters:
- *   iface - For future growth to handle multiple USB host interface.  Should be zero.
- *   enable - true: enable VBUS power; false: disable VBUS power
- *
- * Returned Value:
- *   None
- *
- ***********************************************************************************/
-
-#ifdef CONFIG_USBHOST
-void stm32_usbhost_vbusdrive(int iface, bool enable)
-{
-  DEBUGASSERT(iface == 0);
-  
-  if (enable)
-    {
-      /* Enable the Power Switch by driving the enable pin low */
-
-      stm32_gpiowrite(GPIO_OTGFS_PWRON, false);
-    }
-  else
-    { 
-      /* Disable the Power Switch by driving the enable pin high */
- 
-      stm32_gpiowrite(GPIO_OTGFS_PWRON, true);
-    }
-}
-#endif
-
 /************************************************************************************
- * Name: stm32_setup_overcurrent
+ * Name:  stm32_usbpullup
  *
  * Description:
- *   Setup to receive an interrupt-level callback if an overcurrent condition is
- *   detected.
- *
- * Input paramter:
- *   handler - New overcurrent interrupt handler
- *
- * Returned value:
- *   Old overcurrent interrupt handler
+ *   If USB is supported and the board supports a pullup via GPIO (for USB software
+ *   connect and disconnect), then the board software must provide stm32_pullup.
+ *   See include/nuttx/usb/usbdev.h for additional description of this method.
  *
  ************************************************************************************/
 
-#ifdef CONFIG_USBHOST
-xcpt_t stm32_setup_overcurrent(xcpt_t handler)
+int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 {
-  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+  usbtrace(TRACE_DEVPULLUP, (uint16_t)enable);
+  return OK;
 }
-#endif
 
 /************************************************************************************
  * Name:  stm32_usbsuspend
@@ -281,14 +121,12 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
  *
  ************************************************************************************/
 
-#ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
   ulldbg("resume: %d\n", resume);
 }
-#endif
 
-#endif /* CONFIG_STM32_OTGFS */
+#endif /* CONFIG_STM32_USB */
 
 
 

configs/stm32f4discovery/include/board.h

@@ -49,7 +49,7 @@
 
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/stm32f4discovery/src/up_autoleds.c

@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #ifdef CONFIG_ARCH_LEDS

configs/stm32f4discovery/src/up_boot.c

@@ -84,8 +84,8 @@ void stm32_boardinitialize(void)
 
   /* Initialize USB if the 1) OTG FS controller is in the configuration and 2)
    * disabled, and 3) the weak function stm32_usbinitialize() has been brought 
-   * the weak function stm32_usbinitialize() has been brought into the build.
-   * Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also selected.
+   * into the build. Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also
+   * selected.
    */
 
 #ifdef CONFIG_STM32_OTGFS

configs/stm32f4discovery/src/up_extmem.c

@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 /************************************************************************************

configs/stm32f4discovery/src/up_nsh.c

@@ -58,7 +58,7 @@
 #  include "stm32_usbhost.h"
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 /****************************************************************************

configs/stm32f4discovery/src/up_spi.c

@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)

configs/stm32f4discovery/src/up_ssd1289.c

@@ -59,7 +59,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "stm32f4discovery-internal.h"
 
 #ifdef CONFIG_LCD_SSD1289

configs/stm32f4discovery/src/up_usb.c

@@ -52,7 +52,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS

configs/stm32f4discovery/src/up_userleds.c

@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS

configs/vsn/include/board.h

@@ -51,7 +51,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 #include "muxbus.h"
 

configs/vsn/src/spi.c

@@ -57,7 +57,7 @@
 #include "up_arch.h"
 #include "chip.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32_waste.h"
 #include "vsn.h"
 

configs/vsn/src/usbdev.c

@@ -52,7 +52,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "vsn.h"
 
 /************************************************************************************