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

	* PCI_bus/PCI.c, PCI_bus/PCI.h, PCI_bus/flash.c, PCI_bus/universe.c,
	clock/clock.c, console/85c30.c, console/console.c,
	console/consolebsp.h, include/bsp.h, include/gen2.h, startup/FPGA.c,
	startup/Hwr_init.c, startup/bspstart.c, startup/genpvec.c,
	startup/spurious.c, startup/vmeintr.c, timer/timer.c, tod/tod.c:
	Convert to using c99 fixed size types.

6 files changed, 84 insertions, 84 deletions

diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c b/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c
index 81fd7beb4c..59d7168b42 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c
@@ -24,7 +24,7 @@
 void initialize_PCI_bridge ()
 {
 #if (!SCORE603E_USE_DINK)
-  rtems_unsigned16 mask, shift, data;
+  uint16_t         mask, shift, data;
 
   shift = SCORE603E_85C30_0_IRQ - Score_IRQ_First;
   mask = 1 << shift;
@@ -41,22 +41,22 @@ void initialize_PCI_bridge ()
 }
 
 void set_irq_mask(
-  rtems_unsigned16 value
+  uint16_t         value
 )
 {
-  rtems_unsigned16  *loc;
+  uint16_t          *loc;
 
-  loc = (rtems_unsigned16  *)SCORE603E_FPGA_MASK_DATA;
+  loc = (uint16_t*)SCORE603E_FPGA_MASK_DATA;
 
   *loc = value;
 }
 
