Module Name: src
Committed By: tsutsui
Date: Sun May 17 00:28:35 UTC 2009
Modified Files:
src/sys/dev/sbus: if_hme_sbus.c isp_sbus.c lebuffer.c qec.c
Log Message:
Use device_private() to get struct sbus_softc from device_t parent.
XXX: sbus_softc has been split from device_t on sparc, but not on sparc64!?
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/sbus/if_hme_sbus.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/sbus/isp_sbus.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/sbus/lebuffer.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/sbus/qec.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/sbus/if_hme_sbus.c
diff -u src/sys/dev/sbus/if_hme_sbus.c:1.28 src/sys/dev/sbus/if_hme_sbus.c:1.29
--- src/sys/dev/sbus/if_hme_sbus.c:1.28 Tue May 12 14:43:59 2009
+++ src/sys/dev/sbus/if_hme_sbus.c Sun May 17 00:28:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_sbus.c,v 1.28 2009/05/12 14:43:59 cegger Exp $ */
+/* $NetBSD: if_hme_sbus.c,v 1.29 2009/05/17 00:28:35 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.28 2009/05/12 14:43:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.29 2009/05/17 00:28:35 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,6 +85,7 @@
struct sbus_attach_args *sa = aux;
struct hmesbus_softc *hsc = (void *)self;
struct hme_softc *sc = &hsc->hsc_hme;
+ struct sbus_softc *sbsc = device_private(parent);
struct sbusdev *sd = &hsc->hsc_sbus;
u_int32_t burst, sbusburst;
int node;
@@ -164,7 +165,7 @@
* Get transfer burst size from PROM and pass it on
* to the back-end driver.
*/
- sbusburst = ((struct sbus_softc *)parent)->sc_burst;
+ sbusburst = sbsc->sc_burst;
if (sbusburst == 0)
sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
Index: src/sys/dev/sbus/isp_sbus.c
diff -u src/sys/dev/sbus/isp_sbus.c:1.75 src/sys/dev/sbus/isp_sbus.c:1.76
--- src/sys/dev/sbus/isp_sbus.c:1.75 Tue May 12 14:43:59 2009
+++ src/sys/dev/sbus/isp_sbus.c Sun May 17 00:28:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_sbus.c,v 1.75 2009/05/12 14:43:59 cegger Exp $ */
+/* $NetBSD: isp_sbus.c,v 1.76 2009/05/17 00:28:35 tsutsui Exp $ */
/*
* SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
*
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.75 2009/05/12 14:43:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.76 2009/05/17 00:28:35 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,6 +122,7 @@
int freq, ispburst, sbusburst;
struct sbus_attach_args *sa = aux;
struct isp_sbussoftc *sbc = (struct isp_sbussoftc *) self;
+ struct sbus_softc *sbsc = device_private(parent);
ispsoftc_t *isp = &sbc->sbus_isp;
printf(" for %s\n", sa->sa_name);
@@ -160,7 +161,7 @@
* walks up the tree finding the limiting burst size node (if
* any).
*/
- sbusburst = ((struct sbus_softc *)parent)->sc_burst;
+ sbusburst = sbsc->sc_burst;
if (sbusburst == 0)
sbusburst = SBUS_BURST_32 - 1;
ispburst = prom_getpropint(sa->sa_node, "burst-sizes", -1);
Index: src/sys/dev/sbus/lebuffer.c
diff -u src/sys/dev/sbus/lebuffer.c:1.32 src/sys/dev/sbus/lebuffer.c:1.33
--- src/sys/dev/sbus/lebuffer.c:1.32 Tue May 12 14:43:59 2009
+++ src/sys/dev/sbus/lebuffer.c Sun May 17 00:28:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffer.c,v 1.32 2009/05/12 14:43:59 cegger Exp $ */
+/* $NetBSD: lebuffer.c,v 1.33 2009/05/17 00:28:35 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.32 2009/05/12 14:43:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.33 2009/05/17 00:28:35 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,6 +77,7 @@
{
struct sbus_attach_args *sa = aux;
struct lebuf_softc *sc = (void *)self;
+ struct sbus_softc *sbsc = device_private(parent);
int node;
int sbusburst;
bus_space_tag_t bt = sa->sa_bustag;
@@ -102,7 +103,7 @@
/*
* Get transfer burst size from PROM
*/
- sbusburst = ((struct sbus_softc *)parent)->sc_burst;
+ sbusburst = sbsc->sc_burst;
if (sbusburst == 0)
sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
@@ -121,7 +122,7 @@
/* search through children */
for (node = firstchild(node); node; node = nextsibling(node)) {
struct sbus_attach_args sax;
- sbus_setup_attach_args((struct sbus_softc *)parent,
+ sbus_setup_attach_args(sbsc,
bt, dt, node, &sax);
(void)config_found(&sc->sc_dev, (void *)&sax, lebufprint);
sbus_destroy_attach_args(&sax);
Index: src/sys/dev/sbus/qec.c
diff -u src/sys/dev/sbus/qec.c:1.43 src/sys/dev/sbus/qec.c:1.44
--- src/sys/dev/sbus/qec.c:1.43 Tue May 12 14:43:59 2009
+++ src/sys/dev/sbus/qec.c Sun May 17 00:28:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: qec.c,v 1.43 2009/05/12 14:43:59 cegger Exp $ */
+/* $NetBSD: qec.c,v 1.44 2009/05/17 00:28:35 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.43 2009/05/12 14:43:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.44 2009/05/17 00:28:35 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,6 +99,7 @@
{
struct sbus_attach_args *sa = aux;
struct qec_softc *sc = (void *)self;
+ struct sbus_softc *sbsc = device_private(parent);
int node;
int sbusburst;
bus_space_tag_t sbt;
@@ -150,7 +151,7 @@
/*
* Get transfer burst size from PROM
*/
- sbusburst = ((struct sbus_softc *)parent)->sc_burst;
+ sbusburst = sbsc->sc_burst;
if (sbusburst == 0)
sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
@@ -205,7 +206,7 @@
/* search through children */
for (node = firstchild(node); node; node = nextsibling(node)) {
struct sbus_attach_args sax;
- sbus_setup_attach_args((struct sbus_softc *)parent,
+ sbus_setup_attach_args(sbsc,
sbt, sc->sc_dmatag, node, &sax);
(void)config_found(&sc->sc_dev, (void *)&sax, qecprint);
sbus_destroy_attach_args(&sax);
