Use stdint.h fixed-size types.

8 files changed, 60 insertions, 52 deletions

diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h b/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h
index 43c082df84..2144a285e9 100644
--- a/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h
+++ b/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h
@@ -19,6 +19,7 @@
 #define _PPC_BOOTLDR_H
 
 #ifndef ASM
+#include <stdint.h>
 #include <bsp/residual.h>
 #include <bsp/consoleIo.h>
 #include "pci.h"
@@ -78,77 +79,77 @@ register boot_data *bd __asm__("r13");
 
 extern inline int
 pcibios_read_config_byte(u_char bus, u_char dev_fn,
-			 u_char where, u_char * val) {
+			 u_char where, uint8_t *val) {
 	return bd->pci_functions->read_config_byte(bus, dev_fn, where, val);
 }
 
 extern inline int
 pcibios_read_config_word(u_char bus, u_char dev_fn,
-			 u_char where, u_short * val) {
+			 u_char where, uint16_t *val) {
 	return bd->pci_functions->read_config_word(bus, dev_fn, where, val);
 }
 
 extern inline int
 pcibios_read_config_dword(u_char bus, u_char dev_fn,
-			 u_char where, u_int * val) {
+			 u_char where, uint32_t *val) {
 	return bd->pci_functions->read_config_dword(bus, dev_fn, where, val);
 }
 
 extern inline int
 pcibios_write_config_byte(u_char bus, u_char dev_fn,
-			 u_char where, u_char val) {
+			 u_char where, uint8_t val) {
 	return bd->pci_functions->write_config_byte(bus, dev_fn, where, val);
 }
 
 extern inline int
 pcibios_write_config_word(u_char bus, u_char dev_fn,
-			 u_char where, u_short val) {
+			 u_char where, uint16_t val) {
 	return bd->pci_functions->write_config_word(bus, dev_fn, where, val);
 }
 
 extern inline int
 pcibios_write_config_dword(u_char bus, u_char dev_fn,
-			 u_char where, u_int val) {
+			 u_char where, uint32_t val) {
 	return bd->pci_functions->write_config_dword(bus, dev_fn, where, val);
 }
 
 extern inline int
