diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-06-04 09:40:31 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-06-04 09:40:31 +0000 |
| commit | 1859a4ba0957bb9aabf1a07feb96a52c9f95ecf7 (patch) | |
| tree | 77dc730d9250b906926a2275cc9409e0a83b1cfe /os/nil | |
| parent | 31774bb3d79d528926bf2c0dffa951bda0ba56f1 (diff) | |
| download | ChibiOS-1859a4ba0957bb9aabf1a07feb96a52c9f95ecf7.tar.gz ChibiOS-1859a4ba0957bb9aabf1a07feb96a52c9f95ecf7.tar.bz2 ChibiOS-1859a4ba0957bb9aabf1a07feb96a52c9f95ecf7.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6981 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/nil')
| -rw-r--r-- | os/nil/ports/ARMCMx/nilcore_v6m.h | 2 | ||||
| -rw-r--r-- | os/nil/ports/ARMCMx/nilcore_v7m.h | 6 |
2 files changed, 4 insertions, 4 deletions
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;
}
|