mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2026-06-14 05:02:50 +08:00
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into malloc
This commit is contained in:
-11
@@ -24,17 +24,6 @@
|
||||
static rt_tick_t rt_tick = 0;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* This function will initialize system tick and set it to zero.
|
||||
* @ingroup SystemInit
|
||||
*
|
||||
* @deprecated since 1.1.0, this function does not need to be invoked
|
||||
* in the system initialization.
|
||||
*/
|
||||
void rt_system_tick_init(void)
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* @addtogroup Clock
|
||||
*/
|
||||
|
||||
+1
-13
@@ -191,18 +191,6 @@ void rt_object_put_sethook(void (*hook)(struct rt_object *object))
|
||||
/**@}*/
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @ingroup SystemInit
|
||||
*
|
||||
* This function will initialize system object management.
|
||||
*
|
||||
* @deprecated since 0.3.0, this function does not need to be invoked
|
||||
* in the system initialization.
|
||||
*/
|
||||
void rt_system_object_init(void)
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* @addtogroup KernelObject
|
||||
*/
|
||||
@@ -485,7 +473,7 @@ void rt_object_delete(rt_object_t object)
|
||||
RT_OBJECT_HOOK_CALL(rt_object_detach_hook, (object));
|
||||
|
||||
/* reset object type */
|
||||
object->type = 0;
|
||||
object->type = RT_Object_Class_Null;
|
||||
|
||||
/* lock interrupt */
|
||||
temp = rt_hw_interrupt_disable();
|
||||
|
||||
Reference in New Issue
Block a user