diff options
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68302/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68302/README | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68302/include/bsp.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c | 12 |
5 files changed, 10 insertions, 16 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index bd3cab3bbb..d35bbfea8d 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * README, clock/ckinit.c, 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> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/m68k/gen68302/README b/c/src/lib/libbsp/m68k/gen68302/README index 0261083479..8a1586ddad 100644 --- a/c/src/lib/libbsp/m68k/gen68302/README +++ b/c/src/lib/libbsp/m68k/gen68302/README @@ -135,7 +135,7 @@ Changed "typedef char signed8" to "typedef signed char signed8". *** clock/ TODO: Add set_vector support. Figure out what to do with Clock_exit(). -TODO: Pre-compute (BSP_Configuration.microseconds_per_tick/1000) so that +TODO: Pre-compute (rtems_configuration_get_microseconds_per_tick()/1000) so that it doesn't have to be re-computed on each Clock_isr(). *** console/ diff --git a/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c index f4ddb6fe14..aa4af2c6d9 100644 --- a/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c @@ -73,7 +73,7 @@ rtems_isr Clock_isr( if ( Clock_isrs == 1 ) { rtems_clock_tick(); - Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; + Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000; } else Clock_isrs -= 1; @@ -84,7 +84,7 @@ void Install_clock( ) { Clock_driver_ticks = 0; - Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; + Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000; set_vector( clock_isr, CLOCK_VECTOR, 1 ); diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h index 10f69dcc66..bb546e0271 100644 --- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h @@ -73,8 +73,6 @@ extern "C" { /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - extern m68k_isr_entry M68Kvec[]; /* vector table address */ /* functions */ diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c index 543595fc5e..55dd760240 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c @@ -21,16 +21,6 @@ #include <rtems/libcsupport.h> /* - * The original table from the application and our copy of it with - * some changes. - */ - -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; - -char *rtems_progname; - -/* * Use the shared implementations of the following routines */ @@ -68,5 +58,5 @@ void bsp_start( void ) * not malloc'ed. It is just "pulled from the air". */ - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; + Configuration.work_space_start = (void *) &_WorkspaceBase; } |