diff options
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c | 30 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/score603e/startup/spurious.c | 30 |
4 files changed, 20 insertions, 50 deletions
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index 34caa36cca..81fddc0be4 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -1,3 +1,8 @@ +2005-02-14 Ralf Corsepius <ralf.corsepius@rtems.org> + + * startup/spurious.c: Merge ppc603 and ppc603e. + Remove digits (Unused). + 2005-02-12 Ralf Corsepius <ralf.corsepius@rtems.org> * Makefile.am: Fix typo in previous patch. diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c index b8f2cb501e..684817a986 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c @@ -20,8 +20,6 @@ #include <string.h> -static const char digits[16] = "0123456789abcdef"; - rtems_isr bsp_stub_handler( rtems_vector_number trap ) @@ -107,35 +105,17 @@ rtems_isr bsp_spurious_handler( DEBUG_puts( "0x02000" ); break; -#elif defined(ppc603) -#error "Please fill in names. " - case PPC_IRQ_TRANS_MISS : - DEBUG_puts( "0x1000" ); - break; - case PPC_IRQ_DATA_LOAD: - DEBUG_puts( "0x1100" ); - break; - case PPC_IRQ_DATA_STORE: - DEBUG_puts( "0x1200" ); - break; - case PPC_IRQ_ADDR_BRK: - DEBUG_puts( "0x1300" ); - break; - case PPC_IRQ_SYS_MGT: - DEBUG_puts( "0x1400" ); - break; - -#elif defined(ppc603e) - case PPC_TLB_INST_MISS: +#elif defined(ppc603) || defined(ppc603e) + case PPC_IRQ_TRANS_MISS: DEBUG_puts( "Instruction Translation Miss" ); break; - case PPC_TLB_LOAD_MISS: + case PPC_IRQ_DATA_LOAD: DEBUG_puts( "Data Load Translation Miss" ); break; - case PPC_TLB_STORE_MISS : + case PPC_IRQ_DATA_STORE: DEBUG_puts( "Data store Translation Miss"); break; - case PPC_IRQ_ADDRBRK: + case PPC_IRQ_ADDR_BRK: DEBUG_puts( "Instruction address break point" ); break; case PPC_IRQ_SYS_MGT: diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 2fdc01daab..2ac0c7370e 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,8 @@ +2005-02-14 Ralf Corsepius <ralf.corsepius@rtems.org> + + * startup/spurious.c: Merge ppc603 and ppc603e. + Remove digits (Unused). + 2005-02-12 Ralf Corsepius <ralf.corsepius@rtems.org> * Makefile.am: Fix typo in previous patch. diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/spurious.c b/c/src/lib/libbsp/powerpc/score603e/startup/spurious.c index 59d5ba2949..7cd24bc850 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/spurious.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/spurious.c @@ -19,8 +19,6 @@ #include <string.h> -static const char digits[16] = "0123456789abcdef"; - rtems_isr bsp_stub_handler( rtems_vector_number trap ) @@ -105,35 +103,17 @@ rtems_isr bsp_spurious_handler( DEBUG_puts( "\nTrap: 0x02000" ); break; -#elif defined(ppc603) -#error "Please fill in names. " - case PPC_IRQ_TRANS_MISS : - DEBUG_puts( "\nTrap: 0x1000" ); - break; - case PPC_IRQ_DATA_LOAD: - DEBUG_puts( "\nTrap: 0x1100" ); - break; - case PPC_IRQ_DATA_STORE: - DEBUG_puts( "\nTrap: 0x1200" ); - break; - case PPC_IRQ_ADDR_BRK: - DEBUG_puts( "\nTrap: 0x1300" ); - break; - case PPC_IRQ_SYS_MGT: - DEBUG_puts( "\nTrap: 0x1400" ); - break; - -#elif defined(ppc603e) - case PPC_TLB_INST_MISS: +#elif defined(ppc603) || defined(ppc603e) + case PPC_IRQ_TRANS_MISS: DEBUG_puts( "\nTrap: Instruction Translation Miss" ); break; - case PPC_TLB_LOAD_MISS: + case PPC_IRQ_DATA_LOAD: DEBUG_puts( "\nTrap: Data Load Translation Miss" ); break; - case PPC_TLB_STORE_MISS : + case PPC_IRQ_DATA_STORE: DEBUG_puts( "\nTrap: Data store Translation Miss"); break; - case PPC_IRQ_ADDRBRK: + case PPC_IRQ_ADDR_BRK: DEBUG_puts( "\nTrap: Instruction address break point" ); break; case PPC_IRQ_SYS_MGT: |