aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-11-24 08:49:36 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-11-24 08:49:36 +0000
commita66c595b1417195f185836fa444312fe73c99278 (patch)
tree2ed4cc8edfe091a7f5bb689b46a6cef0b180307a /os
parent8dab615d7d44d65eedafc26ee682d79123b57b41 (diff)
downloadChibiOS-a66c595b1417195f185836fa444312fe73c99278.tar.gz
ChibiOS-a66c595b1417195f185836fa444312fe73c99278.tar.bz2
ChibiOS-a66c595b1417195f185836fa444312fe73c99278.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7530 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/rt/templates/chcore.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/os/rt/templates/chcore.h b/os/rt/templates/chcore.h
index bdb5dd0b6..71a6eaf2f 100644
--- a/os/rt/templates/chcore.h
+++ b/os/rt/templates/chcore.h
@@ -233,6 +233,10 @@ struct context {
/* External declarations. */
/*===========================================================================*/
+/* The following code is not processed when the file is included from an
+ asm module.*/
+#if !defined(_FROM_ASM_)
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -242,10 +246,16 @@ extern "C" {
}
#endif
+#endif /* !defined(_FROM_ASM_) */
+
/*===========================================================================*/
/* Module inline functions. */
/*===========================================================================*/
+/* The following code is not processed when the file is included from an
+ asm module.*/
+#if !defined(_FROM_ASM_)
+
/**
* @brief Returns a word encoding the current interrupts status.
*
@@ -374,6 +384,8 @@ static inline rtcnt_t port_rt_get_counter_value(void) {
/* Module late inclusions. */
/*===========================================================================*/
+/* The following code is not processed when the file is included from an
+ asm module.*/
#if !defined(_FROM_ASM_)
#if CH_CFG_ST_TIMEDELTA > 0