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 --- src/mempool.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/mempool.c') diff --git a/src/mempool.c b/src/mempool.c index 614512fe0e..d1a1527b9c 100644 --- a/src/mempool.c +++ b/src/mempool.c @@ -182,7 +182,7 @@ rt_mp_t rt_mp_create(const char* name, rt_size_t block_count, rt_size_t block_si struct rt_mempool* mp; register rt_base_t offset; - RT_DEBUG_NOT_REENT + RT_DEBUG_NOT_IN_INTERRUPT; /* allocate object */ mp = (struct rt_mempool*)rt_object_allocate(RT_Object_Class_MemPool, name); @@ -237,7 +237,7 @@ rt_err_t rt_mp_delete(rt_mp_t mp) struct rt_thread* thread; register rt_ubase_t temp; - RT_DEBUG_NOT_REENT + RT_DEBUG_NOT_IN_INTERRUPT; /* parameter check */ RT_ASSERT(mp != RT_NULL); @@ -325,7 +325,7 @@ void *rt_mp_alloc (rt_mp_t mp, rt_int32_t time) } else { - RT_DEBUG_NOT_REENT + RT_DEBUG_NOT_IN_INTERRUPT; /* get current thread */ thread = rt_thread_self(); @@ -368,9 +368,7 @@ void *rt_mp_alloc (rt_mp_t mp, rt_int32_t time) /* enable interrupt */ rt_hw_interrupt_enable(level); -#ifdef RT_USING_HOOK - RT_OBJECT_HOOK_CALL2(rt_mp_alloc_hook,mp, (rt_uint8_t*)(block_ptr + sizeof(rt_uint8_t*))); -#endif + RT_OBJECT_HOOK_CALL(rt_mp_alloc_hook, (mp, (rt_uint8_t*)(block_ptr + sizeof(rt_uint8_t*)))); return (rt_uint8_t*)(block_ptr + sizeof(rt_uint8_t*)); } @@ -392,9 +390,7 @@ void rt_mp_free (void *block) block_ptr = (rt_uint8_t**)((rt_uint8_t*)block - sizeof(rt_uint8_t*)); mp = (struct rt_mempool*) *block_ptr; -#ifdef RT_USING_HOOK - RT_OBJECT_HOOK_CALL2(rt_mp_free_hook,mp, block); -#endif + RT_OBJECT_HOOK_CALL(rt_mp_free_hook, (mp, block)); /* disable interrupt */ level = rt_hw_interrupt_disable(); -- cgit v1.3.1