From 5130248e12a0d96c19d88444888c3fbcc93ee922 Mon Sep 17 00:00:00 2001
From: Daniel Cederman <cederman@gaisler.com>
Date: Thu, 13 Mar 2014 14:28:46 +0100
Subject: smc91111: Move driver attach prototype to header file.

Also signal to compiler that the start variable in lan91cxx_recv is only used when debugging.
---
 c/src/lib/libbsp/powerpc/mpc55xxevb/network/if_smc.c       | 5 -----
 c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c | 5 -----
 c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c | 3 ---
 c/src/libchip/network/smc91111.c                           | 8 +++++---
 c/src/libchip/network/smc91111exp.h                        | 3 +++
 5 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/if_smc.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/network/if_smc.c
index 026a56c6d3..995bf0b1b0 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/if_smc.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/network/if_smc.c
@@ -64,11 +64,6 @@ scmv91111_configuration_t mpc5554_scmv91111_configuration = {
   (void *)0
 };
 
-int _rtems_smc91111_driver_attach(
-  struct rtems_bsdnet_ifconfig *config,
-  scmv91111_configuration_t    *scm_config
-);
-
 /*
  * Attach an SMC91111 driver to the system
  */
diff --git a/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c b/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c
index ad74c9a52b..abf1efc774 100644
--- a/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c
+++ b/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c
@@ -40,11 +40,6 @@ scmv91111_configuration_t leon_scmv91111_configuration = {
   1                   /* autoneg */
 };
 
-int _rtems_smc91111_driver_attach(
-  struct rtems_bsdnet_ifconfig *config,
-  scmv91111_configuration_t    *scm_config
-);
-
 /*
  * Attach an SMC91111 driver to the system
  */
diff --git a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
index 495d2eb8d0..5b903eb0ec 100644
--- a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
+++ b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
@@ -23,9 +23,6 @@ scmv91111_configuration_t leon_scmv91111_configuration = {
   1                                   /* autoneg */
 };
 
-int _rtems_smc91111_driver_attach (struct rtems_bsdnet_ifconfig *config,
-				   scmv91111_configuration_t * scm_config);
-
 /*
  * Attach an SMC91111 driver to the system
  */
diff --git a/c/src/libchip/network/smc91111.c b/c/src/libchip/network/smc91111.c
index 2332688df7..aec0f56fbf 100644
--- a/c/src/libchip/network/smc91111.c
+++ b/c/src/libchip/network/smc91111.c
@@ -82,7 +82,7 @@ static void lan91cxx_phy_configure(struct lan91cxx_priv_data *cpd);
 #define max(l,r) ((l) > (r) ? (l) : (r))
 
 /* \ ------------- Interrupt ------------- \ */
-void lan91cxx_interrupt_handler(void *arg)
+static void lan91cxx_interrupt_handler(void *arg)
 {
 	struct lan91cxx_priv_data *cpd = arg;
 	unsigned short irq, event;
@@ -153,6 +153,9 @@ static void lan91cxx_recv(struct lan91cxx_priv_data *cpd, struct mbuf *m)
 	rxd_t *data = NULL, val;
 #if DEBUG & 64
 	rxd_t lp = 0;
+#else
+	/* start is only read with debug enabled */
+	(void)start;
 #endif
 	struct mbuf *n;
 	dbg_prefix = "<";
@@ -247,7 +250,6 @@ static void lan91cxx_recv(struct lan91cxx_priv_data *cpd, struct mbuf *m)
 			}
 		}
 		db64_printf(" \n");
-
 #endif
 	}
 	val = get_data(cpd);	/* Read control word (and potential data) unconditionally */
@@ -657,7 +659,7 @@ static void sendpacket(struct ifnet *ifp, struct mbuf *m)
 	dbg_prefix = "";
 }
 
-void smc91111_txDaemon(void *arg)
+static void smc91111_txDaemon(void *arg)
 {
 	struct lan91cxx_priv_data *cpd = arg;
 	struct ifnet *ifp = &cpd->arpcom.ac_if;
diff --git a/c/src/libchip/network/smc91111exp.h b/c/src/libchip/network/smc91111exp.h
index 11feaab0d9..08e086d9e7 100644
--- a/c/src/libchip/network/smc91111exp.h
+++ b/c/src/libchip/network/smc91111exp.h
@@ -18,6 +18,9 @@ typedef struct scmv91111_configuration {
 #endif
 } scmv91111_configuration_t;
 
+int _rtems_smc91111_driver_attach (struct rtems_bsdnet_ifconfig *config,
+				   scmv91111_configuration_t * scm_config);
+
 #endif  /* _SMC_91111_EXP_H_ */
 
 
-- 
cgit v1.2.3