diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-06-13 08:39:48 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-06-13 08:39:48 +0000 |
| commit | 0c59cbe3c81efbe40d13d0ff3ea99f0fbd15d366 (patch) | |
| tree | dd335e6c88cfcc74c667ccbea2ad05b50bc42e98 /os | |
| parent | 37a6ee0c67b2780f651e0d0a02fb048f55f5cf97 (diff) | |
| download | ChibiOS-0c59cbe3c81efbe40d13d0ff3ea99f0fbd15d366.tar.gz ChibiOS-0c59cbe3c81efbe40d13d0ff3ea99f0fbd15d366.tar.bz2 ChibiOS-0c59cbe3c81efbe40d13d0ff3ea99f0fbd15d366.zip | |
Fixed bug #601.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8019 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/ports/STM32/LLD/OTGv1/usb_lld.c | 8 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/OTGv1/usb_lld.h | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c b/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c index 4c2913164..3bd5f7140 100644 --- a/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c +++ b/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c @@ -915,17 +915,17 @@ void usb_lld_stop(USBDriver *usbp) { otgp->GAHBCFG = 0;
otgp->GCCFG = 0;
-#if STM32_USB_USE_USB1
+#if STM32_USB_USE_OTG1
if (&USBD1 == usbp) {
nvicDisableVector(STM32_OTG1_NUMBER);
- rccDisableOTG1(FALSE);
+ rccDisableOTG_FS(FALSE);
}
#endif
-#if STM32_USB_USE_USB2
+#if STM32_USB_USE_OTG2
if (&USBD2 == usbp) {
nvicDisableVector(STM32_OTG2_NUMBER);
- rccDisableOTG2(FALSE);
+ rccDisableOTG_HS(FALSE);
}
#endif
}
diff --git a/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h b/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h index ffdd19c5a..e43ac5eb5 100644 --- a/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h +++ b/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h @@ -34,15 +34,6 @@ /*===========================================================================*/
/**
- * @brief Maximum endpoint address.
- */
-#if !STM32_USB_USE_OTG2 || defined(__DOXYGEN__)
-#define USB_MAX_ENDPOINTS 3
-#else
-#define USB_MAX_ENDPOINTS 5
-#endif
-
-/**
* @brief Status stage handling method.
*/
#define USB_EP0_STATUS_STAGE USB_EP0_STATUS_STAGE_SW
@@ -146,6 +137,15 @@ /* Derived constants and error checks. */
/*===========================================================================*/
+/**
+ * @brief Maximum endpoint address.
+ */
+#if !STM32_USB_USE_OTG2 || defined(__DOXYGEN__)
+#define USB_MAX_ENDPOINTS 3
+#else
+#define USB_MAX_ENDPOINTS 5
+#endif
+
#if STM32_USB_USE_OTG1 && !STM32_HAS_OTG1
#error "OTG1 not present in the selected device"
#endif
|