From 1914bcbbf422a9616dd2c1d6906a8ced3548921d Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Wed, 16 Mar 2016 11:09:29 +0000
Subject: Removed I/O queues and streams from RT.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9125 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/include/hal_queues.h  | 37 -------------------------------------
 os/hal/include/hal_streams.h |  6 ------
 2 files changed, 43 deletions(-)

(limited to 'os/hal/include')

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)
  * @{
-- 
cgit v1.2.3