diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-13 00:41:12 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-13 00:41:12 +0000 |
| commit | 13e64f06604c1502317921201bdde33c57161808 (patch) | |
| tree | 865c85e4aaa41fc86711010362b7c0b0b4dbf832 /stm/stm32fxxx_it.c | |
| parent | 813edf63a3e4c0bab3dd5edd4e7295462386c2f3 (diff) | |
| parent | 34f813ee29c7191e3de455c3fc9c788496e3b29e (diff) | |
| download | micropython-13e64f06604c1502317921201bdde33c57161808.tar.gz micropython-13e64f06604c1502317921201bdde33c57161808.zip | |
Merge remote-tracking branch 'upstream/master' into containment
Diffstat (limited to 'stm/stm32fxxx_it.c')
| -rw-r--r-- | stm/stm32fxxx_it.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/stm/stm32fxxx_it.c b/stm/stm32fxxx_it.c index e254ccc899..c1a9a0702f 100644 --- a/stm/stm32fxxx_it.c +++ b/stm/stm32fxxx_it.c @@ -31,6 +31,7 @@ #include "stm32fxxx_it.h" #include "stm32f4xx_exti.h" #include "usb_core.h" +//#include "usb_hcd_int.h" // for usb host mode only //#include "usbd_core.h" //#include "usbd_cdc_core.h" @@ -197,7 +198,8 @@ void OTG_HS_IRQHandler(void) void OTG_FS_IRQHandler(void) #endif { - USBD_OTG_ISR_Handler (&USB_OTG_dev); + USBD_OTG_ISR_Handler (&USB_OTG_dev); // device mode + //USBH_OTG_ISR_Handler (&USB_OTG_dev); // host mode FIXME } #ifdef USB_OTG_HS_DEDICATED_EP1_ENABLED |