9 files changed, 21 insertions, 21 deletions
diff --git a/os/hal/include/adc.h b/os/hal/include/adc.h
index c41435452..bff1bb996 100644
--- a/os/hal/include/adc.h
+++ b/os/hal/include/adc.h
@@ -64,8 +64,8 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#if ADC_USE_MUTUAL_EXCLUSION && !CH_USE_MUTEXES && !CH_USE_SEMAPHORES
-#error "ADC_USE_MUTUAL_EXCLUSION requires CH_USE_MUTEXES and/or CH_USE_SEMAPHORES"
+#if ADC_USE_MUTUAL_EXCLUSION && !CH_CFG_USE_MUTEXES && !CH_CFG_USE_SEMAPHORES
+#error "ADC_USE_MUTUAL_EXCLUSION requires CH_CFG_USE_MUTEXES and/or CH_CFG_USE_SEMAPHORES"
 #endif
 
 /*===========================================================================*/
diff --git a/os/hal/include/can.h b/os/hal/include/can.h
index 6cd2f55c1..7b649827f 100644
--- a/os/hal/include/can.h
+++ b/os/hal/include/can.h
@@ -89,8 +89,8 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#if !CH_USE_SEMAPHORES || !CH_USE_EVENTS
-#error "CAN driver requires CH_USE_SEMAPHORES and CH_USE_EVENTS"
+#if !CH_CFG_USE_SEMAPHORES || !CH_CFG_USE_EVENTS
+#error "CAN driver requires CH_CFG_USE_SEMAPHORES and CH_CFG_USE_EVENTS"
 #endif
 
 /*===========================================================================*/
diff --git a/os/hal/include/i2c.h b/os/hal/include/i2c.h
index 2e45450ee..7be2e4ef1 100644
--- a/os/hal/include/i2c.h
+++ b/os/hal/include/i2c.h
@@ -69,8 +69,8 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#if I2C_USE_MUTUAL_EXCLUSION && !CH_USE_MUTEXES && !CH_USE_SEMAPHORES
-#error "I2C_USE_MUTUAL_EXCLUSION requires CH_USE_MUTEXES and/or CH_USE_SEMAPHORES"
+#if I2C_USE_MUTUAL_EXCLUSION && !CH_CFG_USE_MUTEXES && !CH_CFG_USE_SEMAPHORES
+#error "I2C_USE_MUTUAL_EXCLUSION requires CH_CFG_USE_MUTEXES and/or CH_CFG_USE_SEMAPHORES"
 #endif
 
 /*===========================================================================*/
diff --git a/os/hal/include/io_channel.h b/os/hal/include/io_channel.h
index b0c21a9ee..f48eae822 100644
--- a/os/hal/include/io_channel.h
+++ b/os/hal/include/io_channel.h
@@ -199,7 +199,7 @@ typedef struct {
 #define chnReadTimeout(ip, bp, n, time) ((ip)->vmt->readt(ip, bp, n, time))
 /** @} */
 
-#if CH_USE_EVENTS || defined(__DOXYGEN__)
+#if CH_CFG_USE_EVENTS || defined(__DOXYGEN__)
 /**
  * @name    I/O status flags added to the event listener
  * @{
@@ -287,7 +287,7 @@ typedef struct {
 }
 /** @} */
 
-#endif /* CH_USE_EVENTS */
+#endif /* CH_CFG_USE_EVENTS */
 
 #endif /* _IO_CHANNEL_H_ */
 
diff --git a/os/hal/include/mac.h b/os/hal/include/mac.h
index 868460ad5..8b882054a 100644
--- a/os/hal/include/mac.h
+++ b/os/hal/include/mac.h
@@ -61,12 +61,12 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#if !CH_USE_SEMAPHORES || !CH_USE_EVENTS
-#error "the MAC driver requires CH_USE_SEMAPHORES"
+#if !CH_CFG_USE_SEMAPHORES || !CH_CFG_USE_EVENTS
+#error "the MAC driver requires CH_CFG_USE_SEMAPHORES"
 #endif
 
-#if MAC_USE_EVENTS && !CH_USE_EVENTS
-#error "the MAC driver requires CH_USE_EVENTS"
+#if MAC_USE_EVENTS && !CH_CFG_USE_EVENTS
+#error "the MAC driver requires CH_CFG_USE_EVENTS"
 #endif
 
 /*===========================================================================*/
diff --git a/os/hal/include/mmc_spi.h b/os/hal/include/mmc_spi.h
index 5732570b6..3d7eacb21 100644
--- a/os/hal/include/mmc_spi.h
+++ b/os/hal/include/mmc_spi.h
@@ -65,8 +65,8 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#if !HAL_USE_SPI || !SPI_USE_WAIT || !CH_USE_EVENTS
-#error "MMC_SPI driver requires HAL_USE_SPI, SPI_USE_WAIT and CH_USE_EVENTS"
+#if !HAL_USE_SPI || !SPI_USE_WAIT || !CH_CFG_USE_EVENTS
+#error "MMC_SPI driver requires HAL_USE_SPI, SPI_USE_WAIT and CH_CFG_USE_EVENTS"
 #endif
 
 /*===========================================================================*/
diff --git a/os/hal/include/serial.h b/os/hal/include/serial.h
index a44e10cac..ac3ea3130 100644
--- a/os/hal/include/serial.h
+++ b/os/hal/include/serial.h
@@ -79,8 +79,8 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#if !CH_USE_QUEUES && !CH_USE_EVENTS
-#error "Serial Driver requires CH_USE_QUEUES and CH_USE_EVENTS"
+#if !CH_CFG_USE_QUEUES && !CH_CFG_USE_EVENTS
+#error "Serial Driver requires CH_CFG_USE_QUEUES and CH_CFG_USE_EVENTS"
 #endif
 
 /*===========================================================================*/
diff --git a/os/hal/include/serial_usb.h b/os/hal/include/serial_usb.h
index 28ab3a940..83aa4ec69 100644
--- a/os/hal/include/serial_usb.h
+++ b/os/hal/include/serial_usb.h
@@ -99,9 +99,9 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#if !HAL_USE_USB || !CH_USE_QUEUES || !CH_USE_EVENTS
-#error "Serial over USB Driver requires HAL_USE_USB, CH_USE_QUEUES, "
-       "CH_USE_EVENTS"
+#if !HAL_USE_USB || !CH_CFG_USE_QUEUES || !CH_CFG_USE_EVENTS
+#error "Serial over USB Driver requires HAL_USE_USB, CH_CFG_USE_QUEUES, "
+       "CH_CFG_USE_EVENTS"
 #endif
 
 /*===========================================================================*/
diff --git a/os/hal/include/spi.h b/os/hal/include/spi.h
index f9988631b..d7eb2a7e0 100644
--- a/os/hal/include/spi.h
+++ b/os/hal/include/spi.h
@@ -64,8 +64,8 @@
 /* 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"
+#if SPI_USE_MUTUAL_EXCLUSION && !CH_CFG_USE_MUTEXES && !CH_CFG_USE_SEMAPHORES
+#error "SPI_USE_MUTUAL_EXCLUSION requires CH_CFG_USE_MUTEXES and/or CH_CFG_USE_SEMAPHORES"
 #endif
 
 /*===========================================================================*/