diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-11 15:50:25 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-11 15:50:25 +0000 |
| commit | 4130d8e2e2312b72400403570b3d5f88f6f9d6db (patch) | |
| tree | 8ab81640f610440e061706416fe62c5f1954b87c /c/src/lib/libbsp/powerpc/ss555 | |
| parent | 2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-4130d8e2e2312b72400403570b3d5f88f6f9d6db.tar.bz2 | |
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Eliminate copies of the
Configuration Table. Use the RTEMS provided accessor macros to obtain
configuration fields.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/ss555')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/include/bsp.h | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c | 17 |
3 files changed, 10 insertions, 15 deletions
diff --git a/c/src/lib/libbsp/powerpc/ss555/ChangeLog b/c/src/lib/libbsp/powerpc/ss555/ChangeLog index b863b6bf00..e5a8f0cec5 100644 --- a/c/src/lib/libbsp/powerpc/ss555/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ss555/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Eliminate copies of the + Configuration Table. Use the RTEMS provided accessor macros to obtain + configuration fields. + 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h index 75324c6545..eb6ad03be9 100644 --- a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h @@ -77,8 +77,6 @@ extern volatile cpld_t cpld; /* defined in linkcmds */ /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c index 4fea0cf850..786ca22b12 100644 --- a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c @@ -39,16 +39,7 @@ SPR_RW(SPRG0) SPR_RW(SPRG1) -/* - * The original table from the application (in ROM) and our copy of it with - * some changes. Configuration is defined in <confdefs.h>. Make sure that - * our configuration tables are uninitialized so that they get allocated in - * the .bss section (RAM). - */ -extern rtems_configuration_table Configuration; extern unsigned long intrStackPtr; -rtems_configuration_table BSP_Configuration; -char *rtems_progname; /* * Driver configuration parameters @@ -104,8 +95,8 @@ void bsp_pretasking_hook(void) * independently of each other. */ uint8_t *_HeapStart = - (uint8_t *)BSP_Configuration.work_space_start - + BSP_Configuration.work_space_size; + (uint8_t *)Configuration.work_space_start + + rtems_configuration_get_work_space_size(); extern uint8_t _HeapEnd[]; bsp_libc_init( _HeapStart, _HeapEnd - _HeapStart, 0 ); @@ -174,7 +165,7 @@ void bsp_start(void) * In this case, the memory is not malloc'ed. It is just * "pulled from the air". */ - BSP_Configuration.work_space_start = _WorkspaceBase; + Configuration.work_space_start = _WorkspaceBase; /* * initialize the device driver parameters @@ -185,7 +176,7 @@ void bsp_start(void) /* * Call this in case we use TERMIOS for console I/O */ - m5xx_uart_reserve_resources( &BSP_Configuration ); + m5xx_uart_reserve_resources( &Configuration ); /* * Initalize RTEMS IRQ system |