Update for status-checks.h changes.

2 files changed, 21 insertions, 21 deletions

diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
index 13d207eae5..0d8e92ef75 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
@@ -36,7 +36,7 @@
 
 #include <rtems/status-checks.h>
 
-#define DEBUG_DONE() DEBUG_PRINT( "Done\n")
+#define DEBUG_DONE() RTEMS_DEBUG_PRINT( "Done\n")
 
 #define MPC55XX_INTERRUPT_STACK_SIZE 0x1000
 
@@ -81,7 +81,7 @@ void bsp_predriver_hook()
 {
 	rtems_status_code sc = RTEMS_SUCCESSFUL;
 
-	DEBUG_PRINT( "Initialize eDMA ...\n");
+	RTEMS_DEBUG_PRINT( "Initialize eDMA ...\n");
 	sc = mpc55xx_edma_init();
 	if (sc != RTEMS_SUCCESSFUL) {
 		BSP_panic( "Cannot initialize eDMA");
@@ -157,15 +157,15 @@ void bsp_start(void)
 	SIU.PCR [89].R = 0x400;
 	SIU.PCR [90].R = 0x400;
 
-	DEBUG_PRINT( "BSP start ...\n");
+	RTEMS_DEBUG_PRINT( "BSP start ...\n");
 
-	DEBUG_PRINT( "System clock          : %i\n", mpc55xx_get_system_clock());
-	DEBUG_PRINT( "Memory start          : 0x%08x\n", bsp_ram_start);
-	DEBUG_PRINT( "Memory end            : 0x%08x\n", bsp_ram_end);
-	DEBUG_PRINT( "Memory size           : 0x%08x\n", bsp_ram_end - bsp_ram_start);
-	DEBUG_PRINT( "Interrupt stack start : 0x%08x\n", interrupt_stack_start);
-	DEBUG_PRINT( "Interrupt stack end   : 0x%08x\n", interrupt_stack_start + interrupt_stack_size);
-	DEBUG_PRINT( "Interrupt stack size  : 0x%08x\n", interrupt_stack_size);
+	RTEMS_DEBUG_PRINT( "System clock          : %i\n", mpc55xx_get_system_clock());
+	RTEMS_DEBUG_PRINT( "Memory start          : 0x%08x\n", bsp_ram_start);
+	RTEMS_DEBUG_PRINT( "Memory end            : 0x%08x\n", bsp_ram_end);
+	RTEMS_DEBUG_PRINT( "Memory size           : 0x%08x\n", bsp_ram_end - bsp_ram_start);
+	RTEMS_DEBUG_PRINT( "Interrupt stack start : 0x%08x\n", interrupt_stack_start);
+	RTEMS_DEBUG_PRINT( "Interrupt stack end   : 0x%08x\n", interrupt_stack_start + interrupt_stack_size);
+	RTEMS_DEBUG_PRINT( "Interrupt stack size  : 0x%08x\n", interrupt_stack_size);
 	
 	/*
 	 * Get CPU identification dynamically. Note that the get_ppc_cpu_type()
@@ -182,7 +182,7 @@ void bsp_start(void)
 	mpc55xx_ebi_init();
 	
 	/* Initialize exceptions */
-	DEBUG_PRINT( "Initialize exceptions ...\n");
+	RTEMS_DEBUG_PRINT( "Initialize exceptions ...\n");
 	ppc_exc_initialize(
           PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
           interrupt_stack_start,
@@ -191,14 +191,14 @@ void bsp_start(void)
 	DEBUG_DONE();
 
 	/* Initialize interrupts */
-	DEBUG_PRINT( "Initialize interrupts ...\n");
+	RTEMS_DEBUG_PRINT( "Initialize interrupts ...\n");
 	if (bsp_interrupt_initialize() != RTEMS_SUCCESSFUL) {
 		BSP_panic( "Cannot initialize interrupts");
 	} else {
 		DEBUG_DONE();
 	}
 	
-	DEBUG_PRINT( "BSP start done\n");
+	RTEMS_DEBUG_PRINT( "BSP start done\n");
 
 	return;
 
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/sd-card-init.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/sd-card-init.c
index 23052c9928..1d8f31d822 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/sd-card-init.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/sd-card-init.c
@@ -40,7 +40,7 @@ static rtems_status_code mpc55xx_dspi_init(void)
 	union SIU_PCR_tag pcr = MPC55XX_ZERO_FLAGS;
 
 	rv = rtems_libi2c_initialize();
-	CHECK_RVSC( rv, "rtems_libi2c_initialize");
+	RTEMS_CHECK_RV_SC( rv, "rtems_libi2c_initialize");
 
 	/* DSPI D inputs are taken from DSPI C */
 	SIU.DISR.R = 0x000000FC;
@@ -82,7 +82,7 @@ static rtems_status_code mpc55xx_dspi_init(void)
 	for (i = 0; i < MPC55XX_DSPI_NUMBER; ++i) {
 		device_name [8] = (char) ('0' + i);
 		rv = rtems_libi2c_register_bus( device_name, (rtems_libi2c_bus_t *) &mpc55xx_dspi_bus_table [i]);
-		CHECK_RVSC( rv, device_name);
+		RTEMS_CHECK_RV_SC( rv, device_name);
 	}
 
 	return RTEMS_SUCCESSFUL;
@@ -148,22 +148,22 @@ rtems_status_code mpc55xx_sd_card_init(void)
 	int rv = 0;
 	sd_card_driver_entry *e = &sd_card_driver_table [0];
 
-	DEBUG_PRINT( "Task started\n");
+	RTEMS_DEBUG_PRINT( "Task started\n");
 
 	sc = mpc55xx_dspi_init();
-	CHECK_SC( rv, "Intitalize DSPI bus");
+	RTEMS_CHECK_SC( rv, "Intitalize DSPI bus");
 
 	rv = rtems_libi2c_register_drv( e->device_name, (rtems_libi2c_drv_t *) e, mpc55xx_dspi_bus_table [0].bus_number, 0);
-	CHECK_RVSC( rv, "Register SD Card driver");
+	RTEMS_CHECK_RV_SC( rv, "Register SD Card driver");
 
 	sc = rtems_ide_part_table_initialize( MPC55XX_DEVICE_FILE);
-	CHECK_SC( sc, "Initialize IDE partition table");
+	RTEMS_CHECK_SC( sc, "Initialize IDE partition table");
 
 	rv = mkdir( MPC55XX_MOUNT_POINT, S_IRWXU);
-	CHECK_RVSC( rv, "Create mount point");
+	RTEMS_CHECK_RV_SC( rv, "Create mount point");
 
 	rv = rtems_fsmount( mpc55xx_fs_table, sizeof( mpc55xx_fs_table) / sizeof( mpc55xx_fs_table [0]), NULL);
-	CHECK_RVSC( rv, "Mount file systems");
+	RTEMS_CHECK_RV_SC( rv, "Mount file systems");
 
 	return RTEMS_SUCCESSFUL;
 }