git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1441 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 73 insertions, 41 deletions

diff --git a/os/hal/platforms/AT91SAM7/mac_lld.h b/os/hal/platforms/AT91SAM7/mac_lld.h
index 4de8dc481..23139e989 100644
--- a/os/hal/platforms/AT91SAM7/mac_lld.h
+++ b/os/hal/platforms/AT91SAM7/mac_lld.h
@@ -54,10 +54,6 @@
 #define MAC_BUFFERS_SIZE                1518

 #endif

 

-/*===========================================================================*/

-/* EMAC specific settings.                                                   */

-/*===========================================================================*/

-

 /**

  * @brief Interrupt priority level for the EMAC device.

  */

@@ -66,6 +62,14 @@
 #endif

 

 /*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+#if !CH_USE_SEMAPHORES || !CH_USE_EVENTS

+#error "the MAC driver requires CH_USE_SEMAPHORES and CH_USE_EVENTS"

+#endif

+

+/*===========================================================================*/

 /* EMAC specific constants.                                                  */

 /*===========================================================================*/

 

diff --git a/os/hal/platforms/STM32/adc_lld.h b/os/hal/platforms/STM32/adc_lld.h
index 5535a32c3..1d3a03991 100644
--- a/os/hal/platforms/STM32/adc_lld.h
+++ b/os/hal/platforms/STM32/adc_lld.h
@@ -30,43 +30,6 @@
 #if CH_HAL_USE_ADC || defined(__DOXYGEN__)

 

 /*===========================================================================*/

-/* Driver pre-compile time settings.                                         */

-/*===========================================================================*/

-

-/**

- * @brief ADC1 driver enable switch.

- * @details If set to @p TRUE the support for ADC1 is included.

- * @note The default is @p TRUE.

- */

-#if !defined(USE_STM32_ADC1) || defined(__DOXYGEN__)

-#define USE_STM32_ADC1              TRUE

-#endif

-

-/**

- * @brief ADC1 DMA priority (0..3|lowest..highest).

- */

-#if !defined(STM32_ADC1_DMA_PRIORITY) || defined(__DOXYGEN__)

-#define STM32_ADC1_DMA_PRIORITY     1

-#endif

-

-/**

- * @brief ADC1 interrupt priority level setting.

- * @note @p BASEPRI_KERNEL >= @p STM32_ADC1_IRQ_PRIORITY > @p PRIORITY_PENDSV.

- */

-#if !defined(STM32_ADC1_IRQ_PRIORITY) || defined(__DOXYGEN__)

-#define STM32_ADC1_IRQ_PRIORITY     0x70

-#endif

-

-/**

- * @brief ADC1 DMA error hook.
- * @note The default action for DMA errors is a system halt because DMA error

- *       can only happen because programming errors.

- */

-#if !defined(STM32_ADC1_DMA_ERROR_HOOK) || defined(__DOXYGEN__)

-#define STM32_ADC1_DMA_ERROR_HOOK() chSysHalt()

-#endif

-

-/*===========================================================================*/

 /* Driver constants.                                                         */

 /*===========================================================================*/

 

@@ -114,6 +77,51 @@
 #define ADC_SQR1_SQ16_N(n)      ((n) << 15)

 

 /*===========================================================================*/

+/* Driver pre-compile time settings.                                         */

+/*===========================================================================*/

+

+/**

+ * @brief ADC1 driver enable switch.

+ * @details If set to @p TRUE the support for ADC1 is included.

+ * @note The default is @p TRUE.

+ */

+#if !defined(USE_STM32_ADC1) || defined(__DOXYGEN__)

+#define USE_STM32_ADC1              TRUE

+#endif

+

+/**

+ * @brief ADC1 DMA priority (0..3|lowest..highest).

+ */

+#if !defined(STM32_ADC1_DMA_PRIORITY) || defined(__DOXYGEN__)

+#define STM32_ADC1_DMA_PRIORITY     1

+#endif

+

+/**

+ * @brief ADC1 interrupt priority level setting.

+ * @note @p BASEPRI_KERNEL >= @p STM32_ADC1_IRQ_PRIORITY > @p PRIORITY_PENDSV.

+ */

+#if !defined(STM32_ADC1_IRQ_PRIORITY) || defined(__DOXYGEN__)

+#define STM32_ADC1_IRQ_PRIORITY     0x70

+#endif

+

+/**

+ * @brief ADC1 DMA error hook.
+ * @note The default action for DMA errors is a system halt because DMA error

+ *       can only happen because programming errors.

+ */

+#if !defined(STM32_ADC1_DMA_ERROR_HOOK) || defined(__DOXYGEN__)

+#define STM32_ADC1_DMA_ERROR_HOOK() chSysHalt()

+#endif

+

+/*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+#if !CH_USE_SEMAPHORES

+#error "the ADC driver requires CH_USE_SEMAPHORES"

+#endif

+

+/*===========================================================================*/

 /* Driver data structures and types.                                         */

 /*===========================================================================*/

 

diff --git a/os/hal/platforms/STM32/can_lld.h b/os/hal/platforms/STM32/can_lld.h
index a71d6b68d..24f88cb80 100644
--- a/os/hal/platforms/STM32/can_lld.h
+++ b/os/hal/platforms/STM32/can_lld.h
@@ -103,6 +103,14 @@
 #endif /* !CAN_SUPPORTS_SLEEP */

 

 /*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+#if !CH_USE_SEMAPHORES || !CH_USE_EVENTS

+#error "the ADC driver requires CH_USE_SEMAPHORES and CH_USE_EVENTS"

+#endif

+

+/*===========================================================================*/

 /* Driver data structures and types.                                         */

 /*===========================================================================*/

 

diff --git a/os/hal/platforms/STM32/spi_lld.h b/os/hal/platforms/STM32/spi_lld.h
index c18c47853..8748962f2 100644
--- a/os/hal/platforms/STM32/spi_lld.h
+++ b/os/hal/platforms/STM32/spi_lld.h
@@ -30,6 +30,10 @@
 #if CH_HAL_USE_SPI || defined(__DOXYGEN__)

 

 /*===========================================================================*/

+/* Driver constants.                                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

 /* Driver pre-compile time settings.                                         */

 /*===========================================================================*/

 

@@ -106,6 +110,14 @@
 #endif

 

 /*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+#if SPI_USE_MUTUAL_EXCLUSION && !CH_USE_MUTEXES && !CH_USE_SEMAPHORES

+#error "SPI_USE_MUTUAL_EXCLUSION requires CH_USE_MUTEXES and/or CH_USE_SEMAPHORES"

+#endif

+

+/*===========================================================================*/

 /* Driver data structures and types.                                         */

 /*===========================================================================*/