From 1859a4ba0957bb9aabf1a07feb96a52c9f95ecf7 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 4 Jun 2014 09:40:31 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6981
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/nil/ports/ARMCMx/nilcore_v6m.h | 2 +-
 os/nil/ports/ARMCMx/nilcore_v7m.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'os/nil/ports')

diff --git a/os/nil/ports/ARMCMx/nilcore_v6m.h b/os/nil/ports/ARMCMx/nilcore_v6m.h
index 0e73cdc34..ff925342a 100644
--- a/os/nil/ports/ARMCMx/nilcore_v6m.h
+++ b/os/nil/ports/ARMCMx/nilcore_v6m.h
@@ -285,7 +285,7 @@ static inline void port_init(void) {
  */
 static inline syssts_t port_get_irq_status(void) {
 
-  return __get_PRIMASK();
+  return (syssts_t)__get_PRIMASK();
 }
 
 /**
diff --git a/os/nil/ports/ARMCMx/nilcore_v7m.h b/os/nil/ports/ARMCMx/nilcore_v7m.h
index ff2307495..599499c59 100644
--- a/os/nil/ports/ARMCMx/nilcore_v7m.h
+++ b/os/nil/ports/ARMCMx/nilcore_v7m.h
@@ -395,12 +395,12 @@ static inline void port_init(void) {
  * @return              The interrupts status.
  */
 static inline syssts_t port_get_irq_status(void) {
-  register uint32_t sts;
+  syssts_t sts;
 
 #if !CORTEX_SIMPLIFIED_PRIORITY
-  sts = __get_BASEPRI();
+  sts = (syssts_t)__get_BASEPRI();
 #else /* CORTEX_SIMPLIFIED_PRIORITY */
-  sts = __get_PRIMASK();
+  sts = (syssts_t)__get_PRIMASK();
 #endif /* CORTEX_SIMPLIFIED_PRIORITY */
   return sts;
 }
-- 
cgit v1.2.3