Update for exception support changes.

6 files changed, 30 insertions, 21 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
index 9a9e12d92d..dee3957d61 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-22	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am, preinstall.am: Update for exception support changes.
+	* irq/irq.c, irq/irq_init.c: Changed exception header file includes.
+	* startup/bspstart.c: Changed exception header file includes.  Update
+	for ppc_exc_initialize() changes.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* make/custom/gen83xx.inc: Remove RTEMS_BSP_FAMILY.
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index c307d70604..f06dbca7a6 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -66,16 +66,18 @@ libbsp_a_SOURCES += ../shared/clock/clock.c
 include_bsp_HEADERS = include/irq.h \
 	include/irq-config.h \
 	../../shared/include/irq-generic.h \
+	../../shared/include/irq-info.h \
 	include/hwreg_vals.h \
 	../shared/include/u-boot.h \
 	../shared/include/tictac.h
 
 # irq
-libbsp_a_SOURCES += include/irq.h \
-	include/irq-config.h \
-	irq/irq.c \
+libbsp_a_SOURCES += irq/irq.c \
 	../../shared/src/irq-generic.c \
-	../../shared/src/irq-legacy.c
+	../../shared/src/irq-legacy.c \
+	../../shared/src/irq-info.c \
+	../../shared/src/irq-shell.c \
+	../../shared/src/irq-server.c
 
 # console
 libbsp_a_SOURCES += console/console.c console/ns16550cfg.c 
@@ -95,7 +97,6 @@ endif
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
 	../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel   \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h b/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h
index de0a7dba4d..ec63e160fa 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h
+++ b/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h
@@ -24,9 +24,7 @@
 #define TMTESTS_TM27_H
 
 #include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>
-
-#include <bsp/ppc_exc_bspsupp.h>
+#include <bsp/vectors.h>
 
 #define MUST_WAIT_FOR_INTERRUPT 1
 
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c b/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c
index e7d84c88cd..e9a14c9d35 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c
@@ -22,12 +22,10 @@
 #include <rtems.h>
 
 #include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>
+#include <bsp/vectors.h>
 
 #include <bsp.h>
 #include <bsp/irq.h>
-#include <bsp/vectors.h>
-#include <bsp/ppc_exc_bspsupp.h>
 #include <bsp/irq-generic.h>
 
 #define MPC83XX_IPIC_VECTOR_NUMBER 92
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am b/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am
index e87e14ad65..832bf2e798 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am
@@ -101,6 +101,10 @@ $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJE
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
 
+$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
+
 $(PROJECT_INCLUDE)/bsp/hwreg_vals.h: include/hwreg_vals.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
index 6cfa7e2853..9e691e5b82 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
@@ -21,12 +21,11 @@
  */
 
 #include <libcpu/powerpc-utility.h>
-#include <libcpu/raw_exception.h>
 
 #include <bsp.h>
+#include <bsp/vectors.h>
 #include <bsp/bootcard.h>
 #include <bsp/irq-generic.h>
-#include <bsp/ppc_exc_bspsupp.h>
 
 #ifdef HAS_UBOOT
 
@@ -84,13 +83,12 @@ void _BSP_Fatal_error(unsigned n)
 void bsp_start( void)
 {
   rtems_status_code sc = RTEMS_SUCCESSFUL;
-  int rv = 0;
 
   ppc_cpu_id_t myCpu;
   ppc_cpu_revision_t myCpuRevision;
 
-  uint32_t interrupt_stack_start = (uint32_t) bsp_interrupt_stack_start;
-  uint32_t interrupt_stack_size = (uint32_t) bsp_interrupt_stack_size;
+  uintptr_t interrupt_stack_start = (uintptr_t) bsp_interrupt_stack_start;
+  uintptr_t interrupt_stack_size = (uintptr_t) bsp_interrupt_stack_size;
 
   /*
    * Get CPU identification dynamically. Note that the get_ppc_cpu_type() function
@@ -130,22 +128,25 @@ void bsp_start( void)
 #endif /* HAS_UBOOT */
 
   /* Initialize exception handler */
-  ppc_exc_initialize(
+  sc = ppc_exc_initialize(
     PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
     interrupt_stack_start,
     interrupt_stack_size
   );
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot initialize exceptions");
+  }
 
   /* Install default handler for the decrementer exception */
-  rv = ppc_exc_set_handler( ASM_DEC_VECTOR, mpc83xx_decrementer_exception_handler);
-  if (rv < 0) {
-    BSP_panic( "Cannot install decrementer exception handler!\n");
+  sc = ppc_exc_set_handler( ASM_DEC_VECTOR, mpc83xx_decrementer_exception_handler);
+  if (sc != RTEMS_SUCCESSFUL) {
+    BSP_panic("cannot install decrementer exception handler");
   }
 
   /* Initalize interrupt support */
   sc = bsp_interrupt_initialize();
   if (sc != RTEMS_SUCCESSFUL) {
-    BSP_panic( "Cannot intitialize interrupt support\n");
+    BSP_panic("cannot intitialize interrupts\n");
   }
 
 #ifdef SHOW_MORE_INIT_SETTINGS