diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-05 14:12:41 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-05 14:12:41 +0000 |
commit | dcbed0e5f864ec1a2619f13bd0cfdaf3a500a349 (patch) | |
tree | 3709e951542e610c9c9ed5554e0cc3a70a22996e /nuttx/configs | |
parent | 9f8d4d940a096e2d8c7226759596dbe6509cda33 (diff) | |
download | px4-nuttx-dcbed0e5f864ec1a2619f13bd0cfdaf3a500a349.tar.gz px4-nuttx-dcbed0e5f864ec1a2619f13bd0cfdaf3a500a349.tar.bz2 px4-nuttx-dcbed0e5f864ec1a2619f13bd0cfdaf3a500a349.zip |
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
Diffstat (limited to 'nuttx/configs')
-rw-r--r-- | nuttx/configs/stm3240g-eval/src/up_usbdev.c | 20 | ||||
-rw-r--r-- | nuttx/configs/stm32f4discovery/src/up_usbdev.c | 20 |
2 files changed, 2 insertions, 38 deletions
diff --git a/nuttx/configs/stm3240g-eval/src/up_usbdev.c b/nuttx/configs/stm3240g-eval/src/up_usbdev.c index 1920359a3..bd7f880b0 100644 --- a/nuttx/configs/stm3240g-eval/src/up_usbdev.c +++ b/nuttx/configs/stm3240g-eval/src/up_usbdev.c @@ -79,31 +79,13 @@ 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 * * Description: diff --git a/nuttx/configs/stm32f4discovery/src/up_usbdev.c b/nuttx/configs/stm32f4discovery/src/up_usbdev.c index c93e734a1..5ca1d0e94 100644 --- a/nuttx/configs/stm32f4discovery/src/up_usbdev.c +++ b/nuttx/configs/stm32f4discovery/src/up_usbdev.c @@ -79,31 +79,13 @@ 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 * * Description: |