From f5ae2552307f20f3fa3d987591fa60576981ce3d Mon Sep 17 00:00:00 2001 From: gdisirio Date: Tue, 29 Mar 2011 14:51:08 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2850 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/kernel/include/chdebug.h | 2 +- os/kernel/include/chheap.h | 2 +- os/kernel/include/chmemcore.h | 2 +- os/kernel/include/chschd.h | 2 +- os/kernel/include/chvt.h | 2 +- os/kernel/src/chdebug.c | 2 +- os/kernel/src/chheap.c | 2 +- os/kernel/src/chmemcore.c | 2 +- os/kernel/src/chschd.c | 2 +- os/kernel/src/chsys.c | 10 +++++----- os/kernel/src/chvt.c | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) (limited to 'os/kernel') diff --git a/os/kernel/include/chdebug.h b/os/kernel/include/chdebug.h index 5d6b455fe..471da5532 100644 --- a/os/kernel/include/chdebug.h +++ b/os/kernel/include/chdebug.h @@ -151,7 +151,7 @@ extern "C" { #endif #if CH_DBG_ENABLE_TRACE || defined(__DOXYGEN__) extern TraceBuffer trace_buffer; - void trace_init(void); + void _trace_init(void); void chDbgTrace(Thread *otp); #endif #if CH_DBG_ENABLE_ASSERTS || CH_DBG_ENABLE_CHECKS || CH_DBG_ENABLE_STACK_CHECK diff --git a/os/kernel/include/chheap.h b/os/kernel/include/chheap.h index ed5fa252a..eb642cd18 100644 --- a/os/kernel/include/chheap.h +++ b/os/kernel/include/chheap.h @@ -75,7 +75,7 @@ struct memory_heap { #ifdef __cplusplus extern "C" { #endif - void heap_init(void); + void _heap_init(void); void chHeapInit(MemoryHeap *heapp, void *buf, size_t size); void *chHeapAlloc(MemoryHeap *heapp, size_t size); void chHeapFree(void *p); diff --git a/os/kernel/include/chmemcore.h b/os/kernel/include/chmemcore.h index bc0654a6d..cf608c4e8 100644 --- a/os/kernel/include/chmemcore.h +++ b/os/kernel/include/chmemcore.h @@ -67,7 +67,7 @@ typedef void *(*memgetfunc_t)(size_t size); #ifdef __cplusplus extern "C" { #endif - void core_init(void); + void _core_init(void); void *chCoreAlloc(size_t size); void *chCoreAllocI(size_t size); size_t chCoreStatus(void); diff --git a/os/kernel/include/chschd.h b/os/kernel/include/chschd.h index 5dda6d00a..1cd8e0664 100644 --- a/os/kernel/include/chschd.h +++ b/os/kernel/include/chschd.h @@ -127,7 +127,7 @@ register Thread *currp asm(CH_CURRP_REGISTER_CACHE); #ifdef __cplusplus extern "C" { #endif - void scheduler_init(void); + void _scheduler_init(void); #if !defined(PORT_OPTIMIZED_READYI) Thread *chSchReadyI(Thread *tp); #endif diff --git a/os/kernel/include/chvt.h b/os/kernel/include/chvt.h index 9203b974d..e75e966d5 100644 --- a/os/kernel/include/chvt.h +++ b/os/kernel/include/chvt.h @@ -121,7 +121,7 @@ extern VTList vtlist; #ifdef __cplusplus extern "C" { #endif - void vt_init(void); + void _vt_init(void); void chVTSetI(VirtualTimer *vtp, systime_t time, vtfunc_t vtfunc, void *par); void chVTResetI(VirtualTimer *vtp); bool_t chTimeIsWithin(systime_t start, systime_t end); diff --git a/os/kernel/src/chdebug.c b/os/kernel/src/chdebug.c index be98cd40b..3c3c34c70 100644 --- a/os/kernel/src/chdebug.c +++ b/os/kernel/src/chdebug.c @@ -46,7 +46,7 @@ TraceBuffer trace_buffer; * @brief Trace circular buffer subsystem initialization. * @note Internal use only. */ -void trace_init(void) { +void _trace_init(void) { trace_buffer.tb_size = TRACE_BUFFER_SIZE; trace_buffer.tb_ptr = &trace_buffer.tb_buffer[0]; diff --git a/os/kernel/src/chheap.c b/os/kernel/src/chheap.c index a04646bcf..bcfca9b77 100644 --- a/os/kernel/src/chheap.c +++ b/os/kernel/src/chheap.c @@ -65,7 +65,7 @@ static MemoryHeap default_heap; * * @notapi */ -void heap_init(void) { +void _heap_init(void) { default_heap.h_provider = chCoreAlloc; default_heap.h_free.h.u.next = (union heap_header *)NULL; default_heap.h_free.h.size = 0; diff --git a/os/kernel/src/chmemcore.c b/os/kernel/src/chmemcore.c index d66ef5f1c..311d170c5 100644 --- a/os/kernel/src/chmemcore.c +++ b/os/kernel/src/chmemcore.c @@ -56,7 +56,7 @@ static uint8_t *endmem; * * @notapi */ -void core_init(void) { +void _core_init(void) { #if CH_MEMCORE_SIZE == 0 extern uint8_t __heap_base__[]; extern uint8_t __heap_end__[]; diff --git a/os/kernel/src/chschd.c b/os/kernel/src/chschd.c index 210dbfdc1..54e7918b1 100644 --- a/os/kernel/src/chschd.c +++ b/os/kernel/src/chschd.c @@ -45,7 +45,7 @@ ReadyList rlist; * * @notapi */ -void scheduler_init(void) { +void _scheduler_init(void) { queue_init(&rlist.r_queue); rlist.r_prio = NOPRIO; diff --git a/os/kernel/src/chsys.c b/os/kernel/src/chsys.c index db6521b87..29f4bdc7e 100644 --- a/os/kernel/src/chsys.c +++ b/os/kernel/src/chsys.c @@ -76,16 +76,16 @@ void chSysInit(void) { static Thread mainthread; port_init(); - scheduler_init(); - vt_init(); + _scheduler_init(); + _vt_init(); #if CH_USE_MEMCORE - core_init(); + _core_init(); #endif #if CH_USE_HEAP - heap_init(); + _heap_init(); #endif #if CH_DBG_ENABLE_TRACE - trace_init(); + _trace_init(); #endif /* Now this instructions flow becomes the main thread.*/ diff --git a/os/kernel/src/chvt.c b/os/kernel/src/chvt.c index b98396a3a..4674c728e 100644 --- a/os/kernel/src/chvt.c +++ b/os/kernel/src/chvt.c @@ -40,7 +40,7 @@ VTList vtlist; * * @notapi */ -void vt_init(void) { +void _vt_init(void) { vtlist.vt_next = vtlist.vt_prev = (void *)&vtlist; vtlist.vt_time = (systime_t)-1; -- cgit v1.2.3