diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-11 15:49:53 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-11 15:49:53 +0000 |
| commit | 12bd47efc0f50d673c10528ed601eaf8b54f182b (patch) | |
| tree | d775bb30121bac016ab20aa95e4b3d40ba205a0a /c/src/lib/libbsp/m68k/mvme136 | |
| parent | 2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-12bd47efc0f50d673c10528ed601eaf8b54f182b.tar.bz2 | |
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.
Diffstat (limited to 'c/src/lib/libbsp/m68k/mvme136')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/include/bsp.h | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c | 11 |
4 files changed, 9 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index 2d7e6784ea..e5e65b2469 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/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/mvme136/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c index 2695054222..bea1edec35 100644 --- a/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c @@ -66,7 +66,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; @@ -79,7 +79,7 @@ void Install_clock( volatile struct z8036_map *timer; 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, CLOCK_VECTOR, 1 ); timer = (struct z8036_map *) 0xfffb0000; diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index efa813d8c6..7da6ab578b 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -90,8 +90,6 @@ struct w_m681_info { /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* M68681 DUART chip register variables */ EXTERN volatile struct r_m681_info *_Read_m681; /* M68681 read registers */ diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c index 60878303d3..2b4c28fa38 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c @@ -22,15 +22,6 @@ #include <rtems/zilog/z8036.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 */ @@ -71,5 +62,5 @@ void bsp_start( void ) rtems_cache_enable_instruction(); - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; + Configuration.work_space_start = (void *) &_WorkspaceBase; } |