[rtems commit] greth: Make local functions static, remove overflow and correct printf call.

[Joel Sherrill]

Module:    rtems
Branch:    master
Commit:    e4b5085344b8bcf7c53bb7b575535db92036d019
Changeset: http://git.rtems.org/rtems/commit/?id=e4b5085344b8bcf7c53bb7b575535db92036d019

Author:    Daniel Cederman <cederman at gaisler.com>
Date:      Thu Mar 13 14:35:43 2014 +0100

greth: Make local functions static, remove overflow and correct printf call.

---

 .../lib/libbsp/sparc/leon3/leon_greth/leon_greth.c |    2 +-
 c/src/libchip/network/greth.c                      |   14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c b/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c
index ea36118..77e4f49 100644
--- a/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c
+++ b/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c
@@ -47,7 +47,7 @@ int rtems_leon_greth_driver_attach(
     *(volatile int *) base_addr = 0;
     *(volatile int *) base_addr = GRETH_CTRL_RST;
     *(volatile int *) base_addr = 0;
-    leon_greth_configuration.base_address = base_addr;
+    leon_greth_configuration.base_address = (void*)base_addr;
     leon_greth_configuration.vector = eth_irq; /* on LEON vector is IRQ no. */
     leon_greth_configuration.txd_count = TDA_COUNT;
     leon_greth_configuration.rxd_count = RDA_COUNT;
diff --git a/c/src/libchip/network/greth.c b/c/src/libchip/network/greth.c
index 66581c7..e957dc3 100644
--- a/c/src/libchip/network/greth.c
+++ b/c/src/libchip/network/greth.c
@@ -88,7 +88,7 @@ extern void ipalign(struct mbuf *m);
 #endif
 const struct timespec greth_tan = {
    GRETH_AUTONEGO_TIMEOUT_MS/1000,
-   GRETH_AUTONEGO_TIMEOUT_MS*1000000
+   (GRETH_AUTONEGO_TIMEOUT_MS % 1000) *1000000
 };
 
 /* For optimizing the autonegotiation time */
@@ -178,7 +178,7 @@ static char *almalloc(int sz)
 
 /* GRETH interrupt handler */
 
-void greth_interrupt_handler (void *arg)
+static void greth_interrupt_handler (void *arg)
 {
         uint32_t status;
         uint32_t ctrl;
@@ -258,7 +258,7 @@ static void print_init_info(struct greth_softc *sc)
         }
 #ifdef GRETH_AUTONEGO_PRINT_TIME
         if ( sc->auto_neg ) {
-          printf("Autonegotiation Time: %dms\n", sc->auto_neg_time.tv_sec*1000 +
+          printf("Autonegotiation Time: %ldms\n", sc->auto_neg_time.tv_sec*1000 +
                  sc->auto_neg_time.tv_nsec/1000000);
         }
 #endif
@@ -533,7 +533,7 @@ void ipalign(struct mbuf *m)
 }
 #endif
 
-void
+static void
 greth_Daemon (void *arg)
 {
     struct ether_header *eh;
@@ -544,7 +544,9 @@ greth_Daemon (void *arg)
     rtems_event_set events;
     rtems_interrupt_level level;
     int first;
+#ifdef CPU_U32_FIX
     unsigned int tmp;
+#endif
 
     for (;;)
       {
@@ -627,7 +629,7 @@ again:
                                     tmp = GRETH_MEM_LOAD(4+(uintptr_t)eh);
                                     tmp = GRETH_MEM_LOAD(8+(uintptr_t)eh);
                                     tmp = GRETH_MEM_LOAD(12+(uintptr_t)eh);
-
+				    (void)tmp;
                                     ipalign(m);	/* Align packet on 32-bit boundary */
                             }
 #endif
@@ -738,7 +740,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
 }
 
 
-int
+static int
 sendpacket_gbit (struct ifnet *ifp, struct mbuf *m)
 {
         struct greth_softc *dp = ifp->if_softc;