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

	* mpc505/timer/timer.c, mpc5xx/timer/timer.c,
	mpc6xx/clock/c_clock.c, mpc6xx/timer/timer.c, mpc8260/clock/clock.c,
	mpc8260/console-generic/console-generic.c, mpc8260/cpm/cp.c,
	mpc8260/cpm/dpram.c, mpc8260/include/cpm.h, mpc8260/include/mmu.h,
	mpc8260/include/mpc8260.h, mpc8260/mmu/mmu.c, mpc8260/timer/timer.c,
	mpc8xx/clock/clock.c, mpc8xx/console-generic/console-generic.c,
	mpc8xx/cpm/cp.c, mpc8xx/cpm/dpram.c, mpc8xx/include/cpm.h,
	mpc8xx/include/mmu.h, mpc8xx/include/mpc8xx.h, mpc8xx/mmu/mmu.c,
	mpc8xx/timer/timer.c, ppc403/clock/clock.c,
	ppc403/console/console.c, ppc403/console/console405.c,
	ppc403/ictrl/ictrl.c, ppc403/ictrl/ictrl.h, ppc403/timer/timer.c,
	ppc403/tty_drv/tty_drv.c, rtems/powerpc/cache.h, shared/src/cache.c:
	Convert to using c99 fixed size types.

7 files changed, 43 insertions, 43 deletions

diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c
index d272930035..340487f8f7 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c
+++ b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c
@@ -43,8 +43,8 @@
 
 #include <stdlib.h>                     /* for atexit() */
 
-volatile rtems_unsigned32 Clock_driver_ticks;
-static rtems_unsigned32 pit_value, tick_time;
+volatile uint32_t   Clock_driver_ticks;
+static uint32_t   pit_value, tick_time;
 static rtems_boolean auto_restart;
 
 void Clock_exit( void );
