From 7f6bb8cdb175259a3b67d1b71387e10428ab8622 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 11 Dec 2007 15:46:21 +0000 Subject: [PATCH] 2007-12-11 Joel Sherrill * shared/bspstart.c: Eliminate copies of the Configuration Table. Use the RTEMS provided accessor macros to obtain configuration fields. --- c/src/lib/libbsp/sparc/ChangeLog | 5 +++++ c/src/lib/libbsp/sparc/shared/bspstart.c | 14 +++----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/c/src/lib/libbsp/sparc/ChangeLog b/c/src/lib/libbsp/sparc/ChangeLog index 645607c1ac..a1e28cd251 100644 --- a/c/src/lib/libbsp/sparc/ChangeLog +++ b/c/src/lib/libbsp/sparc/ChangeLog @@ -1,3 +1,8 @@ +2007-12-11 Joel Sherrill + + * shared/bspstart.c: Eliminate copies of the Configuration Table. Use + the RTEMS provided accessor macros to obtain configuration fields. + 2007-12-06 Joel Sherrill * shared/include/grcan_spwrtc.h: Removed. diff --git a/c/src/lib/libbsp/sparc/shared/bspstart.c b/c/src/lib/libbsp/sparc/shared/bspstart.c index 8abca8079e..52ddb58d90 100644 --- a/c/src/lib/libbsp/sparc/shared/bspstart.c +++ b/c/src/lib/libbsp/sparc/shared/bspstart.c @@ -31,14 +31,6 @@ #include #include -/* - * The original table from the application and our copy of it with - * some changes. - */ - -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; - /* * Tells us where to put the workspace in case remote debugger is present. */ @@ -95,7 +87,7 @@ void bsp_pretasking_hook(void) if (heap_start & (CPU_ALIGNMENT-1)) heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); - heap_size = BSP_Configuration.work_space_start - (void *)&end - STACK_SIZE; + heap_size = Configuration.work_space_start - (void *)&end - STACK_SIZE; heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */ bsp_libc_init((void *) heap_start, heap_size, 0); @@ -118,14 +110,14 @@ void bsp_start( void ) unsigned char *work_space_start; work_space_start = - (unsigned char *)rdb_start - BSP_Configuration.work_space_size; + (unsigned char *)rdb_start - rtems_configuration_get_work_space_size(); if ( work_space_start <= (unsigned char *)&end ) { printk( "bspstart: Not enough RAM!!!\n" ); BSP_fatal_return(); } - BSP_Configuration.work_space_start = work_space_start; + Configuration.work_space_start = work_space_start; #ifdef LEON2 CPU_SPARC_HAS_SNOOPING = set_snooping();