CVS commit: src/sys/arch/mac68k/nubus

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sun Sep 18 02:45:38 UTC 2022

Modified Files:
src/sys/arch/mac68k/nubus: if_netdock_nubus.c

Log Message:
Eliminate use of IFF_OACTIVE.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mac68k/nubus/if_netdock_nubus.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/arch/mac68k/nubus/if_netdock_nubus.c
diff -u src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.34 src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.35
--- src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.34	Tue Feb  4 07:40:53 2020
+++ src/sys/arch/mac68k/nubus/if_netdock_nubus.c	Sun Sep 18 02:45:38 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_netdock_nubus.c,v 1.34 2020/02/04 07:40:53 skrll Exp $	*/
+/*	$NetBSD: if_netdock_nubus.c,v 1.35 2022/09/18 02:45:38 thorpej Exp $	*/
 
 /*
  * Copyright (C) 2000,2002 Daishi Kato 
@@ -43,7 +43,7 @@
 /***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.34 2020/02/04 07:40:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.35 2022/09/18 02:45:38 thorpej Exp $");
 
 #include 
 #include 
@@ -439,7 +439,7 @@ netdock_start(struct ifnet *ifp)
 	struct netdock_softc *sc = ifp->if_softc;
 	struct mbuf *m;
 
-	if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
+	if ((ifp->if_flags & IFF_RUNNING) == 0)
 		return;
 
 	while (1) {
@@ -447,9 +447,7 @@ netdock_start(struct ifnet *ifp)
 		if (m == 0)
 			return;
 
-		if ((m->m_flags & M_PKTHDR) == 0)
-			panic("%s: netdock_start: no header mbuf",
-			device_xname(sc->sc_dev));
+		KASSERT(m->m_flags & M_PKTHDR);
 
 		bpf_mtap(ifp, m, BPF_D_OUT);
 
@@ -460,7 +458,6 @@ netdock_start(struct ifnet *ifp)
 
 		if_statinc(ifp, if_opackets);
 	}
-
 }
 
 static void
@@ -524,7 +521,6 @@ netdock_init(struct netdock_softc *sc)
 
 
 	sc->sc_if.if_flags |= IFF_RUNNING;
-	sc->sc_if.if_flags &= ~IFF_OACTIVE;
 
 	splx(s);
 	return (0);
@@ -663,7 +659,6 @@ netdock_txint(struct netdock_softc *sc)
 	int reg0004;
 	int regdata;
 
-	ifp->if_flags &= ~IFF_OACTIVE;
 	ifp->if_timer = 0;
 
 	savereg0002 = NIC_GET_2(sc, REG_0002);

CVS commit: src/sys/arch/mac68k/nubus

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sun Sep 18 02:45:38 UTC 2022

Modified Files:
src/sys/arch/mac68k/nubus: if_netdock_nubus.c

Log Message:
Eliminate use of IFF_OACTIVE.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mac68k/nubus/if_netdock_nubus.c

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

CVS commit: src/sys/arch/mac68k/nubus

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Feb  5 08:36:34 UTC 2020

Modified Files:
src/sys/arch/mac68k/nubus: if_ae_nubus.c

Log Message:
Adopt 


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mac68k/nubus/if_ae_nubus.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/arch/mac68k/nubus/if_ae_nubus.c
diff -u src/sys/arch/mac68k/nubus/if_ae_nubus.c:1.41 src/sys/arch/mac68k/nubus/if_ae_nubus.c:1.42
--- src/sys/arch/mac68k/nubus/if_ae_nubus.c:1.41	Fri Jan 16 23:43:46 2009
+++ src/sys/arch/mac68k/nubus/if_ae_nubus.c	Wed Feb  5 08:36:34 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ae_nubus.c,v 1.41 2009/01/16 23:43:46 tsutsui Exp $	*/
+/*	$NetBSD: if_ae_nubus.c,v 1.42 2020/02/05 08:36:34 skrll Exp $	*/
 
 /*
  * Copyright (C) 1997 Scott Reynolds
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ae_nubus.c,v 1.41 2009/01/16 23:43:46 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae_nubus.c,v 1.42 2020/02/05 08:36:34 skrll Exp $");
 
 #include 
 #include 
@@ -502,7 +502,7 @@ ae_nb_watchdog(struct ifnet *ifp)
 	(*via2itab[1])((void *)1);
 
 	log(LOG_ERR, "%s: device timeout\n", device_xname(sc->sc_dev));
-	++ifp->if_oerrors;
+	if_statinc(ifp, if_oerrors);
 
 	dp8390_reset(sc);
 }

CVS commit: src/sys/arch/mac68k/nubus

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Feb  5 08:36:56 UTC 2020

Modified Files:
src/sys/arch/mac68k/nubus: if_ae_nubus.c

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/mac68k/nubus/if_ae_nubus.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/arch/mac68k/nubus/if_ae_nubus.c
diff -u src/sys/arch/mac68k/nubus/if_ae_nubus.c:1.42 src/sys/arch/mac68k/nubus/if_ae_nubus.c:1.43
--- src/sys/arch/mac68k/nubus/if_ae_nubus.c:1.42	Wed Feb  5 08:36:34 2020
+++ src/sys/arch/mac68k/nubus/if_ae_nubus.c	Wed Feb  5 08:36:56 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ae_nubus.c,v 1.42 2020/02/05 08:36:34 skrll Exp $	*/
+/*	$NetBSD: if_ae_nubus.c,v 1.43 2020/02/05 08:36:56 skrll Exp $	*/
 
 /*
  * Copyright (C) 1997 Scott Reynolds
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ae_nubus.c,v 1.42 2020/02/05 08:36:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae_nubus.c,v 1.43 2020/02/05 08:36:56 skrll Exp $");
 
 #include 
 #include 
@@ -386,7 +386,7 @@ void
 ae_nubus_intr(void *arg)
 {
 	struct dp8390_softc *sc = arg;
-	
+
 	(void)dp8390_intr(sc);
 }
 

CVS commit: src/sys/arch/mac68k/nubus

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Feb  5 08:36:56 UTC 2020

Modified Files:
src/sys/arch/mac68k/nubus: if_ae_nubus.c

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/mac68k/nubus/if_ae_nubus.c

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

CVS commit: src/sys/arch/mac68k/nubus

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Feb  5 08:36:34 UTC 2020

Modified Files:
src/sys/arch/mac68k/nubus: if_ae_nubus.c

Log Message:
Adopt 


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mac68k/nubus/if_ae_nubus.c

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

CVS commit: src/sys/arch/mac68k/nubus

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Feb  4 07:40:53 UTC 2020

Modified Files:
src/sys/arch/mac68k/nubus: if_netdock_nubus.c

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mac68k/nubus/if_netdock_nubus.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/arch/mac68k/nubus/if_netdock_nubus.c
diff -u src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.33 src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.34
--- src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.33	Tue Feb  4 07:36:28 2020
+++ src/sys/arch/mac68k/nubus/if_netdock_nubus.c	Tue Feb  4 07:40:53 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_netdock_nubus.c,v 1.33 2020/02/04 07:36:28 skrll Exp $	*/
+/*	$NetBSD: if_netdock_nubus.c,v 1.34 2020/02/04 07:40:53 skrll Exp $	*/
 
 /*
  * Copyright (C) 2000,2002 Daishi Kato 
@@ -43,7 +43,7 @@
 /***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.33 2020/02/04 07:36:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.34 2020/02/04 07:40:53 skrll Exp $");
 
 #include 
 #include 
@@ -91,7 +91,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_netdock_n
 #define REG_DATA	0x0008
 #define REG_EFD00	0xefd00
 
-#define ISR_ALL		0x3300	
+#define ISR_ALL		0x3300
 #define ISR_TX		0x0200
 #define ISR_RX		0x0100
 #define ISR_READY	0x0800
@@ -518,7 +518,7 @@ netdock_init(struct netdock_softc *sc)
 	/* 1382 */
 	savetmp = NIC_GET_2(sc, REG_000E);
 	NIC_PUT_2(sc, REG_000E, 0x0100);
