diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-09-06 12:30:24 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-09-06 12:30:24 +0000 |
| commit | 9b2fe7aa9f6160bcbb644eca911a2c1eb88d9e77 (patch) | |
| tree | f0bf698a0514067f3bbed23398b8424c6b476ab0 /os/common/ext/ARM/CMSIS/Core/Include/core_sc000.h | |
| parent | 7fdf849e4ee0764fbeb8acd9df92b5e432c79424 (diff) | |
| download | ChibiOS-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/core_sc000.h')
| -rw-r--r-- | os/common/ext/ARM/CMSIS/Core/Include/core_sc000.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/os/common/ext/ARM/CMSIS/Core/Include/core_sc000.h b/os/common/ext/ARM/CMSIS/Core/Include/core_sc000.h index 9aab5e5b3..9b67c92f3 100644 --- a/os/common/ext/ARM/CMSIS/Core/Include/core_sc000.h +++ b/os/common/ext/ARM/CMSIS/Core/Include/core_sc000.h @@ -1,8 +1,8 @@ /**************************************************************************//** * @file core_sc000.h * @brief CMSIS SC000 Core Peripheral Access Layer Header File - * @version V5.0.3 - * @date 10. January 2018 + * @version V5.0.5 + * @date 28. May 2018 ******************************************************************************/ /* * Copyright (c) 2009-2018 Arm Limited. All rights reserved. @@ -727,6 +727,12 @@ typedef struct #define NVIC_USER_IRQ_OFFSET 16 +/* The following EXC_RETURN values are saved the LR on exception entry */ +#define EXC_RETURN_HANDLER (0xFFFFFFF1UL) /* return to Handler mode, uses MSP after return */ +#define EXC_RETURN_THREAD_MSP (0xFFFFFFF9UL) /* return to Thread mode, uses MSP after return */ +#define EXC_RETURN_THREAD_PSP (0xFFFFFFFDUL) /* return to Thread mode, uses PSP after return */ + + /* Interrupt Priorities are WORD accessible only under Armv6-M */ /* The following MACROS handle generation of the register offset and byte masks */ #define _BIT_SHIFT(IRQn) ( ((((uint32_t)(int32_t)(IRQn)) ) & 0x03UL) * 8UL) @@ -920,7 +926,7 @@ __STATIC_INLINE uint32_t __NVIC_GetVector(IRQn_Type IRQn) \brief System Reset \details Initiates a system reset request to reset the MCU. */ -__STATIC_INLINE void __NVIC_SystemReset(void) +__NO_RETURN __STATIC_INLINE void __NVIC_SystemReset(void) { __DSB(); /* Ensure all outstanding memory accesses included buffered write are completed before reset */ |