andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #601. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8019 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2015-06-13 08:39:48 +00:00
parent 37a6ee0c67
commit 0c59cbe3c8
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/hal/ports/STM32/LLD/OTGv1/usb_lld.c
View File

@ -915,17 +915,17 @@ void usb_lld_stop(USBDriver *usbp) {
otgp->GAHBCFG = 0; otgp->GAHBCFG = 0;
otgp->GCCFG = 0; otgp->GCCFG = 0;
#if STM32_USB_USE_USB1 #if STM32_USB_USE_OTG1
if (&USBD1 == usbp) { if (&USBD1 == usbp) {
nvicDisableVector(STM32_OTG1_NUMBER); nvicDisableVector(STM32_OTG1_NUMBER);
rccDisableOTG1(FALSE); rccDisableOTG_FS(FALSE);
} }
#endif #endif
#if STM32_USB_USE_USB2 #if STM32_USB_USE_OTG2
if (&USBD2 == usbp) { if (&USBD2 == usbp) {
nvicDisableVector(STM32_OTG2_NUMBER); nvicDisableVector(STM32_OTG2_NUMBER);
rccDisableOTG2(FALSE); rccDisableOTG_HS(FALSE);
} }
#endif #endif
} }

18
os/hal/ports/STM32/LLD/OTGv1/usb_lld.h
View File

@ -33,15 +33,6 @@
/* Driver constants. */ /* 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. * @brief Status stage handling method.
*/ */
@ -146,6 +137,15 @@
/* Derived constants and error checks. */ /* 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 #if STM32_USB_USE_OTG1 && !STM32_HAS_OTG1
#error "OTG1 not present in the selected device" #error "OTG1 not present in the selected device"
#endif #endif

3
readme.txt
View File

@ -76,8 +76,9 @@
*** 3.0.0p6 *** *** 3.0.0p6 ***
- NIL: Added INTC priorities check to the e200z port. - NIL: Added INTC priorities check to the e200z port.
- RT: 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: 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 error in platform_f105_f107.mk file (bug #599).
- HAL: Fixed issue in DMA drivers when channels share ISRs (bug #597). - HAL: Fixed issue in DMA drivers when channels share ISRs (bug #597).