git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4586 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2012-08-19 12:22:32 +00:00
parent 0ba641f9b4
commit 45ae30f505
3 changed files with 13 additions and 8 deletions

View File

@ -939,10 +939,7 @@ void usb_lld_reset(USBDriver *usbp) {
unsigned i; unsigned i;
stm32_otg_t *otgp = usbp->otg; stm32_otg_t *otgp = usbp->otg;
/* Clear the Remote Wake-up Signaling */ /* Flush the Tx FIFO.*/
otgp->DCTL &= ~DCTL_RWUSIG;
/* Flush the Tx FIFO */
otg_txfifo_flush(otgp, 0); otg_txfifo_flush(otgp, 0);
/* All endpoints in NAK mode, interrupts cleared.*/ /* All endpoints in NAK mode, interrupts cleared.*/

View File

@ -61,11 +61,15 @@
/* /*
* OTG units. * OTG units.
*/ */
#define STM32_OTG1_HANDLER OTG_FS_IRQHandler #define STM32_OTG1_HANDLER Vector14C
#define STM32_OTG2_HANDLER OTG_HS_IRQHandler #define STM32_OTG2_HANDLER Vector174
#define STM32_OTG2_EP1OUT_HANDLER Vector168
#define STM32_OTG2_EP1IN_HANDLER Vector16C
#define STM32_OTG1_NUMBER OTG_FS_IRQn #define STM32_OTG1_NUMBER OTG_FS_IRQn
#define STM32_OTG2_NUMBER OTG_HS_IRQn #define STM32_OTG2_NUMBER OTG_HS_IRQn
#define STM32_OTG2_EP1OUT_NUMBER OTG_HS_EP1_OUT_IRQn
#define STM32_OTG2_EP1IN_NUMBER OTG_HS_EP1_IN_IRQn
/* /*
* SDIO unit. * SDIO unit.

View File

@ -61,11 +61,15 @@
/* /*
* OTG units. * OTG units.
*/ */
#define STM32_OTG1_HANDLER OTG_FS_IRQHandler #define STM32_OTG1_HANDLER Vector14C
#define STM32_OTG2_HANDLER OTG_HS_IRQHandler #define STM32_OTG2_HANDLER Vector174
#define STM32_OTG2_EP1OUT_HANDLER Vector168
#define STM32_OTG2_EP1IN_HANDLER Vector16C
#define STM32_OTG1_NUMBER OTG_FS_IRQn #define STM32_OTG1_NUMBER OTG_FS_IRQn
#define STM32_OTG2_NUMBER OTG_HS_IRQn #define STM32_OTG2_NUMBER OTG_HS_IRQn
#define STM32_OTG2_EP1OUT_NUMBER OTG_HS_EP1_OUT_IRQn
#define STM32_OTG2_EP1IN_NUMBER OTG_HS_EP1_IN_IRQn
/* /*
* SDIO unit. * SDIO unit.