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

---
 demos/SPC5/NIL-SPC560D-EVB/Makefile | 8 ++++----
 demos/SPC5/NIL-SPC560D-EVB/main.c   | 5 +----
 os/hal/include/hal_queues.h         | 8 ++++++--
 os/hal/osal/nil/osal.h              | 4 ++++
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/demos/SPC5/NIL-SPC560D-EVB/Makefile b/demos/SPC5/NIL-SPC560D-EVB/Makefile
index 5e6e2008f..1a846e121 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/Makefile
+++ b/demos/SPC5/NIL-SPC560D-EVB/Makefile
@@ -76,10 +76,10 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../..
-#include $(CHIBIOS)/os/hal/hal.mk
-#include $(CHIBIOS)/os/hal/boards/ST_EVB_SPC560D/board.mk
-#include $(CHIBIOS)/os/hal/ports/SPC5/SPC560Dxx/platform.mk
-#include $(CHIBIOS)/os/hal/osal/nil/osal.mk
+include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/os/hal/boards/ST_EVB_SPC560D/board.mk
+include $(CHIBIOS)/os/hal/ports/SPC5/SPC560Dxx/platform.mk
+include $(CHIBIOS)/os/hal/osal/nil/osal.mk
 include $(CHIBIOS)/os/nil/nil.mk
 include $(CHIBIOS)/os/nil/ports/e200/compilers/GCC/mk/port_spc560dxx.mk
 #include $(CHIBIOS)/test/nil/test.mk
diff --git a/demos/SPC5/NIL-SPC560D-EVB/main.c b/demos/SPC5/NIL-SPC560D-EVB/main.c
index 98b2b5dba..2c63168c4 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/main.c
+++ b/demos/SPC5/NIL-SPC560D-EVB/main.c
@@ -15,7 +15,7 @@
 */
 
 #include "nil.h"
-//#include "hal.h"
+#include "hal.h"
 //#include "test.h"
 
 #if 0
@@ -95,7 +95,6 @@ static THD_FUNCTION(Thread1, arg) {
   (void)arg;
 
   while (TRUE) {
-#if 0
     unsigned i;
 
     for (i = 0; i < 4; i++) {
@@ -152,8 +151,6 @@ static THD_FUNCTION(Thread1, arg) {
 
     palSetPort(PORT_E, PAL_PORT_BIT(PE_LED1) | PAL_PORT_BIT(PE_LED2) |
                        PAL_PORT_BIT(PE_LED3) | PAL_PORT_BIT(PE_LED4));
-#endif
-    chThdSleepMilliseconds(500);
   }
 }
 
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