andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated all the STM32F4 mcuconf files because the new OTG options. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5221 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2013-02-17 13:45:48 +00:00
parent 24f6e5ca62
commit 086b5de61e
24 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/ARMCM4-STM32F407-DISCOVERY-G++/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512

4
demos/ARMCM4-STM32F407-DISCOVERY-MEMS/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 TRUE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
demos/ARMCM4-STM32F407-DISCOVERY/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
demos/ARMCM4-STM32F407-LWIP-FATFS-USB/mcuconf.h
View File

@ -268,6 +268,8 @@
*/
#define STM32_USB_USE_OTG1 TRUE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -275,5 +277,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
demos/ARMCM4-STM32F407-LWIP/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

2
demos/ARMCM4-STM32F407-WAVESHARE-OPEN-407I-C-USB_FS/mcuconf.h
View File

@ -266,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

2
demos/ARMCM4-STM32F407-WAVESHARE-OPEN-407I-C-USB_HS_ULPI/mcuconf.h
View File

@ -266,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

14
os/hal/platforms/STM32/OTGv1/usb_lld.c
View File

@ -884,8 +884,9 @@ void usb_lld_start(USBDriver *usbp) {
/* OTG HS clock enable and reset.*/
#if STM32_USE_USB_OTG2_ULPI
rccEnableAHB1((RCC_AHB1ENR_GPIOAEN | RCC_AHB1ENR_GPIOBEN |
RCC_AHB1ENR_GPIOCEN | RCC_AHB1ENR_GPIOHEN | RCC_AHB1ENR_GPIOIEN),
FALSE);
RCC_AHB1ENR_GPIOCEN | RCC_AHB1ENR_GPIOHEN |
RCC_AHB1ENR_GPIOIEN),
FALSE);
rccEnableAHB1(RCC_AHB1ENR_OTGHSULPIEN, FALSE);
#endif
rccEnableOTG_HS(FALSE);
@ -908,7 +909,7 @@ void usb_lld_start(USBDriver *usbp) {
usbp);
/* - Forced device mode.
- USB turn-around time = TRDT_VALUE. */
- USB turn-around time = TRDT_VALUE.*/
#if STM32_USE_USB_OTG2_ULPI
/* High speed ULPI PHY */
otgp->GUSBCFG = GUSBCFG_FDMOD | GUSBCFG_TRDT(TRDT_VALUE) | GUSBCFG_SRPCAP | GUSBCFG_HNPCAP;
@ -917,7 +918,6 @@ void usb_lld_start(USBDriver *usbp) {
otgp->GUSBCFG = GUSBCFG_FDMOD | GUSBCFG_TRDT(TRDT_VALUE) | GUSBCFG_PHYSEL;
#endif
#if STM32_USE_USB_OTG2_HS
/* USB 2.0 High Speed PHY.*/
otgp->DCFG = 0x02200000 | DCFG_DSPD_HS;
@ -931,17 +931,15 @@ void usb_lld_start(USBDriver *usbp) {
if (&USBD2 == usbp) {
#if STM32_USE_USB_OTG2_ULPI
otgp->GCCFG = 0;
otgp->GCCFG = 0;
#else
otgp->GCCFG = GCCFG_VBUSASEN | GCCFG_VBUSBSEN | GCCFG_PWRDWN;
otgp->GCCFG = GCCFG_VBUSASEN | GCCFG_VBUSBSEN | GCCFG_PWRDWN;
#endif
} else {
/* Internal FS PHY activation.*/
otgp->GCCFG = GCCFG_VBUSASEN | GCCFG_VBUSBSEN | GCCFG_PWRDWN;
}
/* Soft core reset.*/
otg_core_reset(usbp);

9
os/hal/platforms/STM32/OTGv1/usb_lld.h
View File

@ -74,7 +74,14 @@
#endif
/**
* @brief ULPI support for OTH-HS.
* @brief High Speed support for OTG-HS.
*/
#if !defined(STM32_USE_USB_OTG2_HS) || defined(__DOXYGEN__)
#define STM32_USE_USB_OTG2_HS FALSE
#endif
/**
* @brief ULPI support for OTG-HS.
*/
#if !defined(STM32_USE_USB_OTG2_ULPI) || defined(__DOXYGEN__)
#define STM32_USE_USB_OTG2_ULPI FALSE

4
testhal/STM32F4xx/ADC/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/CAN/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/DMA_STORM/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/EXT/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/GPT/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/I2C/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/IRQ_STORM/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/PWM-ICU/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/RTC/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/RTC_FATTIME/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/SDC/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/SPI/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/UART/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0

4
testhal/STM32F4xx/USB_CDC/mcuconf.h
View File

@ -257,6 +257,8 @@
*/
#define STM32_USB_USE_OTG1 TRUE
#define STM32_USB_USE_OTG2 TRUE
#define STM32_USE_USB_OTG2_HS FALSE
#define STM32_USE_USB_OTG2_ULPI FALSE
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
@ -264,5 +266,3 @@
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#define STM32_USB_OTGFIFO_FILL_BASEPRI 0