sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

F103VC, F105, and F107: Fix configuration and building of USB. configs/viewtools-stm32f107: Fix build for F103 and F107: F103 has USB device; F107 has OTGFS

Browse Source
This commit is contained in:
Gregory Nutt 2013-12-25 18:34:15 -06:00
parent 8d0e4b407a
commit 6a04f59a9d
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configs/viewtool-stm32f107/README.txt
View File

@ -137,9 +137,9 @@ USB Interface
Pin Signal
--- --------- ----------- ------------------------------------
1 USB_VBUS VDD_USB (No sensing available)
2 OTG_DM PA11 GPIO_OTG_FSDM
3 OTG_DP PA12 GPIO_OTG_FSDP
4 OTG_ID PA10 GPIO_OTG_FSID
2 OTG_DM PA11 GPIO_OTGFS_DM (F107) GPIO_USB_DM (F103)
3 OTG_DP PA12 GPIO_OTGFS_DP (F107) GPIO_USB_DP (F103)
4 OTG_ID PA10 GPIO_OTGFS_ID (F107)
5 Shield N/A N/A
6 Shield N/A N/A
7 Shield N/A N/A
@ -148,8 +148,8 @@ USB Interface
PE11 USB_EN GPIO controlled soft pull-up
NOTES:
1. GPIO_OTG_FSVBUS should not be configured. No VBUS sensing
2. GPIO_OTG_FSSOF is not used
1. GPIO_OTGFS_VBUS (F107) should not be configured. No VBUS sensing
2. GPIO_OTGFS_SOF (F107) is not used
Configuration
-------------

6
configs/viewtool-stm32f107/src/Makefile
View File

@ -54,8 +54,12 @@ ifeq ($(CONFIG_MMCSD),y)
CSRCS += stm32_mmcsd.c
endif
ifeq ($(CONFIG_STM32_OTGFS),y)
ifeq ($(CONFIG_STM32_OTGFS),y) # F107
CSRCS += stm32_usbdev.c
else
ifeq ($(CONFIG_STM32_USB),y) # F103
CSRCS += stm32_usbdev.c
endif
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)

13
configs/viewtool-stm32f107/src/stm32_usbdev.c
View File

@ -48,7 +48,7 @@
#include "stm32_otgfs.h"
#include "viewtool_stm32f107.h"
#ifdef CONFIG_STM32_OTGFS
#if defined(CONFIG_STM32_OTGFS) || defined(CONFIG_STM32_USB)
/************************************************************************************
* Pre-processor Definitions
@ -57,7 +57,7 @@
#ifdef CONFIG_USBDEV
# define HAVE_USB 1
#else
# warning CONFIG_STM32_OTGFS is enabled but CONFIG_USBDEV is not
# warning CONFIG_STM32_OTGFS (F107) or CONFIG_STM32_USB (F103) is enabled but CONFIG_USBDEV is not
# undef HAVE_USB
#endif
@ -87,15 +87,12 @@ void stm32_usbdev_initialize(void)
/* The OTG FS has an internal soft pull-up. No GPIO configuration is required */
#warning REVISIT: The Viewtool board does, indeed, have a soft connect GPIO
/* Configure the OTG FS VBUS sensing GPIO, Power On, and Overcurrent GPIOs */
#ifdef CONFIG_STM32_OTGFS
/* Configure the OTG FS VBUS sensing GPIO and power enable GPIO */
#warning REVISIT: GPIO setup
#endif
}
/************************************************************************************
* Name: stm32_usbsuspend
* Name: stm32_usbsuspend
*
* Description:
* Board logic must provide the stm32_usbsuspend logic if the USBDEV driver is
@ -110,4 +107,4 @@ void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
ulldbg("resume: %d\n", resume);
}
#endif /* CONFIG_STM32_OTGFS */
#endif /* CONFIG_STM32_OTGFS || CONFIG_STM32_USB*/

10
configs/viewtool-stm32f107/src/viewtool_stm32f107.h
View File

@ -129,9 +129,9 @@
* Pin Signal
* --- --------- ----------- ------------------------------------
* 1 USB_VBUS VDD_USB (No sensing available)
* 2 OTG_DM PA11 GPIO_OTG_FSDM
* 3 OTG_DP PA12 GPIO_OTG_FSDP
* 4 OTG_ID PA10 GPIO_OTG_FSID
* 2 OTG_DM PA11 GPIO_OTGFS_DM (F107) GPIO_USB_DM (F103)
* 3 OTG_DP PA12 GPIO_OTGFS_DP (F107) GPIO_USB_DP (F103)
* 4 OTG_ID PA10 GPIO_OTGFS_ID (F107)
* 5 Shield N/A N/A
* 6 Shield N/A N/A
* 7 Shield N/A N/A
@ -140,8 +140,8 @@
* PE11 USB_EN GPIO controlled soft pull-up
*
* NOTES:
* 1. GPIO_OTG_FSVBUS should not be configured. No VBUS sensing
* 2. GPIO_OTG_FSSOF is not used
* 1. GPIO_OTGFS_VBUS (F107) should not be configured. No VBUS sensing
* 2. GPIO_OTGFS_SOF (F107) is not used
*/
/************************************************************************************