diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-29 08:40:11 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-29 08:40:11 +0000 |
| commit | 544117e9eb5a5ca827f1fbf62814459503b36e9e (patch) | |
| tree | 0fa5bc94f3f8939eb1a5f7986136e7048d9d881e /os/io/platforms/STM32/adc_lld.h | |
| parent | 3dc0fb372d94f4dc35150be02cc02ce582d55f41 (diff) | |
| download | ChibiOS-544117e9eb5a5ca827f1fbf62814459503b36e9e.tar.gz ChibiOS-544117e9eb5a5ca827f1fbf62814459503b36e9e.tar.bz2 ChibiOS-544117e9eb5a5ca827f1fbf62814459503b36e9e.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1347 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/io/platforms/STM32/adc_lld.h')
| -rw-r--r-- | os/io/platforms/STM32/adc_lld.h | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/os/io/platforms/STM32/adc_lld.h b/os/io/platforms/STM32/adc_lld.h index d6fe8948f..c9b282685 100644 --- a/os/io/platforms/STM32/adc_lld.h +++ b/os/io/platforms/STM32/adc_lld.h @@ -27,11 +27,7 @@ #ifndef _ADC_LLD_H_
#define _ADC_LLD_H_
-#undef FALSE
-#undef TRUE
-#include <stm32f10x.h>
-#define FALSE 0
-#define TRUE (!FALSE)
+#if CH_HAL_USE_ADC
/*===========================================================================*/
/* Driver pre-compile time settings. */
@@ -74,7 +70,7 @@ /* Driver constants. */
/*===========================================================================*/
-#define ADC_CR2_EXTSEL_SRC(n) (n << 17) /**< @brief Trigger source. */
+#define ADC_CR2_EXTSEL_SRC(n) ((n) << 17) /**< @brief Trigger source. */
#define ADC_CR2_EXTSEL_SWSTART (7 << 17) /**< @brief Software trigger. */
#define ADC_CHANNEL_IN0 0 /**< @brief External analog input 0. */
@@ -96,26 +92,26 @@ #define ADC_CHANNEL_SENSOR 16 /**< @brief Internal temperature sensor.*/
#define ADC_CHANNEL_VREFINT 17 /**< @brief Internal reference. */
-#define ADC_SQR1_NUM_CH(n) (n << 20)
+#define ADC_SQR1_NUM_CH(n) (((n) - 1) << 20)
-#define ADC_SQR3_SQ0_N(n) (n << 0)
-#define ADC_SQR3_SQ1_N(n) (n << 5)
-#define ADC_SQR3_SQ2_N(n) (n << 10)
-#define ADC_SQR3_SQ3_N(n) (n << 15)
-#define ADC_SQR3_SQ4_N(n) (n << 20)
-#define ADC_SQR3_SQ5_N(n) (n << 25)
+#define ADC_SQR3_SQ0_N(n) ((n) << 0)
+#define ADC_SQR3_SQ1_N(n) ((n) << 5)
+#define ADC_SQR3_SQ2_N(n) ((n) << 10)
+#define ADC_SQR3_SQ3_N(n) ((n) << 15)
+#define ADC_SQR3_SQ4_N(n) ((n) << 20)
+#define ADC_SQR3_SQ5_N(n) ((n) << 25)
-#define ADC_SQR2_SQ6_N(n) (n << 0)
-#define ADC_SQR2_SQ7_N(n) (n << 5)
-#define ADC_SQR2_SQ8_N(n) (n << 10)
-#define ADC_SQR2_SQ9_N(n) (n << 15)
-#define ADC_SQR2_SQ10_N(n) (n << 20)
-#define ADC_SQR2_SQ11_N(n) (n << 25)
+#define ADC_SQR2_SQ6_N(n) ((n) << 0)
+#define ADC_SQR2_SQ7_N(n) ((n) << 5)
+#define ADC_SQR2_SQ8_N(n) ((n) << 10)
+#define ADC_SQR2_SQ9_N(n) ((n) << 15)
+#define ADC_SQR2_SQ10_N(n) ((n) << 20)
+#define ADC_SQR2_SQ11_N(n) ((n) << 25)
-#define ADC_SQR1_SQ13_N(n) (n << 0)
-#define ADC_SQR1_SQ14_N(n) (n << 5)
-#define ADC_SQR1_SQ15_N(n) (n << 10)
-#define ADC_SQR1_SQ16_N(n) (n << 15)
+#define ADC_SQR1_SQ13_N(n) ((n) << 0)
+#define ADC_SQR1_SQ14_N(n) ((n) << 5)
+#define ADC_SQR1_SQ15_N(n) ((n) << 10)
+#define ADC_SQR1_SQ16_N(n) ((n) << 15)
/*===========================================================================*/
/* Driver data structures and types. */
@@ -271,6 +267,8 @@ extern "C" { #endif
/** @endcond*/
+#endif /* CH_HAL_USE_ADC */
+
#endif /* _ADC_LLD_H_ */
/** @} */
|