5 files changed, 29 insertions, 28 deletions

diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index fd5d39459de12..f0fee058d1989 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.32 1994/10/23 21:27:26 wollman Exp $
+ *	$Id: isa.c,v 1.33 1994/10/25 23:06:15 se Exp $
  */
 
 /*
@@ -50,6 +50,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>		/* isn't it a joy */
 #include <sys/kernel.h>		/* to have three of these */
+#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/buf.h>
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index fc42848155df2..6e3fdedef128d 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.16 1994/10/19 01:59:00 wollman Exp $
+ *	$Id: if_ie.c,v 1.17 1994/10/23 21:27:20 wollman Exp $
  */
 
 /*
@@ -459,7 +459,7 @@ static int el_probe(dvp)
   c = (inb(PORT + IE507_MADDR) & 0x1c) + 0xc0;
   
   if (kvtop(dvp->id_maddr) != ((int)c << 12)) {
-    printf("ie%d: kernel configured maddr %x doesn't match board configured maddr %x\n",
+    printf("ie%d: kernel configured maddr %lx doesn't match board configured maddr %x\n",
 	   unit, kvtop(dvp->id_maddr),(int)c << 12);
     return 0;
   }
@@ -504,8 +504,6 @@ static int ni_probe(dvp)
   int unit = dvp->id_unit;
   int boardtype, c;
 
-struct ie_softc *ie = &ie_softc[unit];
-
   ie_softc[unit].port = dvp->id_iobase;
   ie_softc[unit].iomembot = dvp->id_maddr;
   ie_softc[unit].iomem = 0;
@@ -1639,7 +1637,7 @@ static void run_tdr(unit, cmd)
     printf("ie%d: TDR detected a short %d clocks away\n", unit,
 	   result & IE_TDR_TIME);
   } else {
-    printf("ie%d: TDR returned unknown status %x\n", result);
+    printf("ie%d: TDR returned unknown status %x\n", unit, result);
   }
 }
 
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index fc42848155df2..6e3fdedef128d 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.16 1994/10/19 01:59:00 wollman Exp $
+ *	$Id: if_ie.c,v 1.17 1994/10/23 21:27:20 wollman Exp $
  */
 
 /*
@@ -459,7 +459,7 @@ static int el_probe(dvp)
   c = (inb(PORT + IE507_MADDR) & 0x1c) + 0xc0;
   
   if (kvtop(dvp->id_maddr) != ((int)c << 12)) {
-    printf("ie%d: kernel configured maddr %x doesn't match board configured maddr %x\n",
+    printf("ie%d: kernel configured maddr %lx doesn't match board configured maddr %x\n",
 	   unit, kvtop(dvp->id_maddr),(int)c << 12);
     return 0;
   }
@@ -504,8 +504,6 @@ static int ni_probe(dvp)
   int unit = dvp->id_unit;
   int boardtype, c;
 
-struct ie_softc *ie = &ie_softc[unit];
-
   ie_softc[unit].port = dvp->id_iobase;
   ie_softc[unit].iomembot = dvp->id_maddr;
   ie_softc[unit].iomem = 0;
@@ -1639,7 +1637,7 @@ static void run_tdr(unit, cmd)
     printf("ie%d: TDR detected a short %d clocks away\n", unit,
 	   result & IE_TDR_TIME);
   } else {
-    printf("ie%d: TDR returned unknown status %x\n", result);
+    printf("ie%d: TDR returned unknown status %x\n", unit, result);
   }
 }
 
diff --git a/sys/i386/isa/if_is.c b/sys/i386/isa/if_is.c
index 64c7abe673d66..fdff2e8740894 100644
--- a/sys/i386/isa/if_is.c
+++ b/sys/i386/isa/if_is.c
@@ -11,7 +11,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: if_is.c,v 1.28 1994/10/19 01:59:02 wollman Exp $
+ * $Id: if_is.c,v 1.29 1994/10/23 21:27:21 wollman Exp $
  */
 
 /* TODO
@@ -106,8 +106,13 @@ static int is_ioctl(struct ifnet *, int, caddr_t);
 static void is_init(int);
 static void is_start(struct ifnet *);
 static void istint(int);
+#ifdef ISDEBUG
 static void recv_print(int, int);
 static void xmit_print(int, int);
+#endif ISDEBUG
+static int ne2100_probe(int);
+static int bicc_probe(int);
+static int lance_probe(int);
 
 
 
@@ -167,7 +172,6 @@ is_probe(isa_dev)
 	int unit = isa_dev->id_unit ;
 	int nports;
 
-int i;
 	is_softc[unit].iobase = isa_dev->id_iobase;
 
 	/*
@@ -189,9 +193,11 @@ int i;
 	printf("\n");
 #endif	/* DEBUG*/
 
