Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use device_private().

Browse Source 
"looks good" ad@
XXX for the device_t/softc split, please check the driver that no cases have been missed.
This commit is contained in:
cegger 2009-05-12 08:22:59 +00:00
parent 4c844fd418
commit b8169823d2
69 changed files with 245 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/pci/aac_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aac_pci.c,v 1.28 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: aac_pci.c,v 1.29 2009/05/12 08:22:59 cegger Exp $ */
/*- /*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -65,7 +65,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.28 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.29 2009/05/12 08:22:59 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -469,7 +469,7 @@ aac_pci_attach(device_t parent, device_t self, void *aux)
pa = aux; pa = aux;
pc = pa->pa_pc; pc = pa->pa_pc;
pcisc = (struct aac_pci_softc *)self; pcisc = device_private(self);
pcisc->sc_pc = pc; pcisc->sc_pc = pc;
sc = &pcisc->sc_aac; sc = &pcisc->sc_aac;
state = 0; state = 0;

6
sys/dev/pci/alipm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: alipm.c,v 1.5 2009/05/11 21:13:09 cegger Exp $ */ /* $NetBSD: alipm.c,v 1.6 2009/05/12 08:22:59 cegger Exp $ */
/* $OpenBSD: alipm.c,v 1.13 2007/05/03 12:19:01 dlg Exp $ */ /* $OpenBSD: alipm.c,v 1.13 2007/05/03 12:19:01 dlg Exp $ */
/* /*
@ -18,7 +18,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: alipm.c,v 1.5 2009/05/11 21:13:09 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: alipm.c,v 1.6 2009/05/12 08:22:59 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/device.h> #include <sys/device.h>
@ -132,7 +132,7 @@ alipm_match(device_t parent, cfdata_t match, void *aux)
static void static void
alipm_attach(device_t parent, device_t self, void *aux) alipm_attach(device_t parent, device_t self, void *aux)
{ {
struct alipm_softc *sc = (struct alipm_softc *) self; struct alipm_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct i2cbus_attach_args iba; struct i2cbus_attach_args iba;
pcireg_t iobase, reg; pcireg_t iobase, reg;

6
sys/dev/pci/amdpm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: amdpm.c,v 1.32 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: amdpm.c,v 1.33 2009/05/12 08:22:59 cegger Exp $ */
/*- /*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.32 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.33 2009/05/12 08:22:59 cegger Exp $");
#include "opt_amdpm.h" #include "opt_amdpm.h"
@ -85,7 +85,7 @@ amdpm_match(device_t parent, cfdata_t match, void *aux)
static void static void
amdpm_attach(device_t parent, device_t self, void *aux) amdpm_attach(device_t parent, device_t self, void *aux)
{ {
struct amdpm_softc *sc = (struct amdpm_softc *) self; struct amdpm_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
char devinfo[256]; char devinfo[256];
pcireg_t confreg, pmptrreg; pcireg_t confreg, pmptrreg;

6
sys/dev/pci/amr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: amr.c,v 1.51 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: amr.c,v 1.52 2009/05/12 08:22:59 cegger Exp $ */
/*- /*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.51 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.52 2009/05/12 08:22:59 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -271,7 +271,7 @@ amr_attach(device_t parent, device_t self, void *aux)
aprint_naive(": RAID controller\n"); aprint_naive(": RAID controller\n");
amr = (struct amr_softc *)self; amr = device_private(self);
pa = (struct pci_attach_args *)aux; pa = (struct pci_attach_args *)aux;
pc = pa->pa_pc; pc = pa->pa_pc;

6
sys/dev/pci/auacer.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: auacer.c,v 1.23 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: auacer.c,v 1.24 2009/05/12 08:22:59 cegger Exp $ */
/*- /*-
* Copyright (c) 2004 The NetBSD Foundation, Inc. * Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -44,7 +44,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.23 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.24 2009/05/12 08:22:59 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -258,7 +258,7 @@ auacer_attach(device_t parent, device_t self, void *aux)
const char *intrstr; const char *intrstr;
int i; int i;
sc = (struct auacer_softc *)self; sc = device_private(self);
pa = aux; pa = aux;
aprint_normal(": Acer Labs M5455 Audio controller\n"); aprint_normal(": Acer Labs M5455 Audio controller\n");

6
sys/dev/pci/autri.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autri.c,v 1.42 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: autri.c,v 1.43 2009/05/12 08:22:59 cegger Exp $ */
/* /*
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.42 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.43 2009/05/12 08:22:59 cegger Exp $");
#include "midi.h" #include "midi.h"
@ -523,7 +523,7 @@ autri_attach(device_t parent, device_t self, void *aux)
int r; int r;
uint32_t reg; uint32_t reg;
sc = (struct autri_softc *)self; sc = device_private(self);
pa = (struct pci_attach_args *)aux; pa = (struct pci_attach_args *)aux;
pc = pa->pa_pc; pc = pa->pa_pc;
aprint_naive(": Audio controller\n"); aprint_naive(": Audio controller\n");

6
sys/dev/pci/bha_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bha_pci.c,v 1.35 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: bha_pci.c,v 1.36 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.35 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.36 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -89,7 +89,7 @@ static void
bha_pci_attach(device_t parent, device_t self, void *aux) bha_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct bha_softc *sc = (void *)self; struct bha_softc *sc = device_private(self);
bus_space_tag_t iot; bus_space_tag_t iot;
bus_space_handle_t ioh; bus_space_handle_t ioh;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;

10
sys/dev/pci/btvmei.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: btvmei.c,v 1.24 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: btvmei.c,v 1.25 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 1999 * Copyright (c) 1999
@ -29,7 +29,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.24 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.25 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -86,7 +86,7 @@ b3_617_match(device_t parent, cfdata_t match, void *aux)
static void static void
b3_617_attach(device_t parent, device_t self, void *aux) b3_617_attach(device_t parent, device_t self, void *aux)
{ {
struct b3_617_softc *sc = (struct b3_617_softc*)self; struct b3_617_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;
@ -186,7 +186,7 @@ b3_617_attach(device_t parent, device_t self, void *aux)
static int static int
b3_617_detach(device_t dev) b3_617_detach(device_t dev)
{ {
struct b3_617_softc *sc = (struct b3_617_softc *)dev; struct b3_617_softc *sc = device_private(dev);
b3_617_halt(sc); b3_617_halt(sc);
@ -203,7 +203,7 @@ b3_617_detach(device_t dev)
void void
b3_617_slaveconfig(device_t dev, struct vme_attach_args *va) b3_617_slaveconfig(device_t dev, struct vme_attach_args *va)
{ {
struct b3_617_softc *sc = (struct b3_617_softc *)dev; struct b3_617_softc *sc = device_private(dev);
vme_chipset_tag_t vmect; vme_chipset_tag_t vmect;
int i, res; int i, res;
const char *name = 0; /* XXX gcc! */ const char *name = 0; /* XXX gcc! */

