From 4216c573e331cf1f5f1bec08cf4f7b21d2bdffbb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 4 Dec 2007 22:19:37 +0000 Subject: 2007-12-04 Joel Sherrill * mpc5xx/console-generic/console-generic.c, mpc8260/timer/timer.c, new-exceptions/cpu.c, old-exceptions/cpu.c: Move interrupt_stack_size field from CPU Table to Configuration Table. Eliminate CPU Table from all ports. Delete references to CPU Table in all forms. --- c/src/lib/libcpu/powerpc/ChangeLog | 7 +++++++ .../powerpc/mpc5xx/console-generic/console-generic.c | 2 -- c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c | 2 -- c/src/lib/libcpu/powerpc/new-exceptions/cpu.c | 18 ++++++++---------- c/src/lib/libcpu/powerpc/old-exceptions/cpu.c | 3 --- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index e0b0adbc6f..40494462b0 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,10 @@ +2007-12-04 Joel Sherrill + + * mpc5xx/console-generic/console-generic.c, mpc8260/timer/timer.c, + new-exceptions/cpu.c, old-exceptions/cpu.c: Move interrupt_stack_size + field from CPU Table to Configuration Table. Eliminate CPU Table from + all ports. Delete references to CPU Table in all forms. + 2007-12-04 Thomas Doerfler * mpc83xx/spi/mpc83xx_spidrv.c, mpc83xx/spi/mpc83xx_spidrv.h: diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c b/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c index e8293e3a6b..dfd5e0848c 100644 --- a/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c +++ b/c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c @@ -52,8 +52,6 @@ #include -extern rtems_cpu_table Cpu_table; /* for CPU clock speed */ - /* * SCI port descriptor table. */ diff --git a/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c index 7306342398..ad53057fac 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c +++ b/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c @@ -53,8 +53,6 @@ static volatile uint32_t Timer_starting; static rtems_boolean Timer_driver_Find_average_overhead; -extern rtems_cpu_table Cpu_table; - /* * This is so small that this code will be reproduced where needed. */ diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/cpu.c b/c/src/lib/libcpu/powerpc/new-exceptions/cpu.c index 19ba358cad..8344aa5c06 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/cpu.c +++ b/c/src/lib/libcpu/powerpc/new-exceptions/cpu.c @@ -40,23 +40,21 @@ * This routine performs processor dependent initialization. * * INPUT PARAMETERS: - * cpu_table - CPU table to initialize * thread_dispatch - address of disptaching routine */ void _CPU_Initialize( - rtems_cpu_table *cpu_table, void (*thread_dispatch) /* ignored on this CPU */ ) { - _CPU_Table = *cpu_table; - - { unsigned hasFixed = 0; - /* assert that our BSP has fixed PR288 */ - __asm__ __volatile__ ("mfspr %0, %2":"=r"(hasFixed):"0"(hasFixed),"i"(SPRG0)); - if ( PPC_BSP_HAS_FIXED_PR288 != hasFixed ) { - BSP_panic("This BSP needs to fix PR#288"); - } + { + unsigned hasFixed = 0; + /* assert that our BSP has fixed PR288 */ + __asm__ __volatile__ ("mfspr %0, %2": + "=r"(hasFixed):"0"(hasFixed),"i"(SPRG0)); + if ( PPC_BSP_HAS_FIXED_PR288 != hasFixed ) { + BSP_panic("This BSP needs to fix PR#288"); + } } } diff --git a/c/src/lib/libcpu/powerpc/old-exceptions/cpu.c b/c/src/lib/libcpu/powerpc/old-exceptions/cpu.c index 0e4a62a8a8..8c5f2cb3ab 100644 --- a/c/src/lib/libcpu/powerpc/old-exceptions/cpu.c +++ b/c/src/lib/libcpu/powerpc/old-exceptions/cpu.c @@ -71,7 +71,6 @@ int _CPU_last_spurious = 0; boolean bsp_exceptions_in_RAM = TRUE; void _CPU_Initialize( - rtems_cpu_table *cpu_table, void (*thread_dispatch) /* ignored on this CPU */ ) { @@ -107,8 +106,6 @@ void _CPU_Initialize( i = _CPU_IRQ_info.msr_initial; asm volatile("mtspr 0x112, %0" : "=r" (i) : "0" (i)); /* SPRG 2 */ #endif - - _CPU_Table = *cpu_table; } /* -- cgit v1.2.3