-pci_bootloader_read_config_byte(struct pci_dev *dev, u_char where, u_char * val) {
+pci_bootloader_read_config_byte(struct pci_dev *dev, u_char where, uint8_t *val) {
 	return bd->pci_functions->read_config_byte(dev->bus->number,
 						   dev->devfn,
 						   where, val);
 }
 
 extern inline int
-pci_bootloader_read_config_word(struct pci_dev *dev, u_char where, u_short * val) {
+pci_bootloader_read_config_word(struct pci_dev *dev, u_char where, uint16_t *val) {
 	return bd->pci_functions->read_config_word(dev->bus->number,
 						   dev->devfn,
 						   where, val);
 }
 
 extern inline int
-pci_bootloader_read_config_dword(struct pci_dev *dev, u_char where, u_int * val) {
+pci_bootloader_read_config_dword(struct pci_dev *dev, u_char where, uint32_t *val) {
 	return bd->pci_functions->read_config_dword(dev->bus->number,
 						    dev->devfn,
 						    where, val);
 }
 
 extern inline int
-pci_bootloader_write_config_byte(struct pci_dev *dev, u_char where, u_char val) {
+pci_bootloader_write_config_byte(struct pci_dev *dev, u_char where, uint8_t val) {
 	return bd->pci_functions->write_config_byte(dev->bus->number,
 						    dev->devfn,
 						    where, val);
 }
 
 extern inline int
-pci_bootloader_write_config_word(struct pci_dev *dev, u_char where, u_short val) {
+pci_bootloader_write_config_word(struct pci_dev *dev, u_char where, uint16_t val) {
 	return bd->pci_functions->write_config_word(dev->bus->number,
 						    dev->devfn,
 						    where, val);
 }
 
 extern inline int
-pci_bootloader_write_config_dword(struct pci_dev *dev, u_char where, u_int val) {
+pci_bootloader_write_config_dword(struct pci_dev *dev, u_char where, uint32_t val) {
 	return bd->pci_functions->write_config_dword(dev->bus->number,
 						     dev->devfn,
 						     where, val);
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c b/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c
index d88bcfa3b9..a7584ea294 100644
--- a/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c
+++ b/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c
@@ -45,8 +45,8 @@ typedef union _reg_type1 {
 } reg_type1;
 
 typedef union _reg_type2 {
- 	unsigned e;
-  	unsigned short x;
+ 	uint32_t e;
+  	uint16_t x;
 } reg_type2;
 
 typedef struct _x86 {
@@ -492,7 +492,8 @@ void em86_main(struct pci_dev *dev){
 	u_short signature;
 	u_char length;
 	volatile u_int *src;
-	u_int *dst, left, saved_rom;
+	u_int *dst, left;
+	uint32_t saved_rom;
 #if defined(MONITOR_IO) && !defined(__BOOT__)
 #define IOMASK 0xff
 #else
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c
index 6913a1befa..7b508ce0f6 100644
--- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c
+++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c
@@ -542,7 +542,7 @@ static void reconfigure_pci(void) {
 
 static int
 indirect_pci_read_config_byte(unsigned char bus, unsigned char dev_fn,
-			      unsigned char offset, unsigned char *val) {
+			      unsigned char offset, uint8_t *val) {
    out_be32(pci->config_addr,
             0x80|(bus<<8)|(dev_fn<<16)|((offset&~3)<<24));
    *val=in_8(pci->config_data + (offset&3));
@@ -551,7 +551,7 @@ indirect_pci_read_config_byte(unsigned char bus, unsigned char dev_fn,
 
 static int
 indirect_pci_read_config_word(unsigned char bus, unsigned char dev_fn,
-			      unsigned char offset, unsigned short *val) {
+			      unsigned char offset, uint16_t *val) {
    *val = 0xffff;
    if (offset&1) return PCIBIOS_BAD_REGISTER_NUMBER;
    out_be32(pci->config_addr,
@@ -562,7 +562,7 @@ indirect_pci_read_config_word(unsigned char bus, unsigned char dev_fn,
 
 static int
 indirect_pci_read_config_dword(unsigned char bus, unsigned char dev_fn,
-                               unsigned char offset, unsigned int *val) {
+                               unsigned char offset, uint32_t *val) {
    *val = 0xffffffff;
    if (offset&3) return PCIBIOS_BAD_REGISTER_NUMBER;
    out_be32(pci->config_addr,
@@ -573,7 +573,7 @@ indirect_pci_read_config_dword(unsigned char bus, unsigned char dev_fn,
 
 static int
 indirect_pci_write_config_byte(unsigned char bus, unsigned char dev_fn,
-			       unsigned char offset, unsigned char val) {
+			       unsigned char offset, uint8_t val) {
    out_be32(pci->config_addr,
             0x80|(bus<<8)|(dev_fn<<16)|((offset&~3)<<24));
    out_8(pci->config_data + (offset&3), val);
@@ -582,7 +582,7 @@ indirect_pci_write_config_byte(unsigned char bus, unsigned char dev_fn,
 
 static int
 indirect_pci_write_config_word(unsigned char bus, unsigned char dev_fn,
-			       unsigned char offset, unsigned short val) {
+			       unsigned char offset, uint16_t val) {
    if (offset&1) return PCIBIOS_BAD_REGISTER_NUMBER;
    out_be32(pci->config_addr,
             0x80|(bus<<8)|(dev_fn<<16)|((offset&~3)<<24));
@@ -592,7 +592,7 @@ indirect_pci_write_config_word(unsigned char bus, unsigned char dev_fn,
 
 static int
 indirect_pci_write_config_dword(unsigned char bus, unsigned char dev_fn,
-				unsigned char offset, unsigned int val) {
+				unsigned char offset, uint32_t val) {
    if (offset&3) return PCIBIOS_BAD_REGISTER_NUMBER;
    out_be32(pci->config_addr,
             0x80|(bus<<8)|(dev_fn<<16)|(offset<<24));
@@ -611,7 +611,7 @@ static const struct pci_bootloader_config_access_functions indirect_functions =
 
 static int
 direct_pci_read_config_byte(unsigned char bus, unsigned char dev_fn,
-                            unsigned char offset, unsigned char *val) {
+                            unsigned char offset, uint8_t *val) {
    if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) {
       *val=0xff;
       return PCIBIOS_DEVICE_NOT_FOUND;
@@ -623,7 +623,7 @@ direct_pci_read_config_byte(unsigned char bus, unsigned char dev_fn,
 
 static int
 direct_pci_read_config_word(unsigned char bus, unsigned char dev_fn,
-                            unsigned char offset, unsigned short *val) {
+                            unsigned char offset, uint16_t *val) {
    *val = 0xffff;
    if (offset&1) return PCIBIOS_BAD_REGISTER_NUMBER;
    if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) {
@@ -637,7 +637,7 @@ direct_pci_read_config_word(unsigned char bus, unsigned char dev_fn,
 
 static int
 direct_pci_read_config_dword(unsigned char bus, unsigned char dev_fn,
-                             unsigned char offset, unsigned int *val) {
+                             unsigned char offset, uint32_t *val) {
    *val = 0xffffffff;
    if (offset&3) return PCIBIOS_BAD_REGISTER_NUMBER;
    if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) {
@@ -651,7 +651,7 @@ direct_pci_read_config_dword(unsigned char bus, unsigned char dev_fn,
 
 static int
 direct_pci_write_config_byte(unsigned char bus, unsigned char dev_fn,
-                             unsigned char offset, unsigned char val) {
+                             unsigned char offset, uint8_t val) {
    if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) {
       return PCIBIOS_DEVICE_NOT_FOUND;
    }
@@ -663,7 +663,7 @@ direct_pci_write_config_byte(unsigned char bus, unsigned char dev_fn,
 
 static int
 direct_pci_write_config_word(unsigned char bus, unsigned char dev_fn,
-                             unsigned char offset, unsigned short val) {
+                             unsigned char offset, uint16_t val) {
    if (offset&1) return PCIBIOS_BAD_REGISTER_NUMBER;
    if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) {
       return PCIBIOS_DEVICE_NOT_FOUND;
@@ -677,7 +677,7 @@ direct_pci_write_config_word(unsigned char bus, unsigned char dev_fn,
 
 static int
 direct_pci_write_config_dword(unsigned char bus, unsigned char dev_fn,
-                              unsigned char offset, unsigned int val) {
+                              unsigned char offset, uint32_t val) {
    if (offset&3) return PCIBIOS_BAD_REGISTER_NUMBER;
    if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) {
       return PCIBIOS_DEVICE_NOT_FOUND;
@@ -785,7 +785,9 @@ void pci_read_bases(struct pci_dev *dev, unsigned int howmany)
 
 u_int pci_scan_bus(struct pci_bus *bus)
 {
-   unsigned int devfn, l, max, class;
+   unsigned int devfn, max;
+   uint32_t class;
+   uint32_t l;
    unsigned char irq, hdr_type, is_multi = 0;
    struct pci_dev *dev, **bus_last;
    struct pci_bus *child;
@@ -891,7 +893,7 @@ u_int pci_scan_bus(struct pci_bus *bus)
        * If it's a bridge, scan the bus behind it.
        */
       if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
-         unsigned int buses;
+         uint32_t buses;
          unsigned int devfn = dev->devfn;
          unsigned short cr;
 
@@ -1321,7 +1323,7 @@ void pci_init(void)
       }
    } else {
       /* Let us try by experimentation at our own risk! */
-      u_int id0;
+      uint32_t id0;
       bd->pci_functions = &direct_functions;
       /* On all direct bridges I know the host bridge itself
        * appears as device 0 function 0.
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h
index fec2976f18..33a276f4b0 100644
--- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h
+++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h
@@ -23,17 +23,17 @@
 /* Functions used to access pci configuration space */
 struct pci_bootloader_config_access_functions {
         int (*read_config_byte)(unsigned char, unsigned char,
-                               unsigned char, unsigned char *);
+                               unsigned char, uint8_t *);
         int (*read_config_word)(unsigned char, unsigned char,
-                               unsigned char, unsigned short *);
+                               unsigned char, uint16_t *);
         int (*read_config_dword)(unsigned char, unsigned char,
-                               unsigned char, unsigned int *);
+                               unsigned char, uint32_t *);
         int (*write_config_byte)(unsigned char, unsigned char,
-                               unsigned char, unsigned char);
+                               unsigned char, uint8_t);
         int (*write_config_word)(unsigned char, unsigned char,
-                               unsigned char, unsigned short);
+                               unsigned char, uint16_t);
         int (*write_config_dword)(unsigned char, unsigned char,
-                               unsigned char, unsigned int);
+                               unsigned char, uint32_t);
 };
 
 /*
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
index fb70847918..648477c406 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
@@ -149,7 +149,7 @@ static unsigned char mcp750_openpic_initsenses[] = {
 void VIA_isa_bridge_interrupts_setup(void)
 {
   pci_isa_bridge_device pci_dev;
-  unsigned int temp;
+  uint32_t temp;
   unsigned char tmp;
   unsigned char maxBus;
   unsigned found = 0;
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c b/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c
index 2decf4e33a..96020518bc 100644
--- a/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c
+++ b/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c
@@ -149,8 +149,8 @@ unsigned merst;
 void detect_host_bridge()
 {
   PPC_DEVICE *hostbridge;
-  unsigned int id0;
-  unsigned int tmp;
+  uint32_t id0;
+  uint32_t tmp;
 
   /*
    * This code assumes that the host bridge is located at
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.c b/c/src/lib/libbsp/powerpc/shared/pci/pci.c
index 399558e5a7..ff2d792439 100644
--- a/c/src/lib/libbsp/powerpc/shared/pci/pci.c
+++ b/c/src/lib/libbsp/powerpc/shared/pci/pci.c
@@ -83,7 +83,7 @@ indirect_pci_read_config_dword(
   unsigned char slot,
   unsigned char function,
   unsigned char offset,
-  unsigned int *val
+  uint32_t *val
 ) {
   *val = 0xffffffff;
   if (offset&3)
@@ -132,7 +132,7 @@ indirect_pci_write_config_dword(
   unsigned char slot,
   unsigned char function,
   unsigned char offset,
-  unsigned int val
+  uint32_t      val
 ) {
   if (offset&3)
     return PCIBIOS_BAD_REGISTER_NUMBER;
@@ -200,7 +200,7 @@ direct_pci_read_config_dword(
   unsigned char slot,
   unsigned char function,
   unsigned char offset,
-  unsigned int *val
+  uint32_t     *val
 ) {
   *val = 0xffffffff;
   if (offset&3)
@@ -257,7 +257,7 @@ direct_pci_write_config_dword(
   unsigned char slot,
   unsigned char function,
   unsigned char offset,
-  unsigned int val
+  uint32_t      val
 ) {
   if (offset&3)
     return PCIBIOS_BAD_REGISTER_NUMBER;
@@ -581,7 +581,8 @@ int pci_initialize()
   unsigned char ucSlotNumber, ucFnNumber, ucNumFuncs;
   unsigned char ucHeader;
   unsigned char ucMaxSubordinate;
-  unsigned int  ulClass, ulDeviceID;
+  uint32_t ulClass;
+  uint32_t ulDeviceID;
 
   detect_host_bridge();
 
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c b/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c
index 1a3aaeca4f..d8d8ef3eb1 100644
--- a/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c
+++ b/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c
@@ -52,6 +52,7 @@
 #define PCI_INVALID_VENDORDEVICEID  0xffffffff
 #define PCI_MULTI_FUNCTION      0x80
 
+#include <inttypes.h>
 #include <bsp/pci.h>
 #include <rtems/bspIo.h>
 #include <stdio.h>
@@ -127,12 +128,13 @@ dump_dev_cb(
    int dev,
    int fun,
    void *uarg
-) {
-unsigned short vi,di;
-unsigned short cd,st;
-unsigned int   b1,b2;
-unsigned char  il,ip;
-FILE           *f = uarg;
+) 
+{
+  uint16_t vi,di;
+  uint16_t cd,st;
+  uint32_t b1,b2;
+  uint8_t  il,ip;
+  FILE     *f = uarg;
 
 	pci_read_config_word (bus, dev, fun, PCI_VENDOR_ID,      &vi);
 	pci_read_config_word (bus, dev, fun, PCI_DEVICE_ID,      &di);
@@ -143,7 +145,8 @@ FILE           *f = uarg;
 	pci_read_config_byte (bus, dev, fun, PCI_INTERRUPT_LINE, &il);
 	pci_read_config_byte (bus, dev, fun, PCI_INTERRUPT_PIN,  &ip);
 
-	fprintf(f,"%3d:0x%02x:%d    0x%04x-0x%04x:  0x%04x 0x%04x 0x%08x 0x%08x       %d -> %3d (=0x%02x)\n",
+   /*  fprintf(f,"%3d:0x%02x:%d    0x%04x-0x%04x:  0x%04x 0x%04x 0x%08x 0x%08x       %d -> %3d (=0x%02x)\n", */
+       fprintf(f,"%3d:0x%02x:%d    0x%04x-0x%04x:  0x%04x 0x%04x 0x%08" PRIx32 " 0x%08" PRIx32 "       %d -> %3d (=0x%02x)\n",
 		bus, dev, fun, vi, di, cd, st, b1, b2, ip, il, il);
 	return 0;
 }
@@ -164,7 +167,7 @@ BSP_pciScan(
   void *uarg
 ) {
 
-   unsigned int d;
+   uint32_t d;
    unsigned char bus,dev,fun,hd;
 
    bus = PCIB_DEVSIG_BUS(  (unsigned long)handle );