powerpc/score603e: Fix warnings

3 files changed, 11 insertions, 28 deletions

diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c
index 817037e6dc..999ab9390c 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c
@@ -1,6 +1,5 @@
 /*
- *
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2014.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -25,10 +24,10 @@
  * an UNIVERSE register, without sufficient delay, the second access will
  * not work correctly.
  */
-void PCI_bus_delay (void)
+static void PCI_bus_delay (void)
 {
-  __asm__ ("	nop");
-  __asm__ (" nop");
+  __asm__ volatile ("nop");
+  __asm__ volatile ("nop");
 }
 
 /*
@@ -43,7 +42,7 @@ void PCI_bus_write(
   *_addr = _data;
 }
 
-uint32_t         PCI_bus_read(
+uint32_t PCI_bus_read(
   volatile uint32_t         *  _addr                  /* IN */
 )
 {
@@ -57,8 +56,7 @@ uint32_t         PCI_bus_read(
  * PCI Configuration Cycle Read/Write Access which is used to access all of
  * devices registers on the PCI bus.  i.e.: Universe, Ethernet & PMC.
  */
-
-uint32_t         Read_pci_device_register(
+uint32_t Read_pci_device_register(
   uint32_t         address
 )
 {
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c
index c50c09b0af..a2e084a45d 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/flash.c
@@ -60,6 +60,7 @@ unsigned int SCORE603e_FLASH_verify_enable( void )
   return RTEMS_SUCCESSFUL;
 }
 
+#if 0
 unsigned int SCORE603e_FLASH_pci_reset_reg(
   uint8_t          reg,
   uint32_t         cmask,
@@ -79,6 +80,7 @@ unsigned int SCORE603e_FLASH_pci_reset_reg(
   }
   return RTEMS_SUCCESSFUL;
 }
+#endif
 
 /*
  *  SCORE603e_FLASH_Enable_writes
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 a1011daff8..c373aa6955 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
@@ -16,22 +16,6 @@
 #include <bsp.h>
 #include "PCI.h"
 
-/********************************************************************
- ********************************************************************
- *********                                                  *********
- *********                  Prototypes                      *********
- *********                                                  *********
- ********************************************************************
- ********************************************************************/
-
-/********************************************************************
- ********************************************************************
- *********                                                  *********
- *********                                                  *********
- *********                                                  *********
- ********************************************************************
- ********************************************************************/
-
 typedef struct {
   uint32_t         PCI_ID;                 /* 0x80030000 */
   uint32_t         PCI_CSR;                /* 0x80030004 */
@@ -153,7 +137,6 @@ volatile Universe_Memory *UNIVERSE =
  * by the boot code.  This routine should be called by user code only if
  * a complete SCORE603e VME initialization is required.
  */
-
 void initialize_universe(void)
 {
   uint32_t         jumper_selection;
@@ -227,7 +210,7 @@ void set_vme_base_address (
 /*
  * Gets the VME base address
  */
-uint32_t         get_vme_base_address (void)
+static uint32_t get_vme_base_address (void)
 {
   volatile uint32_t         temp;
 
@@ -236,7 +219,7 @@ uint32_t         get_vme_base_address (void)
   return (temp);
 }
 
-uint32_t         get_vme_slave_size(void)
+uint32_t get_vme_slave_size(void)
 {
   volatile uint32_t         temp;
   temp  =  PCI_bus_read( &UNIVERSE->VSI0_BD);
@@ -249,7 +232,7 @@ uint32_t         get_vme_slave_size(void)
  * 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 (uint32_t         size)
+void set_vme_slave_size (uint32_t size)
 {
   volatile uint32_t         temp;