diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-08-21 16:09:14 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-08-21 16:09:14 +0000 |
| commit | 35cae2a2900298061c197a19e0b6eace8eaa9312 (patch) | |
| tree | 839366768dd7adc1a6687818cd59a76c55956359 /os/hal/platforms | |
| parent | 79ec800cb608672f38f013ed8302aa6ad72016d0 (diff) | |
| download | ChibiOS-35cae2a2900298061c197a19e0b6eace8eaa9312.tar.gz ChibiOS-35cae2a2900298061c197a19e0b6eace8eaa9312.tar.bz2 ChibiOS-35cae2a2900298061c197a19e0b6eace8eaa9312.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4607 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms')
| -rw-r--r-- | os/hal/platforms/STM32/can_lld.h | 2 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F0xx/adc_lld.h | 2 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F1xx/adc_lld.h | 2 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F2xx/adc_lld.h | 6 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F4xx/adc_lld.h | 6 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F4xx/hal_lld.h | 7 | ||||
| -rw-r--r-- | os/hal/platforms/STM32L1xx/adc_lld.h | 2 |
7 files changed, 17 insertions, 10 deletions
diff --git a/os/hal/platforms/STM32/can_lld.h b/os/hal/platforms/STM32/can_lld.h index f94e7094d..6cb882df2 100644 --- a/os/hal/platforms/STM32/can_lld.h +++ b/os/hal/platforms/STM32/can_lld.h @@ -89,7 +89,7 @@ #if !defined(STM32_CAN_CAN1_IRQ_PRIORITY) || defined(__DOXYGEN__)
#define STM32_CAN_CAN1_IRQ_PRIORITY 11
#endif
-/** @} */TRUE
+/** @} */
/*===========================================================================*/
/* Derived constants and error checks. */
diff --git a/os/hal/platforms/STM32F0xx/adc_lld.h b/os/hal/platforms/STM32F0xx/adc_lld.h index a0d823a8b..ecf215160 100644 --- a/os/hal/platforms/STM32F0xx/adc_lld.h +++ b/os/hal/platforms/STM32F0xx/adc_lld.h @@ -80,7 +80,7 @@ * @note The default is @p TRUE.
*/
#if !defined(STM32_ADC_USE_ADC1) || defined(__DOXYGEN__)
-#define STM32_ADC_USE_ADC1 TRUE
+#define STM32_ADC_USE_ADC1 FALSE
#endif
/**
diff --git a/os/hal/platforms/STM32F1xx/adc_lld.h b/os/hal/platforms/STM32F1xx/adc_lld.h index e3f0fe628..9f4227e31 100644 --- a/os/hal/platforms/STM32F1xx/adc_lld.h +++ b/os/hal/platforms/STM32F1xx/adc_lld.h @@ -95,7 +95,7 @@ * @note The default is @p TRUE.
*/
#if !defined(STM32_ADC_USE_ADC1) || defined(__DOXYGEN__)
-#define STM32_ADC_USE_ADC1 TRUE
+#define STM32_ADC_USE_ADC1 FALSE
#endif
/**
diff --git a/os/hal/platforms/STM32F2xx/adc_lld.h b/os/hal/platforms/STM32F2xx/adc_lld.h index fe30a8196..135f3ce72 100644 --- a/os/hal/platforms/STM32F2xx/adc_lld.h +++ b/os/hal/platforms/STM32F2xx/adc_lld.h @@ -134,7 +134,7 @@ * @note The default is @p TRUE.
*/
#if !defined(STM32_ADC_USE_ADC1) || defined(__DOXYGEN__)
-#define STM32_ADC_USE_ADC1 TRUE
+#define STM32_ADC_USE_ADC1 FALSE
#endif
/**
@@ -143,7 +143,7 @@ * @note The default is @p TRUE.
*/
#if !defined(STM32_ADC_USE_ADC2) || defined(__DOXYGEN__)
-#define STM32_ADC_USE_ADC2 TRUE
+#define STM32_ADC_USE_ADC2 FALSE
#endif
/**
@@ -152,7 +152,7 @@ * @note The default is @p TRUE.
*/
#if !defined(STM32_ADC_USE_ADC3) || defined(__DOXYGEN__)
-#define STM32_ADC_USE_ADC3 TRUE
+#define STM32_ADC_USE_ADC3 FALSE
#endif
/**
diff --git a/os/hal/platforms/STM32F4xx/adc_lld.h b/os/hal/platforms/STM32F4xx/adc_lld.h index 88fad4329..cd417c324 100644 --- a/os/hal/platforms/STM32F4xx/adc_lld.h +++ b/os/hal/platforms/STM32F4xx/adc_lld.h @@ -134,7 +134,7 @@ * @note The default is @p TRUE.
*/
#if !defined(STM32_ADC_USE_ADC1) || defined(__DOXYGEN__)
-#define STM32_ADC_USE_ADC1 TRUE
+#define STM32_ADC_USE_ADC1 FALSE
#endif
/**
@@ -143,7 +143,7 @@ * @note The default is @p TRUE.
*/
#if !defined(STM32_ADC_USE_ADC2) || defined(__DOXYGEN__)
-#define STM32_ADC_USE_ADC2 TRUE
+#define STM32_ADC_USE_ADC2 FALSE
#endif
/**
@@ -152,7 +152,7 @@ * @note The default is @p TRUE.
*/
#if !defined(STM32_ADC_USE_ADC3) || defined(__DOXYGEN__)
-#define STM32_ADC_USE_ADC3 TRUE
+#define STM32_ADC_USE_ADC3 FALSE
#endif
/**
diff --git a/os/hal/platforms/STM32F4xx/hal_lld.h b/os/hal/platforms/STM32F4xx/hal_lld.h index 986156e00..ce01b9ce0 100644 --- a/os/hal/platforms/STM32F4xx/hal_lld.h +++ b/os/hal/platforms/STM32F4xx/hal_lld.h @@ -768,6 +768,13 @@ /* Derived constants and error checks. */
/*===========================================================================*/
+/*
+ * Configuration-related checks.
+ */
+#if !defined(STM32F4xx_MCUCONF)
+#error "Using a wrong mcuconf.h file, STM32F4xx_MCUCONF not defined"
+#endif
+
/**
* @brief Maximum SYSCLK.
* @note It is a function of the core voltage setting.
diff --git a/os/hal/platforms/STM32L1xx/adc_lld.h b/os/hal/platforms/STM32L1xx/adc_lld.h index 94aaff2f2..1ce9444ab 100644 --- a/os/hal/platforms/STM32L1xx/adc_lld.h +++ b/os/hal/platforms/STM32L1xx/adc_lld.h @@ -111,7 +111,7 @@ * @note The default is @p TRUE.
*/
#if !defined(STM32_ADC_USE_ADC1) || defined(__DOXYGEN__)
-#define STM32_ADC_USE_ADC1 TRUE
+#define STM32_ADC_USE_ADC1 FALSE
#endif
/**
|