diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-25 22:10:40 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-25 22:10:40 +0000 |
| commit | 2f9e7c17ae5a9e7ada93021a9d1ed2ee9835d969 (patch) | |
| tree | fa1aaf27248cfc57d4bc9c9f1f066b98e93d0191 /nuttx/configs/stm3240g-eval/src | |
| parent | 5f1c79814968af20b104c8c1b58a7792611c31b5 (diff) | |
Fix packet size calculation in CDC/ACM and PL2303 USB serial drivers
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4771 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/configs/stm3240g-eval/src')
| -rw-r--r-- | nuttx/configs/stm3240g-eval/src/stm3240g-internal.h | 14 | ||||
| -rw-r--r-- | nuttx/configs/stm3240g-eval/src/up_boot.c | 12 |
2 files changed, 24 insertions, 2 deletions
diff --git a/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h b/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h index 70f3f6079f..3dfd79912f 100644 --- a/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h +++ b/nuttx/configs/stm3240g-eval/src/stm3240g-internal.h @@ -213,6 +213,16 @@ void weak_function stm32_spiinitialize(void); /************************************************************************************ + * Name: stm32_usbinitialize + * + * Description: + * Called to setup USB-related GPIO pins for the STM3210E-EVAL board. + * + ************************************************************************************/ + +void weak_function stm32_usbinitialize(void); + +/************************************************************************************ * Name: stm32_extmemgpios * * Description: @@ -323,7 +333,7 @@ void stm32_deselectsram(void); ************************************************************************************/ #ifdef CONFIG_STM32_FSMC -extern void stm32_selectlcd(void); +void stm32_selectlcd(void); #endif /************************************************************************************ @@ -335,7 +345,7 @@ extern void stm32_selectlcd(void); ************************************************************************************/ #ifdef CONFIG_STM32_FSMC -extern void stm32_deselectlcd(void); +void stm32_deselectlcd(void); #endif #endif /* __ASSEMBLY__ */ diff --git a/nuttx/configs/stm3240g-eval/src/up_boot.c b/nuttx/configs/stm3240g-eval/src/up_boot.c index 063f6a32ba..7322878e81 100644 --- a/nuttx/configs/stm3240g-eval/src/up_boot.c +++ b/nuttx/configs/stm3240g-eval/src/up_boot.c @@ -88,6 +88,18 @@ void stm32_boardinitialize(void) stm32_selectsram(); #endif + /* Initialize USB is 1) USBDEV is selected, 2) the OTG FS controller is not + * disabled, and 3) the weak function stm32_usbinitialize() has been brought + * into the build. + */ + +#if defined(CONFIG_USBDEV) && defined(CONFIG_STM32_OTGFS) + if (stm32_usbinitialize) + { + stm32_usbinitialize(); + } +#endif + /* Configure on-board LEDs if LED support has been selected. */ #ifdef CONFIG_ARCH_LEDS |