diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-08-19 12:22:32 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-08-19 12:22:32 +0000 |
| commit | 45ae30f505f5d81c50dab612ed9ecf6efd7b82e5 (patch) | |
| tree | f1e3f455199a7471d4ad04fdb45ce4fe1f38dd05 /os/hal/platforms | |
| parent | 0ba641f9b42c33833111cd2020b49e3a6f353772 (diff) | |
| download | ChibiOS-45ae30f505f5d81c50dab612ed9ecf6efd7b82e5.tar.gz ChibiOS-45ae30f505f5d81c50dab612ed9ecf6efd7b82e5.tar.bz2 ChibiOS-45ae30f505f5d81c50dab612ed9ecf6efd7b82e5.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4586 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms')
| -rw-r--r-- | os/hal/platforms/STM32/OTGv1/usb_lld.c | 5 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F2xx/stm32_isr.h | 8 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F4xx/stm32_isr.h | 8 |
3 files changed, 13 insertions, 8 deletions
diff --git a/os/hal/platforms/STM32/OTGv1/usb_lld.c b/os/hal/platforms/STM32/OTGv1/usb_lld.c index 6b8a0a76e..5c00803f9 100644 --- a/os/hal/platforms/STM32/OTGv1/usb_lld.c +++ b/os/hal/platforms/STM32/OTGv1/usb_lld.c @@ -939,10 +939,7 @@ void usb_lld_reset(USBDriver *usbp) { unsigned i;
stm32_otg_t *otgp = usbp->otg;
- /* Clear the Remote Wake-up Signaling */
- otgp->DCTL &= ~DCTL_RWUSIG;
-
- /* Flush the Tx FIFO */
+ /* Flush the Tx FIFO.*/
otg_txfifo_flush(otgp, 0);
/* All endpoints in NAK mode, interrupts cleared.*/
diff --git a/os/hal/platforms/STM32F2xx/stm32_isr.h b/os/hal/platforms/STM32F2xx/stm32_isr.h index dc862f4de..560ac50bc 100644 --- a/os/hal/platforms/STM32F2xx/stm32_isr.h +++ b/os/hal/platforms/STM32F2xx/stm32_isr.h @@ -61,11 +61,15 @@ /*
* OTG units.
*/
-#define STM32_OTG1_HANDLER OTG_FS_IRQHandler
-#define STM32_OTG2_HANDLER OTG_HS_IRQHandler
+#define STM32_OTG1_HANDLER Vector14C
+#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_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.
diff --git a/os/hal/platforms/STM32F4xx/stm32_isr.h b/os/hal/platforms/STM32F4xx/stm32_isr.h index 383660551..2128cf668 100644 --- a/os/hal/platforms/STM32F4xx/stm32_isr.h +++ b/os/hal/platforms/STM32F4xx/stm32_isr.h @@ -61,11 +61,15 @@ /*
* OTG units.
*/
-#define STM32_OTG1_HANDLER OTG_FS_IRQHandler
-#define STM32_OTG2_HANDLER OTG_HS_IRQHandler
+#define STM32_OTG1_HANDLER Vector14C
+#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_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.
|