mbed official / mbed-src

mbed library sources

Dependents:   Encrypted my_mbed lklk CyaSSL_DTLS_Cellular ... more

Superseded

This library was superseded by mbed-dev - https://os.mbed.com/users/mbed_official/code/mbed-dev/.

Development branch of the mbed library sources. This library is kept in synch with the latest changes from the mbed SDK and it is not guaranteed to work.

If you are looking for a stable and tested release, please import one of the official mbed library releases:

Import librarymbed

The official Mbed 2 C/C++ SDK provides the software platform and libraries to build your applications.

Last commit 20 Feb 2019 by mbed official

Diff: targets/cmsis/TARGET_STM/TARGET_STM32F3/stm32f3xx_hal_adc_ex.c

Revision:
634:ac7d6880524d
Parent:
632:7687fb9c4f91
--- a/targets/cmsis/TARGET_STM/TARGET_STM32F3/stm32f3xx_hal_adc_ex.c	Mon Sep 28 15:00:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32F3/stm32f3xx_hal_adc_ex.c	Mon Sep 28 20:15:09 2015 +0100
@@ -2,8 +2,8 @@
   ******************************************************************************
   * @file    stm32f3xx_hal_adc_ex.c
   * @author  MCD Application Team
-  * @version V1.1.1
-  * @date    19-June-2015
+  * @version V1.1.0
+  * @date    12-Sept-2014
   * @brief   This file provides firmware functions to manage the following 
   *          functionalities of the Analog to Digital Convertor (ADC)
   *          peripheral:
@@ -164,7 +164,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; COPYRIGHT(c) 2015 STMicroelectronics</center></h2>
+  * <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
   *
   * Redistribution and use in source and binary forms, with or without modification,
   * are permitted provided that the following conditions are met:
@@ -379,7 +379,7 @@
   uint32_t WaitLoopIndex = 0;
   
   /* Check ADC handle */
-  if(hadc == NULL)
+  if(hadc == HAL_NULL)
   {
     return HAL_ERROR;
   }
@@ -501,7 +501,7 @@
     /* Parameters that can be updated only when ADC is disabled:              */
     /*  - Multimode clock configuration                                       */
     if ((__HAL_ADC_IS_ENABLED(hadc) == RESET)                                  &&
-        ( (tmphadcSharingSameCommonRegister.Instance == NULL) ||
+        ( (tmphadcSharingSameCommonRegister.Instance == HAL_NULL) ||
           (__HAL_ADC_IS_ENABLED(&tmphadcSharingSameCommonRegister) == RESET) ))
     {
       /* Reset configuration of ADC common register CCR:                      */
@@ -652,7 +652,7 @@
   HAL_StatusTypeDef tmpHALStatus = HAL_OK;
   
   /* Check ADC handle */
-  if(hadc == NULL)
+  if(hadc == HAL_NULL)
   {
     return HAL_ERROR;
   }
@@ -793,7 +793,7 @@
   ADC_HandleTypeDef tmphadcSharingSameCommonRegister;
   
   /* Check ADC handle */
-  if(hadc == NULL)
+  if(hadc == HAL_NULL)
   {
      return HAL_ERROR;
   }
@@ -953,7 +953,7 @@
     /* Software is allowed to change common parameters only when all ADCs of  */
     /* the common group are disabled.                                         */
     if ((__HAL_ADC_IS_ENABLED(hadc) == RESET)                                  &&
-        ( (tmphadcSharingSameCommonRegister.Instance == NULL) ||
+        ( (tmphadcSharingSameCommonRegister.Instance == HAL_NULL) ||
           (__HAL_ADC_IS_ENABLED(&tmphadcSharingSameCommonRegister) == RESET) ))
     {
       /* Reset configuration of ADC common register CCR:
@@ -1051,7 +1051,7 @@
   HAL_StatusTypeDef tmpHALStatus = HAL_OK;
   
   /* Check ADC handle */
-  if(hadc == NULL)
+  if(hadc == HAL_NULL)
   {
      return HAL_ERROR;
   }
@@ -3875,7 +3875,7 @@
   /* (Depending on STM32F3 product, there may be up to 2 ADC slaves)          */
   __HAL_ADC_MULTI_SLAVE(hadc, &tmphadcSlave);
   
-  if (tmphadcSlave.Instance == NULL)
+  if (tmphadcSlave.Instance == HAL_NULL)
   {
     /* Update ADC state machine to error */
     hadc->State = HAL_ADC_STATE_ERROR;
@@ -3995,7 +3995,7 @@
     /* (Depending on STM32F3 product, there may be up to 2 ADC slaves)        */
     __HAL_ADC_MULTI_SLAVE(hadc, &tmphadcSlave);
     
-    if (tmphadcSlave.Instance == NULL)
+    if (tmphadcSlave.Instance == HAL_NULL)
     {
       /* Update ADC state machine to error */
       hadc->State = HAL_ADC_STATE_ERROR;
@@ -4554,7 +4554,7 @@
       /* Software is allowed to change common parameters only when all ADCs   */
       /* of the common group are disabled.                                    */
       if ((__HAL_ADC_IS_ENABLED(hadc) == RESET)                                  &&
-          ( (tmphadcSharingSameCommonRegister.Instance == NULL) ||
+          ( (tmphadcSharingSameCommonRegister.Instance == HAL_NULL) ||
             (__HAL_ADC_IS_ENABLED(&tmphadcSharingSameCommonRegister) == RESET) ))
       {
         /* If Channel_16 is selected, enable Temp. sensor measurement path    */
@@ -5205,7 +5205,7 @@
       /* Software is allowed to change common parameters only when all ADCs   */
       /* of the common group are disabled.                                    */
       if ((__HAL_ADC_IS_ENABLED(hadc) == RESET)                                  &&
-          ( (tmphadcSharingSameCommonRegister.Instance == NULL) ||
+          ( (tmphadcSharingSameCommonRegister.Instance == HAL_NULL) ||
             (__HAL_ADC_IS_ENABLED(&tmphadcSharingSameCommonRegister) == RESET) ))
       {
         /* If Channel_16 is selected, enable Temp. sensor measurement path    */