Diff: targets/cmsis/TARGET_STM/TARGET_STM32F4/stm32f4xx_hal_usart.c

Revision:

613:bc40b8d2aec4

Parent:

532:fe11edbda85c

--- a/targets/cmsis/TARGET_STM/TARGET_STM32F4/stm32f4xx_hal_usart.c	Tue Aug 18 15:00:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32F4/stm32f4xx_hal_usart.c	Thu Aug 20 10:45:13 2015 +0100
@@ -2,8 +2,8 @@
   ******************************************************************************
   * @file    stm32f4xx_hal_usart.c
   * @author  MCD Application Team
-  * @version V1.3.0
-  * @date    09-March-2015
+  * @version V1.3.2
+  * @date    26-June-2015
   * @brief   USART HAL module driver.
   *          This file provides firmware functions to manage the following 
   *          functionalities of the Universal Synchronous Asynchronous Receiver Transmitter (USART) peripheral:
@@ -222,7 +222,7 @@
 HAL_StatusTypeDef HAL_USART_Init(USART_HandleTypeDef *husart)
 {
   /* Check the USART handle allocation */
-  if(husart == HAL_NULL)
+  if(husart == NULL)
   {
     return HAL_ERROR;
   }
@@ -268,7 +268,7 @@
 HAL_StatusTypeDef HAL_USART_DeInit(USART_HandleTypeDef *husart)
 {
    /* Check the USART handle allocation */
-  if(husart == HAL_NULL)
+  if(husart == NULL)
   {
     return HAL_ERROR;
   }
@@ -399,7 +399,7 @@
 
   if(husart->State == HAL_USART_STATE_READY)
   {
-    if((pTxData == HAL_NULL) || (Size == 0)) 
+    if((pTxData == NULL) || (Size == 0)) 
     {
       return  HAL_ERROR;
     }
@@ -476,7 +476,7 @@
 
   if(husart->State == HAL_USART_STATE_READY)
   {
-    if((pRxData == HAL_NULL) || (Size == 0)) 
+    if((pRxData == NULL) || (Size == 0)) 
     {
       return  HAL_ERROR;
     }
@@ -578,7 +578,7 @@
 
   if(husart->State == HAL_USART_STATE_READY)
   {
-    if((pTxData == HAL_NULL) || (pRxData == HAL_NULL) || (Size == 0)) 
+    if((pTxData == NULL) || (pRxData == NULL) || (Size == 0)) 
     {
       return  HAL_ERROR;
     }
@@ -686,7 +686,7 @@
 {
   if(husart->State == HAL_USART_STATE_READY)
   {
-    if((pTxData == HAL_NULL) || (Size == 0)) 
+    if((pTxData == NULL) || (Size == 0)) 
     {
       return HAL_ERROR;
     }
@@ -735,7 +735,7 @@
 {
   if(husart->State == HAL_USART_STATE_READY)
   {
-    if((pRxData == HAL_NULL) || (Size == 0)) 
+    if((pRxData == NULL) || (Size == 0)) 
     {
       return HAL_ERROR;
     }
@@ -785,7 +785,7 @@
 {
   if(husart->State == HAL_USART_STATE_READY)
   {
-    if((pTxData == HAL_NULL) || (pRxData == HAL_NULL) || (Size == 0)) 
+    if((pTxData == NULL) || (pRxData == NULL) || (Size == 0)) 
     {
       return HAL_ERROR;
     }
@@ -839,7 +839,7 @@
   
   if(husart->State == HAL_USART_STATE_READY)
   {
-    if((pTxData == HAL_NULL) || (Size == 0)) 
+    if((pTxData == NULL) || (Size == 0)) 
     {
       return HAL_ERROR;
     }
@@ -900,7 +900,7 @@
   
   if(husart->State == HAL_USART_STATE_READY)
   {
-    if((pRxData == HAL_NULL) || (Size == 0)) 
+    if((pRxData == NULL) || (Size == 0)) 
     {
       return HAL_ERROR;
     }
@@ -973,7 +973,7 @@
   
   if(husart->State == HAL_USART_STATE_READY)
   {
-    if((pTxData == HAL_NULL) || (pRxData == HAL_NULL) || (Size == 0)) 
+    if((pTxData == NULL) || (pRxData == NULL) || (Size == 0)) 
     {
       return HAL_ERROR;
     }
@@ -1094,12 +1094,12 @@
      */
 
   /* Abort the USART DMA Tx Stream */
-  if(husart->hdmatx != HAL_NULL)
+  if(husart->hdmatx != NULL)
   {
     HAL_DMA_Abort(husart->hdmatx);
   }
   /* Abort the USART DMA Rx Stream */
-  if(husart->hdmarx != HAL_NULL)
+  if(husart->hdmarx != NULL)
   {  
     HAL_DMA_Abort(husart->hdmarx);
   }