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.

1 files changed, 114 insertions, 114 deletions

diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
index 00891a18af..182ed2995a 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
@@ -31,108 +31,108 @@
  ********************************************************************/
 
 typedef struct {
-  rtems_unsigned32 PCI_ID;                 /* 0x80030000 */
-  rtems_unsigned32 PCI_CSR;                /* 0x80030004 */
-  rtems_unsigned32 PCI_CLASS;              /* 0x80030008 */
-  rtems_unsigned32 PCI_MISC0;              /* 0x8003000C */
-  rtems_unsigned32 PCI_BS;                 /* 0x80030010 */
-  rtems_unsigned32 Buf_0x80030014[ 0x0A ]; /* 0x80030014 */
-  rtems_unsigned32 PCI_MISC1;              /* 0x8003003C */
-  rtems_unsigned32 Buf_0x80030040[ 0x30 ]; /* 0x80030040 */
-  rtems_unsigned32 LSI0_CTL;               /* 0x80030100 */
-  rtems_unsigned32 LSI0_BS;                /* 0x80030104 */
-  rtems_unsigned32 LSI0_BD;                /* 0x80030108 */
-  rtems_unsigned32 LSI0_TO;                /* 0x8003010C */
-  rtems_unsigned32 Buf_0x80030110;         /* 0x80030110 */
-  rtems_unsigned32 LSI1_CTL;               /* 0x80030114 */
-  rtems_unsigned32 LSI1_BS;                /* 0x80030118 */
-  rtems_unsigned32 LSI1_BD;                /* 0x8003011C */
-  rtems_unsigned32 LSI1_TO;                /* 0x80030120 */
-  rtems_unsigned32 Buf_0x80030124;         /* 0x80030124 */
-  rtems_unsigned32 LSI2_CTL;               /* 0x80030128 */
-  rtems_unsigned32 LSI2_BS;                /* 0x8003012C */
-  rtems_unsigned32 LSI2_BD;                /* 0x80030130 */
-  rtems_unsigned32 LSI2_TO;                /* 0x80030134 */
-  rtems_unsigned32 Buf_0x80030138;         /* 0x80030138 */
-  rtems_unsigned32 LSI3_CTL;               /* 0x8003013C */
-  rtems_unsigned32 LSI3_BS;                /* 0x80030140 */
-  rtems_unsigned32 LSI3_BD;                /* 0x80030144 */
-  rtems_unsigned32 LSI3_TO;                /* 0x80030148 */
-  rtems_unsigned32 Buf_0x8003014C[ 0x09 ]; /* 0x8003014C */
-  rtems_unsigned32 SCYC_CTL;               /* 0x80030170 */
-  rtems_unsigned32 SCYC_ADDR;              /* 0x80030174 */
-  rtems_unsigned32 SCYC_EN;                /* 0x80030178 */
-  rtems_unsigned32 SCYC_CMP;               /* 0x8003017C */
-  rtems_unsigned32 SCYC_SWP;               /* 0x80030180 */
-  rtems_unsigned32 LMISC;                  /* 0x80030184 */
-  rtems_unsigned32 SLSI;                   /* 0x80030188 */
-  rtems_unsigned32 L_CMDERR;               /* 0x8003018C */
-  rtems_unsigned32 LAERR;                  /* 0x80030190 */
-  rtems_unsigned32 Buf_0x80030194[ 0x1B ]; /* 0x80030194 */
-  rtems_unsigned32 DCTL;                   /* 0x80030200 */
-  rtems_unsigned32 DTBC;                   /* 0x80030204 */
-  rtems_unsigned32 DLA;                    /* 0x80030208 */
-  rtems_unsigned32 Buf_0x8003020C;         /* 0x8003020C */
-  rtems_unsigned32 DVA;                    /* 0x80030210 */
-  rtems_unsigned32 Buf_0x80030214;         /* 0x80030214 */
-  rtems_unsigned32 DCPP;                   /* 0x80030218 */
-  rtems_unsigned32 Buf_0x8003021C;         /* 0x8003021C */
-  rtems_unsigned32 DGCS;                   /* 0x80030220 */
-  rtems_unsigned32 D_LLUE;                 /* 0x80030224 */
-  rtems_unsigned32 Buf_0x80030228[ 0x36 ]; /* 0x80030228 */
-  rtems_unsigned32 LINT_EN;                /* 0x80030300 */
-  rtems_unsigned32 LINT_STAT;              /* 0x80030304 */
-  rtems_unsigned32 LINT_MAP0;              /* 0x80030308 */
-  rtems_unsigned32 LINT_MAP1;              /* 0x8003030C */
-  rtems_unsigned32 VINT_EN;                /* 0x80030310 */
-  rtems_unsigned32 VINT_STAT;              /* 0x80030314 */
-  rtems_unsigned32 VINT_MAP0;              /* 0x80030318 */
-  rtems_unsigned32 VINT_MAP1;              /* 0x8003031C */
-  rtems_unsigned32 STATID;                 /* 0x80030320 */
-  rtems_unsigned32 V1_STATID;              /* 0x80030324 */
-  rtems_unsigned32 V2_STATID;              /* 0x80030328 */
-  rtems_unsigned32 V3_STATID;              /* 0x8003032C */
-  rtems_unsigned32 V4_STATID;              /* 0x80030330 */
-  rtems_unsigned32 V5_STATID;              /* 0x80030334 */
-  rtems_unsigned32 V6_STATID;              /* 0x80030338 */
-  rtems_unsigned32 V7_STATID;              /* 0x8003033C */
-  rtems_unsigned32 Buf_0x80030340[ 0x30 ]; /* 0x80030340 */
-  rtems_unsigned32 MAST_CTL;               /* 0x80030400 */ 
-  rtems_unsigned32 MISC_CTL;               /* 0x80030404 */ 
-  rtems_unsigned32 MISC_STAT;              /* 0x80030408 */ 
-  rtems_unsigned32 USER_AM;                /* 0x8003040C */
-  rtems_unsigned32 Buf_0x80030410[ 0x2bc ];/* 0x80030410 */
-  rtems_unsigned32 VSI0_CTL;               /* 0x80030F00 */
-  rtems_unsigned32 VSI0_BS;                /* 0x80030F04 */
-  rtems_unsigned32 VSI0_BD;                /* 0x80030F08 */
-  rtems_unsigned32 VSI0_TO;                /* 0x80030F0C */
-  rtems_unsigned32 Buf_0x80030f10;         /* 0x80030F10 */
-  rtems_unsigned32 VSI1_CTL;               /* 0x80030F14 */
-  rtems_unsigned32 VSI1_BS;                /* 0x80030F18 */
-  rtems_unsigned32 VSI1_BD;                /* 0x80030F1C */
-  rtems_unsigned32 VSI1_TO;                /* 0x80030F20 */
-  rtems_unsigned32 Buf_0x80030F24;         /* 0x80030F24 */
-  rtems_unsigned32 VSI2_CTL;               /* 0x80030F28 */
-  rtems_unsigned32 VSI2_BS;                /* 0x80030F2C */
-  rtems_unsigned32 VSI2_BD;                /* 0x80030F30 */
-  rtems_unsigned32 VSI2_TO;                /* 0x80030F34 */
-  rtems_unsigned32 Buf_0x80030F38;         /* 0x80030F38 */
-  rtems_unsigned32 VSI3_CTL;               /* 0x80030F3C */
-  rtems_unsigned32 VSI3_BS;                /* 0x80030F40 */
-  rtems_unsigned32 VSI3_BD;                /* 0x80030F44 */
-  rtems_unsigned32 VSI3_TO;                /* 0x80030F48 */
-  rtems_unsigned32 Buf_0x80030F4C[ 0x9 ];  /* 0x80030F4C */
-  rtems_unsigned32 VRAI_CTL;               /* 0x80030F70 */
-  rtems_unsigned32 VRAI_BS;                /* 0x80030F74 */
-  rtems_unsigned32 Buf_0x80030F78[ 0x2 ];  /* 0x80030F78 */
-  rtems_unsigned32 VCSR_CTL;               /* 0x80030F80 */
-  rtems_unsigned32 VCSR_TO;                /* 0x80030F84 */
-  rtems_unsigned32 V_AMERR;                /* 0x80030F88 */
-  rtems_unsigned32 VAERR;                  /* 0x80030F8C */
-  rtems_unsigned32 Buf_0x80030F90[ 0x19 ]; /* 0x80030F90 */
-  rtems_unsigned32 VCSR_CLR;               /* 0x80030FF4 */
-  rtems_unsigned32 VCSR_SET;               /* 0x80030FF8 */
-  rtems_unsigned32 VCSR_BS;                /* 0x80030FFC */
+  uint32_t         PCI_ID;                 /* 0x80030000 */
+  uint32_t         PCI_CSR;                /* 0x80030004 */
+  uint32_t         PCI_CLASS;              /* 0x80030008 */
+  uint32_t         PCI_MISC0;              /* 0x8003000C */
+  uint32_t         PCI_BS;                 /* 0x80030010 */
+  uint32_t         Buf_0x80030014[ 0x0A ]; /* 0x80030014 */
+  uint32_t         PCI_MISC1;              /* 0x8003003C */
+  uint32_t         Buf_0x80030040[ 0x30 ]; /* 0x80030040 */
+  uint32_t         LSI0_CTL;               /* 0x80030100 */
+  uint32_t         LSI0_BS;                /* 0x80030104 */
+  uint32_t         LSI0_BD;                /* 0x80030108 */
+  uint32_t         LSI0_TO;                /* 0x8003010C */
+  uint32_t         Buf_0x80030110;         /* 0x80030110 */
+  uint32_t         LSI1_CTL;               /* 0x80030114 */
+  uint32_t         LSI1_BS;                /* 0x80030118 */
+  uint32_t         LSI1_BD;                /* 0x8003011C */
+  uint32_t         LSI1_TO;                /* 0x80030120 */
+  uint32_t         Buf_0x80030124;         /* 0x80030124 */
+  uint32_t         LSI2_CTL;               /* 0x80030128 */
+  uint32_t         LSI2_BS;                /* 0x8003012C */
+  uint32_t         LSI2_BD;                /* 0x80030130 */
+  uint32_t         LSI2_TO;                /* 0x80030134 */
+  uint32_t         Buf_0x80030138;         /* 0x80030138 */
+  uint32_t         LSI3_CTL;               /* 0x8003013C */
+  uint32_t         LSI3_BS;                /* 0x80030140 */
+  uint32_t         LSI3_BD;                /* 0x80030144 */
+  uint32_t         LSI3_TO;                /* 0x80030148 */
+  uint32_t         Buf_0x8003014C[ 0x09 ]; /* 0x8003014C */
+  uint32_t         SCYC_CTL;               /* 0x80030170 */
+  uint32_t         SCYC_ADDR;              /* 0x80030174 */
+  uint32_t         SCYC_EN;                /* 0x80030178 */
+  uint32_t         SCYC_CMP;               /* 0x8003017C */
+  uint32_t         SCYC_SWP;               /* 0x80030180 */
+  uint32_t         LMISC;                  /* 0x80030184 */
+  uint32_t         SLSI;                   /* 0x80030188 */
+  uint32_t         L_CMDERR;               /* 0x8003018C */
+  uint32_t         LAERR;                  /* 0x80030190 */
+  uint32_t         Buf_0x80030194[ 0x1B ]; /* 0x80030194 */
+  uint32_t         DCTL;                   /* 0x80030200 */
+  uint32_t         DTBC;                   /* 0x80030204 */
+  uint32_t         DLA;                    /* 0x80030208 */
+  uint32_t         Buf_0x8003020C;         /* 0x8003020C */
+  uint32_t         DVA;                    /* 0x80030210 */
+  uint32_t         Buf_0x80030214;         /* 0x80030214 */
+  uint32_t         DCPP;                   /* 0x80030218 */
+  uint32_t         Buf_0x8003021C;         /* 0x8003021C */
+  uint32_t         DGCS;                   /* 0x80030220 */
+  uint32_t         D_LLUE;                 /* 0x80030224 */
+  uint32_t         Buf_0x80030228[ 0x36 ]; /* 0x80030228 */
+  uint32_t         LINT_EN;                /* 0x80030300 */
+  uint32_t         LINT_STAT;              /* 0x80030304 */
+  uint32_t         LINT_MAP0;              /* 0x80030308 */
+  uint32_t         LINT_MAP1;              /* 0x8003030C */
+  uint32_t         VINT_EN;                /* 0x80030310 */
+  uint32_t         VINT_STAT;              /* 0x80030314 */
+  uint32_t         VINT_MAP0;              /* 0x80030318 */
+  uint32_t         VINT_MAP1;              /* 0x8003031C */
+  uint32_t         STATID;                 /* 0x80030320 */
+  uint32_t         V1_STATID;              /* 0x80030324 */
+  uint32_t         V2_STATID;              /* 0x80030328 */
+  uint32_t         V3_STATID;              /* 0x8003032C */
+  uint32_t         V4_STATID;              /* 0x80030330 */
+  uint32_t         V5_STATID;              /* 0x80030334 */
+  uint32_t         V6_STATID;              /* 0x80030338 */
+  uint32_t         V7_STATID;              /* 0x8003033C */
+  uint32_t         Buf_0x80030340[ 0x30 ]; /* 0x80030340 */
+  uint32_t         MAST_CTL;               /* 0x80030400 */ 
+  uint32_t         MISC_CTL;               /* 0x80030404 */ 
+  uint32_t         MISC_STAT;              /* 0x80030408 */ 
+  uint32_t         USER_AM;                /* 0x8003040C */
+  uint32_t         Buf_0x80030410[ 0x2bc ];/* 0x80030410 */
+  uint32_t         VSI0_CTL;               /* 0x80030F00 */
+  uint32_t         VSI0_BS;                /* 0x80030F04 */
+  uint32_t         VSI0_BD;                /* 0x80030F08 */
+  uint32_t         VSI0_TO;                /* 0x80030F0C */
+  uint32_t         Buf_0x80030f10;         /* 0x80030F10 */
+  uint32_t         VSI1_CTL;               /* 0x80030F14 */
+  uint32_t         VSI1_BS;                /* 0x80030F18 */
+  uint32_t         VSI1_BD;                /* 0x80030F1C */
+  uint32_t         VSI1_TO;                /* 0x80030F20 */
+  uint32_t         Buf_0x80030F24;         /* 0x80030F24 */
+  uint32_t         VSI2_CTL;               /* 0x80030F28 */
+  uint32_t         VSI2_BS;                /* 0x80030F2C */
+  uint32_t         VSI2_BD;                /* 0x80030F30 */
+  uint32_t         VSI2_TO;                /* 0x80030F34 */
+  uint32_t         Buf_0x80030F38;         /* 0x80030F38 */
+  uint32_t         VSI3_CTL;               /* 0x80030F3C */
+  uint32_t         VSI3_BS;                /* 0x80030F40 */
+  uint32_t         VSI3_BD;                /* 0x80030F44 */
+  uint32_t         VSI3_TO;                /* 0x80030F48 */
+  uint32_t         Buf_0x80030F4C[ 0x9 ];  /* 0x80030F4C */
+  uint32_t         VRAI_CTL;               /* 0x80030F70 */
+  uint32_t         VRAI_BS;                /* 0x80030F74 */
+  uint32_t         Buf_0x80030F78[ 0x2 ];  /* 0x80030F78 */
+  uint32_t         VCSR_CTL;               /* 0x80030F80 */
+  uint32_t         VCSR_TO;                /* 0x80030F84 */
+  uint32_t         V_AMERR;                /* 0x80030F88 */
+  uint32_t         VAERR;                  /* 0x80030F8C */
+  uint32_t         Buf_0x80030F90[ 0x19 ]; /* 0x80030F90 */
+  uint32_t         VCSR_CLR;               /* 0x80030FF4 */
+  uint32_t         VCSR_SET;               /* 0x80030FF8 */
+  uint32_t         VCSR_BS;                /* 0x80030FFC */
 } Universe_Memory;
 
 volatile Universe_Memory *UNIVERSE = 