-	if (nports = bicc_probe(unit))
+	nports = bicc_probe(unit);
+	if (nports)
 		return (nports);
-	if (nports = ne2100_probe(unit))
+	nports = ne2100_probe(unit);
+	if (nports)
 		return (nports);
 
 
@@ -208,7 +214,8 @@ int i;
 	is->rap = is->iobase + NE2100_RAP;
 	is->rdp = is->iobase + NE2100_RDP;
 
-	if (is->ic_type = lance_probe(unit)) {
+	is->ic_type = lance_probe(unit);
+	if (is->ic_type) {
 		is->card_type = NE2100;
 		/* 
 		 * Extract the physical MAC address from ROM
@@ -235,7 +242,8 @@ int i;
 	is->rap = is->iobase + BICC_RAP;
 	is->rdp = is->iobase + BICC_RDP;
 
-	if (is->ic_type = lance_probe(unit)) {
+	is->ic_type = lance_probe(unit);
+	if (is->ic_type) {
 		is->card_type = BICC;
 
 		/*
@@ -303,9 +311,6 @@ int type=0;
 static void
 is_reset(int unit)
 {
-	int s;
-	struct is_softc *is = &is_softc[unit];
-
 	if (unit >= NIS)
 		return;
 	printf("is%d: reset\n", unit);
@@ -367,7 +372,8 @@ is_attach(isa_dev)
 	 */
 
 	if ((u_long)is->init_block & 0x3) 
-		printf("is%d: memory allocated not quadword aligned\n");
+		printf("is%d: memory allocated not quadword aligned\n",
+			isa_dev->id_unit);
 
 	/* Set up DMA */
 	isa_dmacascade(isa_dev->id_drq);
@@ -564,7 +570,6 @@ is_start(ifp)
 	struct mbuf *m0, *m;
 	unsigned char *buffer;
 	u_short len;
-	int i;
 	struct mds *cdm;
 
 
@@ -849,7 +854,6 @@ isread(struct is_softc *is, unsigned char *buf, int len)
         register struct ether_header *eh;
         struct mbuf *m;
         int off, resid;
-        register struct ifqueue *inq;
 
         /*
          * Deal with trailer protocol: if type is trailer type
@@ -930,7 +934,7 @@ isget(buf, totlen, off0, ifp)
         int totlen, off0;
         struct ifnet *ifp;
 {
-        struct mbuf *top, **mp, *m, *p;
+        struct mbuf *top, **mp, *m;
         int off = off0, len;
         register caddr_t cp = buf;
         char *epkt;
@@ -1003,7 +1007,6 @@ is_ioctl(ifp, cmd, data)
 {
 	register struct ifaddr *ifa = (struct ifaddr *)data;
 	int unit = ifp->if_unit;
-	struct is_softc *is = &is_softc[unit];
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -1130,7 +1133,7 @@ is_ioctl(ifp, cmd, data)
 }
 
 #ifdef ISDEBUG
-void
+staic void
 recv_print(unit,no)
 	int unit,no;
 {
@@ -1153,7 +1156,7 @@ recv_print(unit,no)
 		printf("\n");
 }
 
-void
+static void
 xmit_print(unit,no)
 	int unit,no;
 {
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index fd5d39459de12..f0fee058d1989 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.32 1994/10/23 21:27:26 wollman Exp $
+ *	$Id: isa.c,v 1.33 1994/10/25 23:06:15 se Exp $
  */
 
 /*
@@ -50,6 +50,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>		/* isn't it a joy */
 #include <sys/kernel.h>		/* to have three of these */
+#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/buf.h>