diff options
| author | awygle <awygle@gmail.com> | 2016-08-17 00:15:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-17 00:15:02 -0500 |
| commit | 66ee156aa4e7d99db9854cf7fd67515d73b1e3fa (patch) | |
| tree | e01ffb3853c05e75b81be838447c2f5211c53f07 /os/common | |
| parent | e1601e0a7d9b805422e511ea1c29ef9f5ca6000b (diff) | |
| parent | d9ee72504f248b7f9edae382ff941453301bf5ad (diff) | |
| download | ChibiOS-Contrib-66ee156aa4e7d99db9854cf7fd67515d73b1e3fa.tar.gz ChibiOS-Contrib-66ee156aa4e7d99db9854cf7fd67515d73b1e3fa.tar.bz2 ChibiOS-Contrib-66ee156aa4e7d99db9854cf7fd67515d73b1e3fa.zip | |
Merge pull request #81 from awygle/adc
MSP430X ADC12 Support
Diffstat (limited to 'os/common')
| -rw-r--r-- | os/common/ports/MSP430X/chcore.c | 7 | ||||
| -rw-r--r-- | os/common/ports/MSP430X/chcore.h | 20 |
2 files changed, 20 insertions, 7 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
}
/** @} */
diff --git a/os/common/ports/MSP430X/chcore.h b/os/common/ports/MSP430X/chcore.h index 09f87c4..9e1efa8 100644 --- a/os/common/ports/MSP430X/chcore.h +++ b/os/common/ports/MSP430X/chcore.h @@ -28,6 +28,8 @@ #include <msp430.h>
#include <in430.h>
+extern bool __msp430x_in_isr;
+
/*===========================================================================*/
/* Module constants. */
/*===========================================================================*/
@@ -225,21 +227,27 @@ struct port_context { * @details This macro must be inserted at the start of all IRQ handlers
* enabled to invoke system APIs.
*/
-#define PORT_IRQ_PROLOGUE()
+#define PORT_IRQ_PROLOGUE() __msp430x_in_isr = true;
/**
* @brief IRQ epilogue code.
* @details This macro must be inserted at the end of all IRQ handlers
* enabled to invoke system APIs.
*/
-#define PORT_IRQ_EPILOGUE() chSchRescheduleS()
+#define PORT_IRQ_EPILOGUE() { \
+ __msp430x_in_isr = false; \
+ _dbg_check_lock(); \
+ if (chSchIsPreemptionRequired()) \
+ chSchDoReschedule(); \
+ _dbg_check_unlock(); \
+}
/**
* @brief IRQ handler function declaration.
* @note @p id can be a function name or a vector number depending on the
* port implementation.
*/
-#define PORT_IRQ_HANDLER(id) __attribute__ ((interrupt(id))) \
+#define PORT_IRQ_HANDLER(id) __attribute__ ((interrupt(id))) \
void ISR_ ## id (void)
/**
@@ -293,7 +301,7 @@ extern "C" { * @brief Port-related initialization code.
*/
static inline void port_init(void) {
-
+ __msp430x_in_isr = false;
}
/**
@@ -328,9 +336,7 @@ static inline bool port_irq_enabled(syssts_t sts) { * @retval true running in ISR mode.
*/
static inline bool port_is_isr_context(void) {
- /* Efficiency would be enhanced by not doing this,
- * because of implementation details */
- return __get_SR_register() & GIE;
+ return __msp430x_in_isr;
}
/**
|