From 37a6ee0c67b2780f651e0d0a02fb048f55f5cf97 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 12 Jun 2015 08:52:52 +0000 Subject: Fixed bug #600. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8017 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/rt/ports/ARMCMx/compilers/GCC/chtypes.h | 1 - os/rt/ports/e200/chcore.h | 12 ++++++++++++ os/rt/ports/e200/compilers/GCC/chtypes.h | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'os/rt/ports') diff --git a/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h b/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h index af3349d79..c500da63b 100644 --- a/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h +++ b/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h @@ -40,7 +40,6 @@ */ #if !defined(FALSE) || defined(__DOXYGEN__) #define FALSE 0 - #endif /** diff --git a/os/rt/ports/e200/chcore.h b/os/rt/ports/e200/chcore.h index f1485b81a..c0b96e2df 100644 --- a/os/rt/ports/e200/chcore.h +++ b/os/rt/ports/e200/chcore.h @@ -330,6 +330,18 @@ struct context { */ #define PORT_FAST_IRQ_HANDLER(id) void id(void) +/** + * @brief Priority level verification macro. + */ +#define PORT_IRQ_IS_VALID_PRIORITY(n) \ + (((n) >= 0U) && ((n) < INTC_PRIORITY_LEVELS)) + +/** + * @brief Priority level verification macro. + */ +#define PORT_IRQ_IS_VALID_KERNEL_PRIORITY(n) \ + (((n) >= 0U) && ((n) < INTC_PRIORITY_LEVELS)) + /** * @brief Performs a context switch between two threads. * @details This is the most critical code in any port, this function diff --git a/os/rt/ports/e200/compilers/GCC/chtypes.h b/os/rt/ports/e200/compilers/GCC/chtypes.h index 87bb6b74d..2973f8ef8 100644 --- a/os/rt/ports/e200/compilers/GCC/chtypes.h +++ b/os/rt/ports/e200/compilers/GCC/chtypes.h @@ -98,7 +98,7 @@ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */ /** * @brief Optimized thread function declaration macro. */ -#define PORT_THD_FUNCTION(tname, arg) msg_t tname(void *arg) +#define PORT_THD_FUNCTION(tname, arg) void tname(void *arg) #endif /* _CHTYPES_H_ */ -- cgit v1.2.3