diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-03-27 14:42:48 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-03-27 14:42:48 +0000 |
| commit | b83cd4a1dc8b3240f821a23c588c8d7d690f70ae (patch) | |
| tree | c12584d6c2ad17a1ab3a4ed346c62e0373c5e7e4 /ports/ARM7 | |
| parent | 165bcc4a0708ff3252fe73156eace36b5980dbf9 (diff) | |
| download | ChibiOS-b83cd4a1dc8b3240f821a23c588c8d7d690f70ae.tar.gz ChibiOS-b83cd4a1dc8b3240f821a23c588c8d7d690f70ae.tar.bz2 ChibiOS-b83cd4a1dc8b3240f821a23c588c8d7d690f70ae.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@250 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'ports/ARM7')
| -rw-r--r-- | ports/ARM7/chcore.h | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/ports/ARM7/chcore.h b/ports/ARM7/chcore.h index 3604253b5..eed850266 100644 --- a/ports/ARM7/chcore.h +++ b/ports/ARM7/chcore.h @@ -74,8 +74,14 @@ typedef struct { }
#ifdef THUMB
-extern void chSysLock(void);
-extern void chSysUnlock(void);
+#ifdef __cplusplus
+extern "C" {
+#endif
+ void chSysLock(void);
+ void chSysUnlock(void);
+#ifdef __cplusplus
+}
+#endif
#else /* !THUMB */
#define chSysLock() asm("msr CPSR_c, #0x9F")
#define chSysUnlock() asm("msr CPSR_c, #0x1F")
@@ -123,11 +129,17 @@ extern void chSysUnlock(void); /* It requires zero bytes, but better be safe.*/
#define IDLE_THREAD_STACK_SIZE 8
-void _IdleThread(void *p) __attribute__((noreturn));
-void chSysHalt(void);
-void chSysSwitchI(Thread *otp, Thread *ntp);
-void chSysPuts(char *msg);
-void threadstart(void);
+#ifdef __cplusplus
+extern "C" {
+#endif
+ void _IdleThread(void *p) __attribute__((noreturn));
+ void chSysHalt(void);
+ void chSysSwitchI(Thread *otp, Thread *ntp);
+ void chSysPuts(char *msg);
+ void threadstart(void);
+#ifdef __cplusplus
+}
+#endif
#endif /* _CHCORE_H_ */
|