libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Kernel] Fix the object find issue when enable MODULE

This commit is contained in:
Bernard Xiong 2018-01-25 17:46:59 +08:00
parent e38e996e5b
commit 1f37c1a497
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/object.c
View File

@ -26,6 +26,7 @@
* 2007-01-28 Bernard rename RT_OBJECT_Class_Static to RT_Object_Class_Static * 2007-01-28 Bernard rename RT_OBJECT_Class_Static to RT_Object_Class_Static
* 2010-10-26 yi.qiu add module support in rt_object_allocate and rt_object_free * 2010-10-26 yi.qiu add module support in rt_object_allocate and rt_object_free
* 2017-12-10 Bernard Add object_info enum. * 2017-12-10 Bernard Add object_info enum.
* 2018-01-25 Bernard Fix the object find issue when enable MODULE.
*/ */
#include <rtthread.h> #include <rtthread.h>
@ -254,7 +255,7 @@ void rt_object_init(struct rt_object *object,
#ifdef RT_USING_MODULE #ifdef RT_USING_MODULE
/* get module object information */ /* get module object information */
information = (rt_module_self() != RT_NULL) ? information = (rt_module_self() != RT_NULL) ?
&rt_module_self()->module_object[type] : &rt_object_container[type]; &rt_module_self()->module_object[type] : rt_object_get_information(type);
#else #else
/* get object information */ /* get object information */
information = rt_object_get_information(type); information = rt_object_get_information(type);
@ -329,7 +330,7 @@ rt_object_t rt_object_allocate(enum rt_object_class_type type, const char *name)
* module object should be managed by kernel object container * module object should be managed by kernel object container
*/ */
information = (rt_module_self() != RT_NULL && (type != RT_Object_Class_Module)) ? information = (rt_module_self() != RT_NULL && (type != RT_Object_Class_Module)) ?
&rt_module_self()->module_object[type] : &rt_object_container[type]; &rt_module_self()->module_object[type] : rt_object_get_information(type);
#else #else
/* get object information */ /* get object information */
information = rt_object_get_information(type); information = rt_object_get_information(type);