mbed library sources
Fork of mbed-src by
Diff: targets/cmsis/TARGET_STM/TARGET_STM32F0/stm32f0xx_hal_tsc.c
- Revision:
- 441:d2c15dda23c1
- Parent:
- 392:2b59412bb664
diff -r 8a0b45cd594f -r d2c15dda23c1 targets/cmsis/TARGET_STM/TARGET_STM32F0/stm32f0xx_hal_tsc.c --- a/targets/cmsis/TARGET_STM/TARGET_STM32F0/stm32f0xx_hal_tsc.c Tue Dec 16 08:15:08 2014 +0000 +++ b/targets/cmsis/TARGET_STM/TARGET_STM32F0/stm32f0xx_hal_tsc.c Tue Jan 06 16:15:36 2015 +0000 @@ -2,8 +2,8 @@ ****************************************************************************** * @file stm32f0xx_hal_tsc.c * @author MCD Application Team - * @version V1.1.0 - * @date 03-Oct-2014 + * @version V1.2.0 + * @date 11-December-2014 * @brief This file provides firmware functions to manage the following * functionalities of the Touch Sensing Controller (TSC) peripheral: * + Initialization and DeInitialization @@ -111,6 +111,12 @@ /* Includes ------------------------------------------------------------------*/ #include "stm32f0xx_hal.h" +#ifdef HAL_TSC_MODULE_ENABLED + +#if defined(STM32F051x8) || defined(STM32F071xB) || defined(STM32F091xC) || \ + defined(STM32F042x6) || defined(STM32F072xB) || \ + defined(STM32F048xx) || defined(STM32F058xx) || defined(STM32F078xx) || defined(STM32F098xx) + /** @addtogroup STM32F0xx_HAL_Driver * @{ */ @@ -120,12 +126,6 @@ * @{ */ -#ifdef HAL_TSC_MODULE_ENABLED - -#if defined(STM32F051x8) || defined(STM32F071xB) || defined(STM32F091xC) || \ - defined(STM32F042x6) || defined(STM32F072xB) || \ - defined(STM32F048xx) || defined(STM32F058xx) || defined(STM32F078xx) || defined(STM32F098xx) - /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ /* Private macro -------------------------------------------------------------*/ @@ -161,7 +161,7 @@ HAL_StatusTypeDef HAL_TSC_Init(TSC_HandleTypeDef* htsc) { /* Check TSC handle allocation */ - if (htsc == HAL_NULL) + if (htsc == NULL) { return HAL_ERROR; } @@ -244,7 +244,7 @@ HAL_StatusTypeDef HAL_TSC_DeInit(TSC_HandleTypeDef* htsc) { /* Check TSC handle allocation */ - if (htsc == HAL_NULL) + if (htsc == NULL) { return HAL_ERROR; } @@ -774,12 +774,6 @@ * @} */ -#endif /* defined(STM32F051x8) || defined(STM32F071xB) || defined(STM32F091xC) || */ - /* defined(STM32F042x6) || defined(STM32F072xB) || */ - /* defined(STM32F048xx) || defined(STM32F058xx) || defined(STM32F078xx) || defined(STM32F098xx) */ - -#endif /* HAL_TSC_MODULE_ENABLED */ - /** * @} */ @@ -788,4 +782,10 @@ * @} */ +#endif /* defined(STM32F051x8) || defined(STM32F071xB) || defined(STM32F091xC) || */ + /* defined(STM32F042x6) || defined(STM32F072xB) || */ + /* defined(STM32F048xx) || defined(STM32F058xx) || defined(STM32F078xx) || defined(STM32F098xx) */ + +#endif /* HAL_TSC_MODULE_ENABLED */ + /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/