@@ -62,9 +62,9 @@ rtems_isr_entry set_vector(                    /* returns old vector */
 rtems_device_major_number rtems_clock_major = ~0;
 rtems_device_minor_number rtems_clock_minor;
  
-static inline rtems_unsigned32 get_itimer(void)
+static inline uint32_t   get_itimer(void)
 {
-    register rtems_unsigned32 rc;
+    register uint32_t   rc;
 
 #ifndef ppc405 /* this is a ppc403 */
     asm volatile ("mfspr %0, 0x3dd" : "=r" ((rc))); /* TBLO */
@@ -82,10 +82,10 @@ static inline rtems_unsigned32 get_itimer(void)
 rtems_isr
 Clock_isr(rtems_vector_number vector)
 {
-      rtems_unsigned32 clicks_til_next_interrupt;
+      uint32_t   clicks_til_next_interrupt;
     if (!auto_restart)
     {
-      rtems_unsigned32 itimer_value;
+      uint32_t   itimer_value;
       /*
        * setup for next interrupt; making sure the new value is reasonably
        * in the future.... in case we lost out on an interrupt somehow
@@ -141,10 +141,10 @@ Clock_isr(rtems_vector_number vector)
 void Install_clock(rtems_isr_entry clock_isr)
 {
     rtems_isr_entry previous_isr;
-    rtems_unsigned32 iocr;
-    register rtems_unsigned32 tcr;
+    uint32_t   iocr;
+    register uint32_t   tcr;
 #ifdef ppc403
-    rtems_unsigned32 pvr;
+    uint32_t   pvr;
 #endif /* ppc403 */
  
     Clock_driver_ticks = 0;
@@ -225,7 +225,7 @@ void
 ReInstall_clock(rtems_isr_entry new_clock_isr)
 {
     rtems_isr_entry previous_isr;
-    rtems_unsigned32 isrlevel = 0;
+    uint32_t   isrlevel = 0;
 
     rtems_interrupt_disable(isrlevel);
     
@@ -246,7 +246,7 @@ ReInstall_clock(rtems_isr_entry new_clock_isr)
 void
 Clock_exit(void)
 {
-    register rtems_unsigned32 tcr;
+    register uint32_t   tcr;
  
     asm volatile ("mfspr %0, 0x3da" : "=r" ((tcr))); /* TCR */
  
diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/console.c b/c/src/lib/libcpu/powerpc/ppc403/console/console.c
index 7335e6927f..a03231f931 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/console/console.c
+++ b/c/src/lib/libcpu/powerpc/ppc403/console/console.c
@@ -206,9 +206,9 @@ spiStopRemoteTx (int minor)
 }
 
 void 
-spiBaudSet(unsigned32 baudrate)
+spiBaudSet(uint32_t   baudrate)
 {
-  unsigned32 tmp;
+  uint32_t   tmp;
   tmp = rtems_cpu_configuration_get_serial_per_sec() / baudrate;
   tmp = ((tmp) >> 4) - 1;
   port->BRDL = tmp & 0xff;
diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/console405.c b/c/src/lib/libcpu/powerpc/ppc403/console/console405.c
index fbcbeb8b52..345d1abea2 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/console/console405.c
+++ b/c/src/lib/libcpu/powerpc/ppc403/console/console405.c
@@ -191,9 +191,9 @@ int round(double x)
 }
 
 void 
-spiBaudSet(unsigned32 baudrate)
+spiBaudSet(uint32_t   baudrate)
 {
-  unsigned32 tmp;
+  uint32_t   tmp;
 
   tmp = round( (double)rtems_cpu_configuration_get_serial_per_sec() / (baudrate * 16) );
 
diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.c b/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.c
index 769f200822..d459a31306 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.c
+++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.c
@@ -45,7 +45,7 @@ rtems_isr_entry ictrl_vector_table[PPC_IRQ_EXT_MAX];
  */
 #if defined(ppc405)
 RTEMS_INLINE_ROUTINE void 
-clr_exisr(unsigned32 mask) 
+clr_exisr(uint32_t   mask) 
 {
     asm volatile ("mtdcr 0xC0,%0"::"r" (mask));/*EXISR*/
 } 
@@ -53,10 +53,10 @@ clr_exisr(unsigned32 mask)
 /* 
  *  get value of EXISR 
  */
-RTEMS_INLINE_ROUTINE unsigned32 
+RTEMS_INLINE_ROUTINE uint32_t   
 get_exisr(void) 
 {
-    unsigned32 val;
+    uint32_t   val;
 
     asm volatile ("mfdcr %0,0xC0":"=r" (val));/*EXISR*/
     return val; 
@@ -65,10 +65,10 @@ get_exisr(void)
 /* 
  *  get value of EXIER 
  */
-RTEMS_INLINE_ROUTINE unsigned32 
+RTEMS_INLINE_ROUTINE uint32_t   
 get_exier(void) 
 {
-    unsigned32 val;
+    uint32_t   val;
     asm volatile ("mfdcr %0,0xC2":"=r" (val));/*EXIER*/
     return val; 
 } 
@@ -77,7 +77,7 @@ get_exier(void)
  *  set value of EXIER 
  */
 RTEMS_INLINE_ROUTINE void 
-set_exier(unsigned32 val) 
+set_exier(uint32_t   val) 
 {
     asm volatile ("mtdcr 0xC2,%0"::"r" (val));/*EXIER*/
 } 
@@ -85,7 +85,7 @@ set_exier(unsigned32 val)
 #else /* not ppc405 */
 
 RTEMS_INLINE_ROUTINE void 
-clr_exisr(unsigned32 mask) 
+clr_exisr(uint32_t   mask) 
 {
     asm volatile ("mtdcr 0x40,%0"::"r" (mask));/*EXISR*/
 } 
@@ -93,10 +93,10 @@ clr_exisr(unsigned32 mask)
 /* 
  *  get value of EXISR 
  */
-RTEMS_INLINE_ROUTINE unsigned32 
+RTEMS_INLINE_ROUTINE uint32_t   
 get_exisr(void) 
 {
-    unsigned32 val;
+    uint32_t   val;
 
     asm volatile ("mfdcr %0,0x40":"=r" (val));/*EXISR*/
     return val; 
@@ -105,10 +105,10 @@ get_exisr(void)
 /* 
  *  get value of EXIER 
  */
-RTEMS_INLINE_ROUTINE unsigned32 
+RTEMS_INLINE_ROUTINE uint32_t   
 get_exier(void) 
 {
-    unsigned32 val;
+    uint32_t   val;
     asm volatile ("mfdcr %0,0x42":"=r" (val));/*EXIER*/
     return val; 
 } 
@@ -117,7 +117,7 @@ get_exier(void)
  *  set value of EXIER 
  */
 RTEMS_INLINE_ROUTINE void 
-set_exier(unsigned32 val) 
+set_exier(uint32_t   val) 
 {
     asm volatile ("mtdcr 0x42,%0"::"r" (val));/*EXIER*/
 } 
@@ -126,9 +126,9 @@ set_exier(unsigned32 val)
  *  enable an external interrupt, make this interrupt consistent
  */
 RTEMS_INLINE_ROUTINE void 
-enable_ext_irq( unsigned32 mask)
+enable_ext_irq( uint32_t   mask)
 {
-    unsigned32 isrlvl;
+    uint32_t   isrlvl;
     _CPU_ISR_Disable(isrlvl);
     set_exier(get_exier() | ((mask)&PPC_EXI_MASK));
     _CPU_ISR_Enable(isrlvl);
@@ -138,9 +138,9 @@ enable_ext_irq( unsigned32 mask)
  *  disable an external interrupt, make this interrupt consistent
  */
 RTEMS_INLINE_ROUTINE void 
-disable_ext_irq( unsigned32 mask)
+disable_ext_irq( uint32_t   mask)
 {
-    unsigned32 isrlvl;
+    uint32_t   isrlvl;
     _CPU_ISR_Disable(isrlvl);
     set_exier(get_exier() & ~(mask) & PPC_EXI_MASK);
     _CPU_ISR_Enable(isrlvl);
@@ -155,7 +155,7 @@ disable_ext_irq( unsigned32 mask)
  *
  */
 void 
-ictrl_spurious_handler(unsigned32 spurious_mask, 
+ictrl_spurious_handler(uint32_t   spurious_mask, 
 		       CPU_Interrupt_frame *cpu_frame)
 {
   int v;
@@ -183,7 +183,7 @@ ictrl_spurious_handler(unsigned32 spurious_mask,
 void
 ictrl_isr(rtems_vector_number vector,CPU_Interrupt_frame *cpu_frame)
 {
-  unsigned32        istat,
+  uint32_t          istat,
                     mask,
                     global_vec;
   int               exvec;
@@ -223,7 +223,7 @@ ictrl_isr(rtems_vector_number vector,CPU_Interrupt_frame *cpu_frame)
  */ 
 rtems_status_code
 ictrl_set_vector(rtems_isr_entry   new_handler,
-		 unsigned32        vector,
+		 uint32_t          vector,
 		 rtems_isr_entry   *old_handler
 )
 {
diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h b/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h
index 6c6f77f0e5..3cbaec9c25 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h
+++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h
@@ -78,7 +78,7 @@ extern "C" {
  */ 
 rtems_status_code
 ictrl_set_vector(rtems_isr_entry   new_handler,
-		 unsigned32        vector,
+		 uint32_t          vector,
 		 rtems_isr_entry   *old_handler
 );
 /*
diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c b/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
index c5911fe4a2..724b936d94 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
+++ b/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
@@ -38,15 +38,15 @@
 
 #include <rtems.h>
 
-static volatile rtems_unsigned32 Timer_starting;
+static volatile uint32_t   Timer_starting;
 static rtems_boolean Timer_driver_Find_average_overhead;
 
 /*
  *  This is so small that this code will be reproduced where needed.
  */
-static inline rtems_unsigned32 get_itimer(void)
+static inline uint32_t   get_itimer(void)
 {
-   rtems_unsigned32 ret;
+   uint32_t   ret;
 
 #ifndef ppc405
    asm volatile ("mfspr %0, 0x3dd" : "=r" ((ret))); /* TBLO */
@@ -61,7 +61,7 @@ static inline rtems_unsigned32 get_itimer(void)
 
 void Timer_initialize()
 {
-  rtems_unsigned32 iocr;
+  uint32_t   iocr;
 
 #ifndef ppc405
   asm volatile ("mfdcr %0, 0xa0" : "=r" (iocr)); /* IOCR */
@@ -84,8 +84,8 @@ void Timer_initialize()
 
 int Read_timer()
 {
-  rtems_unsigned32 clicks;
-  rtems_unsigned32 total;
+  uint32_t   clicks;
+  uint32_t   total;
 
   clicks = get_itimer();
 
diff --git a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c
index 56ff791f41..afbf36667a 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c
+++ b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c
@@ -150,9 +150,9 @@ int tty0_round(double x)
 }
 
 void 
-tty0BaudSet(unsigned32 baudrate)
+tty0BaudSet(uint32_t   baudrate)
 {
-  unsigned32 tmp;
+  uint32_t   tmp;
 
   tmp = tty0_round( (double)rtems_cpu_configuration_get_serial_per_sec() / (baudrate * 16) );