mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2026-11-09 20:45:41 +08:00
cleanup kernel code
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1715 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
1 parent
fea7d02bfd
commit
c0f80bdf9a
17 files changed
+1012
-1009
No files matched your search
+8
-8
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* File : clock.c
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team
|
||||
* COPYRIGHT (C) 2006 - 2011, RT-Thread Development Team
|
||||
*
|
||||
* The license and distribution terms for this file may be
|
||||
* found in the file LICENSE in this distribution or at
|
||||
@@ -31,7 +31,7 @@ extern void rt_timer_switch(void);
|
||||
* @ingroup SystemInit
|
||||
*
|
||||
*/
|
||||
void rt_system_tick_init()
|
||||
void rt_system_tick_init(void)
|
||||
{
|
||||
rt_tick = 0;
|
||||
}
|
||||
@@ -47,7 +47,7 @@ void rt_system_tick_init()
|
||||
*
|
||||
* @return current tick
|
||||
*/
|
||||
rt_tick_t rt_tick_get()
|
||||
rt_tick_t rt_tick_get(void)
|
||||
{
|
||||
/* return the global tick */
|
||||
return rt_tick;
|
||||
@@ -70,9 +70,9 @@ void rt_tick_set(rt_tick_t tick)
|
||||
* This function will notify kernel there is one tick passed. Normally,
|
||||
* this function is invoked by clock ISR.
|
||||
*/
|
||||
void rt_tick_increase()
|
||||
void rt_tick_increase(void)
|
||||
{
|
||||
struct rt_thread* thread;
|
||||
struct rt_thread *thread;
|
||||
|
||||
/* increase the global tick */
|
||||
++ rt_tick;
|
||||
@@ -87,10 +87,10 @@ void rt_tick_increase()
|
||||
thread->remaining_tick = thread->init_tick;
|
||||
|
||||
/* yield */
|
||||
rt_thread_yield();
|
||||
rt_thread_yield();
|
||||
}
|
||||
|
||||
/* check timer */
|
||||
/* check timer */
|
||||
rt_timer_check();
|
||||
}
|
||||
|
||||
@@ -104,7 +104,7 @@ void rt_tick_increase()
|
||||
rt_tick_t rt_tick_from_millisecond(rt_uint32_t ms)
|
||||
{
|
||||
/* return the calculated tick */
|
||||
return (RT_TICK_PER_SECOND * ms+999) / 1000;
|
||||
return (RT_TICK_PER_SECOND * ms + 999) / 1000;
|
||||
}
|
||||
|
||||
/*@}*/
|
||||
|
||||
+19
-20
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* File : device.c
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team
|
||||
* COPYRIGHT (C) 2006 - 2011, RT-Thread Development Team
|
||||
*
|
||||
* The license and distribution terms for this file may be
|
||||
* found in the file LICENSE in this distribution or at
|
||||
@@ -27,7 +27,7 @@
|
||||
*
|
||||
* @return the error code, RT_EOK on initialization successfully.
|
||||
*/
|
||||
rt_err_t rt_device_register(rt_device_t dev, const char* name, rt_uint16_t flags)
|
||||
rt_err_t rt_device_register(rt_device_t dev, const char *name, rt_uint16_t flags)
|
||||
{
|
||||
if (dev == RT_NULL) return -RT_ERROR;
|
||||
|
||||
@@ -58,10 +58,10 @@ rt_err_t rt_device_unregister(rt_device_t dev)
|
||||
*
|
||||
* @return the error code, RT_EOK on successfully.
|
||||
*/
|
||||
rt_err_t rt_device_init_all()
|
||||
rt_err_t rt_device_init_all(void)
|
||||
{
|
||||
struct rt_device* device;
|
||||
struct rt_list_node* node;
|
||||
struct rt_device *device;
|
||||
struct rt_list_node *node;
|
||||
struct rt_object_information *information;
|
||||
register rt_err_t result;
|
||||
|
||||
@@ -73,7 +73,7 @@ rt_err_t rt_device_init_all()
|
||||
for (node = information->object_list.next; node != &(information->object_list); node = node->next)
|
||||
{
|
||||
rt_err_t (*init)(rt_device_t dev);
|
||||
device = (struct rt_device*)rt_list_entry(node, struct rt_object, list);
|
||||
device = (struct rt_device *)rt_list_entry(node, struct rt_object, list);
|
||||
|
||||
/* get device init handler */
|
||||
init = device->init;
|
||||
@@ -102,10 +102,10 @@ rt_err_t rt_device_init_all()
|
||||
*
|
||||
* @return the registered device driver on successful, or RT_NULL on failure.
|
||||
*/
|
||||
rt_device_t rt_device_find(const char* name)
|
||||
rt_device_t rt_device_find(const char *name)
|
||||
{
|
||||
struct rt_object* object;
|
||||
struct rt_list_node* node;
|
||||
struct rt_object *object;
|
||||
struct rt_list_node *node;
|
||||
struct rt_object_information *information;
|
||||
|
||||
extern struct rt_object_information rt_object_container[];
|
||||
@@ -167,7 +167,7 @@ rt_err_t rt_device_init(rt_device_t dev)
|
||||
}
|
||||
}
|
||||
else result = -RT_ENOSYS;
|
||||
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -182,7 +182,7 @@ rt_err_t rt_device_init(rt_device_t dev)
|
||||
rt_err_t rt_device_open(rt_device_t dev, rt_uint16_t oflag)
|
||||
{
|
||||
rt_err_t result;
|
||||
rt_err_t (*open) (rt_device_t dev, rt_uint16_t oflag);
|
||||
rt_err_t (*open)(rt_device_t dev, rt_uint16_t oflag);
|
||||
|
||||
RT_ASSERT(dev != RT_NULL);
|
||||
|
||||
@@ -205,8 +205,7 @@ rt_err_t rt_device_open(rt_device_t dev, rt_uint16_t oflag)
|
||||
}
|
||||
|
||||
/* device is a stand alone device and opened */
|
||||
if ((dev->flag & RT_DEVICE_FLAG_STANDALONE) &&
|
||||
(dev->open_flag & RT_DEVICE_OFLAG_OPEN))
|
||||
if ((dev->flag & RT_DEVICE_FLAG_STANDALONE) && (dev->open_flag & RT_DEVICE_OFLAG_OPEN))
|
||||
return -RT_EBUSY;
|
||||
|
||||
/* call device open interface */
|
||||
@@ -273,9 +272,9 @@ rt_err_t rt_device_close(rt_device_t dev)
|
||||
*
|
||||
* @note since 0.4.0, the unit of size/pos is a block for block device.
|
||||
*/
|
||||
rt_size_t rt_device_read (rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size)
|
||||
rt_size_t rt_device_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
|
||||
{
|
||||
rt_size_t (*read)(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size);
|
||||
rt_size_t (*read)(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size);
|
||||
|
||||
RT_ASSERT(dev != RT_NULL);
|
||||
|
||||
@@ -303,9 +302,9 @@ rt_size_t rt_device_read (rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t
|
||||
*
|
||||
* @note since 0.4.0, the unit of size/pos is a block for block device.
|
||||
*/
|
||||
rt_size_t rt_device_write(rt_device_t dev, rt_off_t pos, const void* buffer, rt_size_t size)
|
||||
rt_size_t rt_device_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
|
||||
{
|
||||
rt_size_t (*write)(rt_device_t dev, rt_off_t pos, const void* buffer, rt_size_t size);
|
||||
rt_size_t (*write)(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size);
|
||||
|
||||
RT_ASSERT(dev != RT_NULL);
|
||||
|
||||
@@ -330,9 +329,9 @@ rt_size_t rt_device_write(rt_device_t dev, rt_off_t pos, const void* buffer, rt_
|
||||
*
|
||||
* @return the result
|
||||
*/
|
||||
rt_err_t rt_device_control(rt_device_t dev, rt_uint8_t cmd, void* arg)
|
||||
rt_err_t rt_device_control(rt_device_t dev, rt_uint8_t cmd, void *arg)
|
||||
{
|
||||
rt_err_t (*control)(rt_device_t dev, rt_uint8_t cmd, void* arg);
|
||||
rt_err_t (*control)(rt_device_t dev, rt_uint8_t cmd, void *arg);
|
||||
|
||||
RT_ASSERT(dev != RT_NULL);
|
||||
|
||||
@@ -355,7 +354,7 @@ rt_err_t rt_device_control(rt_device_t dev, rt_uint8_t cmd, void* arg)
|
||||
*
|
||||
* @return RT_EOK
|
||||
*/
|
||||
rt_err_t rt_device_set_rx_indicate(rt_device_t dev, rt_err_t (*rx_ind )(rt_device_t dev, rt_size_t size))
|
||||
rt_err_t rt_device_set_rx_indicate(rt_device_t dev, rt_err_t (*rx_ind)(rt_device_t dev, rt_size_t size))
|
||||
{
|
||||
RT_ASSERT(dev != RT_NULL);
|
||||
|
||||
|
||||
+4
-4
@@ -84,7 +84,7 @@ void rt_thread_idle_excute(void)
|
||||
|
||||
/* if the thread is module's main thread */
|
||||
if (module != RT_NULL && module->module_thread == thread)
|
||||
{
|
||||
{
|
||||
/* detach module's main thread */
|
||||
module->module_thread = RT_NULL;
|
||||
}
|
||||
@@ -134,8 +134,8 @@ void rt_thread_idle_excute(void)
|
||||
if ((module->module_thread == RT_NULL) &&
|
||||
rt_list_isempty(&module->module_object[RT_Object_Class_Thread].object_list) )
|
||||
{
|
||||
module->nref--;
|
||||
}
|
||||
module->nref --;
|
||||
}
|
||||
}
|
||||
|
||||
/* unload module */
|
||||
@@ -144,7 +144,7 @@ void rt_thread_idle_excute(void)
|
||||
}
|
||||
}
|
||||
|
||||
static void rt_thread_idle_entry(void* parameter)
|
||||
static void rt_thread_idle_entry(void *parameter)
|
||||
{
|
||||
while (1)
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* File : irq.c
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team
|
||||
* COPYRIGHT (C) 2006 - 2011, RT-Thread Development Team
|
||||
*
|
||||
* The license and distribution terms for this file may be
|
||||
* found in the file LICENSE in this distribution or at
|
||||
@@ -33,11 +33,11 @@ volatile rt_uint8_t rt_interrupt_nest;
|
||||
*
|
||||
* @see rt_interrupt_leave
|
||||
*/
|
||||
void rt_interrupt_enter()
|
||||
void rt_interrupt_enter(void)
|
||||
{
|
||||
rt_base_t level;
|
||||
|
||||
RT_DEBUG_LOG(RT_DEBUG_IRQ,("irq comming..., irq nest:%d\n", rt_interrupt_nest));
|
||||
RT_DEBUG_LOG(RT_DEBUG_IRQ, ("irq comming..., irq nest:%d\n", rt_interrupt_nest));
|
||||
|
||||
level = rt_hw_interrupt_disable();
|
||||
rt_interrupt_nest ++;
|
||||
@@ -51,11 +51,11 @@ void rt_interrupt_enter()
|
||||
*
|
||||
* @see rt_interrupt_enter
|
||||
*/
|
||||
void rt_interrupt_leave()
|
||||
void rt_interrupt_leave(void)
|
||||
{
|
||||
rt_base_t level;
|
||||
|
||||
RT_DEBUG_LOG(RT_DEBUG_IRQ,("irq leave, irq nest:%d\n", rt_interrupt_nest));
|
||||
RT_DEBUG_LOG(RT_DEBUG_IRQ, ("irq leave, irq nest:%d\n", rt_interrupt_nest));
|
||||
|
||||
level = rt_hw_interrupt_disable();
|
||||
rt_interrupt_nest --;
|
||||
|
||||
+116
-113
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* File : kservice.h
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team
|
||||
* COPYRIGHT (C) 2006 - 2011, RT-Thread Development Team
|
||||
*
|
||||
* The license and distribution terms for this file may be
|
||||
* found in the file LICENSE in this distribution or at
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* File : mem.c
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2008 - 2009, RT-Thread Development Team
|
||||
* COPYRIGHT (C) 2008 - 2011, RT-Thread Development Team
|
||||
*
|
||||
* The license and distribution terms for this file may be
|
||||
* found in the file LICENSE in this distribution or at
|
||||
@@ -165,7 +165,7 @@ static void plug_holes(struct heap_mem *mem)
|
||||
* @param end_addr the end address of system page
|
||||
*
|
||||
*/
|
||||
void rt_system_heap_init(void* begin_addr, void* end_addr)
|
||||
void rt_system_heap_init(void *begin_addr, void *end_addr)
|
||||
{
|
||||
struct heap_mem *mem;
|
||||
rt_uint32_t begin_align = RT_ALIGN((rt_uint32_t)begin_addr, RT_ALIGN_SIZE);
|
||||
@@ -174,12 +174,14 @@ void rt_system_heap_init(void* begin_addr, void* end_addr)
|
||||
RT_DEBUG_NOT_IN_INTERRUPT;
|
||||
|
||||
/* alignment addr */
|
||||
if((end_align > (2 * SIZEOF_STRUCT_MEM) ) &&
|
||||
((end_align - 2 * SIZEOF_STRUCT_MEM) >= begin_align )) {
|
||||
/* calculate the aligned memory size */
|
||||
if ((end_align > (2 * SIZEOF_STRUCT_MEM)) &&
|
||||
((end_align - 2 * SIZEOF_STRUCT_MEM) >= begin_align))
|
||||
{
|
||||
/* calculate the aligned memory size */
|
||||
mem_size_aligned = end_align - begin_align - 2 * SIZEOF_STRUCT_MEM;
|
||||
}
|
||||
else {
|
||||
else
|
||||
{
|
||||
rt_kprintf("mem init, error begin address 0x%x, and end address 0x%x\n", (rt_uint32_t)begin_addr, (rt_uint32_t)end_addr);
|
||||
return;
|
||||
}
|
||||
@@ -242,13 +244,13 @@ void *rt_malloc(rt_size_t size)
|
||||
|
||||
if (size > mem_size_aligned)
|
||||
{
|
||||
RT_DEBUG_LOG(RT_DEBUG_MEM,("no memory\n"));
|
||||
RT_DEBUG_LOG(RT_DEBUG_MEM, ("no memory\n"));
|
||||
|
||||
return RT_NULL;
|
||||
}
|
||||
|
||||
/* every data block must be at least MIN_SIZE_ALIGNED long */
|
||||
if(size < MIN_SIZE_ALIGNED) size = MIN_SIZE_ALIGNED;
|
||||
if (size < MIN_SIZE_ALIGNED) size = MIN_SIZE_ALIGNED;
|
||||
|
||||
/* take memory semaphore */
|
||||
rt_sem_take(&heap_sem, RT_WAITING_FOREVER);
|
||||
@@ -258,8 +260,7 @@ void *rt_malloc(rt_size_t size)
|
||||
{
|
||||
mem = (struct heap_mem *)&heap_ptr[ptr];
|
||||
|
||||
if ((!mem->used) &&
|
||||
(mem->next - (ptr + SIZEOF_STRUCT_MEM)) >= size)
|
||||
if ((!mem->used) && (mem->next - (ptr + SIZEOF_STRUCT_MEM)) >= size)
|
||||
{
|
||||
/* mem is not used and at least perfect fit is possible:
|
||||
* mem->next - (ptr + SIZEOF_STRUCT_MEM) gives us the 'user data size' of mem */
|
||||
@@ -328,9 +329,9 @@ void *rt_malloc(rt_size_t size)
|
||||
RT_ASSERT((rt_uint32_t)((rt_uint8_t *)mem + SIZEOF_STRUCT_MEM) % RT_ALIGN_SIZE == 0);
|
||||
RT_ASSERT((((rt_uint32_t)mem) & (RT_ALIGN_SIZE-1)) == 0);
|
||||
|
||||
RT_DEBUG_LOG(RT_DEBUG_MEM,("allocate memory at 0x%x, size: %d\n",
|
||||
(rt_uint32_t)((rt_uint8_t*)mem + SIZEOF_STRUCT_MEM),
|
||||
(rt_uint32_t)(mem->next - ((rt_uint8_t*)mem - heap_ptr))));
|
||||
RT_DEBUG_LOG(RT_DEBUG_MEM, ("allocate memory at 0x%x, size: %d\n",
|
||||
(rt_uint32_t)((rt_uint8_t *)mem + SIZEOF_STRUCT_MEM),
|
||||
(rt_uint32_t)(mem->next - ((rt_uint8_t *)mem - heap_ptr))));
|
||||
|
||||
RT_OBJECT_HOOK_CALL(rt_malloc_hook, (((void*)((rt_uint8_t *)mem + SIZEOF_STRUCT_MEM)), size));
|
||||
/* return the memory data except mem struct */
|
||||
@@ -355,7 +356,7 @@ void *rt_realloc(void *rmem, rt_size_t newsize)
|
||||
rt_size_t size;
|
||||
rt_size_t ptr, ptr2;
|
||||
struct heap_mem *mem, *mem2;
|
||||
void* nmem;
|
||||
void *nmem;
|
||||
|
||||
RT_DEBUG_NOT_IN_INTERRUPT;
|
||||
|
||||
@@ -363,7 +364,7 @@ void *rt_realloc(void *rmem, rt_size_t newsize)
|
||||
newsize = RT_ALIGN(newsize, RT_ALIGN_SIZE);
|
||||
if (newsize > mem_size_aligned)
|
||||
{
|
||||
RT_DEBUG_LOG(RT_DEBUG_MEM,("realloc: out of memory\n"));
|
||||
RT_DEBUG_LOG(RT_DEBUG_MEM, ("realloc: out of memory\n"));
|
||||
|
||||
return RT_NULL;
|
||||
}
|
||||
@@ -478,7 +479,7 @@ void rt_free(void *rmem)
|
||||
|
||||
if ((rt_uint8_t *)rmem < (rt_uint8_t *)heap_ptr || (rt_uint8_t *)rmem >= (rt_uint8_t *)heap_end)
|
||||
{
|
||||
RT_DEBUG_LOG(RT_DEBUG_MEM,("illegal memory\n"));
|
||||
RT_DEBUG_LOG(RT_DEBUG_MEM, ("illegal memory\n"));
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -486,9 +487,9 @@ void rt_free(void *rmem)
|
||||
/* Get the corresponding struct heap_mem ... */
|
||||
mem = (struct heap_mem *)((rt_uint8_t *)rmem - SIZEOF_STRUCT_MEM);
|
||||
|
||||
RT_DEBUG_LOG(RT_DEBUG_MEM,("release memory 0x%x, size: %d\n",
|
||||
RT_DEBUG_LOG(RT_DEBUG_MEM, ("release memory 0x%x, size: %d\n",
|
||||
(rt_uint32_t)rmem,
|
||||
(rt_uint32_t)(mem->next - ((rt_uint8_t*)mem - heap_ptr))));
|
||||
(rt_uint32_t)(mem->next - ((rt_uint8_t *)mem - heap_ptr))));
|
||||
|
||||
|
||||
/* protect the heap from concurrent access */
|
||||
@@ -517,9 +518,7 @@ void rt_free(void *rmem)
|
||||
}
|
||||
|
||||
#ifdef RT_MEM_STATS
|
||||
void rt_memory_info(rt_uint32_t *total,
|
||||
rt_uint32_t *used,
|
||||
rt_uint32_t *max_used)
|
||||
void rt_memory_info(rt_uint32_t *total, rt_uint32_t *used, rt_uint32_t *max_used)
|
||||
{
|
||||
if (total != RT_NULL) *total = mem_size_aligned;
|
||||
if (used != RT_NULL) *used = used_mem;
|
||||
@@ -528,7 +527,7 @@ void rt_memory_info(rt_uint32_t *total,
|
||||
|
||||
#ifdef RT_USING_FINSH
|
||||
#include <finsh.h>
|
||||
void list_mem()
|
||||
void list_mem(void)
|
||||
{
|
||||
rt_kprintf("total memory: %d\n", mem_size_aligned);
|
||||
rt_kprintf("used memory : %d\n", used_mem);
|
||||
|
||||
+40
-40
File diff suppressed because it is too large.
Load diff
+176
-177
File diff suppressed because it is too large.
Load diff
+177
-156
File diff suppressed because it is too large.
Load diff
+23
-24
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* File : object.c
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team
|
||||
* COPYRIGHT (C) 2006 - 2011, RT-Thread Development Team
|
||||
*
|
||||
* The license and distribution terms for this file may be
|
||||
* found in the file LICENSE in this distribution or at
|
||||
@@ -65,11 +65,11 @@ struct rt_object_information rt_object_container[RT_Object_Class_Unknown] =
|
||||
};
|
||||
|
||||
#ifdef RT_USING_HOOK
|
||||
static void (*rt_object_attach_hook)(struct rt_object* object);
|
||||
static void (*rt_object_detach_hook)(struct rt_object* object);
|
||||
void (*rt_object_trytake_hook)(struct rt_object* object);
|
||||
void (*rt_object_take_hook)(struct rt_object* object);
|
||||
void (*rt_object_put_hook)(struct rt_object* object);
|
||||
static void (*rt_object_attach_hook)(struct rt_object *object);
|
||||
static void (*rt_object_detach_hook)(struct rt_object *object);
|
||||
void (*rt_object_trytake_hook)(struct rt_object *object);
|
||||
void (*rt_object_take_hook)(struct rt_object *object);
|
||||
void (*rt_object_put_hook)(struct rt_object *object);
|
||||
|
||||
/**
|
||||
* @addtogroup Hook
|
||||
@@ -82,7 +82,7 @@ void (*rt_object_put_hook)(struct rt_object* object);
|
||||
*
|
||||
* @param hook the hook function
|
||||
*/
|
||||
void rt_object_attach_sethook(void (*hook)(struct rt_object* object))
|
||||
void rt_object_attach_sethook(void (*hook)(struct rt_object *object))
|
||||
{
|
||||
rt_object_attach_hook = hook;
|
||||
}
|
||||
@@ -93,7 +93,7 @@ void rt_object_attach_sethook(void (*hook)(struct rt_object* object))
|
||||
*
|
||||
* @param hook the hook function
|
||||
*/
|
||||
void rt_object_detach_sethook(void (*hook)(struct rt_object* object))
|
||||
void rt_object_detach_sethook(void (*hook)(struct rt_object *object))
|
||||
{
|
||||
rt_object_detach_hook = hook;
|
||||
}
|
||||
@@ -111,7 +111,7 @@ void rt_object_detach_sethook(void (*hook)(struct rt_object* object))
|
||||
*
|
||||
* @param hook the hook function
|
||||
*/
|
||||
void rt_object_trytake_sethook(void (*hook)(struct rt_object* object))
|
||||
void rt_object_trytake_sethook(void (*hook)(struct rt_object *object))
|
||||
{
|
||||
rt_object_trytake_hook = hook;
|
||||
}
|
||||
@@ -130,7 +130,7 @@ void rt_object_trytake_sethook(void (*hook)(struct rt_object* object))
|
||||
*
|
||||
* @param hook the hook function
|
||||
*/
|
||||
void rt_object_take_sethook(void (*hook)(struct rt_object* object))
|
||||
void rt_object_take_sethook(void (*hook)(struct rt_object *object))
|
||||
{
|
||||
rt_object_take_hook = hook;
|
||||
}
|
||||
@@ -141,7 +141,7 @@ void rt_object_take_sethook(void (*hook)(struct rt_object* object))
|
||||
*
|
||||
* @param hook the hook function
|
||||
*/
|
||||
void rt_object_put_sethook(void (*hook)(struct rt_object* object))
|
||||
void rt_object_put_sethook(void (*hook)(struct rt_object *object))
|
||||
{
|
||||
rt_object_put_hook = hook;
|
||||
}
|
||||
@@ -184,7 +184,7 @@ struct rt_object_information *rt_object_get_information(enum rt_object_class_typ
|
||||
* @param type the object type.
|
||||
* @param name the object name. In system, the object's name must be unique.
|
||||
*/
|
||||
void rt_object_init(struct rt_object* object, enum rt_object_class_type type, const char* name)
|
||||
void rt_object_init(struct rt_object *object, enum rt_object_class_type type, const char *name)
|
||||
{
|
||||
register rt_base_t temp;
|
||||
struct rt_object_information* information;
|
||||
@@ -255,11 +255,11 @@ void rt_object_detach(rt_object_t object)
|
||||
*
|
||||
* @return object
|
||||
*/
|
||||
rt_object_t rt_object_allocate(enum rt_object_class_type type, const char* name)
|
||||
rt_object_t rt_object_allocate(enum rt_object_class_type type, const char *name)
|
||||
{
|
||||
struct rt_object* object;
|
||||
struct rt_object *object;
|
||||
register rt_base_t temp;
|
||||
struct rt_object_information* information;
|
||||
struct rt_object_information *information;
|
||||
|
||||
RT_DEBUG_NOT_IN_INTERRUPT;
|
||||
|
||||
@@ -272,7 +272,7 @@ rt_object_t rt_object_allocate(enum rt_object_class_type type, const char* name)
|
||||
information = &rt_object_container[type];
|
||||
#endif
|
||||
|
||||
object = (struct rt_object*)rt_malloc(information->object_size);
|
||||
object = (struct rt_object *)rt_malloc(information->object_size);
|
||||
if (object == RT_NULL)
|
||||
{
|
||||
/* no memory can be allocated */
|
||||
@@ -288,11 +288,11 @@ rt_object_t rt_object_allocate(enum rt_object_class_type type, const char* name)
|
||||
object->flag = 0;
|
||||
|
||||
#ifdef RT_USING_MODULE
|
||||
if(rt_module_self() != RT_NULL)
|
||||
if (rt_module_self() != RT_NULL)
|
||||
{
|
||||
object->flag |= RT_OBJECT_FLAG_MODULE;
|
||||
}
|
||||
object->module_id = (void*)rt_module_self();
|
||||
object->module_id = (void *)rt_module_self();
|
||||
#endif
|
||||
|
||||
/* copy name */
|
||||
@@ -341,7 +341,7 @@ void rt_object_delete(rt_object_t object)
|
||||
rt_hw_interrupt_enable(temp);
|
||||
|
||||
#if defined(RT_USING_MODULE) && defined(RT_USING_SLAB)
|
||||
if(object->flag & RT_OBJECT_FLAG_MODULE)
|
||||
if (object->flag & RT_OBJECT_FLAG_MODULE)
|
||||
rt_module_free((rt_module_t)object->module_id, object);
|
||||
else
|
||||
#endif
|
||||
@@ -382,16 +382,15 @@ rt_err_t rt_object_is_systemobject(rt_object_t object)
|
||||
*
|
||||
* @note this function shall not be invoked in interrupt status.
|
||||
*/
|
||||
rt_object_t rt_object_find(const char* name, rt_uint8_t type)
|
||||
rt_object_t rt_object_find(const char *name, rt_uint8_t type)
|
||||
{
|
||||
struct rt_object* object;
|
||||
struct rt_list_node* node;
|
||||
struct rt_object *object;
|
||||
struct rt_list_node *node;
|
||||
struct rt_object_information *information;
|
||||
extern volatile rt_uint8_t rt_interrupt_nest;
|
||||
|
||||
/* parameter check */
|
||||
if ((name == RT_NULL) ||
|
||||
(type > RT_Object_Class_Unknown))
|
||||
if ((name == RT_NULL) || (type > RT_Object_Class_Unknown))
|
||||
return RT_NULL;
|
||||
|
||||
/* which is invoke in interrupt status */
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
/*
|
||||
* File : rtm.c
|
||||
* This file is part of RT-Thread RTOS
|
||||
* COPYRIGHT (C) 2006 - 2010, RT-Thread Development Team
|
||||
* COPYRIGHT (C) 2006 - 2011, RT-Thread Development Team
|
||||
*
|
||||
* The license and distribution terms for this file may be
|
||||
* found in the file LICENSE in this distribution or at
|
||||
* http://www.rt-thread.org/license/LICENSE
|
||||
*
|
||||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2010-04-12 yi.qiu first version
|
||||
* Date Author Notes
|
||||
* 2010-04-12 yi.qiu first version
|
||||
*/
|
||||
|
||||
#include <rtthread.h>
|
||||
#include <rtthread.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
@@ -25,7 +25,7 @@
|
||||
RTM_EXPORT(rt_object_get_information);
|
||||
|
||||
/*
|
||||
* thread interface symbol
|
||||
* thread interface symbol
|
||||
*/
|
||||
|
||||
RTM_EXPORT(rt_thread_init);
|
||||
@@ -79,7 +79,7 @@ RTM_EXPORT(rt_event_create);
|
||||
RTM_EXPORT(rt_event_delete);
|
||||
RTM_EXPORT(rt_event_send);
|
||||
RTM_EXPORT(rt_event_recv);
|
||||
RTM_EXPORT(rt_event_control);
|
||||
RTM_EXPORT(rt_event_control);
|
||||
#endif
|
||||
|
||||
#ifdef RT_USING_MAILBOX
|
||||
@@ -92,7 +92,7 @@ RTM_EXPORT(rt_mb_create);
|
||||
RTM_EXPORT(rt_mb_delete);
|
||||
RTM_EXPORT(rt_mb_send);
|
||||
RTM_EXPORT(rt_mb_recv);
|
||||
RTM_EXPORT(rt_mb_control);
|
||||
RTM_EXPORT(rt_mb_control);
|
||||
#endif
|
||||
|
||||
#ifdef RT_USING_MESSAGEQUEUE
|
||||
@@ -105,8 +105,8 @@ RTM_EXPORT(rt_mq_create);
|
||||
RTM_EXPORT(rt_mq_delete);
|
||||
RTM_EXPORT(rt_mq_send);
|
||||
RTM_EXPORT(rt_mq_urgent);
|
||||
RTM_EXPORT(rt_mq_recv);
|
||||
RTM_EXPORT(rt_mq_control);
|
||||
RTM_EXPORT(rt_mq_recv);
|
||||
RTM_EXPORT(rt_mq_control);
|
||||
#endif
|
||||
|
||||
#ifdef RT_USING_MEMPOOL
|
||||
@@ -159,8 +159,8 @@ RTM_EXPORT(rt_snprintf);
|
||||
/*
|
||||
* misc interface symbol
|
||||
*/
|
||||
extern int __aeabi_idiv;
|
||||
extern int __aeabi_ddiv;
|
||||
extern int __aeabi_idiv;
|
||||
extern int __aeabi_ddiv;
|
||||
extern int __aeabi_dmul;
|
||||
extern int __aeabi_i2d;
|
||||
extern int __aeabi_uidiv;
|
||||
|
||||
+183
-186
File diff suppressed because it is too large.
Load diff
+66
-69
File diff suppressed because it is too large.
Load diff
+49
-50
File diff suppressed because it is too large.
Load diff
+43
-45
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user