From 25069afdb7ca113779cf4bcc9e3879d6db7afae8 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 17 Jul 2014 10:42:54 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7040
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/include/hal_queues.h | 8 ++++++--
 os/hal/osal/nil/osal.h      | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'os')

diff --git a/os/hal/include/hal_queues.h b/os/hal/include/hal_queues.h
index 4eb21d076..a12118397 100644
--- a/os/hal/include/hal_queues.h
+++ b/os/hal/include/hal_queues.h
@@ -47,7 +47,7 @@
 /**
  * @brief   Type of a generic I/O queue structure.
  */
-typedef struct io_queue_t io_queue_t;
+typedef struct io_queue io_queue_t;
 
 /** @brief Queue notification callback type.*/
 typedef void (*qnotify_t)(io_queue_t *qp);
@@ -61,7 +61,7 @@ typedef void (*qnotify_t)(io_queue_t *qp);
  *          lock zone (see <b>I-Locked</b> and <b>S-Locked</b> states in
  *          @ref system_states) and is non-blocking.
  */
-struct io_queue_t {
+struct io_queue {
   threads_queue_t       q_waiting;  /**< @brief Waiting thread.             */
   size_t                q_counter;  /**< @brief Resources counter.          */
   uint8_t               *q_buffer;  /**< @brief Pointer to the queue buffer.*/
@@ -365,6 +365,10 @@ extern "C" {
 }
 #endif
 
+/* Types provided for backward compatibility, deprecated use.*/
+typedef io_queue_t GenericQueue;
+typedef input_queue_t InputQueue;
+typedef output_queue_t OutputQueue;
 
 #else /* defined(_CHIBIOS_RT_) && CH_USE_QUEUES */
 
diff --git a/os/hal/osal/nil/osal.h b/os/hal/osal/nil/osal.h
index d0811d444..5d97c3466 100644
--- a/os/hal/osal/nil/osal.h
+++ b/os/hal/osal/nil/osal.h
@@ -135,6 +135,10 @@
 /* Module data structures and types.                                         */
 /*===========================================================================*/
 
+/* Temporary types provided for ChibiOS 2.x compatibility.*/
+typedef bool bool_t;
+#define OSAL_FREQUENCY OSAL_ST_FREQUENCY
+
 #if 0
 /**
  * @brief   Type of a system status word.
-- 
cgit v1.2.3