From 852f75dabe8c25a01d6becc6291aa8c26dda0cf5 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 29 Jun 2014 16:42:19 +0000 Subject: Fixed bug #512. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6997 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/rt/ports/ARMCMx/chcore_v7m.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'os/rt/ports/ARMCMx/chcore_v7m.h') diff --git a/os/rt/ports/ARMCMx/chcore_v7m.h b/os/rt/ports/ARMCMx/chcore_v7m.h index da24783e7..9dc1a5e92 100644 --- a/os/rt/ports/ARMCMx/chcore_v7m.h +++ b/os/rt/ports/ARMCMx/chcore_v7m.h @@ -238,7 +238,7 @@ struct port_extctx { regarm_t s14; regarm_t s15; regarm_t fpscr; - regarm_t fpccr; + regarm_t reserved; #endif /* CORTEX_USE_FPU */ }; @@ -396,12 +396,12 @@ static inline void port_init(void) { * @return The interrupts status. */ static inline syssts_t port_get_irq_status(void) { - syssts_t sts; + uint32_t sts; #if !CORTEX_SIMPLIFIED_PRIORITY - sts = (syssts_t)__get_BASEPRI(); + sts = __get_BASEPRI(); #else /* CORTEX_SIMPLIFIED_PRIORITY */ - sts = (syssts_t)__get_PRIMASK(); + sts = __get_PRIMASK(); #endif /* CORTEX_SIMPLIFIED_PRIORITY */ return sts; } -- cgit v1.2.3