2004-10-21 Ralf Corsepius <ralf_corsepius@rtems.org>

	* start/preload.S, include/bsp.h, vectors/exceptionhandler.c,
	startup/bspstart.c: Misc. adaptations to rtems-4.7.

5 files changed, 17 insertions, 14 deletions

diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
index 9c3535d22d..aff7279791 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
@@ -1,5 +1,10 @@
 2004-10-21	Ralf Corsepius <ralf_corsepius@rtems.org>
 
+	* start/preload.S, include/bsp.h, vectors/exceptionhandler.c, 
+	startup/bspstart.c: Misc. adaptations to rtems-4.7.
+
+2004-10-21	Ralf Corsepius <ralf_corsepius@rtems.org>
+
 	* configure: Remove (Bogus).
 	* include/tm27.h: New (Stub).
 
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
index 1d8a79bf39..66c827aa84 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
@@ -17,8 +17,8 @@
 #include <bspopts.h>
 
 #include <rtems.h>
-#include <console.h>
-#include <clockdrv.h>
+#include <rtems/console.h>
+#include <rtems/clockdrv.h>
 #include <libcpu/io.h>
 #include <bsp/vectors.h>
 
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/start/preload.S b/c/src/lib/libbsp/powerpc/mvme5500/start/preload.S
index 4d03910170..b5e607f72e 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/start/preload.S
+++ b/c/src/lib/libbsp/powerpc/mvme5500/start/preload.S
@@ -85,7 +85,7 @@
 #endif
 
 #include <rtems/score/cpu.h>
-#include <asm.h>
+#include <rtems/asm.h>
 
 /* Note that major modifications may be needed
  * if DESTINATION_ADDR is not 0
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
index 534197d7f7..2e46e474ee 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
@@ -61,8 +61,8 @@
 /* there is no public Workspace_Free() variant :-( */
 #include <rtems/score/wkspace.h>
 
-rtems_unsigned32
-_bsp_sbrk_init(rtems_unsigned32 heap_start, rtems_unsigned32 *heap_size_p);
+uint32_t
+_bsp_sbrk_init(uint32_t heap_start, uint32_t *heap_size_p);
 
 /* provide access to the command line parameters */
 char *BSP_commandline_string = 0;
@@ -134,7 +134,7 @@ static unsigned long
 heapStart(void)
 {
 unsigned long rval;
-    rval = ((rtems_unsigned32) __rtems_end) +INIT_STACK_SIZE + INTR_STACK_SIZE;
+    rval = ((uint32_t) __rtems_end) +INIT_STACK_SIZE + INTR_STACK_SIZE;
     if (rval & (CPU_ALIGNMENT-1))
         rval = (rval + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
 	return rval;
@@ -189,10 +189,10 @@ extern void bsp_libc_init( void *, unsigned32, int );
 
 void bsp_pretasking_hook(void)
 {
-    rtems_unsigned32        heap_start=heapStart();    
-    rtems_unsigned32        heap_size,heap_sbrk_spared;
+    uint32_t        heap_start=heapStart();    
+    uint32_t        heap_size,heap_sbrk_spared;
     char		    *buf;
-    extern rtems_unsigned32 _bsp_sbrk_init(rtems_unsigned32, rtems_unsigned32*);
+    extern uint32_t _bsp_sbrk_init(uint32_t, uint32_t*);
 
     heap_size = (BSP_mem_size - heap_start) - BSP_Configuration.work_space_size;
 
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c b/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
index a9f513288d..bc21f7abaa 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
@@ -42,7 +42,7 @@ volatile BSP_ExceptionExtension	test;
 void
 BSP_exceptionHandler(BSP_Exception_frame* excPtr)
 {
-rtems_unsigned32	note;
+uint32_t	note;
 BSP_ExceptionExtension	ext=0;
 rtems_id		id=0;
 int			recoverable = 0;
@@ -147,8 +147,6 @@ int			quiet=0;
 		 printk(" TEA");
 	   }
 	   if (excPtr->EXC_SRR1 & (SRR1_MCP_EXC)) {
-	      unsigned char c1,c2;
-	      unsigned int  l;
 	      unsigned long gerr;
 
 	      if (!quiet) printk(" MCP\n");
@@ -180,8 +178,8 @@ int			quiet=0;
 		if (id) {
 			/* if there's a highlevel hook, install it */
 			if (ext && ext->highlevelHook) {
-				excPtr->EXC_SRR0 = (rtems_unsigned32)ext->highlevelHook;
-				excPtr->GPR3     = (rtems_unsigned32)ext;
+				excPtr->EXC_SRR0 = (uint32_t)ext->highlevelHook;
+				excPtr->GPR3     = (uint32_t)ext;
 				return;
 			}
 			if (excPtr->EXC_SRR1 & MSR_FP) {