git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6106 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2013-08-09 07:25:16 +00:00
parent 9728e44141
commit 4b363412c9
1 changed files with 3 additions and 14 deletions

View File

@ -120,18 +120,6 @@
#define CORTEX_ENABLE_WFI_IDLE FALSE #define CORTEX_ENABLE_WFI_IDLE FALSE
#endif #endif
/**
* @brief SYSTICK handler priority.
* @note The default SYSTICK handler priority is calculated as the priority
* level in the middle of the numeric priorities range.
*/
#if !defined(CORTEX_PRIORITY_SYSTICK)
#define CORTEX_PRIORITY_SYSTICK (CORTEX_PRIORITY_LEVELS >> 1)
#elif !CORTEX_IS_VALID_PRIORITY(CORTEX_PRIORITY_SYSTICK)
/* If it is externally redefined then better perform a validity check on it.*/
#error "invalid priority level specified for CORTEX_PRIORITY_SYSTICK"
#endif
/** /**
* @brief FPU support in context switch. * @brief FPU support in context switch.
* @details Activating this option activates the FPU support in the kernel. * @details Activating this option activates the FPU support in the kernel.
@ -147,6 +135,8 @@
/** /**
* @brief Simplified priority handling flag. * @brief Simplified priority handling flag.
* @details Activating this option makes the Kernel work in compact mode. * @details Activating this option makes the Kernel work in compact mode.
* In compact mode interrupts are disabled globally instead of
* raising the priority mask to some intermediate level.
*/ */
#if !defined(CORTEX_SIMPLIFIED_PRIORITY) #if !defined(CORTEX_SIMPLIFIED_PRIORITY)
#define CORTEX_SIMPLIFIED_PRIORITY FALSE #define CORTEX_SIMPLIFIED_PRIORITY FALSE
@ -194,7 +184,6 @@
/** /**
* @brief BASEPRI level within kernel lock. * @brief BASEPRI level within kernel lock.
* @note In compact kernel mode this constant value is enforced to zero.
*/ */
#define CORTEX_BASEPRI_KERNEL \ #define CORTEX_BASEPRI_KERNEL \
CORTEX_PRIO_MASK(CORTEX_MAX_KERNEL_PRIORITY) CORTEX_PRIO_MASK(CORTEX_MAX_KERNEL_PRIORITY)
@ -382,7 +371,7 @@ struct context {
#define port_switch(ntp, otp) _port_switch(ntp, otp) #define port_switch(ntp, otp) _port_switch(ntp, otp)
#else #else
#define port_switch(ntp, otp) { \ #define port_switch(ntp, otp) { \
register struct intctx *r13 asm ("r13"); \ struct intctx *r13 = __get_PSP(); \
if ((stkalign_t *)(r13 - 1) < otp->p_stklimit) \ if ((stkalign_t *)(r13 - 1) < otp->p_stklimit) \
chDbgPanic("stack overflow"); \ chDbgPanic("stack overflow"); \
_port_switch(ntp, otp); \ _port_switch(ntp, otp); \