aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-11-19 14:57:31 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-11-19 14:57:31 +0000
commit4a8ab636b6063e9dea1c78892adf16a574d8b6dd (patch)
treee9ec2611d70469b731f986a6bac65db3f2201ab3
parentafdfd9880ba8d0bb4b48d68ea3ff05d7d0f5cea8 (diff)
downloadChibiOS-4a8ab636b6063e9dea1c78892adf16a574d8b6dd.tar.gz
ChibiOS-4a8ab636b6063e9dea1c78892adf16a574d8b6dd.tar.bz2
ChibiOS-4a8ab636b6063e9dea1c78892adf16a574d8b6dd.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6496 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/ports/STM32/TIMv1/st_lld.c1
-rw-r--r--os/rt/osal/osal.h6
2 files changed, 6 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/TIMv1/st_lld.c b/os/hal/ports/STM32/TIMv1/st_lld.c
index 090b7a4fe..a8ef5896d 100644
--- a/os/hal/ports/STM32/TIMv1/st_lld.c
+++ b/os/hal/ports/STM32/TIMv1/st_lld.c
@@ -26,7 +26,6 @@
#if (OSAL_ST_MODE != OSAL_ST_MODE_NONE) || defined(__DOXYGEN__)
-
/*===========================================================================*/
/* Driver local definitions. */
/*===========================================================================*/
diff --git a/os/rt/osal/osal.h b/os/rt/osal/osal.h
index 4569d7c4f..868fca249 100644
--- a/os/rt/osal/osal.h
+++ b/os/rt/osal/osal.h
@@ -131,6 +131,12 @@
/* Module data structures and types. */
/*===========================================================================*/
+/* Temporary types provided for ChibiOS 2.x compatibility.*/
+typedef io_queue_t GenericQueue;
+typedef input_queue_t InputQueue;
+typedef output_queue_t OutputQueue;
+typedef bool bool_t;
+
#if 0
/**
* @brief Type of a system status word.