6
sys/dev/pci/btvmeii.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: btvmeii.c,v 1.19 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: btvmeii.c,v 1.20 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 1999 * Copyright (c) 1999
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.19 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.20 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -181,7 +181,7 @@ b3_2706_match(device_t parent, cfdata_t match, void *aux)
static void static void
b3_2706_attach(device_t parent, device_t self, void *aux) b3_2706_attach(device_t parent, device_t self, void *aux)
{ {
struct b3_2706_softc *sc = (struct b3_2706_softc *)self; struct b3_2706_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;
struct pci_attach_args aa; struct pci_attach_args aa;

6
sys/dev/pci/cac_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cac_pci.c,v 1.30 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: cac_pci.c,v 1.31 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.30 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.31 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -150,7 +150,7 @@ cac_pci_attach(device_t parent, device_t self, void *aux)
aprint_naive(": RAID controller\n"); aprint_naive(": RAID controller\n");
sc = (struct cac_softc *)self; sc = device_private(self);
pa = (struct pci_attach_args *)aux; pa = (struct pci_attach_args *)aux;
pc = pa->pa_pc; pc = pa->pa_pc;
ct = cac_pci_findtype(pa); ct = cac_pci_findtype(pa);

6
sys/dev/pci/chipsfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: chipsfb.c,v 1.18 2009/05/06 18:41:54 elad Exp $ */ /* $NetBSD: chipsfb.c,v 1.19 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 2006 Michael Lorenz * Copyright (c) 2006 Michael Lorenz
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: chipsfb.c,v 1.18 2009/05/06 18:41:54 elad Exp $"); __KERNEL_RCSID(0, "$NetBSD: chipsfb.c,v 1.19 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -268,7 +268,7 @@ chipsfb_match(device_t parent, cfdata_t match, void *aux)
static void static void
chipsfb_attach(device_t parent, device_t self, void *aux) chipsfb_attach(device_t parent, device_t self, void *aux)
{ {
struct chipsfb_softc *sc = (void *)self; struct chipsfb_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
char devinfo[256]; char devinfo[256];
struct wsemuldisplaydev_attach_args aa; struct wsemuldisplaydev_attach_args aa;

6
sys/dev/pci/ciss_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ciss_pci.c,v 1.7 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: ciss_pci.c,v 1.8 2009/05/12 08:23:00 cegger Exp $ */
/* $OpenBSD: ciss_pci.c,v 1.9 2005/12/13 15:56:01 brad Exp $ */ /* $OpenBSD: ciss_pci.c,v 1.9 2005/12/13 15:56:01 brad Exp $ */
/* /*
@ -19,7 +19,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.7 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.8 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -246,7 +246,7 @@ ciss_pci_match(device_t parent, cfdata_t match, void *aux)
void void
ciss_pci_attach(device_t parent, device_t self, void *aux) ciss_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct ciss_softc *sc = (struct ciss_softc *)self; struct ciss_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
bus_size_t size, cfgsz; bus_size_t size, cfgsz;
pci_intr_handle_t ih; pci_intr_handle_t ih;

6
sys/dev/pci/cmpci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cmpci.c,v 1.40 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: cmpci.c,v 1.41 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@ -43,7 +43,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.40 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.41 2009/05/12 08:23:00 cegger Exp $");
#if defined(AUDIO_DEBUG) || defined(DEBUG) #if defined(AUDIO_DEBUG) || defined(DEBUG)
#define DPRINTF(x) if (cmpcidebug) printf x #define DPRINTF(x) if (cmpcidebug) printf x
@ -385,7 +385,7 @@ cmpci_attach(device_t parent, device_t self, void *aux)
char devinfo[256]; char devinfo[256];
int i, v; int i, v;
sc = (struct cmpci_softc *)self; sc = device_private(self);
pa = (struct pci_attach_args *)aux; pa = (struct pci_attach_args *)aux;
aprint_naive(": Audio controller\n"); aprint_naive(": Audio controller\n");

6
sys/dev/pci/cs4280.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cs4280.c,v 1.53 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: cs4280.c,v 1.54 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved. * Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
@ -52,7 +52,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.53 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.54 2009/05/12 08:23:00 cegger Exp $");
#include "midi.h" #include "midi.h"
@ -247,7 +247,7 @@ cs4280_attach(device_t parent, device_t self, void *aux)
uint32_t mem; uint32_t mem;
int error; int error;
sc = (struct cs428x_softc *)self; sc = device_private(self);
pa = (struct pci_attach_args *)aux; pa = (struct pci_attach_args *)aux;
pc = pa->pa_pc; pc = pa->pa_pc;
aprint_naive(": Audio controller\n"); aprint_naive(": Audio controller\n");

6
sys/dev/pci/cs4281.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cs4281.c,v 1.41 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: cs4281.c,v 1.42 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved. * Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@ -43,7 +43,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.41 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.42 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -191,7 +191,7 @@ cs4281_attach(device_t parent, device_t self, void *aux)
char devinfo[256]; char devinfo[256];
int error; int error;
sc = (struct cs428x_softc *)self; sc = device_private(self);
pa = (struct pci_attach_args *)aux; pa = (struct pci_attach_args *)aux;
pc = pa->pa_pc; pc = pa->pa_pc;
aprint_naive(": Audio controller\n"); aprint_naive(": Audio controller\n");

6
sys/dev/pci/cxgb_main.c
View File

@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifdef __NetBSD__ #ifdef __NetBSD__
__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.15 2009/05/06 09:25:14 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.16 2009/05/12 08:23:00 cegger Exp $");
#endif #endif
#ifdef __FreeBSD__ #ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.36 2007/09/11 23:49:27 kmacy Exp $"); __FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.36 2007/09/11 23:49:27 kmacy Exp $");
@ -585,7 +585,7 @@ cxgb_controller_attach(device_t parent, device_t dev, void *context)
sc = device_get_softc(dev); sc = device_get_softc(dev);
#endif #endif
#ifdef __NetBSD__ #ifdef __NetBSD__
sc = (struct adapter *)dev; // device is first thing in adapter sc = device_private(dev);
#endif #endif
sc->dev = dev; sc->dev = dev;
#ifdef __NetBSD__ #ifdef __NetBSD__
@ -894,7 +894,7 @@ cxgb_controller_detach(device_t dev, int flags)
sc = device_get_softc(dev); sc = device_get_softc(dev);
#endif #endif
#ifdef __NetBSD__ #ifdef __NetBSD__
sc = (struct adapter *)dev; sc = device_private(dev);
#endif #endif
cxgb_free(sc); cxgb_free(sc);

6
sys/dev/pci/cz.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cz.c,v 1.51 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: cz.c,v 1.52 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 2000 Zembu Labs, Inc. * Copyright (c) 2000 Zembu Labs, Inc.
@ -73,7 +73,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.51 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.52 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -284,7 +284,7 @@ static void
cz_attach(device_t parent, device_t self, void *aux) cz_attach(device_t parent, device_t self, void *aux)
{ {
extern const struct cdevsw cz_cdevsw; /* XXX */ extern const struct cdevsw cz_cdevsw; /* XXX */
struct cz_softc *cz = (void *) self; struct cz_softc *cz = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_intr_handle_t ih; pci_intr_handle_t ih;
const char *intrstr = NULL; const char *intrstr = NULL;

6
sys/dev/pci/dpt_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dpt_pci.c,v 1.23 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: dpt_pci.c,v 1.24 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org> * Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.23 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.24 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -89,7 +89,7 @@ dpt_pci_attach(device_t parent, device_t self, void *aux)
aprint_naive(": Storage controller\n"); aprint_naive(": Storage controller\n");
sc = (struct dpt_softc *)self; sc = device_private(self);
pa = (struct pci_attach_args *)aux; pa = (struct pci_attach_args *)aux;
pc = pa->pa_pc; pc = pa->pa_pc;
aprint_normal(": "); aprint_normal(": ");

10
sys/dev/pci/emuxki.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: emuxki.c,v 1.56 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: emuxki.c,v 1.57 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 2001 The NetBSD Foundation, Inc. * Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -49,7 +49,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.56 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.57 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/device.h> #include <sys/device.h>
@ -407,7 +407,7 @@ emuxki_attach(device_t parent, device_t self, void *aux)
pci_intr_handle_t ih; pci_intr_handle_t ih;
const char *intrstr; const char *intrstr;
sc = (struct emuxki_softc *) self; sc = device_private(self);
pa = aux; pa = aux;
aprint_naive(": Audio controller\n"); aprint_naive(": Audio controller\n");
@ -484,7 +484,7 @@ emuxki_detach(device_t self, int flags)
{ {
struct emuxki_softc *sc; struct emuxki_softc *sc;
sc = (struct emuxki_softc *)self; sc = device_private(self);
if (sc->sc_audev != NULL) /* Test in case audio didn't attach */ if (sc->sc_audev != NULL) /* Test in case audio didn't attach */
config_detach(sc->sc_audev, 0); config_detach(sc->sc_audev, 0);
@ -2331,7 +2331,7 @@ emuxki_round_blocksize(void *addr, int blksize,
if (sc == NULL) if (sc == NULL)
return blksize; return blksize;
au = (void *)sc->sc_audev; au = device_private(sc->sc_audev);
if (au == NULL) if (au == NULL)
return blksize; return blksize;

6
sys/dev/pci/esiop_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: esiop_pci.c,v 1.14 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: esiop_pci.c,v 1.15 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 2002 Manuel Bouyer. * Copyright (c) 2002 Manuel Bouyer.
@ -32,7 +32,7 @@
/* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */ /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.14 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.15 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -78,7 +78,7 @@ static void
esiop_pci_attach(device_t parent, device_t self, void *aux) esiop_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct esiop_pci_softc *sc = (struct esiop_pci_softc *)self; struct esiop_pci_softc *sc = device_private(self);
if (siop_pci_attach_common(&sc->esiop_pci, &sc->esiop.sc_c, if (siop_pci_attach_common(&sc->esiop_pci, &sc->esiop.sc_c,
pa, esiop_intr) == 0) pa, esiop_intr) == 0)

8
sys/dev/pci/eso.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: eso.c,v 1.55 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: eso.c,v 1.56 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 1999, 2000, 2004 Klaus J. Klein * Copyright (c) 1999, 2000, 2004 Klaus J. Klein
@ -33,7 +33,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.55 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.56 2009/05/12 08:23:00 cegger Exp $");
#include "mpu.h" #include "mpu.h"
@ -234,7 +234,7 @@ eso_attach(device_t parent, device_t self, void *aux)
int idx; int idx;
uint8_t a2mode, mvctl; uint8_t a2mode, mvctl;
sc = (struct eso_softc *)self; sc = device_private(self);
pa = aux; pa = aux;
aprint_naive(": Audio controller\n"); aprint_naive(": Audio controller\n");
@ -426,7 +426,7 @@ eso_defer(device_t self)
struct pci_attach_args *pa; struct pci_attach_args *pa;
bus_addr_t addr, start; bus_addr_t addr, start;
sc = (struct eso_softc *)self; sc = device_private(self);
pa = &sc->sc_pa; pa = &sc->sc_pa;
aprint_normal_dev(&sc->sc_dev, ""); aprint_normal_dev(&sc->sc_dev, "");

6
sys/dev/pci/fms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fms.c,v 1.35 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: fms.c,v 1.36 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.35 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.36 2009/05/12 08:23:00 cegger Exp $");
#include "mpu.h" #include "mpu.h"
@ -235,7 +235,7 @@ fms_attach(device_t parent, device_t self, void *aux)
uint16_t k1; uint16_t k1;
pa = aux; pa = aux;
sc = (struct fms_softc *)self; sc = device_private(self);
intrstr = NULL; intrstr = NULL;
pc = pa->pa_pc; pc = pa->pa_pc;
pt = pa->pa_tag; pt = pa->pa_tag;

6
sys/dev/pci/fwlynx_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fwlynx_pci.c,v 1.16 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: fwlynx_pci.c,v 1.17 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fwlynx_pci.c,v 1.16 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: fwlynx_pci.c,v 1.17 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -75,7 +75,7 @@ static void
fwlynx_pci_attach(device_t parent, device_t self, void *aux) fwlynx_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct pci_attach_args *pa = (struct pci_attach_args *) aux; struct pci_attach_args *pa = (struct pci_attach_args *) aux;
struct fwlynx_pci_softc *psc = (struct fwlynx_pci_softc *) self; struct fwlynx_pci_softc *psc = device_private(self);
char devinfo[256]; char devinfo[256];
char const *intrstr; char const *intrstr;
pci_intr_handle_t ih; pci_intr_handle_t ih;

6
sys/dev/pci/genfb_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: genfb_pci.c,v 1.19 2009/05/06 18:41:54 elad Exp $ */ /* $NetBSD: genfb_pci.c,v 1.20 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 2007 Michael Lorenz * Copyright (c) 2007 Michael Lorenz
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.19 2009/05/06 18:41:54 elad Exp $"); __KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.20 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -112,7 +112,7 @@ pci_genfb_match(device_t parent, cfdata_t match, void *aux)
static void static void
pci_genfb_attach(device_t parent, device_t self, void *aux) pci_genfb_attach(device_t parent, device_t self, void *aux)
{ {
struct pci_genfb_softc *sc = (struct pci_genfb_softc *)self; struct pci_genfb_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct genfb_ops ops; struct genfb_ops ops;
int idx, bar, type; int idx, bar, type;

6
sys/dev/pci/gtp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gtp.c,v 1.16 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: gtp.c,v 1.17 2009/05/12 08:23:00 cegger Exp $ */
/* $OpenBSD: gtp.c,v 1.1 2002/06/03 16:13:21 mickey Exp $ */ /* $OpenBSD: gtp.c,v 1.1 2002/06/03 16:13:21 mickey Exp $ */
/* /*
@ -29,7 +29,7 @@
/* Gemtek PCI Radio Card Device Driver */ /* Gemtek PCI Radio Card Device Driver */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gtp.c,v 1.16 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: gtp.c,v 1.17 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -141,7 +141,7 @@ gtp_match(device_t parent, cfdata_t cf, void *aux)
static void static void
gtp_attach(device_t parent, device_t self, void *aux) gtp_attach(device_t parent, device_t self, void *aux)
{ {
struct gtp_softc *sc = (struct gtp_softc *) self; struct gtp_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
cfdata_t cf = device_cfdata(&sc->sc_dev); cfdata_t cf = device_cfdata(&sc->sc_dev);
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;

10
sys/dev/pci/i82365_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365_pci.c,v 1.29 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: i82365_pci.c,v 1.30 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 1997 Marc Horowitz. All rights reserved. * Copyright (c) 1997 Marc Horowitz. All rights reserved.
@ -34,7 +34,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i82365_pci.c,v 1.29 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: i82365_pci.c,v 1.30 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -112,8 +112,8 @@ void pcic_isa_config_interrupts(device_t);
void void
pcic_pci_attach(device_t parent, device_t self, void *aux) pcic_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct pcic_softc *sc = (void *) self; struct pcic_pci_softc *psc = device_private(self);
struct pcic_pci_softc *psc = (void *) self; struct pcic_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;
bus_space_tag_t memt = pa->pa_memt; bus_space_tag_t memt = pa->pa_memt;
@ -214,7 +214,7 @@ pcic_pci_attach(device_t parent, device_t self, void *aux)
static void static void
pcic_pci_callback(device_t self) pcic_pci_callback(device_t self)
{ {
struct pcic_softc *sc = (void *) self; struct pcic_softc *sc = device_private(self);
pcic_attach_sockets(sc); pcic_attach_sockets(sc);
} }

12
sys/dev/pci/iavc_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iavc_pci.c,v 1.10 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: iavc_pci.c,v 1.11 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 2001-2003 Cubical Solutions Ltd. * Copyright (c) 2001-2003 Cubical Solutions Ltd.
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.10 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.11 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@ -121,8 +121,8 @@ iavc_pci_probe(device_t parent, cfdata_t match, void *aux)
static void static void
iavc_pci_attach(device_t parent, device_t self, void *aux) iavc_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct iavc_pci_softc *psc = (void *) self; struct iavc_pci_softc *psc = device_private(self);
struct iavc_softc *sc = (void *) self; struct iavc_softc *sc = &psc->sc_iavc;
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;
const struct iavc_pci_product *pp; const struct iavc_pci_product *pp;
@ -332,7 +332,7 @@ iavc_pci_intr(void *arg)
static int static int
iavc_pci_detach(device_t self, int flags) iavc_pci_detach(device_t self, int flags)
{ {
struct iavc_pci_softc *psc = (void *) self; struct iavc_pci_softc *psc = device_private(self);
bus_space_unmap(psc->sc_iavc.sc_mem_bt, psc->sc_iavc.sc_mem_bh, bus_space_unmap(psc->sc_iavc.sc_mem_bt, psc->sc_iavc.sc_mem_bh,
psc->mem_size); psc->mem_size);
@ -353,7 +353,7 @@ iavc_pci_detach(device_t self, int flags)
static int static int
iavc_pci_activate(device_t self, enum devact act) iavc_pci_activate(device_t self, enum devact act)
{ {
struct iavc_softc *psc = (struct iavc_softc *) self; struct iavc_softc *psc = device_private(self);
int error, s; int error, s;
error = 0; error = 0;

6
sys/dev/pci/icp_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: icp_pci.c,v 1.17 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: icp_pci.c,v 1.18 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -69,7 +69,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.17 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.18 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -255,7 +255,7 @@ icp_pci_attach(device_t parent, device_t self, void *aux)
pa = aux; pa = aux;
status = 0; status = 0;
icp = (struct icp_softc *)self; icp = device_private(self);
icp->icp_class = icp_pci_find_class(pa); icp->icp_class = icp_pci_find_class(pa);
aprint_naive(": RAID controller\n"); aprint_naive(": RAID controller\n");

6
sys/dev/pci/if_de.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_de.c,v 1.132 2009/05/06 09:25:15 cegger Exp $ */ /* $NetBSD: if_de.c,v 1.133 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -37,7 +37,7 @@
* board which support 21040, 21041, or 21140 (mostly). * board which support 21040, 21041, or 21140 (mostly).
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.132 2009/05/06 09:25:15 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.133 2009/05/12 08:23:00 cegger Exp $");
#define TULIP_HDR_DATA #define TULIP_HDR_DATA
@ -5632,7 +5632,7 @@ tulip_pci_attach(
(sc)->tulip_pci_devno = pa->d_agent)) (sc)->tulip_pci_devno = pa->d_agent))
#endif #endif
#if defined(__NetBSD__) #if defined(__NetBSD__)
tulip_softc_t * const sc = (tulip_softc_t *) self; tulip_softc_t * const sc = device_private(self);
struct pci_attach_args * const pa = (struct pci_attach_args *) aux; struct pci_attach_args * const pa = (struct pci_attach_args *) aux;
const int unit = sc->tulip_dev.dv_unit; const int unit = sc->tulip_dev.dv_unit;
#define PCI_CONF_WRITE(r, v) pci_conf_write(pa->pa_pc, pa->pa_tag, (r), (v)) #define PCI_CONF_WRITE(r, v) pci_conf_write(pa->pa_pc, pa->pa_tag, (r), (v))

8
sys/dev/pci/if_dge.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_dge.c,v 1.25 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_dge.c,v 1.26 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 2004, SUNET, Swedish University Computer Network. * Copyright (c) 2004, SUNET, Swedish University Computer Network.
@ -80,7 +80,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.25 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.26 2009/05/12 08:23:00 cegger Exp $");
#include "bpfilter.h" #include "bpfilter.h"
#include "rnd.h" #include "rnd.h"
@ -669,7 +669,7 @@ dge_match(device_t parent, cfdata_t cf, void *aux)
static void static void
dge_attach(device_t parent, device_t self, void *aux) dge_attach(device_t parent, device_t self, void *aux)
{ {
struct dge_softc *sc = (void *) self; struct dge_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct ifnet *ifp = &sc->sc_ethercom.ec_if; struct ifnet *ifp = &sc->sc_ethercom.ec_if;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;
@ -2399,7 +2399,7 @@ phwait(struct dge_softc *sc, int p, int r, int d, int type)
static void static void
dge_xgmii_writereg(device_t self, int phy, int reg, int val) dge_xgmii_writereg(device_t self, int phy, int reg, int val)
{ {
struct dge_softc *sc = (void *) self; struct dge_softc *sc = device_private(self);
int mdic; int mdic;
CSR_WRITE(sc, DGE_MDIRW, val); CSR_WRITE(sc, DGE_MDIRW, val);

8
sys/dev/pci/if_en_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_en_pci.c,v 1.31 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_en_pci.c,v 1.32 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* *
@ -43,7 +43,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.31 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.32 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -187,8 +187,8 @@ en_pci_match(device_t parent, cfdata_t match, void *aux)
static void static void
en_pci_attach(device_t parent, device_t self, void *aux) en_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct en_softc *sc = (void *)self; struct en_pci_softc *scp = device_private(self);
struct en_pci_softc *scp = (void *)self; struct en_softc *sc = &scp->esc;
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_intr_handle_t ih; pci_intr_handle_t ih;
const char *intrstr; const char *intrstr;

6
sys/dev/pci/if_esh_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_esh_pci.c,v 1.26 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_esh_pci.c,v 1.27 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.26 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.27 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -103,7 +103,7 @@ esh_pci_match(device_t parent, cfdata_t match, void *aux)
static void static void
esh_pci_attach(device_t parent, device_t self, void *aux) esh_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct esh_softc *sc = (void *)self; struct esh_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;
pci_intr_handle_t ih; pci_intr_handle_t ih;

8
sys/dev/pci/if_fpa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fpa.c,v 1.54 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_fpa.c,v 1.55 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@ -34,7 +34,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.54 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.55 2009/05/12 08:23:00 cegger Exp $");
#ifdef __NetBSD__ #ifdef __NetBSD__
#include "opt_inet.h" #include "opt_inet.h"
@ -341,7 +341,7 @@ pdq_pci_probe(device_t parent, cfdata_t cf, void *aux)
void void
pdq_pci_attach(device_t parent, device_t self, void *aux) pdq_pci_attach(device_t parent, device_t self, void *aux)
{ {
pdq_softc_t *sc = (pdq_softc_t *) self; pdq_softc_t *sc = device_private(self);
struct isa_attach_args *ia = (struct isa_attach_args *) aux; struct isa_attach_args *ia = (struct isa_attach_args *) aux;
struct ifnet *ifp = &sc->sc_if; struct ifnet *ifp = &sc->sc_if;
int i; int i;
@ -400,7 +400,7 @@ pdq_pci_match(device_t parent, cfdata_t match, void *aux)
static void static void
pdq_pci_attach(device_t const parent, device_t const self, void *const aux) pdq_pci_attach(device_t const parent, device_t const self, void *const aux)
{ {
pdq_softc_t * const sc = (pdq_softc_t *)self; pdq_softc_t * const sc = device_private(self);
struct pci_attach_args * const pa = (struct pci_attach_args *) aux; struct pci_attach_args * const pa = (struct pci_attach_args *) aux;
pdq_uint32_t data; pdq_uint32_t data;
pci_intr_handle_t intrhandle; pci_intr_handle_t intrhandle;

6
sys/dev/pci/if_gem_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gem_pci.c,v 1.34 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_gem_pci.c,v 1.35 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* *
@ -34,7 +34,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.34 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.35 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -160,7 +160,7 @@ void
gem_attach_pci(device_t parent, device_t self, void *aux) gem_attach_pci(device_t parent, device_t self, void *aux)
{ {
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct gem_pci_softc *gsc = (void *)self; struct gem_pci_softc *gsc = device_private(self);
struct gem_softc *sc = &gsc->gsc_gem; struct gem_softc *sc = &gsc->gsc_gem;
pci_intr_handle_t ih; pci_intr_handle_t ih;
const char *intrstr; const char *intrstr;

6
sys/dev/pci/if_hme_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_hme_pci.c,v 1.27 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_hme_pci.c,v 1.28 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 2000 Matthew R. Green * Copyright (c) 2000 Matthew R. Green
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.27 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.28 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -124,7 +124,7 @@ void
hmeattach_pci(device_t parent, device_t self, void *aux) hmeattach_pci(device_t parent, device_t self, void *aux)
{ {
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct hme_pci_softc *hsc = (void *)self; struct hme_pci_softc *hsc = device_private(self);
struct hme_softc *sc = &hsc->hsc_hme; struct hme_softc *sc = &hsc->hsc_hme;
pci_intr_handle_t ih; pci_intr_handle_t ih;
pcireg_t csr; pcireg_t csr;

8
sys/dev/pci/if_ipw.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ipw.c,v 1.47 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_ipw.c,v 1.48 2009/05/12 08:23:00 cegger Exp $ */
/* FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp */ /* FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp */
/*- /*-
@ -29,7 +29,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.47 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.48 2009/05/12 08:23:00 cegger Exp $");
/*- /*-
* Intel(R) PRO/Wireless 2100 MiniPCI driver * Intel(R) PRO/Wireless 2100 MiniPCI driver
@ -175,7 +175,7 @@ ipw_match(device_t parent, cfdata_t match, void *aux)
static void static void
ipw_attach(device_t parent, device_t self, void *aux) ipw_attach(device_t parent, device_t self, void *aux)
{ {
struct ipw_softc *sc = (struct ipw_softc *)self; struct ipw_softc *sc = device_private(self);
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
struct ifnet *ifp = &sc->sc_if; struct ifnet *ifp = &sc->sc_if;
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
@ -342,7 +342,7 @@ fail: ipw_detach(self, 0);
static int static int
ipw_detach(struct device* self, int flags) ipw_detach(struct device* self, int flags)
{ {
struct ipw_softc *sc = (struct ipw_softc *)self; struct ipw_softc *sc = device_private(self);
struct ifnet *ifp = &sc->sc_if; struct ifnet *ifp = &sc->sc_if;
if (ifp->if_softc) { if (ifp->if_softc) {

6
sys/dev/pci/if_iwn.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_iwn.c,v 1.30 2009/05/07 08:10:02 cegger Exp $ */ /* $NetBSD: if_iwn.c,v 1.31 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 2007 * Copyright (c) 2007
@ -18,7 +18,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.30 2009/05/07 08:10:02 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.31 2009/05/12 08:23:00 cegger Exp $");
/* /*
@ -431,7 +431,7 @@ fail1: iwn_free_fwmem(sc);
static int static int
iwn_detach(device_t self, int flags __unused) iwn_detach(device_t self, int flags __unused)
{ {
struct iwn_softc *sc = (struct iwn_softc *)self; struct iwn_softc *sc = device_private(self);
struct ifnet *ifp = sc->sc_ic.ic_ifp; struct ifnet *ifp = sc->sc_ic.ic_ifp;
int ac; int ac;

6
sys/dev/pci/if_kse.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_kse.c,v 1.18 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_kse.c,v 1.19 2009/05/12 08:23:00 cegger Exp $ */
/*- /*-
* Copyright (c) 2006 The NetBSD Foundation, Inc. * Copyright (c) 2006 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.18 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.19 2009/05/12 08:23:00 cegger Exp $");
#include "bpfilter.h" #include "bpfilter.h"
@ -344,7 +344,7 @@ kse_match(device_t parent, cfdata_t match, void *aux)
static void static void
kse_attach(device_t parent, device_t self, void *aux) kse_attach(device_t parent, device_t self, void *aux)
{ {
struct kse_softc *sc = (struct kse_softc *)self; struct kse_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;
pci_intr_handle_t ih; pci_intr_handle_t ih;

16
sys/dev/pci/if_msk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_msk.c,v 1.26 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_msk.c,v 1.27 2009/05/12 08:23:00 cegger Exp $ */
/* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */ /* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
/* /*
@ -52,7 +52,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.26 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.27 2009/05/12 08:23:00 cegger Exp $");
#include "bpfilter.h" #include "bpfilter.h"
#include "rnd.h" #include "rnd.h"
@ -229,7 +229,7 @@ sk_win_write_1(struct sk_softc *sc, u_int32_t reg, u_int8_t x)
int int
msk_miibus_readreg(device_t dev, int phy, int reg) msk_miibus_readreg(device_t dev, int phy, int reg)
{ {
struct sk_if_softc *sc_if = (struct sk_if_softc *)dev; struct sk_if_softc *sc_if = device_private(dev);
u_int16_t val; u_int16_t val;
int i; int i;
@ -262,7 +262,7 @@ msk_miibus_readreg(device_t dev, int phy, int reg)
void void
msk_miibus_writereg(device_t dev, int phy, int reg, int val) msk_miibus_writereg(device_t dev, int phy, int reg, int val)
{ {
struct sk_if_softc *sc_if = (struct sk_if_softc *)dev; struct sk_if_softc *sc_if = device_private(dev);
int i; int i;
DPRINTFN(9, ("msk_miibus_writereg phy=%d reg=%#x val=%#x\n", DPRINTFN(9, ("msk_miibus_writereg phy=%d reg=%#x val=%#x\n",
@ -285,7 +285,7 @@ msk_miibus_writereg(device_t dev, int phy, int reg, int val)
void void
msk_miibus_statchg(device_t dev) msk_miibus_statchg(device_t dev)
{ {
struct sk_if_softc *sc_if = (struct sk_if_softc *)dev; struct sk_if_softc *sc_if = device_private(dev);
struct mii_data *mii = &sc_if->sk_mii; struct mii_data *mii = &sc_if->sk_mii;
struct ifmedia_entry *ife = mii->mii_media.ifm_cur; struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int gpcr; int gpcr;
@ -978,8 +978,8 @@ msk_resume(device_t dv PMF_FN_ARGS)
void void
msk_attach(device_t parent, device_t self, void *aux) msk_attach(device_t parent, device_t self, void *aux)
{ {
struct sk_if_softc *sc_if = (struct sk_if_softc *) self; struct sk_if_softc *sc_if = device_private(self);
struct sk_softc *sc = (struct sk_softc *)parent; struct sk_softc *sc = device_private(parent);
struct skc_attach_args *sa = aux; struct skc_attach_args *sa = aux;
struct ifnet *ifp; struct ifnet *ifp;
void *kva; void *kva;
@ -1161,7 +1161,7 @@ mskcprint(void *aux, const char *pnp)
void void
mskc_attach(device_t parent, device_t self, void *aux) mskc_attach(device_t parent, device_t self, void *aux)
{ {
struct sk_softc *sc = (struct sk_softc *)self; struct sk_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct skc_attach_args skca; struct skc_attach_args skca;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;

6
sys/dev/pci/if_ntwoc_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ntwoc_pci.c,v 1.24 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_ntwoc_pci.c,v 1.25 2009/05/12 08:23:00 cegger Exp $ */
/* /*
* Copyright (c) 1998 Vixie Enterprises * Copyright (c) 1998 Vixie Enterprises
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.24 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.25 2009/05/12 08:23:00 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -189,7 +189,7 @@ ntwoc_pci_match(device_t parent, cfdata_t match, void *aux)
static void static void
ntwoc_pci_attach(device_t parent, device_t self, void *aux) ntwoc_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct ntwoc_pci_softc *sc = (void *)self; struct ntwoc_pci_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct sca_softc *sca = &sc->sc_sca; struct sca_softc *sca = &sc->sc_sca;
pci_intr_handle_t ih; pci_intr_handle_t ih;

8
sys/dev/pci/if_ral_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ral_pci.c,v 1.11 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_ral_pci.c,v 1.12 2009/05/12 08:23:01 cegger Exp $ */
/* $OpenBSD: if_ral_pci.c,v 1.6 2006/01/09 20:03:43 damien Exp $ */ /* $OpenBSD: if_ral_pci.c,v 1.6 2006/01/09 20:03:43 damien Exp $ */
/*- /*-
@ -22,7 +22,7 @@
* PCI front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver. * PCI front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.11 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.12 2009/05/12 08:23:01 cegger Exp $");
#include "bpfilter.h" #include "bpfilter.h"
@ -121,7 +121,7 @@ ral_pci_match(device_t parent, cfdata_t cfdata,
void void
ral_pci_attach(device_t parent, device_t self, void *aux) ral_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct ral_pci_softc *psc = (struct ral_pci_softc *)self; struct ral_pci_softc *psc = device_private(self);
struct rt2560_softc *sc = &psc->sc_sc; struct rt2560_softc *sc = &psc->sc_sc;
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
const char *intrstr; const char *intrstr;
@ -180,7 +180,7 @@ ral_pci_attach(device_t parent, device_t self, void *aux)
int int
ral_pci_detach(device_t self, int flags) ral_pci_detach(device_t self, int flags)
{ {
struct ral_pci_softc *psc = (struct ral_pci_softc *)self; struct ral_pci_softc *psc = device_private(self);
struct rt2560_softc *sc = &psc->sc_sc; struct rt2560_softc *sc = &psc->sc_sc;
(*psc->sc_opns->detach)(sc); (*psc->sc_opns->detach)(sc);

6
sys/dev/pci/if_ti.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ti.c,v 1.84 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_ti.c,v 1.85 2009/05/12 08:23:01 cegger Exp $ */
/* /*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
@ -81,7 +81,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.84 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.85 2009/05/12 08:23:01 cegger Exp $");
#include "bpfilter.h" #include "bpfilter.h"
#include "opt_inet.h" #include "opt_inet.h"
@ -1636,7 +1636,7 @@ ti_attach(device_t parent, device_t self, void *aux)
printf(": %s (rev. 0x%02x)\n", t->ti_name, PCI_REVISION(pa->pa_class)); printf(": %s (rev. 0x%02x)\n", t->ti_name, PCI_REVISION(pa->pa_class));
sc = (struct ti_softc *)self; sc = device_private(self);
/* /*
* Map control/status registers. * Map control/status registers.

12
sys/dev/pci/if_vge.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_vge.c,v 1.46 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_vge.c,v 1.47 2009/05/12 08:23:01 cegger Exp $ */
/*- /*-
* Copyright (c) 2004 * Copyright (c) 2004
@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.46 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.47 2009/05/12 08:23:01 cegger Exp $");
/* /*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver. * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@ -523,7 +523,7 @@ vge_miibus_readreg(device_t dev, int phy, int reg)
int i, s; int i, s;
uint16_t rval; uint16_t rval;
sc = (void *)dev; sc = device_private(dev);
rval = 0; rval = 0;
if (phy != (CSR_READ_1(sc, VGE_MIICFG) & 0x1F)) if (phy != (CSR_READ_1(sc, VGE_MIICFG) & 0x1F))
return 0; return 0;
@ -561,7 +561,7 @@ vge_miibus_writereg(device_t dev, int phy, int reg, int data)
struct vge_softc *sc; struct vge_softc *sc;
int i, s; int i, s;
sc = (void *)dev; sc = device_private(dev);
if (phy != (CSR_READ_1(sc, VGE_MIICFG) & 0x1F)) if (phy != (CSR_READ_1(sc, VGE_MIICFG) & 0x1F))
return; return;
@ -924,7 +924,7 @@ static void
vge_attach(device_t parent, device_t self, void *aux) vge_attach(device_t parent, device_t self, void *aux)
{ {
uint8_t *eaddr; uint8_t *eaddr;
struct vge_softc *sc = (void *)self; struct vge_softc *sc = device_private(self);
struct ifnet *ifp; struct ifnet *ifp;
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;
@ -2166,7 +2166,7 @@ vge_resume(device_t dev)
struct ifnet *ifp; struct ifnet *ifp;
int i; int i;
sc = (void *)dev; sc = device_private(dev);
ifp = &sc->sc_ethercom.ec_if; ifp = &sc->sc_ethercom.ec_if;
/* better way to do this? */ /* better way to do this? */

6
sys/dev/pci/if_wi_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wi_pci.c,v 1.47 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_wi_pci.c,v 1.48 2009/05/12 08:23:01 cegger Exp $ */
/*- /*-
* Copyright (c) 2001 The NetBSD Foundation, Inc. * Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.47 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.48 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -214,7 +214,7 @@ wi_pci_match(device_t parent, cfdata_t match, void *aux)
static void static void
wi_pci_attach(device_t parent, device_t self, void *aux) wi_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct wi_pci_softc *psc = (struct wi_pci_softc *)self; struct wi_pci_softc *psc = device_private(self);
struct wi_softc *sc = &psc->psc_wi; struct wi_softc *sc = &psc->psc_wi;
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;

6
sys/dev/pci/if_xge.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_xge.c,v 1.12 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: if_xge.c,v 1.13 2009/05/12 08:23:01 cegger Exp $ */
/* /*
* Copyright (c) 2004, SUNET, Swedish University Computer Network. * Copyright (c) 2004, SUNET, Swedish University Computer Network.
@ -43,7 +43,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.12 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.13 2009/05/12 08:23:01 cegger Exp $");
#include "bpfilter.h" #include "bpfilter.h"
#include "rnd.h" #include "rnd.h"
@ -294,7 +294,7 @@ xge_attach(device_t parent, device_t self, void *aux)
uint64_t val; uint64_t val;
int i; int i;
sc = (struct xge_softc *)self; sc = device_private(self);
sc->sc_dmat = pa->pa_dmat; sc->sc_dmat = pa->pa_dmat;

12
sys/dev/pci/ifpci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ifpci.c,v 1.27 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: ifpci.c,v 1.28 2009/05/12 08:23:01 cegger Exp $ */
/* /*
* Copyright (c) 1999 Gary Jennejohn. All rights reserved. * Copyright (c) 1999 Gary Jennejohn. All rights reserved.
* *
@ -36,14 +36,14 @@
* Fritz!Card PCI driver * Fritz!Card PCI driver
* ------------------------------------------------ * ------------------------------------------------
* *
* $Id: ifpci.c,v 1.27 2009/05/06 10:34:32 cegger Exp $ * $Id: ifpci.c,v 1.28 2009/05/12 08:23:01 cegger Exp $
* *
* last edit-date: [Fri Jan 5 11:38:58 2001] * last edit-date: [Fri Jan 5 11:38:58 2001]
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.27 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.28 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
@ -275,7 +275,7 @@ ifpci_match(device_t parent, cfdata_t match, void *aux)
static void static void
ifpci_attach(device_t parent, device_t self, void *aux) ifpci_attach(device_t parent, device_t self, void *aux)
{ {
struct ifpci_softc *psc = (void*)self; struct ifpci_softc *psc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct isic_softc *sc = &psc->sc_isic; struct isic_softc *sc = &psc->sc_isic;
struct isdn_l3_driver *drv; struct isdn_l3_driver *drv;
@ -399,7 +399,7 @@ ifpci_attach(device_t parent, device_t self, void *aux)
static int static int
ifpci_detach(device_t self, int flags) ifpci_detach(device_t self, int flags)
{ {
struct ifpci_softc *psc = (struct ifpci_softc *)self; struct ifpci_softc *psc = device_private(self);
bus_space_unmap(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size); bus_space_unmap(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
bus_space_free(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size); bus_space_free(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
@ -411,7 +411,7 @@ ifpci_detach(device_t self, int flags)
int int
ifpci_activate(device_t self, enum devact act) ifpci_activate(device_t self, enum devact act)
{ {
struct ifpci_softc *psc = (struct ifpci_softc *)self; struct ifpci_softc *psc = device_private(self);
int error = 0, s; int error = 0, s;
s = splnet(); s = splnet();

12
sys/dev/pci/ifpci2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ifpci2.c,v 1.15 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: ifpci2.c,v 1.16 2009/05/12 08:23:01 cegger Exp $ */
/* /*
* Copyright (c) 1999 Gary Jennejohn. All rights reserved. * Copyright (c) 1999 Gary Jennejohn. All rights reserved.
* *
@ -36,14 +36,14 @@
* Fritz!Card PCI driver * Fritz!Card PCI driver
* ------------------------------------------------ * ------------------------------------------------
* *
* $Id: ifpci2.c,v 1.15 2009/05/06 10:34:32 cegger Exp $ * $Id: ifpci2.c,v 1.16 2009/05/12 08:23:01 cegger Exp $
* *
* last edit-date: [Fri Jan 5 11:38:58 2001] * last edit-date: [Fri Jan 5 11:38:58 2001]
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.15 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.16 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
@ -245,7 +245,7 @@ ifpci2_match(device_t parent, cfdata_t match, void *aux)
static void static void
ifpci2_attach(device_t parent, device_t self, void *aux) ifpci2_attach(device_t parent, device_t self, void *aux)
{ {
struct ifpci_softc *psc = (void*)self; struct ifpci_softc *psc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct isic_softc *sc = &psc->sc_isic; struct isic_softc *sc = &psc->sc_isic;
struct isdn_l3_driver *drv; struct isdn_l3_driver *drv;
@ -358,7 +358,7 @@ ifpci2_attach(device_t parent, device_t self, void *aux)
static int static int
ifpci2_detach(device_t self, int flags) ifpci2_detach(device_t self, int flags)
{ {
struct ifpci_softc *psc = (struct ifpci_softc *)self; struct ifpci_softc *psc = device_private(self);
bus_space_unmap(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size); bus_space_unmap(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
bus_space_free(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size); bus_space_free(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
@ -370,7 +370,7 @@ ifpci2_detach(device_t self, int flags)
int int
ifpci2_activate(device_t self, enum devact act) ifpci2_activate(device_t self, enum devact act)
{ {
struct ifpci_softc *psc = (struct ifpci_softc *)self; struct ifpci_softc *psc = device_private(self);
int error = 0, s; int error = 0, s;
s = splnet(); s = splnet();

6
sys/dev/pci/igsfb_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: igsfb_pci.c,v 1.19 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: igsfb_pci.c,v 1.20 2009/05/12 08:23:01 cegger Exp $ */
/* /*
* Copyright (c) 2002, 2003 Valeriy E. Ushakov * Copyright (c) 2002, 2003 Valeriy E. Ushakov
@ -31,7 +31,7 @@
* Integraphics Systems IGA 168x and CyberPro series. * Integraphics Systems IGA 168x and CyberPro series.
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: igsfb_pci.c,v 1.19 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: igsfb_pci.c,v 1.20 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -153,7 +153,7 @@ igsfb_pci_match(device_t parent, cfdata_t match, void *aux)
static void static void
igsfb_pci_attach(device_t parent, device_t self, void *aux) igsfb_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct igsfb_softc *sc = (struct igsfb_softc *)self; struct igsfb_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
int isconsole; int isconsole;
char devinfo[256]; char devinfo[256];

6
sys/dev/pci/iop_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iop_pci.c,v 1.25 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: iop_pci.c,v 1.26 2009/05/12 08:23:01 cegger Exp $ */
/*- /*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc. * Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.25 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.26 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -115,7 +115,7 @@ iop_pci_attach(device_t parent, device_t self, void *aux)
pcireg_t reg; pcireg_t reg;
int i; int i;
sc = (struct iop_softc *)self; sc = device_private(self);
pa = (struct pci_attach_args *)aux; pa = (struct pci_attach_args *)aux;
pc = pa->pa_pc; pc = pa->pa_pc;
printf(": "); printf(": ");

10
sys/dev/pci/isic_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isic_pci.c,v 1.34 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: isic_pci.c,v 1.35 2009/05/12 08:23:01 cegger Exp $ */
/*- /*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.34 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.35 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/errno.h> #include <sys/errno.h>
@ -129,7 +129,7 @@ isic_pci_match(device_t parent, cfdata_t match, void *aux)
static void static void
isic_pci_attach(device_t parent, device_t self, void *aux) isic_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct pci_isic_softc *psc = (void*) self; struct pci_isic_softc *psc = device_private(self);
struct isic_softc *sc = &psc->sc_isic; struct isic_softc *sc = &psc->sc_isic;
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
const struct isic_pci_product * prod; const struct isic_pci_product * prod;
@ -300,7 +300,7 @@ isic_pci_isdn_attach(struct pci_isic_softc *psc, struct pci_attach_args *pa, con
static int static int
isic_pci_detach(device_t self, int flags) isic_pci_detach(device_t self, int flags)
{ {
struct pci_isic_softc *psc = (struct pci_isic_softc *)self; struct pci_isic_softc *psc = device_private(self);
bus_space_unmap(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size); bus_space_unmap(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
bus_space_free(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size); bus_space_free(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
@ -312,7 +312,7 @@ isic_pci_detach(device_t self, int flags)
static int static int
isic_pci_activate(device_t self, enum devact act) isic_pci_activate(device_t self, enum devact act)
{ {
struct pci_isic_softc *psc = (struct pci_isic_softc *)self; struct pci_isic_softc *psc = device_private(self);
int error = 0, s; int error = 0, s;
s = splnet(); s = splnet();

6
sys/dev/pci/isp_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isp_pci.c,v 1.107 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: isp_pci.c,v 1.108 2009/05/12 08:23:01 cegger Exp $ */
/* /*
* Copyright (C) 1997, 1998, 1999 National Aeronautics & Space Administration * Copyright (C) 1997, 1998, 1999 National Aeronautics & Space Administration
* All rights reserved. * All rights reserved.
@ -38,7 +38,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.107 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.108 2009/05/12 08:23:01 cegger Exp $");
#include <dev/ic/isp_netbsd.h> #include <dev/ic/isp_netbsd.h>
#include <dev/pci/pcireg.h> #include <dev/pci/pcireg.h>
@ -460,7 +460,7 @@ isp_pci_attach(device_t parent, device_t self, void *aux)
static const char nomem[] = "\n%s: no mem for sdparam table\n"; static const char nomem[] = "\n%s: no mem for sdparam table\n";
uint32_t data, rev, linesz = PCI_DFLT_LNSZ; uint32_t data, rev, linesz = PCI_DFLT_LNSZ;
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) self; struct isp_pcisoftc *pcs = device_private(self);
struct ispsoftc *isp = &pcs->pci_isp; struct ispsoftc *isp = &pcs->pci_isp;
bus_space_tag_t st, iot, memt; bus_space_tag_t st, iot, memt;
bus_space_handle_t sh, ioh, memh; bus_space_handle_t sh, ioh, memh;

6
sys/dev/pci/iwic_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iwic_pci.c,v 1.14 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: iwic_pci.c,v 1.15 2009/05/12 08:23:01 cegger Exp $ */
/* /*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved. * Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.14 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.15 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@ -225,7 +225,7 @@ iwic_pci_probe(device_t dev,
static void static void
iwic_pci_attach(device_t parent, device_t dev, void *aux) iwic_pci_attach(device_t parent, device_t dev, void *aux)
{ {
struct iwic_softc *sc = (void *) dev; struct iwic_softc *sc = device_private(dev);
struct iwic_bchan *bchan; struct iwic_bchan *bchan;
pci_intr_handle_t ih; pci_intr_handle_t ih;
const char *intrstr; const char *intrstr;

8
sys/dev/pci/ld_amr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ld_amr.c,v 1.18 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: ld_amr.c,v 1.19 2009/05/12 08:23:01 cegger Exp $ */
/*- /*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.18 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.19 2009/05/12 08:23:01 cegger Exp $");
#include "rnd.h" #include "rnd.h"
@ -161,7 +161,7 @@ ld_amr_dobio(struct ld_amr_softc *sc, void *data, int datasize,
} else { } else {
ac->ac_handler = ld_amr_handler; ac->ac_handler = ld_amr_handler;
ac->ac_context = bp; ac->ac_context = bp;
ac->ac_dv = (device_t)sc; ac->ac_dv = sc->sc_ld.sc_dv;
amr_ccb_enqueue(amr, ac); amr_ccb_enqueue(amr, ac);
rv = 0; rv = 0;
} }
@ -185,7 +185,7 @@ ld_amr_handler(struct amr_ccb *ac)
struct amr_softc *amr; struct amr_softc *amr;
bp = ac->ac_context; bp = ac->ac_context;
sc = (struct ld_amr_softc *)ac->ac_dv; sc = device_private(ac->ac_dv);
amr = device_private(device_parent(sc->sc_ld.sc_dv)); amr = device_private(device_parent(sc->sc_ld.sc_dv));
if (ac->ac_status != AMR_STATUS_SUCCESS) { if (ac->ac_status != AMR_STATUS_SUCCESS) {

8
sys/dev/pci/ld_twe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ld_twe.c,v 1.33 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: ld_twe.c,v 1.34 2009/05/12 08:23:01 cegger Exp $ */
/*- /*-
* Copyright (c) 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. * Copyright (c) 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.33 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.34 2009/05/12 08:23:01 cegger Exp $");
#include "rnd.h" #include "rnd.h"
@ -221,7 +221,7 @@ ld_twe_dobio(struct ld_twe_softc *sc, void *data, int datasize, int blkno,
} else { } else {
ccb->ccb_tx.tx_handler = ld_twe_handler; ccb->ccb_tx.tx_handler = ld_twe_handler;
ccb->ccb_tx.tx_context = bp; ccb->ccb_tx.tx_context = bp;
ccb->ccb_tx.tx_dv = (device_t)sc; ccb->ccb_tx.tx_dv = sc->sc_ld.sc_dv;
twe_ccb_enqueue(twe, ccb); twe_ccb_enqueue(twe, ccb);
rv = 0; rv = 0;
} }
@ -247,7 +247,7 @@ ld_twe_handler(struct twe_ccb *ccb, int error)
tx = &ccb->ccb_tx; tx = &ccb->ccb_tx;
bp = tx->tx_context; bp = tx->tx_context;
sc = (struct ld_twe_softc *)tx->tx_dv; sc = device_private(tx->tx_dv);
twe = device_private(device_parent(sc->sc_ld.sc_dv)); twe = device_private(device_parent(sc->sc_ld.sc_dv));
twe_ccb_unmap(twe, ccb); twe_ccb_unmap(twe, ccb);

6
sys/dev/pci/mfi_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mfi_pci.c,v 1.7 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: mfi_pci.c,v 1.8 2009/05/12 08:23:01 cegger Exp $ */
/* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */ /* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */
/* /*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
@ -17,7 +17,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.7 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.8 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -120,7 +120,7 @@ mfi_pci_match(device_t parent, cfdata_t match, void *aux)
void void
mfi_pci_attach(device_t parent, device_t self, void *aux) mfi_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct mfi_softc *sc = (struct mfi_softc *)self; struct mfi_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
const struct mfi_pci_device *mpd; const struct mfi_pci_device *mpd;
const struct mfi_pci_subtype *st; const struct mfi_pci_subtype *st;

6
sys/dev/pci/mlx_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mlx_pci.c,v 1.21 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: mlx_pci.c,v 1.22 2009/05/12 08:23:01 cegger Exp $ */
/*- /*-
* Copyright (c) 2001 The NetBSD Foundation, Inc. * Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -62,7 +62,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.21 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.22 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -201,7 +201,7 @@ mlx_pci_attach(device_t parent, device_t self, void *aux)
int ior, memr, i; int ior, memr, i;
const struct mlx_pci_ident *mpi; const struct mlx_pci_ident *mpi;
mlx = (struct mlx_softc *)self; mlx = device_private(self);
pa = aux; pa = aux;
pc = pa->pa_pc; pc = pa->pa_pc;
mpi = mlx_pci_findmpi(aux); mpi = mlx_pci_findmpi(aux);

10
sys/dev/pci/mly.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mly.c,v 1.41 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: mly.c,v 1.42 2009/05/12 08:23:01 cegger Exp $ */
/*- /*-
* Copyright (c) 2001 The NetBSD Foundation, Inc. * Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -70,7 +70,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.41 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.42 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -283,7 +283,7 @@ mly_attach(device_t parent, device_t self, void *aux)
struct scsipi_adapter *adapt; struct scsipi_adapter *adapt;
struct scsipi_channel *chan; struct scsipi_channel *chan;
mly = (struct mly_softc *)self; mly = device_private(self);
pa = aux; pa = aux;
pc = pa->pa_pc; pc = pa->pa_pc;
ident = mly_find_ident(pa); ident = mly_find_ident(pa);
@ -1805,7 +1805,7 @@ mly_scsipi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req,
struct mly_btl *btl; struct mly_btl *btl;
int s, tmp; int s, tmp;
mly = (void *)chan->chan_adapter->adapt_dev; mly = device_private(chan->chan_adapter->adapt_dev);
switch (req) { switch (req) {
case ADAPTER_REQ_RUN_XFER: case ADAPTER_REQ_RUN_XFER:
@ -2061,7 +2061,7 @@ mly_scsipi_ioctl(struct scsipi_channel *chan, u_long cmd, void *data,
struct mly_softc *mly; struct mly_softc *mly;
int rv; int rv;
mly = (struct mly_softc *)chan->chan_adapter->adapt_dev; mly = device_private(chan->chan_adapter->adapt_dev);
switch (cmd) { switch (cmd) {
case SCBUSIOLLSCAN: case SCBUSIOLLSCAN:

6
sys/dev/pci/mpt_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mpt_pci.c,v 1.18 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: mpt_pci.c,v 1.19 2009/05/12 08:23:01 cegger Exp $ */
/* /*
* Copyright (c) 2003 Wasabi Systems, Inc. * Copyright (c) 2003 Wasabi Systems, Inc.
@ -46,7 +46,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.18 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.19 2009/05/12 08:23:01 cegger Exp $");
#include <dev/ic/mpt.h> /* pulls in all headers */ #include <dev/ic/mpt.h> /* pulls in all headers */
@ -125,7 +125,7 @@ mpt_pci_match(device_t parent, cfdata_t cf, void *aux)
static void static void
mpt_pci_attach(device_t parent, device_t self, void *aux) mpt_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct mpt_pci_softc *psc = (void *) self; struct mpt_pci_softc *psc = device_private(self);
mpt_softc_t *mpt = &psc->sc_mpt; mpt_softc_t *mpt = &psc->sc_mpt;
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_intr_handle_t ih; pci_intr_handle_t ih;

6
sys/dev/pci/n8/n8_memory_bsd.c
View File

@ -61,7 +61,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
static char const n8_id[] = "$Id: n8_memory_bsd.c,v 1.3 2009/05/11 20:53:47 cegger Exp $"; static char const n8_id[] = "$Id: n8_memory_bsd.c,v 1.4 2009/05/12 08:23:01 cegger Exp $";
/*****************************************************************************/ /*****************************************************************************/
/** @file n8_memory_bsd.c /** @file n8_memory_bsd.c
* @brief NetOctaveMemory Services - FreeBSD-specific support routines. * @brief NetOctaveMemory Services - FreeBSD-specific support routines.
@ -271,7 +271,7 @@ n8_GetLargeAllocation(N8_MemoryType_t bankIndex,
{ {
NspInstance_t *nip = &NSPDeviceTable_g[0]; /* can only attach once */ NspInstance_t *nip = &NSPDeviceTable_g[0]; /* can only attach once */
struct nsp_softc *sc = (struct nsp_softc *)nip->dev; struct nsp_softc *sc = device_private(nip->dev);
bus_dma_segment_t seg; bus_dma_segment_t seg;
int rseg; int rseg;
@ -356,7 +356,7 @@ n8_FreeLargeAllocation(N8_MemoryType_t bankIndex,
unsigned char debug) unsigned char debug)
{ {
NspInstance_t *nip = &NSPDeviceTable_g[0]; /* can only attach once */ NspInstance_t *nip = &NSPDeviceTable_g[0]; /* can only attach once */
struct nsp_softc *sc = (struct nsp_softc *)nip->dev; struct nsp_softc *sc = device_private(nip->dev);
printf("n8_FreeLargeAllocation: freeing %p for bankIndex %d\n", printf("n8_FreeLargeAllocation: freeing %p for bankIndex %d\n",
BasePointer_g[bankIndex], bankIndex); BasePointer_g[bankIndex], bankIndex);

4
sys/dev/pci/n8/nsp.c
View File

@ -326,7 +326,7 @@ nsp_attach(device_t parent, device_t self, void *aux)
int res; int res;
int ind; int ind;
sc = (struct nsp_softc *)self; sc = device_private(self);
mutex_init(&sc->sc_intrlock, MUTEX_DEFAULT, IPL_NET); mutex_init(&sc->sc_intrlock, MUTEX_DEFAULT, IPL_NET);
@ -512,7 +512,7 @@ nsp_detach(device_t dev, int flags)
int res; int res;
int ind; int ind;
sc = (struct nsp_softc *)dev; sc = device_private(dev);
mutex_enter(&sc->sc_intrlock); mutex_enter(&sc->sc_intrlock);
DBG(("nsp.%d detach\n", sc->unit)); DBG(("nsp.%d detach\n", sc->unit));

6
sys/dev/pci/neo.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: neo.c,v 1.41 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: neo.c,v 1.42 2009/05/12 08:23:01 cegger Exp $ */
/* /*
* Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk> * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.41 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.42 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -569,7 +569,7 @@ neo_attach(device_t parent, device_t self, void *aux)
pci_intr_handle_t ih; pci_intr_handle_t ih;
pcireg_t csr; pcireg_t csr;
sc = (struct neo_softc *)self; sc = device_private(self);
pa = (struct pci_attach_args *)aux; pa = (struct pci_attach_args *)aux;
pc = pa->pa_pc; pc = pa->pa_pc;

10
sys/dev/pci/oboe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: oboe.c,v 1.34 2009/05/06 10:34:32 cegger Exp $ */ /* $NetBSD: oboe.c,v 1.35 2009/05/12 08:23:01 cegger Exp $ */
/* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */ /* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@ -38,7 +38,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.34 2009/05/06 10:34:32 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.35 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -175,7 +175,7 @@ oboe_match(device_t parent, cfdata_t match, void *aux)
static void static void
oboe_attach(device_t parent, device_t self, void *aux) oboe_attach(device_t parent, device_t self, void *aux)
{ {
struct oboe_softc *sc = (struct oboe_softc *)self; struct oboe_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
pci_intr_handle_t ih; pci_intr_handle_t ih;
struct ir_attach_args ia; struct ir_attach_args ia;
@ -246,7 +246,7 @@ oboe_attach(device_t parent, device_t self, void *aux)
static int static int
oboe_activate(device_t self, enum devact act) oboe_activate(device_t self, enum devact act)
{ {
struct oboe_softc *sc = (struct oboe_softc *)self; struct oboe_softc *sc = device_private(self);
int error = 0; int error = 0;
DPRINTF(("%s: sc=%p\n", __func__, sc)); DPRINTF(("%s: sc=%p\n", __func__, sc));
@ -267,7 +267,7 @@ oboe_activate(device_t self, enum devact act)
static int static int
oboe_detach(device_t self, int flags) oboe_detach(device_t self, int flags)
{ {
struct oboe_softc *sc = (struct oboe_softc *)self; struct oboe_softc *sc = device_private(self);
#ifdef OBOE_DEBUG #ifdef OBOE_DEBUG
/* XXX needs reference counting for proper detach. */ /* XXX needs reference counting for proper detach. */

6
sys/dev/pci/radeonfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: radeonfb.c,v 1.32 2009/05/06 18:41:54 elad Exp $ */ /* $NetBSD: radeonfb.c,v 1.33 2009/05/12 08:23:01 cegger Exp $ */
/*- /*-
* Copyright (c) 2006 Itronix Inc. * Copyright (c) 2006 Itronix Inc.
@ -70,7 +70,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.32 2009/05/06 18:41:54 elad Exp $"); __KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.33 2009/05/12 08:23:01 cegger Exp $");
#define RADEONFB_DEFAULT_DEPTH 32 #define RADEONFB_DEFAULT_DEPTH 32
@ -426,7 +426,7 @@ radeonfb_match(device_t parent, cfdata_t match, void *aux)
static void static void
radeonfb_attach(device_t parent, device_t dev, void *aux) radeonfb_attach(device_t parent, device_t dev, void *aux)
{ {
struct radeonfb_softc *sc = (struct radeonfb_softc *)dev; struct radeonfb_softc *sc = device_private(dev);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
const char *mptr; const char *mptr;
bus_size_t bsz; bus_size_t bsz;

6
sys/dev/pci/siop_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: siop_pci.c,v 1.23 2009/05/06 10:34:33 cegger Exp $ */ /* $NetBSD: siop_pci.c,v 1.24 2009/05/12 08:23:01 cegger Exp $ */
/* /*
* Copyright (c) 2000 Manuel Bouyer. * Copyright (c) 2000 Manuel Bouyer.
@ -32,7 +32,7 @@
/* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */ /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.23 2009/05/06 10:34:33 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.24 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -73,7 +73,7 @@ static void
siop_pci_attach(device_t parent, device_t self, void *aux) siop_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct siop_pci_softc *sc = (struct siop_pci_softc *)self; struct siop_pci_softc *sc = device_private(self);
if (siop_pci_attach_common(&sc->siop_pci, &sc->siop.sc_c, if (siop_pci_attach_common(&sc->siop_pci, &sc->siop.sc_c,
pa, siop_intr) == 0) pa, siop_intr) == 0)

8
sys/dev/pci/sv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sv.c,v 1.41 2009/05/06 10:34:33 cegger Exp $ */ /* $NetBSD: sv.c,v 1.42 2009/05/12 08:23:01 cegger Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */ /* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/* /*
@ -67,7 +67,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.41 2009/05/06 10:34:33 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.42 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -303,7 +303,7 @@ sv_defer(device_t self)
pcitag_t pt; pcitag_t pt;
pcireg_t dmaio; pcireg_t dmaio;
sc = (struct sv_softc *)self; sc = device_private(self);
pc = sc->sc_pa.pa_pc; pc = sc->sc_pa.pa_pc;
pt = sc->sc_pa.pa_tag; pt = sc->sc_pa.pa_tag;
DPRINTF(("sv_defer: %p\n", sc)); DPRINTF(("sv_defer: %p\n", sc));
@ -353,7 +353,7 @@ sv_attach(device_t parent, device_t self, void *aux)
uint8_t reg; uint8_t reg;
struct audio_attach_args arg; struct audio_attach_args arg;
sc = (struct sv_softc *)self; sc = device_private(self);
pa = aux; pa = aux;
pc = pa->pa_pc; pc = pa->pa_pc;
pt = pa->pa_tag; pt = pa->pa_tag;

6
sys/dev/pci/tga.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tga.c,v 1.74 2009/05/06 10:34:33 cegger Exp $ */ /* $NetBSD: tga.c,v 1.75 2009/05/12 08:23:01 cegger Exp $ */
/* /*
* Copyright (c) 1995, 1996 Carnegie-Mellon University. * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.74 2009/05/06 10:34:33 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.75 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -383,7 +383,7 @@ void
tgaattach(device_t parent, device_t self, void *aux) tgaattach(device_t parent, device_t self, void *aux)
{ {
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
struct tga_softc *sc = (struct tga_softc *)self; struct tga_softc *sc = device_private(self);
struct wsemuldisplaydev_attach_args aa; struct wsemuldisplaydev_attach_args aa;
pci_intr_handle_t intrh; pci_intr_handle_t intrh;
const char *intrstr; const char *intrstr;

6
sys/dev/pci/twa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: twa.c,v 1.30 2009/05/06 10:34:33 cegger Exp $ */ /* $NetBSD: twa.c,v 1.31 2009/05/12 08:23:01 cegger Exp $ */
/* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */ /* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */
/*- /*-
@ -67,7 +67,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.30 2009/05/06 10:34:33 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.31 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -1498,7 +1498,7 @@ twa_attach(device_t parent, device_t self, void *aux)
int i; int i;
bool use_64bit; bool use_64bit;
sc = (struct twa_softc *)self; sc = device_private(self);
pa = aux; pa = aux;
pc = pa->pa_pc; pc = pa->pa_pc;

8
sys/dev/pci/twe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: twe.c,v 1.89 2009/05/06 10:34:33 cegger Exp $ */ /* $NetBSD: twe.c,v 1.90 2009/05/12 08:23:01 cegger Exp $ */
/*- /*-
* Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc. * Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@ -63,7 +63,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.89 2009/05/06 10:34:33 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.90 2009/05/12 08:23:01 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -322,7 +322,7 @@ twe_attach(device_t parent, device_t self, void *aux)
struct twe_cmd *tc; struct twe_cmd *tc;
struct twe_ccb *ccb; struct twe_ccb *ccb;
sc = (struct twe_softc *)self; sc = device_private(self);
pa = aux; pa = aux;
pc = pa->pa_pc; pc = pa->pa_pc;
sc->sc_dmat = pa->pa_dmat; sc->sc_dmat = pa->pa_dmat;
@ -909,7 +909,7 @@ twe_aen_handler(struct twe_ccb *ccb, int error)
uint16_t aen; uint16_t aen;
int rv; int rv;
sc = (struct twe_softc *)ccb->ccb_tx.tx_dv; sc = device_private(ccb->ccb_tx.tx_dv);
tp = ccb->ccb_tx.tx_context; tp = ccb->ccb_tx.tx_context;
twe_ccb_unmap(sc, ccb); twe_ccb_unmap(sc, ccb);

6
sys/dev/pci/ubsec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ubsec.c,v 1.22 2009/05/06 10:34:33 cegger Exp $ */ /* $NetBSD: ubsec.c,v 1.23 2009/05/12 08:23:01 cegger Exp $ */
/* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */ /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */
/* $OpenBSD: ubsec.c,v 1.127 2003/06/04 14:04:58 jason Exp $ */ /* $OpenBSD: ubsec.c,v 1.127 2003/06/04 14:04:58 jason Exp $ */
@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.22 2009/05/06 10:34:33 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.23 2009/05/12 08:23:01 cegger Exp $");
#undef UBSEC_DEBUG #undef UBSEC_DEBUG
@ -300,7 +300,7 @@ ubsec_probe(device_t parent, cfdata_t match, void *aux)
static void static void
ubsec_attach(device_t parent, device_t self, void *aux) ubsec_attach(device_t parent, device_t self, void *aux)
{ {
struct ubsec_softc *sc = (struct ubsec_softc *)self; struct ubsec_softc *sc = device_private(self);
struct pci_attach_args *pa = aux; struct pci_attach_args *pa = aux;
const struct ubsec_product *up; const struct ubsec_product *up;
pci_chipset_tag_t pc = pa->pa_pc; pci_chipset_tag_t pc = pa->pa_pc;