From 12bd47efc0f50d673c10528ed601eaf8b54f182b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 11 Dec 2007 15:49:53 +0000 Subject: 2007-12-11 Joel Sherrill * 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. --- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c | 2 +- c/src/lib/libbsp/m68k/gen68340/include/bsp.h | 8 -------- c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c | 12 +----------- 4 files changed, 8 insertions(+), 20 deletions(-) (limited to 'c/src/lib/libbsp/m68k/gen68340') diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index f749815873..1db7869f09 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill + + * 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 * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c index 3078046cf5..3c1bb27297 100644 --- a/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c @@ -108,7 +108,7 @@ Install_clock (rtems_isr_entry clock_isr) /* sets the PITR count value */ /* this assumes a 32.765 kHz crystal */ - usecs_per_tick = BSP_Configuration.microseconds_per_tick; + usecs_per_tick = rtems_configuration_get_microseconds_per_tick(); /* find out whether prescaler should be enabled or not */ if ( usecs_per_tick <= 31128 ) { pitr_tmp = ( usecs_per_tick * 8192 ) / 1000000 ; diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h index 15afbfa4b3..3f1106806c 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h @@ -63,16 +63,8 @@ extern "C" { * NOTE: Use the standard Clock driver entry */ -/* - * How many libio files we want - */ - -#define BSP_LIBIO_MAX_FDS 20 - /* 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/gen68340/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c index 4bb4ed4a7a..1b001cdc10 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c @@ -25,16 +25,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; - -char *rtems_progname; - /* Initialize whatever libc we are using * called from postdriver hook */ @@ -71,5 +61,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; } -- cgit v1.2.3