From 3c630dcebe3431dd19dd3f3a8a0ea2ab109b4770 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 5 Apr 2012 14:12:41 +0000 Subject: [PATCH] More progress on the STM32 OTG FS device driver git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4558 42af7a65-404d-4744-a932-0658087f49c3 --- configs/stm3240g-eval/src/up_usbdev.c | 20 +------------------- configs/stm32f4discovery/src/up_usbdev.c | 20 +------------------- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/configs/stm3240g-eval/src/up_usbdev.c b/configs/stm3240g-eval/src/up_usbdev.c index 1920359a3f9..bd7f880b000 100644 --- a/configs/stm3240g-eval/src/up_usbdev.c +++ b/configs/stm3240g-eval/src/up_usbdev.c @@ -79,30 +79,12 @@ void stm32_usbinitialize(void) /* Configure the OTG FS VBUS sensing GPIO, Power On, and Overcurrent GPIOs */ #ifdef CONFIG_STM32_OTGFS - stm32_configgpio(GPIO_USB_PULLUP); + stm32_configgpio(GPIO_OTGFS_VBUS); stm32_configgpio(GPIO_OTGFS_PWRON); stm32_configgpio(GPIO_OTGFS_OVER); #endif } -/************************************************************************************ - * Name: stm32_usbpullup - * - * Description: - * 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. - * Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be - * NULL. - * - ************************************************************************************/ - -int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) -{ - usbtrace(TRACE_DEVPULLUP, (uint16_t)enable); - return OK; -} - /************************************************************************************ * Name: stm32_usbsuspend * diff --git a/configs/stm32f4discovery/src/up_usbdev.c b/configs/stm32f4discovery/src/up_usbdev.c index c93e734a15b..5ca1d0e9499 100644 --- a/configs/stm32f4discovery/src/up_usbdev.c +++ b/configs/stm32f4discovery/src/up_usbdev.c @@ -79,30 +79,12 @@ void stm32_usbinitialize(void) /* Configure the OTG FS VBUS sensing GPIO, Power On, and Overcurrent GPIOs */ #ifdef CONFIG_STM32_OTGFS - stm32_configgpio(GPIO_USB_PULLUP); + stm32_configgpio(GPIO_OTGFS_VBUS); stm32_configgpio(GPIO_OTGFS_PWRON); stm32_configgpio(GPIO_OTGFS_OVER); #endif } -/************************************************************************************ - * Name: stm32_usbpullup - * - * Description: - * 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. - * Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be - * NULL. - * - ************************************************************************************/ - -int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) -{ - usbtrace(TRACE_DEVPULLUP, (uint16_t)enable); - return OK; -} - /************************************************************************************ * Name: stm32_usbsuspend *