-	NIC_ORW(sc, REG_ISR, ISR_BIT_03); 
+	NIC_ORW(sc, REG_ISR, ISR_BIT_03);
 	NIC_PUT_2(sc, REG_000E, savetmp);
 	NIC_PUT_2(sc, REG_ISR , saveisr);
 

CVS commit: src/sys/arch/mac68k/nubus

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Feb  4 07:40:53 UTC 2020

Modified Files:
src/sys/arch/mac68k/nubus: if_netdock_nubus.c

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mac68k/nubus/if_netdock_nubus.c

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

CVS commit: src/sys/arch/mac68k/nubus

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Feb  4 07:36:28 UTC 2020

Modified Files:
src/sys/arch/mac68k/nubus: if_netdock_nubus.c

Log Message:
Adopt 


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mac68k/nubus/if_netdock_nubus.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/arch/mac68k/nubus/if_netdock_nubus.c
diff -u src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.32 src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.33
--- src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.32	Wed Jan 29 05:25:42 2020
+++ src/sys/arch/mac68k/nubus/if_netdock_nubus.c	Tue Feb  4 07:36:28 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_netdock_nubus.c,v 1.32 2020/01/29 05:25:42 thorpej Exp $	*/
+/*	$NetBSD: if_netdock_nubus.c,v 1.33 2020/02/04 07:36:28 skrll Exp $	*/
 
 /*
  * Copyright (C) 2000,2002 Daishi Kato 
@@ -43,7 +43,7 @@
 /***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.32 2020/01/29 05:25:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.33 2020/02/04 07:36:28 skrll Exp $");
 
 #include 
 #include 
@@ -674,9 +674,9 @@ netdock_txint(struct netdock_softc *sc)
 		NIC_GET_2(sc, REG_ISR);
 		regdata = NIC_GET_2(sc, REG_DATA);
 		if ((regdata & REG_DATA_BIT_08) == 0) {
-			/* ifp->if_collisions++; */
+			/* if_statinc(ifp, if_collisions); */
 			if (regdata & REG_DATA_BIT_07)