-rtems_unsigned16 get_irq_mask()
+uint16_t         get_irq_mask()
 {
-  rtems_unsigned16  *loc;
-  rtems_unsigned16  value;
+  uint16_t          *loc;
+  uint16_t          value;
 
-  loc =  (rtems_unsigned16  *)SCORE603E_FPGA_MASK_DATA;
+  loc =  (uint16_t*)SCORE603E_FPGA_MASK_DATA;
 
   value = *loc;
 
@@ -64,11 +64,11 @@ rtems_unsigned16 get_irq_mask()
 }
 
 void unmask_irq( 
-  rtems_unsigned16 irq_idx
+  uint16_t         irq_idx
 )
 {
-  rtems_unsigned16 value;
-  rtems_unsigned32 mask_idx = irq_idx;
+  uint16_t         value;
+  uint32_t         mask_idx = irq_idx;
 
   value = get_irq_mask();
 
@@ -92,8 +92,8 @@ void unmask_irq(
 
 void init_irq_data_register()
 {
-  rtems_unsigned32 index;
-  rtems_unsigned32 i;
+  uint32_t         index;
+  uint32_t         i;
 
 #if (SCORE603E_USE_DINK)
   set_irq_mask( 0xffff );
@@ -109,11 +109,11 @@ void init_irq_data_register()
   }
 }
 
-rtems_unsigned16 read_and_clear_PMC_irq(
-  rtems_unsigned16    irq
+uint16_t         read_and_clear_PMC_irq(
+  uint16_t            irq
 ) 
 {
-  rtems_unsigned16    status_word = irq;
+  uint16_t            status_word = irq;
 
   status_word = (*SCORE603E_PMC_STATUS_ADDRESS);
 
@@ -121,8 +121,8 @@ rtems_unsigned16 read_and_clear_PMC_irq(
 }
 
 rtems_boolean Is_PMC_IRQ(
-  rtems_unsigned32   pmc_irq,
-  rtems_unsigned16   status_word
+  uint32_t           pmc_irq,
+  uint16_t           status_word
 )
 {
   rtems_boolean   result= FALSE;
@@ -148,9 +148,9 @@ rtems_boolean Is_PMC_IRQ(
   return result;
 }
 
-rtems_unsigned16 read_and_clear_irq()
+uint16_t         read_and_clear_irq()
 {
-  rtems_unsigned16    irq;
+  uint16_t            irq;
 
   irq = (*SCORE603E_FPGA_VECT_DATA);
 
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c b/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c
index 938aeeddc5..bc83599cc1 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c
@@ -52,24 +52,24 @@
 
 
 typedef struct {
-  rtems_unsigned32  counter_1_100;
-  rtems_unsigned32  counter_hours;
-  rtems_unsigned32  counter_min;
-  rtems_unsigned32  counter_sec;
-  rtems_unsigned32  counter_month;
-  rtems_unsigned32  counter_date;
-  rtems_unsigned32  counter_year;
-  rtems_unsigned32  counter_day_of_week;
-
-  rtems_unsigned32  RAM_1_100;
-  rtems_unsigned32  RAM_hours;
-  rtems_unsigned32  RAM_month;
-  rtems_unsigned32  RAM_date;
-  rtems_unsigned32  RAM_year;
-  rtems_unsigned32  RAM_day_of_week;
-
-  rtems_unsigned32  interupt_status_mask;
-  rtems_unsigned32  command_register;
+  uint32_t          counter_1_100;
+  uint32_t          counter_hours;
+  uint32_t          counter_min;
+  uint32_t          counter_sec;
+  uint32_t          counter_month;
+  uint32_t          counter_date;
+  uint32_t          counter_year;
+  uint32_t          counter_day_of_week;
+
+  uint32_t          RAM_1_100;
+  uint32_t          RAM_hours;
+  uint32_t          RAM_month;
+  uint32_t          RAM_date;
+  uint32_t          RAM_year;
+  uint32_t          RAM_day_of_week;
+
+  uint32_t          interupt_status_mask;
+  uint32_t          command_register;
 }Harris_RTC;
 
 void init_RTC()
@@ -84,7 +84,7 @@ void init_RTC()
 void init_PCI()
 {  
 #if (SCORE603E_USE_SDS) | (SCORE603E_USE_OPEN_FIRMWARE) | (SCORE603E_USE_NONE)
-  rtems_unsigned32 value;
+  uint32_t         value;
 
  /*
   * NOTE:  Accessing any memory location not mapped by the BAT 
@@ -174,7 +174,7 @@ void init_PCI()
 
 void instruction_cache_enable ()
 {
-  rtems_unsigned32 value;
+  uint32_t         value;
 
   /*
    * Enable the instruction cache
@@ -189,7 +189,7 @@ void instruction_cache_enable ()
 
 void data_cache_enable ()
 {
-  rtems_unsigned32 value;
+  uint32_t         value;
 
   /*
    * enable data cache 
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
index 4157d89ad5..a3fee15ba8 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
@@ -29,14 +29,14 @@
 extern rtems_configuration_table  Configuration;
 rtems_configuration_table         BSP_Configuration;
 rtems_cpu_table                   Cpu_table;
-rtems_unsigned32                  bsp_isr_level;
+uint32_t                          bsp_isr_level;
 
 /*
  *  Use the shared implementations of the following routines
  */
 
 void bsp_postdriver_hook(void);
-void bsp_libc_init( void *, unsigned32, int );
+void bsp_libc_init( void *, uint32_t, int );
 
 /*PAGE
  *
@@ -49,10 +49,10 @@ void bsp_libc_init( void *, unsigned32, int );
 void bsp_pretasking_hook(void)
 {
   extern int end;
-  rtems_unsigned32 heap_start;
-  rtems_unsigned32 heap_size;
+  uint32_t         heap_start;
+  uint32_t         heap_size;
 
-  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);
 
@@ -109,8 +109,8 @@ void bsp_predriver_hook(void)
  */
 
 void initialize_PMC() {
-  volatile rtems_unsigned32 *PMC_addr;
-  rtems_unsigned8  data;
+  volatile uint32_t         *PMC_addr;
+  uint8_t          data;
 
 #if (0) /* First Values sent */
   /*
@@ -128,7 +128,7 @@ void initialize_PMC() {
   /*
    * Bit 0 and 1 HI cause Medium Loopback to occur.
    */
-  PMC_addr = (volatile rtems_unsigned32 *)
+  PMC_addr = (volatile uint32_t*)
         SCORE603E_PMC_SERIAL_ADDRESS( 0x100000 );
   data = *PMC_addr;
   /*   *PMC_addr = data | 0x3;  */
@@ -151,7 +151,7 @@ void initialize_PMC() {
   PMC_addr  = SCORE603E_PCI_DEVICE_ADDRESS( 0x14 );
   *PMC_addr = (SCORE603E_PCI_REGISTER_BASE >> 24) & 0x3f;
 
-  PMC_addr = (volatile rtems_unsigned32 *)
+  PMC_addr = (volatile uint32_t*)
       SCORE603E_PMC_SERIAL_ADDRESS( 0x100000 );
   data = *PMC_addr;
   *PMC_addr = data & 0xfc;
@@ -190,7 +190,7 @@ void bsp_start( void )
 {
   unsigned char *work_space_start;
   unsigned int  msr_value = 0x0000;
-  volatile rtems_unsigned32 *ptr;
+  volatile uint32_t         *ptr;
 
   rtems_bsp_delay( 1000 );
 
@@ -215,13 +215,13 @@ void bsp_start( void )
     
    Code = 0x4bf00002;          
    for (Address = 0x100; Address <= 0xe00; Address += 0x100) { 
-     A_Vector = (unsigned32    *)Address;
+     A_Vector = (uint32_t*)Address;
      Code = 0x4bf00002 + Address;
      *A_Vector = Code;
    }
     
    for (Address = 0x1000; Address <= 0x1400; Address += 0x100) { 
-     A_Vector = (unsigned32    *)Address;
+     A_Vector = (uint32_t*)Address;
      Code = 0x4bf00002 + Address;
      *A_Vector = Code;
    }
@@ -248,7 +248,7 @@ void bsp_start( void )
    * Override the DINK error on a Decrementor interrupt.
    */
   /* org    dec_vector  - rfi */
-  ptr = (rtems_unsigned32 *)0x900;
+  ptr = (uint32_t*)0x900;
   *ptr = 0x4c000064;
 
 #else
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c b/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c
index d23748209b..c247ed0df9 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c
@@ -47,7 +47,7 @@ typedef struct
  *        handlers at a later time.
  */
   EE_ISR_Type       ISR_Nodes [NUM_LIRQ_HANDLERS];
-  rtems_unsigned16  Nodes_Used; 
+  uint16_t          Nodes_Used; 
   Chain_Control     ISR_Array  [NUM_LIRQ];
 
 /* XXX */
@@ -91,8 +91,8 @@ rtems_isr_entry  set_EE_vector(
   rtems_vector_number vector        /* vector number      */
 )
 {
-  rtems_unsigned16 vec_idx  = vector - Score_IRQ_First;
-  rtems_unsigned32 index;
+  uint16_t         vec_idx  = vector - Score_IRQ_First;
+  uint32_t         index;
   
   assert  (Nodes_Used < NUM_LIRQ_HANDLERS);
    
@@ -138,14 +138,14 @@ rtems_isr external_exception_ISR (
   rtems_vector_number   vector             /* IN  */
 )
 { 
- rtems_unsigned16    index;
+ uint16_t            index;
  EE_ISR_Type         *node;
- rtems_unsigned16    value;
+ uint16_t            value;
  char                err_msg[100];
 #if (HAS_PMC_PSC8)
- rtems_unsigned16    PMC_irq;
- rtems_unsigned16    check_irq;
- rtems_unsigned16    status_word;
+ uint16_t            PMC_irq;
+ uint16_t            check_irq;
+ uint16_t            status_word;
 #endif
 
  index = read_and_clear_irq();
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/spurious.c b/c/src/lib/libbsp/powerpc/score603e/startup/spurious.c
index 6fb9f70712..7ba0632e77 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/spurious.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/spurious.c
@@ -172,7 +172,7 @@ rtems_isr bsp_spurious_handler(
 
 void bsp_spurious_initialize()
 {
-  rtems_unsigned32 trap;
+  uint32_t         trap;
 
   for ( trap=0 ; trap < PPC_IRQ_LAST ; trap++ ) {
     if (trap == PPC_IRQ_DECREMENTER)
@@ -185,70 +185,70 @@ void bsp_spurious_initialize()
 
 void bsp_set_trap_vectors( void )
 {
-  volatile rtems_unsigned32 *ptr;
+  volatile uint32_t         *ptr;
 
   /* reset_vector  */
-  ptr = (rtems_unsigned32 *)0x00100  ;
+  ptr = (uint32_t*)0x00100  ;
   *ptr = 0x48000000;
 
   /* org    mach_vector  */
-  ptr = (rtems_unsigned32 *)0x00200;
+  ptr = (uint32_t*)0x00200;
   *ptr = 0x48000000;
 
   /* org    prot_vector  */
-  ptr = (rtems_unsigned32 *)0x00300;
+  ptr = (uint32_t*)0x00300;
   *ptr = 0x48000000;
 
   /* org    isi_vector  */
-  ptr = (rtems_unsigned32 *)0x00400;
+  ptr = (uint32_t*)0x00400;
   *ptr = 0x48000000;
 
   /* org    ext_vector  */
-  ptr = (rtems_unsigned32 *)0x0500  ;
+  ptr = (uint32_t*)0x0500  ;
   *ptr = 0x48000000;
 
   /* org    align_vector  */
-  ptr = (rtems_unsigned32 *)0x00600  ;
+  ptr = (uint32_t*)0x00600  ;
   *ptr = 0x48000000;
 
   /* org    prog_vector  */
-  ptr = (rtems_unsigned32 *)0x00700  ;
+  ptr = (uint32_t*)0x00700  ;
   *ptr = 0x48000000;
 
   /* org    float_vector  */
-  ptr = (rtems_unsigned32 *)0x00800;
+  ptr = (uint32_t*)0x00800;
   *ptr = 0x48000000;
 
   /* org    dec_vector  - rfi */
-  ptr = (rtems_unsigned32 *)0x900;
+  ptr = (uint32_t*)0x900;
   *ptr = 0x4c000064;
 
   /* org    sys_vector  */
-  ptr = (rtems_unsigned32 *)0x0c00  ;
+  ptr = (uint32_t*)0x0c00  ;
   *ptr = 0x48000000;
 
   /* org    trace_vector  */
-  ptr = (rtems_unsigned32 *)0x0d00  ;
+  ptr = (uint32_t*)0x0d00  ;
   *ptr = 0x48000000;
 
   /* org    itm_vector  */
-  ptr = (rtems_unsigned32 *)0x01000  ;
+  ptr = (uint32_t*)0x01000  ;
   *ptr = 0x48000000;
 
   /* org    dltm_vector  */
-  ptr = (rtems_unsigned32 *)0x01100  ;
+  ptr = (uint32_t*)0x01100  ;
   *ptr = 0x48000000;
 
   /* org    dstm_vector  */
-  ptr = (rtems_unsigned32 *)0x1200  ;
+  ptr = (uint32_t*)0x1200  ;
   *ptr = 0x48000000;
 
   /* org    addr_vector  */
-  ptr = (rtems_unsigned32 *)0x1300  ;
+  ptr = (uint32_t*)0x1300  ;
   *ptr = 0x48000000;
 
   /* org    sysmgmt_vector  */
-  ptr = (rtems_unsigned32 *)0x1400  ;
+  ptr = (uint32_t*)0x1400  ;
   *ptr = 0x48000000;
 
 }
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/vmeintr.c b/c/src/lib/libbsp/powerpc/score603e/startup/vmeintr.c
index 7102814ef4..9d843439dd 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/vmeintr.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/vmeintr.c
@@ -26,8 +26,8 @@ void VME_interrupt_Disable (
   VME_interrupt_Mask                mask                        /* IN  */
 )
 {
-  volatile rtems_unsigned8  *VME_interrupt_enable;
-  rtems_unsigned8  value;
+  volatile uint8_t          *VME_interrupt_enable;
+  uint8_t          value;
 
 #if 0
   VME_interrupt_enable = ACC_VIE;
@@ -51,8 +51,8 @@ void VME_interrupt_Enable (
   VME_interrupt_Mask                mask                        /* IN  */
 )
 {
-  volatile rtems_unsigned8  *VME_interrupt_enable;
-  rtems_unsigned8  value;
+  volatile uint8_t          *VME_interrupt_enable;
+  uint8_t          value;
 
 #if 0
   VME_interrupt_enable = ACC_VIE;