RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-08-19 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
* 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.
This commit is contained in:
Joel Sherrill
2008-08-19 12:41:03 +00:00
parent a9c2508f60
commit f3eaba9a0c
7 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
c/src/lib/libbsp/shared/ChangeLog
View File

@@ -1,3 +1,16 @@
2008-08-15 Allan Hessenflow <allanh@kallisti.com>
* src/lib/libbsp/mips/jmr3904/tools/runtest: Add bf537Stamp.
2008-08-19 Sebastian Huber <sebastian.huber@embedded-brains.de>
* 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 <joel.sherrill@oarcorp.com> 2008-08-18 Joel Sherrill <joel.sherrill@oarcorp.com>
* bsppost.c: Fix warning by moving prototype to libcsupport.h. * bsppost.c: Fix warning by moving prototype to libcsupport.h.

6
c/src/lib/libbsp/shared/bootcard.c
View File

@@ -81,8 +81,8 @@ char *rtems_progname;
* For the default heap size use the free space from the start of the * 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. * work area up to the work space start as heap area.
*/ */
heap_size_default = (char *) Configuration.work_space_start heap_size_default = (size_t) ((char *) Configuration.work_space_start
- (char *) work_area_start; - (char *) work_area_start);
/* Keep it as a multiple of 16 bytes */ /* Keep it as a multiple of 16 bytes */
heap_size_default &= ~((size_t) 0xf); 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; return RTEMS_SUCCESSFUL;
} }

8
c/src/lib/libbsp/shared/bsplibc.c
View File

@@ -9,13 +9,15 @@
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
#include <bsp/bootcard.h>
void bsp_libc_init( void bsp_libc_init(
void *heap_start, void *heap_start,
uint32_t heap_size, size_t heap_size,
int use_sbrk 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 * Init the RTEMS libio facility to provide UNIX-like system

5
c/src/lib/libbsp/shared/bsppost.c
View File

@@ -14,9 +14,12 @@
* $Id$ * $Id$
*/ */
#include <fcntl.h>
#include <rtems.h> #include <rtems.h>
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
#include <fcntl.h>
#include <bsp/bootcard.h>
void bsp_postdriver_hook(void) void bsp_postdriver_hook(void)
{ {

2
c/src/lib/libbsp/shared/bsppredriverhook.c
View File

@@ -11,6 +11,8 @@
* $Id$ * $Id$
*/ */
#include <bsp/bootcard.h>
void bsp_predriver_hook( void ) void bsp_predriver_hook( void )
{ {
} }

7
c/src/lib/libbsp/shared/include/bootcard.h
View File

@@ -61,12 +61,7 @@ void bsp_cleanup( void);
int boot_card( int argc, char **argv, char **envp); int boot_card( int argc, char **argv, char **envp);
/* void bsp_libc_init( void *heap_start, size_t heap_size, size_t sbrk_amount);
* 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);
#ifdef __cplusplus #ifdef __cplusplus
} }

6
c/src/lib/libbsp/shared/src/irq-generic.c
View File

@@ -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 i = index / 8;
rtems_vector_number s = index % 8; rtems_vector_number s = index % 8;
if (unique) { if (unique) {
bsp_interrupt_handler_unique_table [i] |= 0x1 << s; bsp_interrupt_handler_unique_table [i] |= (uint8_t) 0x1 << s;
} else { } else {
bsp_interrupt_handler_unique_table [i] &= ~((uint8_t) 0x1 << s); 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); 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); bsp_interrupt_set_handler_unique( BSP_INTERRUPT_HANDLER_TABLE_SIZE, true);
} }