From f3eaba9a0c6ec185afd565d8a155ee88f1413c06 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 19 Aug 2008 12:41:03 +0000 Subject: 2008-08-19 Sebastian Huber * include/bootcard.h, bootcard.c, bsplibc.c: Changed parameter types of bsp_libc_init() to match RTEMS_Malloc_Initialize(). * bsppost.c, bsppredriverhook.c: Include bootcard.h. * src/irq-generic.c: Fixed warnings. --- c/src/lib/libbsp/shared/ChangeLog | 13 +++++++++++++ c/src/lib/libbsp/shared/bootcard.c | 6 +++--- c/src/lib/libbsp/shared/bsplibc.c | 10 ++++++---- c/src/lib/libbsp/shared/bsppost.c | 5 ++++- c/src/lib/libbsp/shared/bsppredriverhook.c | 2 ++ c/src/lib/libbsp/shared/include/bootcard.h | 17 ++++++----------- c/src/lib/libbsp/shared/src/irq-generic.c | 6 +++--- 7 files changed, 37 insertions(+), 22 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog index aa0b8f2491..4fe1bc5ccb 100644 --- a/c/src/lib/libbsp/shared/ChangeLog +++ b/c/src/lib/libbsp/shared/ChangeLog @@ -1,3 +1,16 @@ +2008-08-15 Allan Hessenflow + + * src/lib/libbsp/mips/jmr3904/tools/runtest: Add bf537Stamp. + +2008-08-19 Sebastian Huber + + * include/bootcard.h, bootcard.c, bsplibc.c: Changed parameter types of + bsp_libc_init() to match RTEMS_Malloc_Initialize(). + + * bsppost.c, bsppredriverhook.c: Include bootcard.h. + + * src/irq-generic.c: Fixed warnings. + 2008-08-18 Joel Sherrill * bsppost.c: Fix warning by moving prototype to libcsupport.h. diff --git a/c/src/lib/libbsp/shared/bootcard.c b/c/src/lib/libbsp/shared/bootcard.c index d7539c75ed..2853097d2f 100644 --- a/c/src/lib/libbsp/shared/bootcard.c +++ b/c/src/lib/libbsp/shared/bootcard.c @@ -81,8 +81,8 @@ char *rtems_progname; * For the default heap size use the free space from the start of the * work area up to the work space start as heap area. */ - heap_size_default = (char *) Configuration.work_space_start - - (char *) work_area_start; + heap_size_default = (size_t) ((char *) Configuration.work_space_start + - (char *) work_area_start); /* Keep it as a multiple of 16 bytes */ heap_size_default &= ~((size_t) 0xf); @@ -98,7 +98,7 @@ char *rtems_progname; } } - bsp_libc_init( heap_start, (uint32_t) heap_size, 0); + bsp_libc_init( heap_start, heap_size, 0); return RTEMS_SUCCESSFUL; } diff --git a/c/src/lib/libbsp/shared/bsplibc.c b/c/src/lib/libbsp/shared/bsplibc.c index 1bd0ac502c..11c0c49607 100644 --- a/c/src/lib/libbsp/shared/bsplibc.c +++ b/c/src/lib/libbsp/shared/bsplibc.c @@ -9,13 +9,15 @@ #include #include +#include + void bsp_libc_init( - void *heap_start, - uint32_t heap_size, - int use_sbrk + void *heap_start, + size_t heap_size, + size_t sbrk_amount ) { - RTEMS_Malloc_Initialize( heap_start, heap_size, use_sbrk ); + RTEMS_Malloc_Initialize( heap_start, heap_size, sbrk_amount ); /* * Init the RTEMS libio facility to provide UNIX-like system diff --git a/c/src/lib/libbsp/shared/bsppost.c b/c/src/lib/libbsp/shared/bsppost.c index 3c8c1a2784..273ef3baf0 100644 --- a/c/src/lib/libbsp/shared/bsppost.c +++ b/c/src/lib/libbsp/shared/bsppost.c @@ -14,9 +14,12 @@ * $Id$ */ +#include + #include #include -#include + +#include void bsp_postdriver_hook(void) { diff --git a/c/src/lib/libbsp/shared/bsppredriverhook.c b/c/src/lib/libbsp/shared/bsppredriverhook.c index 69785a8e7d..29461092f0 100644 --- a/c/src/lib/libbsp/shared/bsppredriverhook.c +++ b/c/src/lib/libbsp/shared/bsppredriverhook.c @@ -11,6 +11,8 @@ * $Id$ */ +#include + void bsp_predriver_hook( void ) { } diff --git a/c/src/lib/libbsp/shared/include/bootcard.h b/c/src/lib/libbsp/shared/include/bootcard.h index a0720cda7f..7960005382 100644 --- a/c/src/lib/libbsp/shared/include/bootcard.h +++ b/c/src/lib/libbsp/shared/include/bootcard.h @@ -36,15 +36,15 @@ extern "C" { #endif /* __cplusplus */ -void bsp_start( void); +void bsp_start(void); -void bsp_pretasking_hook( void); +void bsp_pretasking_hook(void); -void bsp_predriver_hook( void); +void bsp_predriver_hook(void); -void bsp_postdriver_hook( void); +void bsp_postdriver_hook(void); -void bsp_cleanup( void); +void bsp_cleanup(void); #ifdef BSP_BOOTCARD_HANDLES_RAM_ALLOCATION #define BSP_BOOTCARD_HEAP_USES_WORK_AREA NULL @@ -61,12 +61,7 @@ void bsp_cleanup( void); int boot_card( int argc, char **argv, char **envp); -/* - * FIXME: Nearly every BSP declares this function in the BSP startup file - * separately and uses the implementation in bsplibc.c. - * Why differ the parameter types from RTEMS_Malloc_Initialize()? - */ -void bsp_libc_init( void *heap_start, uint32_t heap_size, int use_sbrk); +void bsp_libc_init( void *heap_start, size_t heap_size, size_t sbrk_amount); #ifdef __cplusplus } diff --git a/c/src/lib/libbsp/shared/src/irq-generic.c b/c/src/lib/libbsp/shared/src/irq-generic.c index 95edee674a..ef43ba91e6 100644 --- a/c/src/lib/libbsp/shared/src/irq-generic.c +++ b/c/src/lib/libbsp/shared/src/irq-generic.c @@ -52,18 +52,18 @@ static inline void bsp_interrupt_set_handler_unique( rtems_vector_number index, rtems_vector_number i = index / 8; rtems_vector_number s = index % 8; if (unique) { - bsp_interrupt_handler_unique_table [i] |= 0x1 << s; + bsp_interrupt_handler_unique_table [i] |= (uint8_t) 0x1 << s; } else { bsp_interrupt_handler_unique_table [i] &= ~((uint8_t) 0x1 << s); } } -static inline bool bsp_interrupt_is_initialized() +static inline bool bsp_interrupt_is_initialized(void) { return bsp_interrupt_is_handler_unique( BSP_INTERRUPT_HANDLER_TABLE_SIZE); } -static inline void bsp_interrupt_set_initialized() +static inline void bsp_interrupt_set_initialized(void) { bsp_interrupt_set_handler_unique( BSP_INTERRUPT_HANDLER_TABLE_SIZE, true); } -- cgit v1.2.3