sparc/leon2: Fix warnings

1 files changed, 15 insertions, 13 deletions

diff --git a/c/src/lib/libbsp/sparc/leon2/pci/pci.c b/c/src/lib/libbsp/sparc/leon2/pci/pci.c
index f34a173a7f..bf1cd32def 100644
--- a/c/src/lib/libbsp/sparc/leon2/pci/pci.c
+++ b/c/src/lib/libbsp/sparc/leon2/pci/pci.c
@@ -136,9 +136,9 @@ struct pci_res {
 
 static int
 BSP_pci_read_config_dword(unsigned char bus, unsigned char slot,
-    unsigned char function, unsigned char offset, unsigned int *val) {
+    unsigned char function, unsigned char offset, uint32_t *val) {
 
-    volatile unsigned int data;
+    volatile uint32_t data;
 
     if (offset & 3) return PCIBIOS_BAD_REGISTER_NUMBER;
 
@@ -171,7 +171,7 @@ BSP_pci_read_config_dword(unsigned char bus, unsigned char slot,
 static int
 BSP_pci_read_config_word(unsigned char bus, unsigned char slot,
     unsigned char function, unsigned char offset, unsigned short *val) {
-    unsigned int v;
+    uint32_t v;
 
     if (offset & 1) return PCIBIOS_BAD_REGISTER_NUMBER;
 
@@ -185,7 +185,7 @@ BSP_pci_read_config_word(unsigned char bus, unsigned char slot,
 static int
 BSP_pci_read_config_byte(unsigned char bus, unsigned char slot,
     unsigned char function, unsigned char offset, unsigned char *val) {
-    unsigned int v;
+    uint32_t v;
 
     pci_read_config_dword(bus, slot, function, offset&~3, &v);
 
@@ -197,7 +197,7 @@ BSP_pci_read_config_byte(unsigned char bus, unsigned char slot,
 
 static int
 BSP_pci_write_config_dword(unsigned char bus, unsigned char slot,
-    unsigned char function, unsigned char offset, unsigned int val) {
+    unsigned char function, unsigned char offset, uint32_t val) {
 
     if (offset & 3) return PCIBIOS_BAD_REGISTER_NUMBER;
 
@@ -227,7 +227,7 @@ BSP_pci_write_config_dword(unsigned char bus, unsigned char slot,
 static int
 BSP_pci_write_config_word(unsigned char bus, unsigned char slot,
     unsigned char function, unsigned char offset, unsigned short val) {
-    unsigned int v;
+    uint32_t v;
 
     if (offset & 1) return PCIBIOS_BAD_REGISTER_NUMBER;
 
@@ -242,7 +242,7 @@ BSP_pci_write_config_word(unsigned char bus, unsigned char slot,
 static int
 BSP_pci_write_config_byte(unsigned char bus, unsigned char slot,
     unsigned char function, unsigned char offset, unsigned char val) {
-    unsigned int v;
+    uint32_t v;
 
     pci_read_config_dword(bus, slot, function, offset&~3, &v);
 
@@ -295,7 +295,8 @@ static void init_at697_pci(void) {
 }
 
 /* May not pass a 1k boundary */
-int dma_from_pci_1k(unsigned int addr, unsigned int paddr, unsigned char len) {
+static int dma_from_pci_1k(
+  unsigned int addr, unsigned int paddr, unsigned char len) {
 
     int retval = 0;
 
@@ -327,7 +328,8 @@ int dma_from_pci_1k(unsigned int addr, unsigned int paddr, unsigned char len) {
 }
 
 /* May not pass a 1k boundary */
-int dma_to_pci_1k(unsigned int addr, unsigned int paddr, unsigned char len) {
+static int dma_to_pci_1k(
+  unsigned int addr, unsigned int paddr, unsigned char len) {
 
     int retval = 0;
 
@@ -425,7 +427,7 @@ int dma_from_pci(unsigned int addr, unsigned int paddr, unsigned int len) {
 
 void pci_mem_enable(unsigned char bus, unsigned char slot,
     unsigned char function) {
-    unsigned int data;
+    uint32_t data;
 
     pci_read_config_dword(0, slot, function, PCI_COMMAND, &data);
     pci_write_config_dword(0, slot, function, PCI_COMMAND,
@@ -435,7 +437,7 @@ void pci_mem_enable(unsigned char bus, unsigned char slot,
 
 void pci_master_enable(unsigned char bus, unsigned char slot,
     unsigned char function) {
-    unsigned int data;
+    uint32_t data;
 
     pci_read_config_dword(0, slot, function, PCI_COMMAND, &data);
     pci_write_config_dword(0, slot, function, PCI_COMMAND,
@@ -464,7 +466,7 @@ static inline void swap_res(struct pci_res **p1, struct pci_res **p2) {
  */
 static void pci_allocate_resources(void) {
 
-    unsigned int slot, numfuncs, func, id, pos, size, tmp;
+    uint32_t slot, numfuncs, func, id, pos, size, tmp;
     unsigned int i, swapped, addr, dev, fn;
     unsigned char header;
     struct pci_res **res;
@@ -648,7 +650,7 @@ int init_pci(void)
     unsigned char ucSlotNumber, ucFnNumber, ucNumFuncs;
     unsigned char ucHeader;
     unsigned char ucMaxSubordinate;
-    unsigned int  ulClass, ulDeviceID;
+    uint32_t      ulClass, ulDeviceID;
 
     init_at697_pci();
     pci_allocate_resources();