diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-11 15:50:04 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-11 15:50:04 +0000 |
commit | a3ca595f1ab85c8b43bca39e29a74038de29958e (patch) | |
tree | 6dfd3c68af9cc73dedc43f0c40caf1ef9da08ee9 /c/src/lib/libbsp/m68k | |
parent | 2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-a3ca595f1ab85c8b43bca39e29a74038de29958e.tar.bz2 |
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/clock.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')
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/clock/clock.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/include/bsp.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c | 11 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/clock/clock.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/include/bsp.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c | 10 |
8 files changed, 16 insertions, 25 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index fec20de52c..b8f87f029f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * clock/clock.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/gen68360/clock/clock.c b/c/src/lib/libbsp/m68k/gen68360/clock/clock.c index 8959821991..b48b641acd 100644 --- a/c/src/lib/libbsp/m68k/gen68360/clock/clock.c +++ b/c/src/lib/libbsp/m68k/gen68360/clock/clock.c @@ -87,7 +87,7 @@ static unsigned long nsec; extern int m360_clock_rate; \ unsigned long nsec_per_chip_tick = 1000000000 / m360_clock_rate; \ unsigned long nsec_per_pit_tick = 512 * nsec_per_chip_tick; \ - rtems_nsec_per_tick = BSP_Configuration.microseconds_per_tick * 1000; \ + rtems_nsec_per_tick = rtems_configuration_get_microseconds_per_tick() * 1000; \ divisor = rtems_nsec_per_tick / nsec_per_pit_tick; \ if (divisor > 255) \ divisor = 255; \ diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h index 9486831ac2..7f84e5b26a 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h @@ -79,8 +79,6 @@ extern int rtems_scc1_driver_attach (struct rtems_bsdnet_ifconfig *config, int a /* 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/gen68360/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c index 3b505cf999..879215fe5d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c @@ -20,15 +20,6 @@ #include <rtems/libio.h> #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; - /* Amount of RAM on this board. Dynamically set in start.S */ unsigned long _M68K_RamSize; @@ -70,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; } diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index dbda2c3fac..ec48f1c3e0 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * clock/clock.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> * Makefile.am, startup/bspstart.c: Move interrupt_stack_size field from diff --git a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c b/c/src/lib/libbsp/m68k/uC5282/clock/clock.c index 37e623ee34..663ab384a3 100644 --- a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c +++ b/c/src/lib/libbsp/m68k/uC5282/clock/clock.c @@ -102,7 +102,7 @@ uint32_t bsp_clock_nanoseconds_since_last_tick(void) MCF5282_PIT_PCSR_OVW | \ MCF5282_PIT_PCSR_PIE | \ MCF5282_PIT_PCSR_RLD; \ - MCF5282_PIT3_PMR = BSP_Configuration.microseconds_per_tick - 1; \ + MCF5282_PIT3_PMR = rtems_configuration_get_microseconds_per_tick() - 1; \ MCF5282_PIT3_PCSR = MCF5282_PIT_PCSR_PRE(preScaleCode) | \ MCF5282_PIT_PCSR_PIE | \ MCF5282_PIT_PCSR_RLD | \ diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h index 3aec736efd..cfd900624d 100644 --- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h +++ b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h @@ -56,8 +56,6 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c index 2064f03c84..597885b93a 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c @@ -27,14 +27,6 @@ #include <errno.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; - -/* * Location of 'VME' access */ #define VME_ONE_BASE 0x30000000 @@ -263,7 +255,7 @@ 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; /* * Invalidate the cache and disable it |