diff options
Diffstat (limited to 'c/src/lib/libbsp/m68k/mvme147')
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/include/bsp.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c | 11 |
4 files changed, 9 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index f51b882e7a..81daf80921 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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/mvme147/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c index 6681819045..1e009829c1 100644 --- a/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c @@ -54,7 +54,7 @@ rtems_isr Clock_isr(rtems_vector_number vector) 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; @@ -64,7 +64,7 @@ void Install_clock(rtems_isr_entry clock_isr ) { Clock_driver_ticks = 0; - Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; + Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000; Old_ticker = (rtems_isr_entry) set_vector( clock_isr, TIMER_2_VECTOR, 1 ); diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h index ce1fd8f410..f085425080 100644 --- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h @@ -116,8 +116,6 @@ struct pcc_map { /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - extern m68k_isr_entry M68Kvec[]; /* vector table address */ /* diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c index 0606257937..b62655d1c1 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c @@ -25,15 +25,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 */ @@ -79,5 +70,5 @@ void bsp_start( void ) rtems_cache_enable_instruction(); rtems_cache_enable_data(); - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; + Configuration.work_space_start = (void *) &_WorkspaceBase; } |