diff --git a/demos/AVR/RT-ARDUINOMEGA/chconf.h b/demos/AVR/RT-ARDUINOMEGA/chconf.h
index 6afe4ab69..bd462afa5 100644
--- a/demos/AVR/RT-ARDUINOMEGA/chconf.h
+++ b/demos/AVR/RT-ARDUINOMEGA/chconf.h
@@ -275,14 +275,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/AVR/RT-ARDUINOUNO/chconf.h b/demos/AVR/RT-ARDUINOUNO/chconf.h
index 6afe4ab69..bd462afa5 100644
--- a/demos/AVR/RT-ARDUINOUNO/chconf.h
+++ b/demos/AVR/RT-ARDUINOUNO/chconf.h
@@ -275,14 +275,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/chconf.h b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/chconf.h
index ea4adf5f5..cb3f46362 100644
--- a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/chconf.h
+++ b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M/chconf.h b/demos/KINETIS/RT-FREEDOM-K20D50M/chconf.h
index b7a340d6f..95054d300 100644
--- a/demos/KINETIS/RT-FREEDOM-K20D50M/chconf.h
+++ b/demos/KINETIS/RT-FREEDOM-K20D50M/chconf.h
@@ -262,14 +262,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/chconf.h b/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/chconf.h
index ea4adf5f5..cb3f46362 100644
--- a/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/chconf.h
+++ b/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z/chconf.h b/demos/KINETIS/RT-FREEDOM-KL25Z/chconf.h
index b7a340d6f..95054d300 100644
--- a/demos/KINETIS/RT-FREEDOM-KL25Z/chconf.h
+++ b/demos/KINETIS/RT-FREEDOM-KL25Z/chconf.h
@@ -262,14 +262,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/KINETIS/RT-MCHCK-K20-GPT/chconf.h b/demos/KINETIS/RT-MCHCK-K20-GPT/chconf.h
index ea4adf5f5..cb3f46362 100644
--- a/demos/KINETIS/RT-MCHCK-K20-GPT/chconf.h
+++ b/demos/KINETIS/RT-MCHCK-K20-GPT/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/KINETIS/RT-MCHCK-K20-SPI/chconf.h b/demos/KINETIS/RT-MCHCK-K20-SPI/chconf.h
index b7a340d6f..95054d300 100644
--- a/demos/KINETIS/RT-MCHCK-K20-SPI/chconf.h
+++ b/demos/KINETIS/RT-MCHCK-K20-SPI/chconf.h
@@ -262,14 +262,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/KINETIS/RT-TEENSY3/chconf.h b/demos/KINETIS/RT-TEENSY3/chconf.h
index b7a340d6f..95054d300 100644
--- a/demos/KINETIS/RT-TEENSY3/chconf.h
+++ b/demos/KINETIS/RT-TEENSY3/chconf.h
@@ -262,14 +262,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h b/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h
index e49bdc2a2..12c1944ca 100644
--- a/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h
+++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/SPC5/RT-SPC560B-EVB/chconf.h b/demos/SPC5/RT-SPC560B-EVB/chconf.h
index e49bdc2a2..12c1944ca 100644
--- a/demos/SPC5/RT-SPC560B-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC560B-EVB/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/SPC5/RT-SPC560D-EVB/chconf.h b/demos/SPC5/RT-SPC560D-EVB/chconf.h
index e49bdc2a2..12c1944ca 100644
--- a/demos/SPC5/RT-SPC560D-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC560D-EVB/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/SPC5/RT-SPC560P-EVB/chconf.h b/demos/SPC5/RT-SPC560P-EVB/chconf.h
index e49bdc2a2..12c1944ca 100644
--- a/demos/SPC5/RT-SPC560P-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC560P-EVB/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/SPC5/RT-SPC563M-EVB/chconf.h b/demos/SPC5/RT-SPC563M-EVB/chconf.h
index e49bdc2a2..12c1944ca 100644
--- a/demos/SPC5/RT-SPC563M-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC563M-EVB/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/SPC5/RT-SPC564A-EVB/chconf.h b/demos/SPC5/RT-SPC564A-EVB/chconf.h
index e49bdc2a2..12c1944ca 100644
--- a/demos/SPC5/RT-SPC564A-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC564A-EVB/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/SPC5/RT-SPC56EC-EVB/chconf.h b/demos/SPC5/RT-SPC56EC-EVB/chconf.h
index e49bdc2a2..12c1944ca 100644
--- a/demos/SPC5/RT-SPC56EC-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC56EC-EVB/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/SPC5/RT-SPC56EL-EVB/chconf.h b/demos/SPC5/RT-SPC56EL-EVB/chconf.h
index e49bdc2a2..12c1944ca 100644
--- a/demos/SPC5/RT-SPC56EL-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC56EL-EVB/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/CMSIS-STM32F407-DISCOVERY/chconf.h b/demos/STM32/CMSIS-STM32F407-DISCOVERY/chconf.h
index 2ddded71e..f2727d8a3 100644
--- a/demos/STM32/CMSIS-STM32F407-DISCOVERY/chconf.h
+++ b/demos/STM32/CMSIS-STM32F407-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/chconf.h b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/chconf.h
index 731b07adb..60b9cb98e 100644
--- a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/chconf.h
+++ b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/chconf.h b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/chconf.h
index e290aaff1..76c1bf86d 100644
--- a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/chconf.h
+++ b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/chconf.h b/demos/STM32/RT-STM32F030R8-NUCLEO/chconf.h
index b88665f4c..5c2d4d5dd 100644
--- a/demos/STM32/RT-STM32F030R8-NUCLEO/chconf.h
+++ b/demos/STM32/RT-STM32F030R8-NUCLEO/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F031K6-NUCLEO32/chconf.h b/demos/STM32/RT-STM32F031K6-NUCLEO32/chconf.h
index 81d7d91fa..24c19cc31 100644
--- a/demos/STM32/RT-STM32F031K6-NUCLEO32/chconf.h
+++ b/demos/STM32/RT-STM32F031K6-NUCLEO32/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F042K6-NUCLEO32/chconf.h b/demos/STM32/RT-STM32F042K6-NUCLEO32/chconf.h
index 81d7d91fa..24c19cc31 100644
--- a/demos/STM32/RT-STM32F042K6-NUCLEO32/chconf.h
+++ b/demos/STM32/RT-STM32F042K6-NUCLEO32/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F051-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F051-DISCOVERY/chconf.h
index 81d7d91fa..24c19cc31 100644
--- a/demos/STM32/RT-STM32F051-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F051-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F072-DISCOVERY/chconf.h
index 81d7d91fa..24c19cc31 100644
--- a/demos/STM32/RT-STM32F072-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F072-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO/chconf.h b/demos/STM32/RT-STM32F072RB-NUCLEO/chconf.h
index 81d7d91fa..24c19cc31 100644
--- a/demos/STM32/RT-STM32F072RB-NUCLEO/chconf.h
+++ b/demos/STM32/RT-STM32F072RB-NUCLEO/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO/chconf.h b/demos/STM32/RT-STM32F091RC-NUCLEO/chconf.h
index 81d7d91fa..24c19cc31 100644
--- a/demos/STM32/RT-STM32F091RC-NUCLEO/chconf.h
+++ b/demos/STM32/RT-STM32F091RC-NUCLEO/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F100-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F100-DISCOVERY/chconf.h
index b88665f4c..5c2d4d5dd 100644
--- a/demos/STM32/RT-STM32F100-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F100-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/chconf.h b/demos/STM32/RT-STM32F103-MAPLEMINI/chconf.h
index 4695094d0..cfb8d7f6a 100644
--- a/demos/STM32/RT-STM32F103-MAPLEMINI/chconf.h
+++ b/demos/STM32/RT-STM32F103-MAPLEMINI/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/chconf.h b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/chconf.h
index b54167091..551000b93 100644
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/chconf.h
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/chconf.h b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/chconf.h
index b54167091..551000b93 100644
--- a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/chconf.h
+++ b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO/chconf.h b/demos/STM32/RT-STM32F103RB-NUCLEO/chconf.h
index 1684bb4b5..9fee77d33 100644
--- a/demos/STM32/RT-STM32F103RB-NUCLEO/chconf.h
+++ b/demos/STM32/RT-STM32F103RB-NUCLEO/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/chconf.h b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/chconf.h
index b54167091..551000b93 100644
--- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F207-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F207-DISCOVERY/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F207-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F207-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO/chconf.h b/demos/STM32/RT-STM32F302R8-NUCLEO/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F302R8-NUCLEO/chconf.h
+++ b/demos/STM32/RT-STM32F302R8-NUCLEO/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F303-DISCOVERY/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F303K8-NUCLEO32/chconf.h b/demos/STM32/RT-STM32F303K8-NUCLEO32/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F303K8-NUCLEO32/chconf.h
+++ b/demos/STM32/RT-STM32F303K8-NUCLEO32/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F334-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F334-DISCOVERY/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F334-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F334-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO/chconf.h b/demos/STM32/RT-STM32F334R8-NUCLEO/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F334R8-NUCLEO/chconf.h
+++ b/demos/STM32/RT-STM32F334R8-NUCLEO/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F373-STM32373C_EVAL/chconf.h b/demos/STM32/RT-STM32F373-STM32373C_EVAL/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F373-STM32373C_EVAL/chconf.h
+++ b/demos/STM32/RT-STM32F373-STM32373C_EVAL/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F401C-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F401C-DISCOVERY/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F401C-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F401C-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/chconf.h b/demos/STM32/RT-STM32F401RE-NUCLEO/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F401RE-NUCLEO/chconf.h
+++ b/demos/STM32/RT-STM32F401RE-NUCLEO/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/chconf.h b/demos/STM32/RT-STM32F407-DISCOVERY-G++/chconf.h
index fee82b431..38fbc4544 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/chconf.h
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/chconf.h b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/chconf.h
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F407-DISCOVERY/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F407-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/chconf.h b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/chconf.h
index fee82b431..38fbc4544 100644
--- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/chconf.h
+++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO/chconf.h b/demos/STM32/RT-STM32F411RE-NUCLEO/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F411RE-NUCLEO/chconf.h
+++ b/demos/STM32/RT-STM32F411RE-NUCLEO/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F429-DISCOVERY/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F429-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/chconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/chconf.h
index daebfe66e..2afa49c5b 100644
--- a/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/chconf.h
+++ b/demos/STM32/RT-STM32F746G-DISCOVERY-LWIP-FATFS-USB/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h
index daebfe66e..2afa49c5b 100644
--- a/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/chconf.h b/demos/STM32/RT-STM32L053R8-NUCLEO/chconf.h
index b88665f4c..5c2d4d5dd 100644
--- a/demos/STM32/RT-STM32L053R8-NUCLEO/chconf.h
+++ b/demos/STM32/RT-STM32L053R8-NUCLEO/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32L152-DISCOVERY/chconf.h b/demos/STM32/RT-STM32L152-DISCOVERY/chconf.h
index 1684bb4b5..9fee77d33 100644
--- a/demos/STM32/RT-STM32L152-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32L152-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO/chconf.h b/demos/STM32/RT-STM32L152RE-NUCLEO/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32L152RE-NUCLEO/chconf.h
+++ b/demos/STM32/RT-STM32L152RE-NUCLEO/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/chconf.h b/demos/STM32/RT-STM32L476-DISCOVERY/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32L476-DISCOVERY/chconf.h
+++ b/demos/STM32/RT-STM32L476-DISCOVERY/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO/chconf.h b/demos/STM32/RT-STM32L476RG-NUCLEO/chconf.h
index a554d3957..c33aa3118 100644
--- a/demos/STM32/RT-STM32L476RG-NUCLEO/chconf.h
+++ b/demos/STM32/RT-STM32L476RG-NUCLEO/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/various/RT-ARM7-GENERIC/chconf.h b/demos/various/RT-ARM7-GENERIC/chconf.h
index 9cdb5b83b..793c44d69 100644
--- a/demos/various/RT-ARM7-GENERIC/chconf.h
+++ b/demos/various/RT-ARM7-GENERIC/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/various/RT-ARMCM0-GENERIC/chconf.h b/demos/various/RT-ARMCM0-GENERIC/chconf.h
index 9cdb5b83b..793c44d69 100644
--- a/demos/various/RT-ARMCM0-GENERIC/chconf.h
+++ b/demos/various/RT-ARMCM0-GENERIC/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/various/RT-ARMCM4-GENERIC/chconf.h b/demos/various/RT-ARMCM4-GENERIC/chconf.h
index fc69d0962..142c2c5a1 100644
--- a/demos/various/RT-ARMCM4-GENERIC/chconf.h
+++ b/demos/various/RT-ARMCM4-GENERIC/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/demos/various/RT-Win32-Simulator/chconf.h b/demos/various/RT-Win32-Simulator/chconf.h
index aa9154fb8..f20214a06 100644
--- a/demos/various/RT-Win32-Simulator/chconf.h
+++ b/demos/various/RT-Win32-Simulator/chconf.h
@@ -262,14 +262,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/os/hal/include/hal_queues.h b/os/hal/include/hal_queues.h
index e6b3b39c4..68b61af4b 100644
--- a/os/hal/include/hal_queues.h
+++ b/os/hal/include/hal_queues.h
@@ -25,11 +25,6 @@
#ifndef _HAL_QUEUES_H_
#define _HAL_QUEUES_H_
-/* The ChibiOS/RT kernel provides the following definitions by itself, this
- check is performed in order to avoid conflicts. */
-#if !defined(_CHIBIOS_RT_) || (CH_CFG_USE_QUEUES == FALSE) || \
- defined(__DOXYGEN__)
-
/**
* @name Queue functions returned status value
* @{
@@ -298,38 +293,6 @@ extern "C" {
}
#endif
-#else /* defined(_CHIBIOS_RT_) && CH_CFG_USE_QUEUES */
-
-/* If ChibiOS is being used and its own queues subsystem is activated then
- this module will use the ChibiOS queues code.*/
-#define qSizeX(qp) chQSizeX(qp)
-#define qSpaceI(qp) chQSpaceI(qp)
-#define qGetLink(qp) chQGetLinkX(qp)
-#define iqGetFullI(iqp) chIQGetFullI(iqp)
-#define iqGetEmptyI(iqp) chIQGetEmptyI(iqp)
-#define iqIsEmptyI(iqp) chIQIsEmptyI(iqp)
-#define iqIsFullI(iqp) chIQIsFullI(iqp)
-#define iqGet(iqp) chIQGet(iqp)
-#define oqGetFullI(oqp) chOQGetFullI(oqp)
-#define oqGetEmptyI(oqp) chOQGetEmptyI(oqp)
-#define oqIsEmptyI(oqp) chOQIsEmptyI(oqp)
-#define oqIsFullI(oqp) chOQIsFullI(oqp)
-#define oqPut(oqp, b) chOQPut(oqp, b)
-#define iqObjectInit(iqp, bp, size, infy, link) \
- chIQObjectInit(iqp, bp, size, infy, link)
-#define iqResetI(iqp) chIQResetI(iqp)
-#define iqPutI(iqp, b) chIQPutI(iqp, b)
-#define iqGetTimeout(iqp, time) chIQGetTimeout(iqp, time)
-#define iqReadTimeout(iqp, bp, n, time) chIQReadTimeout(iqp, bp, n, time)
-#define oqObjectInit(oqp, bp, size, onfy, link) \
- chOQObjectInit(oqp, bp, size, onfy, link)
-#define oqResetI(oqp) chOQResetI(oqp)
-#define oqPutTimeout(oqp, b, time) chOQPutTimeout(oqp, b, time)
-#define oqGetI(oqp) chOQGetI(oqp)
-#define oqWriteTimeout(oqp, bp, n, time) chOQWriteTimeout(oqp, bp, n, time)
-
-#endif /* defined(_CHIBIOS_RT_) || (CH_CFG_USE_QUEUES == FALSE) */
-
#endif /* _HAL_QUEUES_H_ */
/** @} */
diff --git a/os/hal/include/hal_streams.h b/os/hal/include/hal_streams.h
index bd19a9c7c..93204a75f 100644
--- a/os/hal/include/hal_streams.h
+++ b/os/hal/include/hal_streams.h
@@ -44,10 +44,6 @@
#define STM_RESET MSG_RESET
/** @} */
-/* The ChibiOS/RT kernel provides the following definitions by itself, this
- check is performed in order to avoid conflicts. */
-#if !defined(_CHIBIOS_RT_) || defined(__DOXYGEN__)
-
/**
* @brief BaseSequentialStream specific methods.
*/
@@ -86,8 +82,6 @@ typedef struct {
_base_sequential_stream_data
} BaseSequentialStream;
-#endif /* !defined(_CHIBIOS_RT_)*/
-
/**
* @name Macro Functions (BaseSequentialStream)
* @{
diff --git a/os/hal/src/hal_queues.c b/os/hal/src/hal_queues.c
index a54174b8e..bda820306 100644
--- a/os/hal/src/hal_queues.c
+++ b/os/hal/src/hal_queues.c
@@ -37,9 +37,6 @@
#include "hal.h"
-#if !defined(_CHIBIOS_RT_) || (CH_CFG_USE_QUEUES == FALSE) || \
- defined(__DOXYGEN__)
-
/**
* @brief Initializes an input queue.
* @details A Semaphore is internally initialized and works as a counter of
@@ -490,6 +487,4 @@ size_t oqWriteTimeout(output_queue_t *oqp, const uint8_t *bp,
}
}
-#endif /* !defined(_CHIBIOS_RT_) || (CH_USE_QUEUES == FALSE) */
-
/** @} */
diff --git a/os/rt/include/ch.h b/os/rt/include/ch.h
index 29b6c410a..10d4ddfd8 100644
--- a/os/rt/include/ch.h
+++ b/os/rt/include/ch.h
@@ -99,8 +99,6 @@
#include "chheap.h"
#include "chmempools.h"
#include "chdynamic.h"
-#include "chqueues.h"
-#include "chstreams.h"
#if !defined(_CHIBIOS_RT_CONF_)
#error "missing or wrong configuration file"
diff --git a/os/rt/include/chqueues.h b/os/rt/include/chqueues.h
deleted file mode 100644
index 3ab7087ca..000000000
--- a/os/rt/include/chqueues.h
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio.
-
- This file is part of ChibiOS.
-
- ChibiOS is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see
- * The stream interface can be used as base class for high level
- * object types such as files, sockets, serial ports, pipes etc.
- * @{
- */
-
-#ifndef _CHSTREAMS_H_
-#define _CHSTREAMS_H_
-
-/**
- * @brief BaseSequentialStream specific methods.
- */
-#define _base_sequential_stream_methods \
- /* Stream write buffer method.*/ \
- size_t (*write)(void *instance, const uint8_t *bp, size_t n); \
- /* Stream read buffer method.*/ \
- size_t (*read)(void *instance, uint8_t *bp, size_t n); \
- /* Channel put method, blocking.*/ \
- msg_t (*put)(void *instance, uint8_t b); \
- /* Channel get method, blocking.*/ \
- msg_t (*get)(void *instance); \
-
-/**
- * @brief @p BaseSequentialStream specific data.
- * @note It is empty because @p BaseSequentialStream is only an interface
- * without implementation.
- */
-#define _base_sequential_stream_data
-
-/**
- * @brief @p BaseSequentialStream virtual methods table.
- */
-struct BaseSequentialStreamVMT {
- _base_sequential_stream_methods
-};
-
-/**
- * @brief Base stream class.
- * @details This class represents a generic blocking unbuffered sequential
- * data stream.
- */
-typedef struct {
- /** @brief Virtual Methods Table.*/
- const struct BaseSequentialStreamVMT *vmt;
- _base_sequential_stream_data
-} BaseSequentialStream;
-
-/**
- * @name Macro Functions (BaseSequentialStream)
- * @{
- */
-/**
- * @brief Sequential Stream write.
- * @details The function writes data from a buffer to a stream.
- *
- * @param[in] ip pointer to a @p BaseSequentialStream or derived class
- * @param[in] bp pointer to the data buffer
- * @param[in] n the maximum amount of data to be transferred
- * @return The number of bytes transferred. The return value can
- * be less than the specified number of bytes if an
- * end-of-file condition has been met.
- *
- * @api
- */
-#define chSequentialStreamWrite(ip, bp, n) ((ip)->vmt->write(ip, bp, n))
-
-/**
- * @brief Sequential Stream read.
- * @details The function reads data from a stream into a buffer.
- *
- * @param[in] ip pointer to a @p BaseSequentialStream or derived class
- * @param[out] bp pointer to the data buffer
- * @param[in] n the maximum amount of data to be transferred
- * @return The number of bytes transferred. The return value can
- * be less than the specified number of bytes if an
- * end-of-file condition has been met.
- *
- * @api
- */
-#define chSequentialStreamRead(ip, bp, n) ((ip)->vmt->read(ip, bp, n))
-
-/**
- * @brief Sequential Stream blocking byte write.
- * @details This function writes a byte value to a channel. If the channel
- * is not ready to accept data then the calling thread is suspended.
- *
- * @param[in] ip pointer to a @p BaseSequentialStream or derived class
- * @param[in] b the byte value to be written to the channel
- *
- * @return The operation status.
- * @retval Q_OK if the operation succeeded.
- * @retval Q_RESET if an end-of-file condition has been met.
- *
- * @api
- */
-#define chSequentialStreamPut(ip, b) ((ip)->vmt->put(ip, b))
-
-/**
- * @brief Sequential Stream blocking byte read.
- * @details This function reads a byte value from a channel. If the data
- * is not available then the calling thread is suspended.
- *
- * @param[in] ip pointer to a @p BaseSequentialStream or derived class
- *
- * @return A byte value from the queue.
- * @retval Q_RESET if an end-of-file condition has been met.
- *
- * @api
- */
-#define chSequentialStreamGet(ip) ((ip)->vmt->get(ip))
-/** @} */
-
-#endif /* _CHSTREAMS_H_ */
-
-/** @} */
diff --git a/os/rt/rt.mk b/os/rt/rt.mk
index cf92d654d..c445d305f 100644
--- a/os/rt/rt.mk
+++ b/os/rt/rt.mk
@@ -32,9 +32,6 @@ endif
ifneq ($(findstring CH_CFG_USE_MESSAGES TRUE,$(CHCONF)),)
KERNSRC += $(CHIBIOS)/os/rt/src/chmsg.c
endif
-ifneq ($(findstring CH_CFG_USE_QUEUES TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/rt/src/chqueues.c
-endif
ifneq ($(findstring CH_CFG_USE_DYNAMIC TRUE,$(CHCONF)),)
KERNSRC += $(CHIBIOS)/os/rt/src/chdynamic.c
endif
@@ -64,7 +61,6 @@ KERNSRC := $(CHIBIOS)/os/rt/src/chsys.c \
$(CHIBIOS)/os/rt/src/chcond.c \
$(CHIBIOS)/os/rt/src/chevents.c \
$(CHIBIOS)/os/rt/src/chmsg.c \
- $(CHIBIOS)/os/rt/src/chqueues.c \
$(CHIBIOS)/os/rt/src/chdynamic.c \
$(CHIBIOS)/os/common/oslib/src/chmboxes.c \
$(CHIBIOS)/os/common/oslib/src/chmemcore.c \
diff --git a/os/rt/src/chqueues.c b/os/rt/src/chqueues.c
deleted file mode 100644
index 0eeaa3c0e..000000000
--- a/os/rt/src/chqueues.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio.
-
- This file is part of ChibiOS.
-
- ChibiOS is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see
- * There are several kind of queues:
- * - Input queue, unidirectional queue where the writer is the
- * lower side and the reader is the upper side.
- * - Output queue, unidirectional queue where the writer is the
- * upper side and the reader is the lower side.
- * - Full duplex queue, bidirectional queue. Full duplex queues
- * are implemented by pairing an input queue and an output queue
- * together.
- * .
- * @pre In order to use the I/O queues the @p CH_CFG_USE_QUEUES option must
- * be enabled in @p chconf.h.
- * @{
- */
-
-#include "ch.h"
-
-#if (CH_CFG_USE_QUEUES == TRUE) || defined(__DOXYGEN__)
-
-/*===========================================================================*/
-/* Module local definitions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Module exported variables. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Module local types. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Module local variables. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Module local functions. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Module exported functions. */
-/*===========================================================================*/
-
-/**
- * @brief Initializes an input queue.
- * @details A Semaphore is internally initialized and works as a counter of
- * the bytes contained in the queue.
- * @note The callback is invoked from within the S-Locked system state,
- * see @ref system_states.
- *
- * @param[out] iqp pointer to an @p input_queue_t structure
- * @param[in] bp pointer to a memory area allocated as queue buffer
- * @param[in] size size of the queue buffer
- * @param[in] infy pointer to a callback function that is invoked when
- * data is read from the queue. The value can be @p NULL.
- * @param[in] link application defined pointer
- *
- * @init
- */
-void chIQObjectInit(input_queue_t *iqp, uint8_t *bp, size_t size,
- qnotify_t infy, void *link) {
-
- chThdQueueObjectInit(&iqp->waiting);
- iqp->counter = 0;
- iqp->buffer = bp;
- iqp->rdptr = bp;
- iqp->wrptr = bp;
- iqp->top = bp + size;
- iqp->notify = infy;
- iqp->link = link;
-}
-
-/**
- * @brief Resets an input queue.
- * @details All the data in the input queue is erased and lost, any waiting
- * thread is resumed with status @p Q_RESET.
- * @note A reset operation can be used by a low level driver in order to
- * obtain immediate attention from the high level layers.
- *
- * @param[in] iqp pointer to an @p input_queue_t structure
- *
- * @iclass
- */
-void chIQResetI(input_queue_t *iqp) {
-
- chDbgCheckClassI();
-
- iqp->rdptr = iqp->buffer;
- iqp->wrptr = iqp->buffer;
- iqp->counter = 0;
- chThdDequeueAllI(&iqp->waiting, Q_RESET);
-}
-
-/**
- * @brief Input queue write.
- * @details A byte value is written into the low end of an input queue.
- *
- * @param[in] iqp pointer to an @p input_queue_t structure
- * @param[in] b the byte value to be written in the queue
- * @return The operation status.
- * @retval Q_OK if the operation has been completed with success.
- * @retval Q_FULL if the queue is full and the operation cannot be
- * completed.
- *
- * @iclass
- */
-msg_t chIQPutI(input_queue_t *iqp, uint8_t b) {
-
- chDbgCheckClassI();
-
- if (chIQIsFullI(iqp)) {
- return Q_FULL;
- }
-
- iqp->counter++;
- *iqp->wrptr++ = b;
- if (iqp->wrptr >= iqp->top) {
- iqp->wrptr = iqp->buffer;
- }
-
- chThdDequeueNextI(&iqp->waiting, Q_OK);
-
- return Q_OK;
-}
-
-/**
- * @brief Input queue read with timeout.
- * @details This function reads a byte value from an input queue. If the queue
- * is empty then the calling thread is suspended until a byte arrives
- * in the queue or a timeout occurs.
- * @note The callback is invoked before reading the character from the
- * buffer or before entering the state @p CH_STATE_WTQUEUE.
- *
- * @param[in] iqp pointer to an @p input_queue_t structure
- * @param[in] timeout the number of ticks before the operation timeouts,
- * the following special values are allowed:
- * - @a TIME_IMMEDIATE immediate timeout.
- * - @a TIME_INFINITE no timeout.
- * .
- * @return A byte value from the queue.
- * @retval Q_TIMEOUT if the specified time expired.
- * @retval Q_RESET if the queue has been reset.
- *
- * @api
- */
-msg_t chIQGetTimeout(input_queue_t *iqp, systime_t timeout) {
- uint8_t b;
-
- chSysLock();
- if (iqp->notify != NULL) {
- iqp->notify(iqp);
- }
-
- while (chIQIsEmptyI(iqp)) {
- msg_t msg = chThdEnqueueTimeoutS(&iqp->waiting, timeout);
- if (msg < Q_OK) {
- chSysUnlock();
- return msg;
- }
- }
-
- iqp->counter--;
- b = *iqp->rdptr++;
- if (iqp->rdptr >= iqp->top) {
- iqp->rdptr = iqp->buffer;
- }
- chSysUnlock();
-
- return (msg_t)b;
-}
-
-/**
- * @brief Input queue read with timeout.
- * @details The function reads data from an input queue into a buffer. The
- * operation completes when the specified amount of data has been
- * transferred or after the specified timeout or if the queue has
- * been reset.
- * @note The function is not atomic, if you need atomicity it is suggested
- * to use a semaphore or a mutex for mutual exclusion.
- * @note The callback is invoked before reading each character from the
- * buffer or before entering the state @p CH_STATE_WTQUEUE.
- *
- * @param[in] iqp pointer to an @p input_queue_t structure
- * @param[out] bp pointer to the data buffer
- * @param[in] n the maximum amount of data to be transferred, the
- * value 0 is reserved
- * @param[in] timeout the number of ticks before the operation timeouts,
- * the following special values are allowed:
- * - @a TIME_IMMEDIATE immediate timeout.
- * - @a TIME_INFINITE no timeout.
- * .
- * @return The number of bytes effectively transferred.
- *
- * @api
- */
-size_t chIQReadTimeout(input_queue_t *iqp, uint8_t *bp,
- size_t n, systime_t timeout) {
- qnotify_t nfy = iqp->notify;
- size_t r = 0;
-
- chDbgCheck(n > 0U);
-
- chSysLock();
- while (true) {
- if (nfy != NULL) {
- nfy(iqp);
- }
-
- while (chIQIsEmptyI(iqp)) {
- if (chThdEnqueueTimeoutS(&iqp->waiting, timeout) != Q_OK) {
- chSysUnlock();
- return r;
- }
- }
-
- iqp->counter--;
- *bp++ = *iqp->rdptr++;
- if (iqp->rdptr >= iqp->top) {
- iqp->rdptr = iqp->buffer;
- }
- chSysUnlock(); /* Gives a preemption chance in a controlled point.*/
-
- r++;
- if (--n == 0U) {
- return r;
- }
-
- chSysLock();
- }
-}
-
-/**
- * @brief Initializes an output queue.
- * @details A Semaphore is internally initialized and works as a counter of
- * the free bytes in the queue.
- * @note The callback is invoked from within the S-Locked system state,
- * see @ref system_states.
- *
- * @param[out] oqp pointer to an @p output_queue_t structure
- * @param[in] bp pointer to a memory area allocated as queue buffer
- * @param[in] size size of the queue buffer
- * @param[in] onfy pointer to a callback function that is invoked when
- * data is written to the queue. The value can be @p NULL.
- * @param[in] link application defined pointer
- *
- * @init
- */
-void chOQObjectInit(output_queue_t *oqp, uint8_t *bp, size_t size,
- qnotify_t onfy, void *link) {
-
- chThdQueueObjectInit(&oqp->waiting);
- oqp->counter = size;
- oqp->buffer = bp;
- oqp->rdptr = bp;
- oqp->wrptr = bp;
- oqp->top = bp + size;
- oqp->notify = onfy;
- oqp->link = link;
-}
-
-/**
- * @brief Resets an output queue.
- * @details All the data in the output queue is erased and lost, any waiting
- * thread is resumed with status @p Q_RESET.
- * @note A reset operation can be used by a low level driver in order to
- * obtain immediate attention from the high level layers.
- *
- * @param[in] oqp pointer to an @p output_queue_t structure
- *
- * @iclass
- */
-void chOQResetI(output_queue_t *oqp) {
-
- chDbgCheckClassI();
-
- oqp->rdptr = oqp->buffer;
- oqp->wrptr = oqp->buffer;
- oqp->counter = chQSizeX(oqp);
- chThdDequeueAllI(&oqp->waiting, Q_RESET);
-}
-
-/**
- * @brief Output queue write with timeout.
- * @details This function writes a byte value to an output queue. If the queue
- * is full then the calling thread is suspended until there is space
- * in the queue or a timeout occurs.
- * @note The callback is invoked after writing the character into the
- * buffer.
- *
- * @param[in] oqp pointer to an @p output_queue_t structure
- * @param[in] b the byte value to be written in the queue
- * @param[in] timeout the number of ticks before the operation timeouts,
- * the following special values are allowed:
- * - @a TIME_IMMEDIATE immediate timeout.
- * - @a TIME_INFINITE no timeout.
- * .
- * @return The operation status.
- * @retval Q_OK if the operation succeeded.
- * @retval Q_TIMEOUT if the specified time expired.
- * @retval Q_RESET if the queue has been reset.
- *
- * @api
- */
-msg_t chOQPutTimeout(output_queue_t *oqp, uint8_t b, systime_t timeout) {
-
- chSysLock();
- while (chOQIsFullI(oqp)) {
- msg_t msg = chThdEnqueueTimeoutS(&oqp->waiting, timeout);
- if (msg < Q_OK) {
- chSysUnlock();
- return msg;
- }
- }
-
- oqp->counter--;
- *oqp->wrptr++ = b;
- if (oqp->wrptr >= oqp->top) {
- oqp->wrptr = oqp->buffer;
- }
-
- if (oqp->notify != NULL) {
- oqp->notify(oqp);
- }
- chSysUnlock();
-
- return Q_OK;
-}
-
-/**
- * @brief Output queue read.
- * @details A byte value is read from the low end of an output queue.
- *
- * @param[in] oqp pointer to an @p output_queue_t structure
- * @return The byte value from the queue.
- * @retval Q_EMPTY if the queue is empty.
- *
- * @iclass
- */
-msg_t chOQGetI(output_queue_t *oqp) {
- uint8_t b;
-
- chDbgCheckClassI();
-
- if (chOQIsEmptyI(oqp)) {
- return Q_EMPTY;
- }
-
- oqp->counter++;
- b = *oqp->rdptr++;
- if (oqp->rdptr >= oqp->top) {
- oqp->rdptr = oqp->buffer;
- }
-
- chThdDequeueNextI(&oqp->waiting, Q_OK);
-
- return (msg_t)b;
-}
-
-/**
- * @brief Output queue write with timeout.
- * @details The function writes data from a buffer to an output queue. The
- * operation completes when the specified amount of data has been
- * transferred or after the specified timeout or if the queue has
- * been reset.
- * @note The function is not atomic, if you need atomicity it is suggested
- * to use a semaphore or a mutex for mutual exclusion.
- * @note The callback is invoked after writing each character into the
- * buffer.
- *
- * @param[in] oqp pointer to an @p output_queue_t structure
- * @param[in] bp pointer to the data buffer
- * @param[in] n the maximum amount of data to be transferred, the
- * value 0 is reserved
- * @param[in] timeout the number of ticks before the operation timeouts,
- * the following special values are allowed:
- * - @a TIME_IMMEDIATE immediate timeout.
- * - @a TIME_INFINITE no timeout.
- * .
- * @return The number of bytes effectively transferred.
- *
- * @api
- */
-size_t chOQWriteTimeout(output_queue_t *oqp, const uint8_t *bp,
- size_t n, systime_t timeout) {
- qnotify_t nfy = oqp->notify;
- size_t w = 0;
-
- chDbgCheck(n > 0U);
-
- chSysLock();
- while (true) {
- while (chOQIsFullI(oqp)) {
- if (chThdEnqueueTimeoutS(&oqp->waiting, timeout) != Q_OK) {
- chSysUnlock();
- return w;
- }
- }
-
- oqp->counter--;
- *oqp->wrptr++ = *bp++;
- if (oqp->wrptr >= oqp->top) {
- oqp->wrptr = oqp->buffer;
- }
-
- if (nfy != NULL) {
- nfy(oqp);
- }
- chSysUnlock(); /* Gives a preemption chance in a controlled point.*/
-
- w++;
- if (--n == 0U) {
- return w;
- }
- chSysLock();
- }
-}
-#endif /* CH_CFG_USE_QUEUES == TRUE */
-
-/** @} */
diff --git a/os/rt/templates/chconf.h b/os/rt/templates/chconf.h
index 9bf08a34d..0b74391a7 100644
--- a/os/rt/templates/chconf.h
+++ b/os/rt/templates/chconf.h
@@ -264,14 +264,6 @@
*/
#define CH_CFG_USE_MAILBOXES TRUE
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
/**
* @brief Core Memory Manager APIs.
* @details If enabled then the core memory manager APIs are included
diff --git a/readme.txt b/readme.txt
index e029e01f2..0d1ed9043 100644
--- a/readme.txt
+++ b/readme.txt
@@ -79,6 +79,8 @@
*****************************************************************************
*** Next ***
+- RT: Removed I/O Queues and Streams interface, now those exists (much
+ improved) inside the HAL.
- HAL: Improvements to the I/O queues now timeouts are absolute for
iqReadTimeout() and oqWriteTimeout functions.
- RT: Added a NASA-OSAL API emulator over the RT kernel.
diff --git a/test/hal/testbuild/chconf.h b/test/hal/testbuild/chconf.h
deleted file mode 100644
index fa26b1fee..000000000
--- a/test/hal/testbuild/chconf.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-/**
- * @file templates/chconf.h
- * @brief Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- * contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-/*===========================================================================*/
-/**
- * @name System timers settings
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief System time counter resolution.
- * @note Allowed values are 16 or 32 bits.
- */
-#define CH_CFG_ST_RESOLUTION 32
-
-/**
- * @brief System tick frequency.
- * @details Frequency of the system timer that drives the system ticks. This
- * setting also defines the system tick time unit.
- */
-#define CH_CFG_ST_FREQUENCY 10000
-
-/**
- * @brief Time delta constant for the tick-less mode.
- * @note If this value is zero then the system uses the classic
- * periodic tick. This value represents the minimum number
- * of ticks that is safe to specify in a timeout directive.
- * The value one is not valid, timeouts are rounded up to
- * this value.
- */
-#define CH_CFG_ST_TIMEDELTA 2
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- * threads before preemption occurs. Setting this value to zero
- * disables the preemption for threads with equal priority and the
- * round robin becomes cooperative. Note that higher priority
- * threads can still preempt, the kernel is always preemptive.
- * @note Disabling the round robin preemption makes the kernel more compact
- * and generally faster.
- * @note The round robin preemption is not supported in tickless mode and
- * must be set to zero in that case.
- */
-#define CH_CFG_TIME_QUANTUM 0
-
-/**
- * @brief Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- * then the whole available RAM is used. The core memory is made
- * available to the heap allocator and/or can be used directly through
- * the simplified core memory allocator.
- *
- * @note In order to let the OS manage the whole RAM the linker script must
- * provide the @p __heap_base__ and @p __heap_end__ symbols.
- * @note Requires @p CH_CFG_USE_MEMCORE.
- */
-#define CH_CFG_MEMCORE_SIZE 0x20000
-
-/**
- * @brief Idle thread automatic spawn suppression.
- * @details When this option is activated the function @p chSysInit()
- * does not spawn the idle thread. The application @p main()
- * function becomes the idle thread and must implement an
- * infinite loop.
- */
-#define CH_CFG_NO_IDLE_THREAD FALSE
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- * is used when two possible implementations exist.
- *
- * @note This is not related to the compiler optimization options.
- * @note The default is @p TRUE.
- */
-#define CH_CFG_OPTIMIZE_SPEED TRUE
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief Time Measurement APIs.
- * @details If enabled then the time measurement APIs are included in
- * the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_TM TRUE
-
-/**
- * @brief Threads registry APIs.
- * @details If enabled then the registry APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_REGISTRY TRUE
-
-/**
- * @brief Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- * the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_WAITEXIT TRUE
-
-/**
- * @brief Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_SEMAPHORES TRUE
-
-/**
- * @brief Semaphores queuing mode.
- * @details If enabled then the threads are enqueued on semaphores by
- * priority rather than in FIFO order.
- *
- * @note The default is @p FALSE. Enable this if you have special
- * requirements.
- * @note Requires @p CH_CFG_USE_SEMAPHORES.
- */
-#define CH_CFG_USE_SEMAPHORES_PRIORITY FALSE
-
-/**
- * @brief Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_MUTEXES TRUE
-
-/**
- * @brief Enables recursive behavior on mutexes.
- * @note Recursive mutexes are heavier and have an increased
- * memory footprint.
- *
- * @note The default is @p FALSE.
- * @note Requires @p CH_CFG_USE_MUTEXES.
- */
-#define CH_CFG_USE_MUTEXES_RECURSIVE FALSE
-
-/**
- * @brief Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_CFG_USE_MUTEXES.
- */
-#define CH_CFG_USE_CONDVARS TRUE
-
-/**
- * @brief Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- * specification are included in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_CFG_USE_CONDVARS.
- */
-#define CH_CFG_USE_CONDVARS_TIMEOUT TRUE
-
-/**
- * @brief Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_EVENTS TRUE
-
-/**
- * @brief Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- * are included in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_CFG_USE_EVENTS.
- */
-#define CH_CFG_USE_EVENTS_TIMEOUT TRUE
-
-/**
- * @brief Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_MESSAGES TRUE
-
-/**
- * @brief Synchronous Messages queuing mode.
- * @details If enabled then messages are served by priority rather than in
- * FIFO order.
- *
- * @note The default is @p FALSE. Enable this if you have special
- * requirements.
- * @note Requires @p CH_CFG_USE_MESSAGES.
- */
-#define CH_CFG_USE_MESSAGES_PRIORITY FALSE
-
-/**
- * @brief Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- * included in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_CFG_USE_SEMAPHORES.
- */
-#define CH_CFG_USE_MAILBOXES TRUE
-
-/**
- * @brief I/O Queues APIs.
- * @details If enabled then the I/O queues APIs are included in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_QUEUES TRUE
-
-/**
- * @brief Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_MEMCORE TRUE
-
-/**
- * @brief Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
- * @p CH_CFG_USE_SEMAPHORES.
- * @note Mutexes are recommended.
- */
-#define CH_CFG_USE_HEAP TRUE
-
-/**
- * @brief Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- */
-#define CH_CFG_USE_MEMPOOLS TRUE
-
-/**
- * @brief Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- * in the kernel.
- *
- * @note The default is @p TRUE.
- * @note Requires @p CH_CFG_USE_WAITEXIT.
- * @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
- */
-#define CH_CFG_USE_DYNAMIC TRUE
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief Debug option, kernel statistics.
- *
- * @note The default is @p FALSE.
- */
-#define CH_DBG_STATISTICS FALSE
-
-/**
- * @brief Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- * at runtime.
- *
- * @note The default is @p FALSE.
- */
-#define CH_DBG_SYSTEM_STATE_CHECK FALSE
-
-/**
- * @brief Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- * parameters are activated.
- *
- * @note The default is @p FALSE.
- */
-#define CH_DBG_ENABLE_CHECKS FALSE
-
-/**
- * @brief Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- * activated. This includes consistency checks inside the kernel,
- * runtime anomalies and port-defined checks.
- *
- * @note The default is @p FALSE.
- */
-#define CH_DBG_ENABLE_ASSERTS FALSE
-
-/**
- * @brief Debug option, trace buffer.
- * @details If enabled then the context switch circular trace buffer is
- * activated.
- *
- * @note The default is @p FALSE.
- */
-#define CH_DBG_ENABLE_TRACE FALSE
-
-/**
- * @brief Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note The default is @p FALSE.
- * @note The stack check is performed in a architecture/port dependent way.
- * It may not be implemented or some ports.
- * @note The default failure mode is to halt the system with the global
- * @p panic_msg variable set to @p NULL.
- */
-#define CH_DBG_ENABLE_STACK_CHECK FALSE
-
-/**
- * @brief Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- * value when a thread is created. This can be useful for the
- * runtime measurement of the used stack.
- *
- * @note The default is @p FALSE.
- */
-#define CH_DBG_FILL_THREADS FALSE
-
-/**
- * @brief Debug option, threads profiling.
- * @details If enabled then a field is added to the @p thread_t structure that
- * counts the system ticks occurred while executing the thread.
- *
- * @note The default is @p FALSE.
- * @note This debug option is not currently compatible with the
- * tickless mode.
- */
-#define CH_DBG_THREADS_PROFILING FALSE
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief Threads descriptor structure extension.
- * @details User fields added to the end of the @p thread_t structure.
- */
-#define CH_CFG_THREAD_EXTRA_FIELDS \
- /* Add threads custom fields here.*/
-
-/**
- * @brief Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
- *
- * @note It is invoked from within @p chThdInit() and implicitly from all
- * the threads creation APIs.
- */
-#define CH_CFG_THREAD_INIT_HOOK(tp) { \
- /* Add threads initialization code here.*/ \
-}
-
-/**
- * @brief Threads finalization hook.
- * @details User finalization code added to the @p chThdExit() API.
- *
- * @note It is inserted into lock zone.
- * @note It is also invoked when the threads simply return in order to
- * terminate.
- */
-#define CH_CFG_THREAD_EXIT_HOOK(tp) { \
- /* Add threads finalization code here.*/ \
-}
-
-/**
- * @brief Context switch hook.
- * @details This hook is invoked just before switching between threads.
- */
-#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) { \
- /* Context switch code here.*/ \
-}
-
-/**
- * @brief Idle thread enter hook.
- * @note This hook is invoked within a critical zone, no OS functions
- * should be invoked from here.
- * @note This macro can be used to activate a power saving mode.
- */
-#define CH_CFG_IDLE_ENTER_HOOK() { \
-}
-
-/**
- * @brief Idle thread leave hook.
- * @note This hook is invoked within a critical zone, no OS functions
- * should be invoked from here.
- * @note This macro can be used to deactivate a power saving mode.
- */
-#define CH_CFG_IDLE_LEAVE_HOOK() { \
-}
-
-/**
- * @brief Idle Loop hook.
- * @details This hook is continuously invoked by the idle thread loop.
- */
-#define CH_CFG_IDLE_LOOP_HOOK() { \
- /* Idle loop code here.*/ \
-}
-
-/**
- * @brief System tick event hook.
- * @details This hook is invoked in the system tick handler immediately
- * after processing the virtual timers queue.
- */
-#define CH_CFG_SYSTEM_TICK_HOOK() { \
- /* System tick event code here.*/ \
-}
-
-/**
- * @brief System halt hook.
- * @details This hook is invoked in case to a system halting error before
- * the system is halted.
- */
-#define CH_CFG_SYSTEM_HALT_HOOK(reason) { \
- /* System halt code here.*/ \
-}
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h). */
-/*===========================================================================*/
-
-#endif /* _CHCONF_H_ */
-
-/** @} */
diff --git a/test/rt/test.c b/test/rt/test.c
index f4a08eeea..09f0ea91c 100644
--- a/test/rt/test.c
+++ b/test/rt/test.c
@@ -36,7 +36,6 @@
#include "testheap.h"
#include "testpools.h"
#include "testdyn.h"
-#include "testqueues.h"
#include "testbmk.h"
/*
@@ -53,7 +52,6 @@ static ROMCONST struct testcase * ROMCONST *patterns[] = {
patternheap,
patternpools,
patterndyn,
- patternqueues,
patternbmk,
NULL
};
@@ -95,13 +93,13 @@ void test_printn(uint32_t n) {
char buf[16], *p;
if (!n)
- chSequentialStreamPut(chp, '0');
+ streamPut(chp, '0');
else {
p = buf;
while (n)
*p++ = (n % 10) + '0', n /= 10;
while (p > buf)
- chSequentialStreamPut(chp, *--p);
+ streamPut(chp, *--p);
}
}
@@ -113,7 +111,7 @@ void test_printn(uint32_t n) {
void test_print(const char *msgp) {
while (*msgp)
- chSequentialStreamPut(chp, *msgp++);
+ streamPut(chp, *msgp++);
}
/**
@@ -124,7 +122,7 @@ void test_print(const char *msgp) {
void test_println(const char *msgp) {
test_print(msgp);
- chSequentialStreamWrite(chp, (const uint8_t *)"\r\n", 2);
+ streamWrite(chp, (const uint8_t *)"\r\n", 2);
}
/*
@@ -139,7 +137,7 @@ static void print_tokens(void) {
char *cp = tokens_buffer;
while (cp < tokp)
- chSequentialStreamPut(chp, *cp++);
+ streamPut(chp, *cp++);
}
/**
@@ -304,8 +302,8 @@ static void print_line(void) {
unsigned i;
for (i = 0; i < 76; i++)
- chSequentialStreamPut(chp, '-');
- chSequentialStreamWrite(chp, (const uint8_t *)"\r\n", 2);
+ streamPut(chp, '-');
+ streamWrite(chp, (const uint8_t *)"\r\n", 2);
}
/**
diff --git a/test/rt/test.mk b/test/rt/test.mk
index 03de3c89a..8e929df3c 100644
--- a/test/rt/test.mk
+++ b/test/rt/test.mk
@@ -9,7 +9,6 @@ TESTSRC = ${CHIBIOS}/test/rt/test.c \
${CHIBIOS}/test/rt/testheap.c \
${CHIBIOS}/test/rt/testpools.c \
${CHIBIOS}/test/rt/testdyn.c \
- ${CHIBIOS}/test/rt/testqueues.c \
${CHIBIOS}/test/rt/testsys.c \
${CHIBIOS}/test/rt/testbmk.c
diff --git a/test/rt/testbmk.c b/test/rt/testbmk.c
index 3cc713089..b5d4e4a6d 100644
--- a/test/rt/testbmk.c
+++ b/test/rt/testbmk.c
@@ -48,7 +48,6 @@
* - @subpage test_benchmarks_010
* - @subpage test_benchmarks_011
* - @subpage test_benchmarks_012
- * - @subpage test_benchmarks_013
* .
* @file testbmk.c Kernel Benchmarks
* @brief Kernel Benchmarks source file
@@ -448,57 +447,8 @@ ROMCONST struct testcase testbmk8 = {
bmk8_execute
};
-#if CH_CFG_USE_QUEUES || defined(__DOXYGEN__)
/**
- * @page test_benchmarks_009 I/O Queues throughput
- *
- *