diff options
| author | Michael Walker <walkerstop@gmail.com> | 2018-05-02 03:37:31 -0700 |
|---|---|---|
| committer | Michael Walker <walkerstop@gmail.com> | 2018-05-02 03:37:31 -0700 |
| commit | cd7559268dcc2da5f2b1f3872e6baa1cff1d5476 (patch) | |
| tree | 0cf31de069f9df06a13743eab4e1879f05ce9c12 /os/common/ports/MSP430X/chcore.c | |
| parent | 4d7ccdd1fce0c95c57129b80c81fab829daf9f99 (diff) | |
| parent | 457afa6202fe9f8e6accb65411629172bb32c41b (diff) | |
| download | ChibiOS-Contrib-cd7559268dcc2da5f2b1f3872e6baa1cff1d5476.tar.gz ChibiOS-Contrib-cd7559268dcc2da5f2b1f3872e6baa1cff1d5476.tar.bz2 ChibiOS-Contrib-cd7559268dcc2da5f2b1f3872e6baa1cff1d5476.zip | |
Merge branch 'master' into mike
Diffstat (limited to 'os/common/ports/MSP430X/chcore.c')
| -rw-r--r-- | os/common/ports/MSP430X/chcore.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/os/common/ports/MSP430X/chcore.c b/os/common/ports/MSP430X/chcore.c index 7a8d7f2..b9001b0 100644 --- a/os/common/ports/MSP430X/chcore.c +++ b/os/common/ports/MSP430X/chcore.c @@ -32,6 +32,8 @@ /* Module exported variables. */
/*===========================================================================*/
+bool __msp430x_in_isr;
+
/*===========================================================================*/
/* Module local types. */
/*===========================================================================*/
@@ -98,6 +100,11 @@ void _port_thread_start(void) { asm volatile ("mov R5, R12");
asm volatile ("call R4");
#endif
+#if defined(_CHIBIOS_RT_CONF_)
+ chThdExit(MSG_OK);
+#endif
+#if defined(_CHIBIOS_NIL_CONF_)
chSysHalt(0);
+#endif
}
/** @} */
|