From 0c59cbe3c81efbe40d13d0ff3ea99f0fbd15d366 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 13 Jun 2015 08:39:48 +0000
Subject: Fixed bug #601.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8019 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/ports/STM32/LLD/OTGv1/usb_lld.c |  8 ++++----
 os/hal/ports/STM32/LLD/OTGv1/usb_lld.h | 18 +++++++++---------
 readme.txt                             |  3 ++-
 3 files changed, 15 insertions(+), 14 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
@@ -33,15 +33,6 @@
 /* Driver constants.                                                         */
 /*===========================================================================*/
 
-/**
- * @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.
  */
@@ -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
diff --git a/readme.txt b/readme.txt
index ad62b2636..ef9036998 100644
--- a/readme.txt
+++ b/readme.txt
@@ -76,8 +76,9 @@
 *** 3.0.0p6 ***
 - NIL: Added INTC priorities check to the e200z port.
 - RT:  Added INTC priorities check to the e200z port.
-- DEM: Fixed missing paths in e200z demos (bug #600).
 - HAL: Added support for extra DMA channels in STM32F072 devices.
+- HAL: Fixed errors in STM32 OTGv1 driver (bug #601).
+- DEM: Fixed missing paths in e200z demos (bug #600).
 - HAL: Fixed error in platform_f105_f107.mk file (bug #599).
 - HAL: Fixed issue in DMA drivers when channels share ISRs (bug #597).
 
-- 
cgit v1.2.3