From fa8b45cc5be41840b99d4a5468108568f93513c1 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Tue, 3 Sep 2013 13:21:10 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6255 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/rt/ports/ARMCMx/chcore_v6m.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'os/rt/ports/ARMCMx/chcore_v6m.h') diff --git a/os/rt/ports/ARMCMx/chcore_v6m.h b/os/rt/ports/ARMCMx/chcore_v6m.h index 846378b65..759041b8a 100644 --- a/os/rt/ports/ARMCMx/chcore_v6m.h +++ b/os/rt/ports/ARMCMx/chcore_v6m.h @@ -202,13 +202,13 @@ struct context { * @details This code usually setup the context switching frame represented * by an @p port_intctx structure. */ -#define PORT_SETUP_CONTEXT(workspace, wsize, pf, arg) { \ - tp->p_ctx.r13 = (struct port_intctx *)((uint8_t *)workspace + \ +#define PORT_SETUP_CONTEXT(tp, workspace, wsize, pf, arg) { \ + (tp)->p_ctx.r13 = (struct port_intctx *)((uint8_t *)workspace + \ wsize - \ sizeof(struct port_intctx)); \ - tp->p_ctx.r13->r4 = (regarm_t)(pf); \ - tp->p_ctx.r13->r5 = (regarm_t)(arg); \ - tp->p_ctx.r13->lr = (regarm_t)(_port_thread_start); \ + (tp)->p_ctx.r13->r4 = (regarm_t)(pf); \ + (tp)->p_ctx.r13->r5 = (regarm_t)(arg); \ + (tp)->p_ctx.r13->lr = (regarm_t)(_port_thread_start); \ } /** @@ -281,7 +281,6 @@ struct context { #ifdef __cplusplus extern "C" { #endif - void port_halt(void); void _port_irq_epilogue(regarm_t lr); void _port_switch_from_isr(void); void _port_exit_from_isr(void); -- cgit v1.2.3