-			/* ifp->if_oerrors++; */
+			/* if_statinc(ifp, if_oerrors); */
 			NIC_PUT_2(sc, REG_000E, 0);
 			NIC_ORW(sc, REG_, 0x0100);
 			NIC_PUT_2(sc, REG_000E, 0x0200);

CVS commit: src/sys/arch/mac68k/nubus

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Feb  4 07:36:28 UTC 2020

Modified Files:
src/sys/arch/mac68k/nubus: if_netdock_nubus.c

Log Message:
Adopt 


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mac68k/nubus/if_netdock_nubus.c

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

CVS commit: src/sys/arch/mac68k/nubus

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sat Jul 29 02:17:44 UTC 2017

Modified Files:
src/sys/arch/mac68k/nubus: if_netdock_nubus.c

Log Message:
Avoid memory leak in netdock_get.

If top is null, this is the first time through and nothing else will
free m.

>From Ilja Van Sprundel.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mac68k/nubus/if_netdock_nubus.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/arch/mac68k/nubus/if_netdock_nubus.c
diff -u src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.25 src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.26
--- src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.25	Thu Dec 15 09:28:03 2016
+++ src/sys/arch/mac68k/nubus/if_netdock_nubus.c	Sat Jul 29 02:17:44 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_netdock_nubus.c,v 1.25 2016/12/15 09:28:03 ozaki-r Exp $	*/
+/*	$NetBSD: if_netdock_nubus.c,v 1.26 2017/07/29 02:17:44 riastradh Exp $	*/
 
 /*
  * Copyright (C) 2000,2002 Daishi Kato 
@@ -43,7 +43,7 @@
 /***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.25 2016/12/15 09:28:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.26 2017/07/29 02:17:44 riastradh Exp $");
 
 #include 
 #include 
@@ -802,6 +802,8 @@ netdock_get(struct netdock_softc *sc, in
 			if ((m->m_flags & M_EXT) == 0) {
 if (top)
 	m_freem(top);
+else
+	m_freem(m);
 return (NULL);
 			}
 			len = MCLBYTES;

CVS commit: src/sys/arch/mac68k/nubus

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sat Jul 29 02:17:44 UTC 2017

Modified Files:
src/sys/arch/mac68k/nubus: if_netdock_nubus.c

Log Message:
Avoid memory leak in netdock_get.

If top is null, this is the first time through and nothing else will
free m.

>From Ilja Van Sprundel.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mac68k/nubus/if_netdock_nubus.c

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

CVS commit: src/sys/arch/mac68k/nubus

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sun Feb 28 19:39:27 UTC 2016

Modified Files:
src/sys/arch/mac68k/nubus: grf_nubus.c

Log Message:
Set sc_dev field of softc.

Should pullup to 7.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/mac68k/nubus/grf_nubus.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/arch/mac68k/nubus/grf_nubus.c
diff -u src/sys/arch/mac68k/nubus/grf_nubus.c:1.77 src/sys/arch/mac68k/nubus/grf_nubus.c:1.78
--- src/sys/arch/mac68k/nubus/grf_nubus.c:1.77	Fri Oct 25 21:42:30 2013
+++ src/sys/arch/mac68k/nubus/grf_nubus.c	Sun Feb 28 19:39:27 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_nubus.c,v 1.77 2013/10/25 21:42:30 martin Exp $	*/
+/*	$NetBSD: grf_nubus.c,v 1.78 2016/02/28 19:39:27 rjs Exp $	*/
 
 /*
  * Copyright (c) 1995 Allen Briggs.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grf_nubus.c,v 1.77 2013/10/25 21:42:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_nubus.c,v 1.78 2016/02/28 19:39:27 rjs Exp $");
 
 #include 
 
@@ -143,6 +143,7 @@ grfmv_attach(device_t parent, device_t s
 
 	memcpy(>sc_slot, na->fmt, sizeof(nubus_slot));
 
+	sc->sc_dev = self;
 	sc->sc_tag = na->na_tag;
 	sc->card_id = na->drhw;
 	sc->sc_basepa = (bus_addr_t)NUBUS_SLOT2PA(na->slot);

CVS commit: src/sys/arch/mac68k/nubus

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Sun Feb 28 19:39:27 UTC 2016

Modified Files:
src/sys/arch/mac68k/nubus: grf_nubus.c

Log Message:
Set sc_dev field of softc.

Should pullup to 7.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/mac68k/nubus/grf_nubus.c

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

CVS commit: src/sys/arch/mac68k/nubus

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Oct 25 21:42:30 UTC 2013

Modified Files:
src/sys/arch/mac68k/nubus: grf_nubus.c

Log Message:
Simplify


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/mac68k/nubus/grf_nubus.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/arch/mac68k/nubus/grf_nubus.c
diff -u src/sys/arch/mac68k/nubus/grf_nubus.c:1.76 src/sys/arch/mac68k/nubus/grf_nubus.c:1.77
--- src/sys/arch/mac68k/nubus/grf_nubus.c:1.76	Sat Oct 27 17:17:59 2012
+++ src/sys/arch/mac68k/nubus/grf_nubus.c	Fri Oct 25 21:42:30 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_nubus.c,v 1.76 2012/10/27 17:17:59 chs Exp $	*/
+/*	$NetBSD: grf_nubus.c,v 1.77 2013/10/25 21:42:30 martin Exp $	*/
 
 /*
  * Copyright (c) 1995 Allen Briggs.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: grf_nubus.c,v 1.76 2012/10/27 17:17:59 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: grf_nubus.c,v 1.77 2013/10/25 21:42:30 martin Exp $);
 
 #include sys/param.h
 
@@ -628,9 +628,8 @@ static void
 grfmv_intr_supermacgfx(void *vsc)
 {
 	struct grfbus_softc *sc = (struct grfbus_softc *)vsc;
-	u_int8_t dummy;
 
-	dummy = bus_space_read_1(sc-sc_tag, sc-sc_handle, 0xE70D3);
+	bus_space_read_1(sc-sc_tag, sc-sc_handle, 0xE70D3);
 }
 
 /*
@@ -641,10 +640,9 @@ static void
 grfmv_intr_cmax(void *vsc)
 {
 	struct grfbus_softc *sc = (struct grfbus_softc *)vsc;
-	u_int32_t dummy;
 
-	dummy = bus_space_read_4(sc-sc_tag, sc-sc_handle, 0xf501c);
-	dummy = bus_space_read_4(sc-sc_tag, sc-sc_handle, 0xf5018);
+	bus_space_read_4(sc-sc_tag, sc-sc_handle, 0xf501c);
+	bus_space_read_4(sc-sc_tag, sc-sc_handle, 0xf5018);
 }
 
 /*
@@ -670,10 +668,9 @@ static void
 grfmv_intr_formac(void *vsc)
 {
 	struct grfbus_softc *sc = (struct grfbus_softc *)vsc;
-	u_int8_t dummy;
 
-	dummy = bus_space_read_1(sc-sc_tag, sc-sc_handle, 0xde80db);
-	dummy = bus_space_read_1(sc-sc_tag, sc-sc_handle, 0xde80d3);
+	bus_space_read_1(sc-sc_tag, sc-sc_handle, 0xde80db);
+	bus_space_read_1(sc-sc_tag, sc-sc_handle, 0xde80d3);
 }
 
 /*
@@ -697,9 +694,8 @@ static void
 grfmv_intr_gvimage(void *vsc)
 {
 	struct grfbus_softc *sc = (struct grfbus_softc *)vsc;
-	u_int8_t dummy;
 
-	dummy = bus_space_read_1(sc-sc_tag, sc-sc_handle, 0xf0);
+	bus_space_read_1(sc-sc_tag, sc-sc_handle, 0xf0);
 }
 
 /*
@@ -710,9 +706,8 @@ static void
 grfmv_intr_radius_gsc(void *vsc)
 {
 	struct grfbus_softc *sc = (struct grfbus_softc *)vsc;
-	u_int8_t dummy;
 
-	dummy = bus_space_read_1(sc-sc_tag, sc-sc_handle, 0xfb802);
+	bus_space_read_1(sc-sc_tag, sc-sc_handle, 0xfb802);
 	bus_space_write_1(sc-sc_tag, sc-sc_handle, 0xfb802, 0xff);
 }
 
@@ -737,10 +732,9 @@ static void
 grfmv_intr_relax_200(void *vsc)
 {
 	struct grfbus_softc *sc = (struct grfbus_softc *)vsc;
-	unsigned long	scratch;
 
 	/* The board ROM driver code has a tst.l here. */
-	scratch = bus_space_read_4(sc-sc_tag, sc-sc_handle, 0x000D0040);
+	bus_space_read_4(sc-sc_tag, sc-sc_handle, 0x000D0040);
 }
 
 /*
@@ -764,9 +758,8 @@ static void
 grfmv_intr_viltro_340(void *vsc)
 {
 	struct grfbus_softc *sc = (struct grfbus_softc *)vsc;
-	u_int8_t scratch;
 
 	/* Yes, two read accesses to the same spot. */
-	scratch = bus_space_read_1(sc-sc_tag, sc-sc_handle, 0x0500);
-	scratch = bus_space_read_1(sc-sc_tag, sc-sc_handle, 0x0500);
+	bus_space_read_1(sc-sc_tag, sc-sc_handle, 0x0500);
+	bus_space_read_1(sc-sc_tag, sc-sc_handle, 0x0500);
 }

CVS commit: src/sys/arch/mac68k/nubus

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Oct 25 21:42:30 UTC 2013

Modified Files:
src/sys/arch/mac68k/nubus: grf_nubus.c

Log Message:
Simplify


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/mac68k/nubus/grf_nubus.c

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