diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-01-10 12:33:06 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-01-10 12:33:06 +0000 |
| commit | 49adf9423cdfe92b489f35858082ea50454e076a (patch) | |
| tree | f0a59882d51683aad76140b97ab4b93c703c9c4f | |
| parent | 0fc2adba2ad0f66c86c3d7c79a79b666b9614ca2 (diff) | |
| download | ChibiOS-49adf9423cdfe92b489f35858082ea50454e076a.tar.gz ChibiOS-49adf9423cdfe92b489f35858082ea50454e076a.tar.bz2 ChibiOS-49adf9423cdfe92b489f35858082ea50454e076a.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@604 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | ports/ARM7/chcore.h | 66 |
1 files changed, 58 insertions, 8 deletions
diff --git a/ports/ARM7/chcore.h b/ports/ARM7/chcore.h index 19b09adaf..2cf889751 100644 --- a/ports/ARM7/chcore.h +++ b/ports/ARM7/chcore.h @@ -135,7 +135,7 @@ typedef struct { * IRQ prologue code, inserted at the start of all IRQ handlers enabled to
* invoke system APIs.
* @note This macro has a different implementation depending if compiled in
- * ARM or TUMB mode. + * ARM or THUMB mode. */
#ifdef THUMB
#define SYS_IRQ_PROLOGUE() { \
@@ -155,7 +155,7 @@ typedef struct { * IRQ epilogue code, inserted at the end of all IRQ handlers enabled to
* invoke system APIs.
* @note This macro has a different implementation depending if compiled in
- * ARM or TUMB mode.
+ * ARM or THUMB mode.
*/
#ifdef THUMB
#define SYS_IRQ_EPILOGUE() { \
@@ -169,21 +169,71 @@ typedef struct { #endif /* !THUMB */
/**
- * IRQ handler function modifier. + * IRQ handler function modifier.
*/
#define SYS_IRQ_HANDLER __attribute__((naked))
+/**
+ * Performs a context switch between two threads.
+ * @param otp the thread to be switched out
+ * @param ntp the thread to be switched in
+ * @note This macro has a different implementation depending if compiled in
+ * ARM or THUMB mode.
+ * @note This macro assumes to be invoked in ARM system mode.
+ */
+#ifdef THUMB
+#define sys_switch(otp, ntp) _sys_switch_thumb(otp, ntp)
+#else /* THUMB */
+#define sys_switch(otp, ntp) _sys_switch_arm(otp, ntp)
+#endif /* !THUMB */
+
+/**
+ * In this port this macro disables the IRQ sources.
+ * @note This macro has a different implementation depending if compiled in
+ * ARM or THUMB mode.
+ * @note This macro assumes to be invoked in ARM system mode.
+ */
+#ifdef THUMB
+#define sys_disable() asm volatile ("msr CPSR_c, #0x9F")
+#else /* THUMB */
+#define sys_disable() _sys_disable_thumb()
+#endif /* !THUMB */
+
+/**
+ * This port function is implemented as inlined code for performance reasons.
+ * @note This macro has a different implementation depending if compiled in
+ * ARM or THUMB mode.
+ * @note This macro assumes to be invoked in ARM system mode.
+ */
+#ifdef THUMB
+#define sys_enable() asm volatile ("msr CPSR_c, #0x1F")
+#else /* THUMB */
+#define sys_enable() _sys_enable_thumb()
+#endif /* !THUMB */
+
+/**
+ * This function is empty in this port.
+ */
+#define sys_disable_from_isr()
+
+/**
+ * This function is empty in this port.
+ */
+#define sys_enable_from_isr()
+
#ifdef __cplusplus
extern "C" {
#endif
void sys_puts(char *msg);
- void sys_switch(Thread *otp, Thread *ntp);
- void sys_enable(void);
- void sys_disable(void);
- void sys_disable_from_isr(void);
- void sys_enable_from_isr(void);
void sys_wait_for_interrupt(void);
void sys_halt(void);
+ void _sys_enable_thumb(void);
+ void _sys_disable_thumb(void);
+#ifdef THUMB
+ void _sys_switch_thumb(Thread *otp, Thread *ntp);
+#else /* THUMB */
+ void _sys_switch_arm(Thread *otp, Thread *ntp);
+#endif /* !THUMB */
#ifdef __cplusplus
}
#endif
|