]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Demo/CORTEX_M7_STM32F7_STM32756G-EVAL_IAR_Keil/ST_Library/stm32f7xx_hal_hcd.c
Update library files used in STM32F7 demo to the latest version released by ST.
[freertos] / FreeRTOS / Demo / CORTEX_M7_STM32F7_STM32756G-EVAL_IAR_Keil / ST_Library / stm32f7xx_hal_hcd.c
index 5b6bb9d12d325344ffe1ea3e7047b158a5391ca6..188f0ffabcb41f32304865b5312115b774c7ad0a 100644 (file)
@@ -2,8 +2,8 @@
   ******************************************************************************\r
   * @file    stm32f7xx_hal_hcd.c\r
   * @author  MCD Application Team\r
-  * @version V1.0.0RC1\r
-  * @date    24-March-2015\r
+  * @version V1.0.0\r
+  * @date    12-May-2015\r
   * @brief   HCD HAL module driver.\r
   *          This file provides firmware functions to manage the following \r
   *          functionalities of the USB Peripheral Controller:\r
@@ -896,16 +896,17 @@ static void HCD_HC_IN_IRQHandler   (HCD_HandleTypeDef *hhcd, uint8_t chnum)
       __HAL_HCD_UNMASK_HALT_HC_INT(chnum); \r
       USB_HC_Halt(hhcd->Instance, chnum);  \r
     }\r
-    else if  ((hhcd->hc[chnum].ep_type == EP_TYPE_CTRL)||\r
-              (hhcd->hc[chnum].ep_type == EP_TYPE_BULK))\r
+    \r
+    hhcd->hc[chnum].state = HC_NAK;\r
+    __HAL_HCD_CLEAR_HC_INT(chnum, USB_OTG_HCINT_NAK);\r
+     \r
+    if  ((hhcd->hc[chnum].ep_type == EP_TYPE_CTRL)||\r
+         (hhcd->hc[chnum].ep_type == EP_TYPE_BULK))\r
     {\r
       /* re-activate the channel  */\r
       USBx_HC(chnum)->HCCHAR &= ~USB_OTG_HCCHAR_CHDIS;         \r
       USBx_HC(chnum)->HCCHAR |= USB_OTG_HCCHAR_CHENA;\r
-   \r
     }\r
-    hhcd->hc[chnum].state = HC_NAK;\r
-     __HAL_HCD_CLEAR_HC_INT(chnum, USB_OTG_HCINT_NAK);\r
   }\r
 }\r
 \r