From 2d2de4eba16374ea05fc7ee9cd257ad0d4ebf2ca Mon Sep 17 00:00:00 2001
From: Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
Date: Fri, 23 Oct 2009 07:32:46 +0000
Subject: Update for exception support changes.

---
 .../libbsp/powerpc/mpc55xxevb/startup/bspstart.c   | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'c/src/lib/libbsp/powerpc/mpc55xxevb/startup')

diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
index 32d3d42021..8f516d335a 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
@@ -25,12 +25,12 @@
 #include <rtems.h>
 
 #include <libcpu/powerpc-utility.h>
+#include <bsp/vectors.h>
 
 #include <bsp.h>
 #include <bsp/bootcard.h>
 #include <bsp/irq.h>
 #include <bsp/irq-generic.h>
-#include <bsp/ppc_exc_bspsupp.h>
 
 #define RTEMS_STATUS_CHECKS_USE_PRINTK
 
@@ -188,6 +188,7 @@ static void mpc55xx_ebi_init()
  */
 void bsp_start(void)
 {
+	rtems_status_code sc = RTEMS_SUCCESSFUL;
 	ppc_cpu_id_t myCpu;
 	ppc_cpu_revision_t myCpuRevision;
 
@@ -224,16 +225,21 @@ void bsp_start(void)
 	
 	/* Initialize exceptions */
 	RTEMS_DEBUG_PRINT( "Initialize exceptions ...\n");
-	ppc_exc_initialize(
-          PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
-          interrupt_stack_start,
-          interrupt_stack_size
-        );
-	DEBUG_DONE();
+	sc = ppc_exc_initialize(
+		PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
+		interrupt_stack_start,
+		interrupt_stack_size
+	);
+	if (sc != RTEMS_SUCCESSFUL) {
+		BSP_panic( "Cannot initialize exceptions");
+	} else {
+		DEBUG_DONE();
+	}
 
 	/* Initialize interrupts */
 	RTEMS_DEBUG_PRINT( "Initialize interrupts ...\n");
-	if (bsp_interrupt_initialize() != RTEMS_SUCCESSFUL) {
+	sc = bsp_interrupt_initialize();
+	if (sc != RTEMS_SUCCESSFUL) {
 		BSP_panic( "Cannot initialize interrupts");
 	} else {
 		DEBUG_DONE();
-- 
cgit v1.2.3