frederic blanc / mbed

/TARGET_K64F/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_KPSDK_CODE/hal/adc/fsl_adc_hal.h substitute line 894 extern } by }

Fork of mbed by mbed official

Diff: TARGET_NUCLEO_F401RE/stm32f4xx_hal_flash.h

Revision:
81:7d30d6019079
Parent:
77:869cf507173a
Child:
85:024bf7f99721
--- a/TARGET_NUCLEO_F401RE/stm32f4xx_hal_flash.h	Fri Feb 21 12:21:39 2014 +0000
+++ b/TARGET_NUCLEO_F401RE/stm32f4xx_hal_flash.h	Wed Mar 19 18:28:32 2014 +0000
@@ -2,8 +2,8 @@
   ******************************************************************************
   * @file    stm32f4xx_hal_flash.h
   * @author  MCD Application Team
-  * @version V1.0.0RC2
-  * @date    04-February-2014
+  * @version V1.0.0
+  * @date    18-February-2014
   * @brief   Header file of FLASH HAL module.
   ******************************************************************************
   * @attention
@@ -302,7 +302,7 @@
   *            @arg FLASH_FLAG_BSY   : FLASH Busy flag
   * @retval The new state of __FLAG__ (SET or RESET).
   */
-#define __HAL_FLASH_GET_FLAG(__FLAG__)   ((FLASH->SR & (__FLAG__)) == (__FLAG__))
+#define __HAL_FLASH_GET_FLAG(__FLAG__)   ((FLASH->SR & (__FLAG__)))
 
 /**
   * @brief  Clear the specified FLASH flag.
@@ -329,8 +329,8 @@
 /* FLASH IRQ handler method */
 void                HAL_FLASH_IRQHandler(void);
 /* Callbacks in non blocking modes */ 
-__weak void         HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue);
-__weak void         HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue);
+void         HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue);
+void         HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue);
 
 /* Peripheral Control functions  **********************************************/
 HAL_StatusTypeDef   HAL_FLASH_Unlock(void);