From de50381baabcc4280c27331e3988eeccb688f6e5 Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Wed, 15 Jun 2011 00:12:40 +0000 Subject: [PATCH] because the sethook operation is invoked only in system initialization, the interrupt protect is removed. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1504 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- src/mem.c | 17 +---------------- src/object.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/src/mem.c b/src/mem.c index 81f1362dbb..4447c69514 100644 --- a/src/mem.c +++ b/src/mem.c @@ -49,6 +49,7 @@ * */ +#include #include /* #define RT_MEM_DEBUG */ @@ -72,15 +73,7 @@ static void (*rt_free_hook)(void *ptr); */ void rt_malloc_sethook(void (*hook)(void *ptr, rt_size_t size)) { - register rt_base_t temp; - - /* disable interrupt */ - temp = rt_hw_interrupt_disable(); - rt_malloc_hook = hook; - - /* enable interrupt */ - rt_hw_interrupt_enable(temp); } /** @@ -91,15 +84,7 @@ void rt_malloc_sethook(void (*hook)(void *ptr, rt_size_t size)) */ void rt_free_sethook(void (*hook)(void *ptr)) { - register rt_base_t temp; - - /* disable interrupt */ - temp = rt_hw_interrupt_disable(); - rt_free_hook = hook; - - /* enable interrupt */ - rt_hw_interrupt_enable(temp); } /*@}*/ diff --git a/src/object.c b/src/object.c index b2e584b793..5667fdd30f 100644 --- a/src/object.c +++ b/src/object.c @@ -84,15 +84,7 @@ void (*rt_object_put_hook)(struct rt_object* object); */ void rt_object_attach_sethook(void (*hook)(struct rt_object* object)) { - register rt_base_t temp; - - /* disable interrupt */ - temp = rt_hw_interrupt_disable(); - rt_object_attach_hook = hook; - - /* enable interrupt */ - rt_hw_interrupt_enable(temp); } /** @@ -103,15 +95,7 @@ void rt_object_attach_sethook(void (*hook)(struct rt_object* object)) */ void rt_object_detach_sethook(void (*hook)(struct rt_object* object)) { - register rt_base_t temp; - - /* disable interrupt */ - temp = rt_hw_interrupt_disable(); - rt_object_detach_hook = hook; - - /* enable interrupt */ - rt_hw_interrupt_enable(temp); } /** @@ -129,15 +113,7 @@ void rt_object_detach_sethook(void (*hook)(struct rt_object* object)) */ void rt_object_trytake_sethook(void (*hook)(struct rt_object* object)) { - register rt_base_t temp; - - /* disable interrupt */ - temp = rt_hw_interrupt_disable(); - rt_object_trytake_hook = hook; - - /* enable interrupt */ - rt_hw_interrupt_enable(temp); } /** @@ -156,15 +132,7 @@ void rt_object_trytake_sethook(void (*hook)(struct rt_object* object)) */ void rt_object_take_sethook(void (*hook)(struct rt_object* object)) { - register rt_base_t temp; - - /* disable interrupt */ - temp = rt_hw_interrupt_disable(); - rt_object_take_hook = hook; - - /* enable interrupt */ - rt_hw_interrupt_enable(temp); } /** @@ -175,15 +143,7 @@ void rt_object_take_sethook(void (*hook)(struct rt_object* object)) */ void rt_object_put_sethook(void (*hook)(struct rt_object* object)) { - register rt_base_t temp; - - /* disable interrupt */ - temp = rt_hw_interrupt_disable(); - rt_object_put_hook = hook; - - /* enable interrupt */ - rt_hw_interrupt_enable(temp); } /*@}*/ -- GitLab