michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arches: move _NanoFatalErrorHandler defintion

Browse source 
This needs to be in <arch/cpu.h> so that it can be called
from the k_panic()/k_oops() macros in kernel.h.

Fixes build errors on these arches when using k_panic() or
k_oops().

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2017-07-17 16:07:01 -07:00 • committed by Anas Nashif
commit 74afcb67ae
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/nios2/include/kernel_arch_func.h
View file

@ -45,10 +45,6 @@ static inline void _IntLibInit(void)
/* No special initialization of the interrupt subsystem required */ /* No special initialization of the interrupt subsystem required */
} }
FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
const NANO_ESF * esf);
#define _is_in_isr() (_kernel.nested != 0) #define _is_in_isr() (_kernel.nested != 0)
#ifdef CONFIG_IRQ_OFFLOAD #ifdef CONFIG_IRQ_OFFLOAD

3
arch/xtensa/include/kernel_arch_func.h
View file

@ -76,9 +76,6 @@ static inline void _IntLibInit(void)
{ {
} }
FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
const NANO_ESF *pEsf);
#include <stddef.h> /* For size_t */ #include <stddef.h> /* For size_t */
#ifdef __cplusplus #ifdef __cplusplus

2
include/arch/nios2/arch.h
View file

@ -159,6 +159,8 @@ extern const NANO_ESF _default_esf;
FUNC_NORETURN void _SysFatalErrorHandler(unsigned int reason, FUNC_NORETURN void _SysFatalErrorHandler(unsigned int reason,
const NANO_ESF *esf); const NANO_ESF *esf);
FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
const NANO_ESF *esf);
enum nios2_exception_cause { enum nios2_exception_cause {
NIOS2_EXCEPTION_UNKNOWN = -1, NIOS2_EXCEPTION_UNKNOWN = -1,

3
include/arch/xtensa/arch.h
View file

@ -129,6 +129,9 @@ extern void _irq_priority_set(u32_t irq, u32_t prio, u32_t flags);
FUNC_NORETURN void _SysFatalErrorHandler(unsigned int reason, FUNC_NORETURN void _SysFatalErrorHandler(unsigned int reason,
const NANO_ESF *esf); const NANO_ESF *esf);
FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
const NANO_ESF *pEsf);
extern u32_t _timer_cycle_get_32(void); extern u32_t _timer_cycle_get_32(void);
#define _arch_k_cycle_get_32() _timer_cycle_get_32() #define _arch_k_cycle_get_32() _timer_cycle_get_32()