CVS commit: src/sys/dev/bi

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Oct 25 15:11:32 UTC 2013

Modified Files:
src/sys/dev/bi: if_ni.c

Log Message:
Eliminate unused variable


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/bi/if_ni.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/bi/if_ni.c
diff -u src/sys/dev/bi/if_ni.c:1.40 src/sys/dev/bi/if_ni.c:1.41
--- src/sys/dev/bi/if_ni.c:1.40	Sat Nov 13 13:51:57 2010
+++ src/sys/dev/bi/if_ni.c	Fri Oct 25 15:11:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ni.c,v 1.40 2010/11/13 13:51:57 uebayasi Exp $ */
+/*	$NetBSD: if_ni.c,v 1.41 2013/10/25 15:11:32 martin Exp $ */
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ni.c,v 1.40 2010/11/13 13:51:57 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ni.c,v 1.41 2013/10/25 15:11:32 martin Exp $);
 
 #include opt_inet.h
 
@@ -233,7 +233,7 @@ niattach(device_t parent, device_t self,
 	struct ni_msg *msg;
 	struct ni_ptdb *ptdb;
 	void *va;
-	int i, j, s, res;
+	int i, j, s;
 	u_short type;
 
 	sc-sc_dev = self;
@@ -346,7 +346,7 @@ niattach(device_t parent, device_t self,
 	ni_getpgs(sc, NMSGBUF * 512, va, 0);
 	for (i = 0; i  NMSGBUF; i++) {
 		msg = (void *)((char *)va + i * 512);
-		res = INSQTI(msg, fqb-nf_mforw);
+		INSQTI(msg, fqb-nf_mforw);
 	}
 	WAITREG(NI_PCR, PCR_OWN);
 	NI_WREG(NI_PCR, PCR_FREEQNE|PCR_MFREEQ|PCR_OWN);
@@ -369,7 +369,7 @@ niattach(device_t parent, device_t self,
 			bbd[i * NTXFRAGS + j].nb_status = 0;
 			data-bufs[j]._index = i * NTXFRAGS + j;
 		}
-		res = INSQTI(data, fqb-nf_dforw);
+		INSQTI(data, fqb-nf_dforw);
 	}
 	WAITREG(NI_PCR, PCR_OWN);
 	NI_WREG(NI_PCR, PCR_FREEQNE|PCR_DFREEQ|PCR_OWN);
@@ -391,7 +391,7 @@ niattach(device_t parent, device_t self,
 		if (ni_add_rxbuf(sc, data, idx))
 			panic(niattach: ni_add_rxbuf: out of mbufs);
 
-		res = INSQTI(data, fqb-nf_rforw);
+		INSQTI(data, fqb-nf_rforw);
 	}
 	WAITREG(NI_PCR, PCR_OWN);
 	NI_WREG(NI_PCR, PCR_FREEQNE|PCR_RFREEQ|PCR_OWN);
@@ -409,7 +409,7 @@ niattach(device_t parent, device_t self,
 	((struct ni_param *)msg-nm_text[0])-np_flags = NP_PAD;
 
 	endwait = retry = 0;
-	res = INSQTI(msg, gvp-nc_forw0);
+	INSQTI(msg, gvp-nc_forw0);
 
 retry:	WAITREG(NI_PCR, PCR_OWN);
 	NI_WREG(NI_PCR, PCR_CMDQNE|PCR_CMDQ0|PCR_OWN);
@@ -432,7 +432,7 @@ retry:	WAITREG(NI_PCR, PCR_OWN);
 	msg-nm_len = sizeof(struct ni_param) + 6;
 	msg-nm_opcode2 = NI_RCCNTR;
 
-	res = INSQTI(msg, gvp-nc_forw0);
+	INSQTI(msg, gvp-nc_forw0);
 
 	WAITREG(NI_PCR, PCR_OWN);
 	NI_WREG(NI_PCR, PCR_CMDQNE|PCR_CMDQ0|PCR_OWN);
@@ -450,7 +450,7 @@ retry:	WAITREG(NI_PCR, PCR_OWN);
 	ptdb-np_index = 1;
 	ptdb-np_fque = 1;
 
-	res = INSQTI(msg, gvp-nc_forw0);
+	INSQTI(msg, gvp-nc_forw0);
 
 	WAITREG(NI_PCR, PCR_OWN);
 	NI_WREG(NI_PCR, PCR_CMDQNE|PCR_CMDQ0|PCR_OWN);

CVS commit: src/sys/dev/bi

[David Young]

Module Name:src
Committed By:   dyoung
Date:   Sat Jan 16 18:43:34 UTC 2010

Modified Files:
src/sys/dev/bi: kdb.c

Log Message:
Delete some dead (#ifdef notyet) code.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/bi/kdb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/bi/kdb.c
diff -u src/sys/dev/bi/kdb.c:1.46 src/sys/dev/bi/kdb.c:1.47
--- src/sys/dev/bi/kdb.c:1.46	Mon Nov 23 02:13:45 2009
+++ src/sys/dev/bi/kdb.c	Sat Jan 16 18:43:34 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: kdb.c,v 1.46 2009/11/23 02:13:45 rmind Exp $ */
+/*	$NetBSD: kdb.c,v 1.47 2010/01/16 18:43:34 dyoung Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kdb.c,v 1.46 2009/11/23 02:13:45 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: kdb.c,v 1.47 2010/01/16 18:43:34 dyoung Exp $);
 
 #include sys/param.h
 #include sys/kernel.h
@@ -302,34 +302,6 @@
 	KERNEL_UNLOCK_ONE(NULL);
 }
 
-#ifdef notyet
-/*
- * The KDB50 has been reset.  Reinitialise the controller
- * and requeue outstanding I/O.
- */
-void
-kdbreset(int ctlr)
-{
-	struct kdb_softc *sc;
-
-	sc = device_lookup_private(kdb_cd, ctlr);
-	printf( kdb%d, ctlr);
-
-
-	/* reset queues and requeue pending transfers */
-	mscp_requeue(sc-sc_softc);
-
-	/*
-	 * If it fails to initialise we will notice later and
-	 * try again (and again...).  Do not call kdbstart()
-	 * here; it will be done after the controller finishes
-	 * initialisation.
-	 */
-	if (kdbinit(sc))
-		printf( (hung));
-}
-#endif
-
 void
 kdbctlrdone(device_t usc)
 {