diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-04-18 20:54:54 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-04-18 20:54:54 +0000 |
| commit | 80387318e50d01aad0dd549f1aa18faf8ffc0eed (patch) | |
| tree | 4108e794193900470005fa22acf43a113c29e7bf | |
| parent | 2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-80387318e50d01aad0dd549f1aa18faf8ffc0eed.tar.bz2 | |
2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* irq/irq.c: Reflect changes to <rtems/score/cpu.h>.
Fix loopCounter.
* irq/irq_asm.S: Reflect changes to <rtems/score/cpu.h>.
* vectors/vectors.S: Ditto.
* vectors/vectors_init.c: Include <rtems/bspIo.h>.
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 8 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_asm.S | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.S | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors_init.c | 1 |
5 files changed, 16 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index edf895952f..47a0199b44 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog @@ -1,3 +1,11 @@ +2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * irq/irq.c: Reflect changes to <rtems/score/cpu.h>. + Fix loopCounter. + * irq/irq_asm.S: Reflect changes to <rtems/score/cpu.h>. + * vectors/vectors.S: Ditto. + * vectors/vectors_init.c: Include <rtems/bspIo.h>. + 2002-04-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * startup/bspstart.c: Include <libcpu/cpuIdent.h>, <rtems/bspIo.h>. diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c index 656046a41a..eb3a237500 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c @@ -11,13 +11,13 @@ * $Id$ */ +#include <rtems/system.h> #include <bsp.h> #include <bsp/irq.h> #include <rtems/score/thread.h> #include <rtems/score/apiext.h> #include <libcpu/raw_exception.h> #include <bsp/vectors.h> -#include <libcpu/cpu.h> #include <bsp/8xx_immap.h> #include <bsp/mbx.h> #include <bsp/commproc.h> @@ -402,8 +402,9 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum) register unsigned oldMask; /* old siu pic masks */ register unsigned msr; register unsigned new_msr; +#ifdef DISPATCH_HANDLER_STAT unsigned loopCounter; - +#endif /* * Handle decrementer interrupt */ diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_asm.S index 01e02f4027..6131100e9f 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_asm.S +++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_asm.S @@ -13,11 +13,10 @@ * $Id$ */ +#include <asm.h> +#include <rtems/score/cpu.h> #include <bsp/vectors.h> -#include <libcpu/cpu.h> #include <libcpu/raw_exception.h> -#include <rtems/score/cpuopts.h> /* for PPC_HAS_FPU */ -#include "asm.h" #define SYNC \ diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.S b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.S index 291a70a0b7..5520dac235 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.S +++ b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.S @@ -10,10 +10,9 @@ +#include <asm.h> +#include <rtems/score/cpu.h> #include <bsp/vectors.h> -#include <libcpu/cpu.h> -#include <rtems/score/targopts.h> -#include "asm.h" #define SYNC \ diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors_init.c b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors_init.c index 864aac71a4..555cd13151 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors_init.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors_init.c @@ -15,6 +15,7 @@ #include <bsp/vectors.h> #include <libcpu/raw_exception.h> #include <bsp.h> +#include <rtems/bspIo.h> static rtems_raw_except_global_settings exception_config; static rtems_raw_except_connect_data exception_table[LAST_VALID_EXC + 1]; |