diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-19 14:26:38 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-19 14:26:38 +0000 |
| commit | 52e34df5767ed023955d295cc118d92bb42cff46 (patch) | |
| tree | daa77f410baf86b91c6e60d3bf288b8254f99159 /os | |
| parent | 58f8d8a051580add16ede4c74ae5e24e5f4bb45e (diff) | |
| download | ChibiOS-52e34df5767ed023955d295cc118d92bb42cff46.tar.gz ChibiOS-52e34df5767ed023955d295cc118d92bb42cff46.tar.bz2 ChibiOS-52e34df5767ed023955d295cc118d92bb42cff46.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6181 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/platforms/STM32/st_lld.h | 2 | ||||
| -rw-r--r-- | os/rt/include/ch.h | 9 | ||||
| -rw-r--r-- | os/rt/include/chdebug.h | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/os/hal/platforms/STM32/st_lld.h b/os/hal/platforms/STM32/st_lld.h index ac17d7ff7..78929cac5 100644 --- a/os/hal/platforms/STM32/st_lld.h +++ b/os/hal/platforms/STM32/st_lld.h @@ -27,6 +27,8 @@ #if (OSAL_ST_MODE != OSAL_ST_MODE_NONE) || defined(__DOXYGEN__)
+#include "stm32_tim.h"
+
/*===========================================================================*/
/* Driver constants. */
/*===========================================================================*/
diff --git a/os/rt/include/ch.h b/os/rt/include/ch.h index 3e3b90983..c2c486c0f 100644 --- a/os/rt/include/ch.h +++ b/os/rt/include/ch.h @@ -104,6 +104,15 @@ typedef struct thread thread_t;
typedef struct virtual_timer virtual_timer_t;
+/* This function is special, it must be accessible from all modules.*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+ void chSysHalt(const char *reason);
+#ifdef __cplusplus
+}
+#endif
+
/* Inclusion of all the kernel sub-headers.*/
#include "chconf.h"
#include "chtypes.h"
diff --git a/os/rt/include/chdebug.h b/os/rt/include/chdebug.h index c33d078d3..ee49eec00 100644 --- a/os/rt/include/chdebug.h +++ b/os/rt/include/chdebug.h @@ -196,7 +196,7 @@ typedef struct { #if !defined(chDbgAssert)
#define chDbgAssert(c, r) { \
if (!(c)) \
- chSysHalt("A:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__)); \
+ chSysHalt("A:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__)); \
}
#endif /* !defined(chDbgAssert) */
#else /* !CH_DBG_ENABLE_ASSERTS */
|