From ee68988518f8aa2b7cdafc2bcfe0abe6ad7df385 Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Tue, 14 Jun 2011 23:59:42 +0000 Subject: change the RT_DEBUG_NOT_REENT to RT_DEBUG_NOT_IN_INTERRUPT. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1503 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- include/rtthread.h | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'include/rtthread.h') diff --git a/include/rtthread.h b/include/rtthread.h index 95ab191397..ea7806599f 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -36,6 +36,7 @@ extern "C" { */ void rt_system_object_init(void); +struct rt_object_information *rt_object_get_information(enum rt_object_class_type type); void rt_object_init(struct rt_object* object, enum rt_object_class_type type, const char* name); void rt_object_detach(rt_object_t object); rt_object_t rt_object_allocate(enum rt_object_class_type type, const char* name); @@ -49,24 +50,6 @@ void rt_object_detach_sethook(void (*hook)(struct rt_object* object)); void rt_object_trytake_sethook(void (*hook)(struct rt_object* object)); void rt_object_take_sethook(void (*hook)(struct rt_object* object)); void rt_object_put_sethook(void (*hook)(struct rt_object* object)); -#define RT_OBJECT_HOOK_CALL(hookfunc)\ - do{\ - register rt_base_t temp;\ - temp = rt_hw_interrupt_disable();\ - RT_DEBUG_REENT_IN\ - if (hookfunc != RT_NULL) hookfunc();\ - RT_DEBUG_REENT_OUT\ - rt_hw_interrupt_enable(temp);\ - }while(0) -#define RT_OBJECT_HOOK_CALL2(hookfunc,...)\ - do{\ - register rt_base_t temp;\ - temp = rt_hw_interrupt_disable();\ - RT_DEBUG_REENT_IN\ - if (hookfunc != RT_NULL) hookfunc(__VA_ARGS__);\ - RT_DEBUG_REENT_OUT\ - rt_hw_interrupt_enable(temp);\ - }while(0) #endif /*@}*/ @@ -346,6 +329,10 @@ typedef void (*rt_isr_handler_t)(int vector); */ void rt_interrupt_enter(void); void rt_interrupt_leave(void); +/* + * the number of nested interrupts. + */ +rt_uint8_t rt_interrupt_get_nest(void); /** * @addtogroup KernelService -- cgit v1.3.1