Diff: targets/cmsis/TARGET_STM/TARGET_STM32F0/stm32f0xx_hal_dma.c

Revision:

441:d2c15dda23c1

Parent:

392:2b59412bb664

--- a/targets/cmsis/TARGET_STM/TARGET_STM32F0/stm32f0xx_hal_dma.c	Tue Dec 16 08:15:08 2014 +0000
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32F0/stm32f0xx_hal_dma.c	Tue Jan 06 16:15:36 2015 +0000
@@ -2,8 +2,8 @@
   ******************************************************************************
   * @file    stm32f0xx_hal_dma.c
   * @author  MCD Application Team
-  * @version V1.1.0
-  * @date    03-Oct-2014
+  * @version V1.2.0
+  * @date    11-December-2014
   * @brief   DMA HAL module driver.
   *    
   *         This file provides firmware functions to manage the following 
@@ -172,7 +172,7 @@
   uint32_t tmp = 0;
   
   /* Check the DMA handle allocation */
-  if(hdma == HAL_NULL)
+  if(hdma == NULL)
   {
     return HAL_ERROR;
   }
@@ -225,7 +225,7 @@
 HAL_StatusTypeDef HAL_DMA_DeInit(DMA_HandleTypeDef *hdma)
 {
   /* Check the DMA handle allocation */
-  if(hdma == HAL_NULL)
+  if(hdma == NULL)
   {
     return HAL_ERROR;
   }
@@ -535,7 +535,7 @@
       /* Process Unlocked */
       __HAL_UNLOCK(hdma); 
     
-      if (hdma->XferErrorCallback != HAL_NULL)
+      if (hdma->XferErrorCallback != (void (*)(DMA_HandleTypeDef *))NULL)
       {
         /* Transfer error callback */
         hdma->XferErrorCallback(hdma);
@@ -560,7 +560,7 @@
       /* Change DMA peripheral state */
       hdma->State = HAL_DMA_STATE_READY_HALF;
 
-      if(hdma->XferHalfCpltCallback != HAL_NULL)
+      if(hdma->XferHalfCpltCallback != (void (*)(DMA_HandleTypeDef *))NULL)
       {
         /* Half transfer callback */
         hdma->XferHalfCpltCallback(hdma);
@@ -590,7 +590,7 @@
       /* Process Unlocked */
       __HAL_UNLOCK(hdma);
     
-      if(hdma->XferCpltCallback != HAL_NULL)
+      if(hdma->XferCpltCallback != (void (*)(DMA_HandleTypeDef *))NULL)
       {       
         /* Transfer complete callback */
         hdma->XferCpltCallback(hdma);