2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>

	* times, include/bsp.h, startup/bspstart.c: Convert to using c99
	fixed size types.

4 files changed, 15 insertions, 10 deletions

diff --git a/c/src/lib/libbsp/mips/p4000/ChangeLog b/c/src/lib/libbsp/mips/p4000/ChangeLog
index ffda69501b..80547b4d85 100644
--- a/c/src/lib/libbsp/mips/p4000/ChangeLog
+++ b/c/src/lib/libbsp/mips/p4000/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* times, include/bsp.h, startup/bspstart.c: Convert to using c99
+	fixed size types.
+
 2004-03-03	Joel Sherrill <joel@OARcorp.com>
 
 	* Makefile.am: Correct typo.
diff --git a/c/src/lib/libbsp/mips/p4000/include/bsp.h b/c/src/lib/libbsp/mips/p4000/include/bsp.h
index b673f5f27e..045754a76d 100644
--- a/c/src/lib/libbsp/mips/p4000/include/bsp.h
+++ b/c/src/lib/libbsp/mips/p4000/include/bsp.h
@@ -64,7 +64,7 @@ extern void WriteDisplay( char * string );
 
 #define Lower_tm27_intr()
 
-extern unsigned32 mips_get_timer( void );
+extern uint32_t   mips_get_timer( void );
 
 #define CPU_CLOCK_RATE_MHZ     (50)
 #define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ ) /* equivalent to CPU clock speed in MHz */
@@ -74,15 +74,15 @@ extern unsigned32 mips_get_timer( void );
  *  This is very dependent on the clock speed of the target.
  *
  *  NOTE: This macro generates a warning like "integer constant out 
- *        of range" which is safe to ignore.  In 64 bit mode, unsigned32
+ *        of range" which is safe to ignore.  In 64 bit mode, uint32_t  
  *        types are actually 64 bits long so that comparisons between
- *        unsigned32 types and pointers are valid.  The warning is caused
+ *        uint32_t   types and pointers are valid.  The warning is caused
  *        by code in the delay macro that is necessary for 64 bit mode.
  */
 
 #define rtems_bsp_delay( microseconds ) \
   { \
-     unsigned32 _end_clock = \
+     uint32_t   _end_clock = \
           mips_get_timer() + microseconds * CLOCKS_PER_MICROSECOND; \
      _end_clock %= 0x100000000;  /* make sure result is 32 bits */ \
      \
diff --git a/c/src/lib/libbsp/mips/p4000/startup/bspstart.c b/c/src/lib/libbsp/mips/p4000/startup/bspstart.c
index 3437867651..7ff8a8e381 100644
--- a/c/src/lib/libbsp/mips/p4000/startup/bspstart.c
+++ b/c/src/lib/libbsp/mips/p4000/startup/bspstart.c
@@ -45,7 +45,7 @@ char *rtems_progname;
  */
  
 void bsp_postdriver_hook(void);
-void bsp_libc_init( void *, unsigned32, int );
+void bsp_libc_init( void *, uint32_t, int );
 
 /*
  *  Function:   bsp_pretasking_hook
@@ -66,9 +66,9 @@ void bsp_libc_init( void *, unsigned32, int );
 void bsp_pretasking_hook(void)
 {
     extern int end;
-    rtems_unsigned32        heap_start;
+    uint32_t                heap_start;
 
-    heap_start = (rtems_unsigned32) &end;
+    heap_start = (uint32_t) &end;
     if (heap_start & (CPU_ALIGNMENT-1))
         heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
 
@@ -104,7 +104,7 @@ void bsp_start( void )
    */
 
   BSP_Configuration.work_space_start =
-       (void *)((unsigned64)((&end) + LIBC_HEAP_SIZE + 0x2000) & ~0x7);
+       (void *)((uint64_t)((&end) + LIBC_HEAP_SIZE + 0x2000) & ~0x7);
 
   /*
    *  initialize the CPU table for this BSP
diff --git a/c/src/lib/libbsp/mips/p4000/times b/c/src/lib/libbsp/mips/p4000/times
index 58574229e1..5e6b22debb 100644
--- a/c/src/lib/libbsp/mips/p4000/times
+++ b/c/src/lib/libbsp/mips/p4000/times
@@ -22,8 +22,8 @@ Wait States:
 Times Reported in: cycles
 Timer Source: on-CPU cycle counter
 
-Column A:RTEMS compiled with 64 bit pointers and 64 bit unsigned32 types
-Column B:RTEMS compiled with 32 bit pointers and 32 bit unsigned32 types
+Column A:RTEMS compiled with 64 bit pointers and 64 bit uint32_t   types
+Column B:RTEMS compiled with 32 bit pointers and 32 bit uint32_t   types
 
 #                          DESCRIPTION                                 A    B
 == =================================================================  ==== ====