aboutsummaryrefslogtreecommitdiffstats
path: root/os/common/ext/ARM/CMSIS/Core/Include/cmsis_armcc.h
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2018-09-06 12:30:24 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2018-09-06 12:30:24 +0000
commit9b2fe7aa9f6160bcbb644eca911a2c1eb88d9e77 (patch)
treef0bf698a0514067f3bbed23398b8424c6b476ab0 /os/common/ext/ARM/CMSIS/Core/Include/cmsis_armcc.h
parent7fdf849e4ee0764fbeb8acd9df92b5e432c79424 (diff)
downloadChibiOS-9b2fe7aa9f6160bcbb644eca911a2c1eb88d9e77.tar.gz
ChibiOS-9b2fe7aa9f6160bcbb644eca911a2c1eb88d9e77.tar.bz2
ChibiOS-9b2fe7aa9f6160bcbb644eca911a2c1eb88d9e77.zip
Updated CMSIS to 5.4.0.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12239 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/common/ext/ARM/CMSIS/Core/Include/cmsis_armcc.h')
-rw-r--r--os/common/ext/ARM/CMSIS/Core/Include/cmsis_armcc.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/os/common/ext/ARM/CMSIS/Core/Include/cmsis_armcc.h b/os/common/ext/ARM/CMSIS/Core/Include/cmsis_armcc.h
index 093d35b9e..4d9d0645d 100644
--- a/os/common/ext/ARM/CMSIS/Core/Include/cmsis_armcc.h
+++ b/os/common/ext/ARM/CMSIS/Core/Include/cmsis_armcc.h
@@ -337,8 +337,6 @@ __STATIC_INLINE void __set_FAULTMASK(uint32_t faultMask)
(defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1)) ) */
-#if ((defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1)) )
-
/**
\brief Get FPSCR
\details Returns the current value of the Floating Point Status/Control register.
@@ -372,9 +370,6 @@ __STATIC_INLINE void __set_FPSCR(uint32_t fpscr)
#endif
}
-#endif /* ((defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1)) ) */
-
-
/*@} end of CMSIS_Core_RegAccFunctions */