1 files changed, 11 insertions, 18 deletions

diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c
index 79a2a464a8..729c8a0640 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c
@@ -34,8 +34,8 @@
 #include <stdio.h>
 #include <string.h>
 
-/* #define PCI_DEBUG 1 */
-/* #define PCI_PRINT 1 */
+#define PCI_DEBUG 0
+#define PCI_PRINT 0
 
 /* allow for overriding these definitions */
 #ifndef PCI_CONFIG_ADDR
@@ -75,8 +75,8 @@ unsigned char ucMaxPCIBus=0;
 
 /* Please note that PCI0 and PCI1 does not correlate with the busNum 0 and 1.
  */
-static int direct_pci_read_config_byte(unsigned char bus,unsigned char dev,
-  unsigned char func, unsigned char offset, uint8_t *val)
+static int direct_pci_read_config_byte(unsigned char bus,unsigned char dev,unsigned char func,
+unsigned char offset,unsigned char *val)
 {
   volatile unsigned char *config_addr, *config_data;
 
@@ -101,7 +101,7 @@ static int direct_pci_read_config_byte(unsigned char bus,unsigned char dev,
 }
 
 static int direct_pci_read_config_word(unsigned char bus, unsigned char dev,
-  unsigned char func, unsigned char offset, uint16_t *val)
+unsigned char func, unsigned char offset, unsigned short *val)
 {
   volatile unsigned char *config_addr, *config_data;
 
@@ -127,7 +127,7 @@ static int direct_pci_read_config_word(unsigned char bus, unsigned char dev,
 }
 
 static int direct_pci_read_config_dword(unsigned char bus, unsigned char dev,
-  unsigned char func, unsigned char offset, uint32_t *val) 
+unsigned char func, unsigned char offset, unsigned int *val) 
 {
   volatile unsigned char *config_addr, *config_data;
 
@@ -152,8 +152,7 @@ static int direct_pci_read_config_dword(unsigned char bus, unsigned char dev,
   return PCIBIOS_SUCCESSFUL;
 }
 
-static int direct_pci_write_config_byte(unsigned char bus, unsigned char dev,
-  unsigned char func, unsigned char offset, uint8_t val) 
+static int direct_pci_write_config_byte(unsigned char bus, unsigned char dev,unsigned char func, unsigned char offset, unsigned char val) 
 {
   volatile unsigned char *config_addr, *config_data;
 
@@ -178,8 +177,7 @@ static int direct_pci_write_config_byte(unsigned char bus, unsigned char dev,
   return PCIBIOS_SUCCESSFUL;
 }
 
-static int direct_pci_write_config_word(unsigned char bus, unsigned char dev,
-  unsigned char func, unsigned char offset, uint16_t val) 
+static int direct_pci_write_config_word(unsigned char bus, unsigned char dev,unsigned char func, unsigned char offset, unsigned short val) 
 {
   volatile unsigned char *config_addr, *config_data;
 
@@ -203,8 +201,7 @@ static int direct_pci_write_config_word(unsigned char bus, unsigned char dev,
   return PCIBIOS_SUCCESSFUL;
 }
 
-static int direct_pci_write_config_dword(unsigned char bus, unsigned char dev,
-  unsigned char func, unsigned char offset, uint32_t val) 
+static int direct_pci_write_config_dword(unsigned char bus,unsigned char dev,unsigned char func, unsigned char offset, unsigned int val) 
 {
   volatile unsigned char *config_addr, *config_data;
 
@@ -252,12 +249,8 @@ int pci_initialize()
 {
   int deviceFound;
   unsigned char ucBusNumber, ucSlotNumber, ucFnNumber, ucNumFuncs;
-  uint32_t ulHeader;
-  uint32_t pcidata, ulClass, ulDeviceID;
-#if PCI_DEBUG
-  uint16_t sdata;
-  uint32_t data;
-#endif
+  unsigned int ulHeader;
+  unsigned int pcidata, ulClass, ulDeviceID;
 
   pci_interface();