Diff: TARGET_SAMD21G18A/core_cm4.h

Revision:

128:9bcdf88f62b0

Parent:

122:f9eeca106725

Child:

131:faff56e089b2

diff -r 25aea2a3f4e3 -r 9bcdf88f62b0 TARGET_SAMD21G18A/core_cm4.h
--- a/TARGET_SAMD21G18A/core_cm4.h	Fri Sep 30 16:49:46 2016 +0100
+++ b/TARGET_SAMD21G18A/core_cm4.h	Thu Oct 27 16:45:56 2016 +0100
@@ -248,6 +248,14 @@
 #define     __O     volatile             /*!< Defines 'write only' permissions                */
 #define     __IO    volatile             /*!< Defines 'read / write' permissions              */
 
+#ifdef __cplusplus
+  #define   __IM    volatile             /*!< Defines 'read only' permissions                 */
+#else
+  #define   __IM    volatile const       /*!< Defines 'read only' permissions                 */
+#endif
+#define     __OM    volatile             /*!< Defines 'write only' permissions                */
+#define     __IOM   volatile             /*!< Defines 'read / write' permissions              */
+
 /*@} end of group Cortex_M4 */
 
 
@@ -1518,6 +1526,7 @@
   #define NVIC_GetActive              __NVIC_GetActive
   #define NVIC_SetPriority            __NVIC_SetPriority
   #define NVIC_GetPriority            __NVIC_GetPriority
+  #define NVIC_SystemReset            __NVIC_SystemReset
 #endif /* CMSIS_NVIC_VIRTUAL */
 
 #ifdef CMSIS_VECTAB_VIRTUAL
@@ -1747,7 +1756,7 @@
 
     The function initiates a system reset request to reset the MCU.
  */
-__STATIC_INLINE void NVIC_SystemReset(void)
+__STATIC_INLINE void __NVIC_SystemReset(void)
 {
   __DSB();                                                          /* Ensure all outstanding memory accesses included
                                                                        buffered write are completed before reset */