@@ -155,17 +155,17 @@ volatile Universe_Memory *UNIVERSE =
 
 void initialize_universe()
 {
-  rtems_unsigned32 jumper_selection;
-  rtems_unsigned32 pci_id;
+  uint32_t         jumper_selection;
+  uint32_t         pci_id;
 #if (SCORE603E_USE_SDS) | (SCORE603E_USE_OPEN_FIRMWARE) | (SCORE603E_USE_NONE)
-  volatile rtems_unsigned32 universe_temp_value;
+  volatile uint32_t         universe_temp_value;
 #endif
  
   /*
    * Read the VME jumper location to determine the VME base address
    */
   jumper_selection = PCI_bus_read( 
-                     (volatile rtems_unsigned32 *)SCORE603E_VME_JUMPER_ADDR );
+                     (volatile uint32_t*)SCORE603E_VME_JUMPER_ADDR );
   jumper_selection = (jumper_selection >> 3) & 0x1f;
 
   /*
@@ -249,10 +249,10 @@ void initialize_universe()
  *       Slave Image 0 registers.
  */
 void set_vme_base_address (
-  rtems_unsigned32 base_address 
+  uint32_t         base_address 
 )
 {  
-  volatile rtems_unsigned32 temp;
+  volatile uint32_t         temp;
 
   /*
    * Calculate the current size of the Slave VME image 0
@@ -281,18 +281,18 @@ void set_vme_base_address (
 /*
  * Gets the VME base address
  */
-rtems_unsigned32 get_vme_base_address ()
+uint32_t         get_vme_base_address ()
 {  
-  volatile rtems_unsigned32 temp;
+  volatile uint32_t         temp;
 
   temp = PCI_bus_read( &UNIVERSE->VSI0_BS );
   temp &= 0xFFFFF000;
   return (temp);
 }
 
-rtems_unsigned32 get_vme_slave_size()
+uint32_t         get_vme_slave_size()
 {
-  volatile rtems_unsigned32 temp;
+  volatile uint32_t         temp;
   temp  =  PCI_bus_read( &UNIVERSE->VSI0_BD);
   temp &= 0xFFFFF000;
   temp  = temp - get_vme_base_address ();
@@ -303,9 +303,9 @@ rtems_unsigned32 get_vme_slave_size()
  * Set the size of the VME slave image
  * Note: The maximum size is up to 24 M bytes. (00000000 - 017FFFFF)
  */
-void set_vme_slave_size (rtems_unsigned32 size)
+void set_vme_slave_size (uint32_t         size)
 {  
-  volatile rtems_unsigned32 temp;
+  volatile uint32_t         temp;
 
   if (size<0) 
     size = 0;