Module Name: src
Committed By: cegger
Date: Tue May 12 14:43:59 UTC 2009
Modified Files:
src/sys/dev/sbus: be.c bwtwo_sbus.c cgthree_sbus.c cs4231_sbus.c
esp_sbus.c genfb_sbus.c if_en.c if_gem_sbus.c if_hme_sbus.c
isp_sbus.c lebuffer.c magma.c magmareg.h p9100.c qe.c qec.c sio16.c
spif.c spifreg.h stp4020.c tcx.c xbox.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/sbus/be.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/sbus/bwtwo_sbus.c \
src/sys/dev/sbus/cgthree_sbus.c src/sys/dev/sbus/if_en.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/sbus/cs4231_sbus.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/sbus/esp_sbus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sbus/genfb_sbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/sbus/if_gem_sbus.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/sbus/if_hme_sbus.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/sbus/isp_sbus.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/sbus/lebuffer.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/sbus/magma.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/sbus/magmareg.h
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/sbus/p9100.c src/sys/dev/sbus/qec.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/sbus/qe.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/sbus/sio16.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/sbus/spif.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/sbus/spifreg.h
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/sbus/stp4020.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/sbus/tcx.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/sbus/xbox.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/be.c
diff -u src/sys/dev/sbus/be.c:1.64 src/sys/dev/sbus/be.c:1.65
--- src/sys/dev/sbus/be.c:1.64 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/be.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.64 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: be.c,v 1.65 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.64 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.65 2009/05/12 14:43:59 cegger Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -159,8 +159,8 @@
#endif
};
-int bematch(struct device *, cfdata_t, void *);
-void beattach(struct device *, struct device *, void *);
+int bematch(device_t, cfdata_t, void *);
+void beattach(device_t, device_t, void *);
void beinit(struct be_softc *);
void bestart(struct ifnet *);
@@ -188,9 +188,9 @@
void be_mcreset(struct be_softc *);
/* MII methods & callbacks */
-static int be_mii_readreg(struct device *, int, int);
-static void be_mii_writereg(struct device *, int, int, int);
-static void be_mii_statchg(struct device *);
+static int be_mii_readreg(device_t, int, int);
+static void be_mii_writereg(device_t, int, int, int);
+static void be_mii_statchg(device_t);
/* MII helpers */
static void be_mii_sync(struct be_softc *);
@@ -209,7 +209,7 @@
bematch, beattach, NULL, NULL);
int
-bematch(struct device *parent, cfdata_t cf, void *aux)
+bematch(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -217,7 +217,7 @@
}
void
-beattach(struct device *parent, struct device *self, void *aux)
+beattach(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa = aux;
struct qec_softc *qec = (struct qec_softc *)parent;
@@ -1319,7 +1319,7 @@
}
static int
-be_mii_readreg(struct device *self, int phy, int reg)
+be_mii_readreg(device_t self, int phy, int reg)
{
struct be_softc *sc = (struct be_softc *)self;
int val = 0, i;
@@ -1347,7 +1347,7 @@
}
void
-be_mii_writereg(struct device *self, int phy, int reg, int val)
+be_mii_writereg(device_t self, int phy, int reg, int val)
{
struct be_softc *sc = (struct be_softc *)self;
int i;
@@ -1373,12 +1373,12 @@
{
int n;
- be_mii_writereg((struct device *)sc, phy, MII_BMCR,
+ be_mii_writereg((device_t)sc, phy, MII_BMCR,
BMCR_LOOP | BMCR_PDOWN | BMCR_ISO);
- be_mii_writereg((struct device *)sc, phy, MII_BMCR, BMCR_RESET);
+ be_mii_writereg((device_t)sc, phy, MII_BMCR, BMCR_RESET);
for (n = 16; n >= 0; n--) {
- int bmcr = be_mii_readreg((struct device *)sc, phy, MII_BMCR);
+ int bmcr = be_mii_readreg((device_t)sc, phy, MII_BMCR);
if ((bmcr & BMCR_RESET) == 0)
break;
DELAY(20);
@@ -1405,7 +1405,7 @@
}
void
-be_mii_statchg(struct device *self)
+be_mii_statchg(device_t self)
{
struct be_softc *sc = (struct be_softc *)self;
bus_space_tag_t t = sc->sc_bustag;
@@ -1613,7 +1613,7 @@
/* Callback if something changed. */
if (sc->sc_mii_active != mii->mii_media_active || cmd == MII_MEDIACHG) {
- (*mii->mii_statchg)((struct device *)sc);
+ (*mii->mii_statchg)((device_t)sc);
sc->sc_mii_active = mii->mii_media_active;
}
return (0);
@@ -1635,7 +1635,7 @@
/*
* Internal transceiver; do the work here.
*/
- bmcr = be_mii_readreg((struct device *)sc, BE_PHY_INTERNAL, MII_BMCR);
+ bmcr = be_mii_readreg((device_t)sc, BE_PHY_INTERNAL, MII_BMCR);
switch (bmcr & (BMCR_S100 | BMCR_FDX)) {
case (BMCR_S100 | BMCR_FDX):
@@ -1653,8 +1653,8 @@
}
/* Read twice in case the register is latched */
- bmsr = be_mii_readreg((struct device *)sc, BE_PHY_INTERNAL, MII_BMSR)|
- be_mii_readreg((struct device *)sc, BE_PHY_INTERNAL, MII_BMSR);
+ bmsr = be_mii_readreg((device_t)sc, BE_PHY_INTERNAL, MII_BMSR)|
+ be_mii_readreg((device_t)sc, BE_PHY_INTERNAL, MII_BMSR);
if (bmsr & BMSR_LINK)
media_status |= IFM_ACTIVE;
Index: src/sys/dev/sbus/bwtwo_sbus.c
diff -u src/sys/dev/sbus/bwtwo_sbus.c:1.24 src/sys/dev/sbus/bwtwo_sbus.c:1.25
--- src/sys/dev/sbus/bwtwo_sbus.c:1.24 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/bwtwo_sbus.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo_sbus.c,v 1.24 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: bwtwo_sbus.c,v 1.25 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.24 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.25 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -103,8 +103,8 @@
#include <dev/sun/pfourreg.h>
/* autoconfiguration driver */
-static void bwtwoattach_sbus (struct device *, struct device *, void *);
-static int bwtwomatch_sbus (struct device *, cfdata_t, void *);
+static void bwtwoattach_sbus (device_t, device_t, void *);
+static int bwtwomatch_sbus (device_t, cfdata_t, void *);
/* Allocate an `sbusdev' in addition to the bwtwo softc */
struct bwtwo_sbus_softc {
@@ -122,7 +122,7 @@
* Match a bwtwo.
*/
static int
-bwtwomatch_sbus(struct device *parent, cfdata_t cf, void *aux)
+bwtwomatch_sbus(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -134,7 +134,7 @@
* Attach a display. We need to notice if it is the console, too.
*/
void
-bwtwoattach_sbus(struct device *parent, struct device *self, void *args)
+bwtwoattach_sbus(device_t parent, device_t self, void *args)
{
struct bwtwo_softc *sc = (struct bwtwo_softc *)self;
struct sbusdev *sd = &((struct bwtwo_sbus_softc *)self)->bss_sd;
Index: src/sys/dev/sbus/cgthree_sbus.c
diff -u src/sys/dev/sbus/cgthree_sbus.c:1.24 src/sys/dev/sbus/cgthree_sbus.c:1.25
--- src/sys/dev/sbus/cgthree_sbus.c:1.24 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/cgthree_sbus.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree_sbus.c,v 1.24 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: cgthree_sbus.c,v 1.25 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.24 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.25 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,8 +111,8 @@
/* autoconfiguration driver */
-static int cgthreematch_sbus(struct device *, cfdata_t, void *);
-static void cgthreeattach_sbus(struct device *, struct device *, void *);
+static int cgthreematch_sbus(device_t, cfdata_t, void *);
+static void cgthreeattach_sbus(device_t, device_t, void *);
CFATTACH_DECL(cgthree_sbus, sizeof(struct cgthree_softc),
cgthreematch_sbus, cgthreeattach_sbus, NULL, NULL);
@@ -121,7 +121,7 @@
* Match a cgthree.
*/
int
-cgthreematch_sbus(struct device *parent, cfdata_t cf, void *aux)
+cgthreematch_sbus(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -132,7 +132,7 @@
* Attach a display. We need to notice if it is the console, too.
*/
void
-cgthreeattach_sbus(struct device *parent, struct device *self, void *args)
+cgthreeattach_sbus(device_t parent, device_t self, void *args)
{
struct cgthree_softc *sc = (struct cgthree_softc *)self;
struct sbusdev *sd = &((struct cgthree_sbus_softc *)self)->bss_sd;
Index: src/sys/dev/sbus/if_en.c
diff -u src/sys/dev/sbus/if_en.c:1.24 src/sys/dev/sbus/if_en.c:1.25
--- src/sys/dev/sbus/if_en.c:1.24 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/if_en.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_en.c,v 1.24 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: if_en.c,v 1.25 2009/05/12 14:43:59 cegger Exp $ */
/*
*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.24 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.25 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,8 +79,8 @@
/*
* prototypes
*/
-static int en_sbus_match(struct device *, cfdata_t, void *);
-static void en_sbus_attach(struct device *, struct device *, void *);
+static int en_sbus_match(device_t, cfdata_t, void *);
+static void en_sbus_attach(device_t, device_t, void *);
/*
* SBus autoconfig attachments
@@ -96,11 +96,7 @@
*/
static int
-en_sbus_match(parent, cf, aux)
- struct device *parent;
- cfdata_t cf;
- void *aux;
-
+en_sbus_match(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -120,10 +116,7 @@
static void
-en_sbus_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-
+en_sbus_attach(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa = aux;
struct en_softc *sc = (void *)self;
Index: src/sys/dev/sbus/cs4231_sbus.c
diff -u src/sys/dev/sbus/cs4231_sbus.c:1.44 src/sys/dev/sbus/cs4231_sbus.c:1.45
--- src/sys/dev/sbus/cs4231_sbus.c:1.44 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/cs4231_sbus.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231_sbus.c,v 1.44 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: cs4231_sbus.c,v 1.45 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1998, 1999, 2002, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.44 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.45 2009/05/12 14:43:59 cegger Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -79,8 +79,8 @@
};
-static int cs4231_sbus_match(struct device *, cfdata_t, void *);
-static void cs4231_sbus_attach(struct device *, struct device *, void *);
+static int cs4231_sbus_match(device_t, cfdata_t, void *);
+static void cs4231_sbus_attach(device_t, device_t, void *);
static int cs4231_sbus_pint(void *);
static int cs4231_sbus_rint(void *);
@@ -138,7 +138,7 @@
static int
-cs4231_sbus_match(struct device *parent, cfdata_t cf, void *aux)
+cs4231_sbus_match(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa;
@@ -148,7 +148,7 @@
static void
-cs4231_sbus_attach(struct device *parent, struct device *self, void *aux)
+cs4231_sbus_attach(device_t parent, device_t self, void *aux)
{
struct cs4231_sbus_softc *sbsc;
struct cs4231_softc *sc;
Index: src/sys/dev/sbus/esp_sbus.c
diff -u src/sys/dev/sbus/esp_sbus.c:1.47 src/sys/dev/sbus/esp_sbus.c:1.48
--- src/sys/dev/sbus/esp_sbus.c:1.47 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/esp_sbus.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_sbus.c,v 1.47 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: esp_sbus.c,v 1.48 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.47 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.48 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,7 +132,7 @@
};
int
-espmatch_sbus(struct device *parent, cfdata_t cf, void *aux)
+espmatch_sbus(device_t parent, cfdata_t cf, void *aux)
{
int rv;
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/genfb_sbus.c
diff -u src/sys/dev/sbus/genfb_sbus.c:1.6 src/sys/dev/sbus/genfb_sbus.c:1.7
--- src/sys/dev/sbus/genfb_sbus.c:1.6 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/genfb_sbus.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_sbus.c,v 1.6 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: genfb_sbus.c,v 1.7 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -29,7 +29,7 @@
/* an SBus frontend for the generic fb console driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_sbus.c,v 1.6 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_sbus.c,v 1.7 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,8 +57,8 @@
paddr_t sc_paddr;
};
-static int genfb_match_sbus(struct device *, cfdata_t, void *);
-static void genfb_attach_sbus(struct device *, struct device *, void *);
+static int genfb_match_sbus(device_t, cfdata_t, void *);
+static void genfb_attach_sbus(device_t, device_t, void *);
static int genfb_ioctl_sbus(void *, void *, u_long, void *, int,
struct lwp*);
static paddr_t genfb_mmap_sbus(void *, void *, off_t, int);
@@ -70,7 +70,7 @@
* Match a graphics device.
*/
static int
-genfb_match_sbus(struct device *parent, cfdata_t cf, void *aux)
+genfb_match_sbus(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -88,7 +88,7 @@
* Attach a display. We need to notice if it is the console, too.
*/
static void
-genfb_attach_sbus(struct device *parent, struct device *self, void *args)
+genfb_attach_sbus(device_t parent, device_t self, void *args)
{
struct genfb_sbus_softc *sc = (struct genfb_sbus_softc *)self;
struct sbusdev *sd = &sc->sc_sd;
Index: src/sys/dev/sbus/if_gem_sbus.c
diff -u src/sys/dev/sbus/if_gem_sbus.c:1.9 src/sys/dev/sbus/if_gem_sbus.c:1.10
--- src/sys/dev/sbus/if_gem_sbus.c:1.9 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/if_gem_sbus.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gem_sbus.c,v 1.9 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: if_gem_sbus.c,v 1.10 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.9 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.10 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,14 +67,14 @@
bus_space_handle_t gsc_sbus_regs_h;
};
-int gemmatch_sbus(struct device *, cfdata_t, void *);
-void gemattach_sbus(struct device *, struct device *, void *);
+int gemmatch_sbus(device_t, cfdata_t, void *);
+void gemattach_sbus(device_t, device_t, void *);
CFATTACH_DECL(gem_sbus, sizeof(struct gem_sbus_softc),
gemmatch_sbus, gemattach_sbus, NULL, NULL);
int
-gemmatch_sbus(struct device *parent, cfdata_t cf, void *aux)
+gemmatch_sbus(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -82,7 +82,7 @@
}
void
-gemattach_sbus(struct device *parent, struct device *self, void *aux)
+gemattach_sbus(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa = aux;
struct gem_sbus_softc *gsc = (void *)self;
Index: src/sys/dev/sbus/if_hme_sbus.c
diff -u src/sys/dev/sbus/if_hme_sbus.c:1.27 src/sys/dev/sbus/if_hme_sbus.c:1.28
--- src/sys/dev/sbus/if_hme_sbus.c:1.27 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/if_hme_sbus.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_sbus.c,v 1.27 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: if_hme_sbus.c,v 1.28 2009/05/12 14:43:59 cegger 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.27 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.28 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,14 +63,14 @@
struct sbusdev hsc_sbus; /* SBus device */
};
-int hmematch_sbus(struct device *, cfdata_t, void *);
-void hmeattach_sbus(struct device *, struct device *, void *);
+int hmematch_sbus(device_t, cfdata_t, void *);
+void hmeattach_sbus(device_t, device_t, void *);
CFATTACH_DECL(hme_sbus, sizeof(struct hmesbus_softc),
hmematch_sbus, hmeattach_sbus, NULL, NULL);
int
-hmematch_sbus(struct device *parent, cfdata_t cf, void *aux)
+hmematch_sbus(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -80,7 +80,7 @@
}
void
-hmeattach_sbus(struct device *parent, struct device *self, void *aux)
+hmeattach_sbus(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa = aux;
struct hmesbus_softc *hsc = (void *)self;
Index: src/sys/dev/sbus/isp_sbus.c
diff -u src/sys/dev/sbus/isp_sbus.c:1.74 src/sys/dev/sbus/isp_sbus.c:1.75
--- src/sys/dev/sbus/isp_sbus.c:1.74 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/isp_sbus.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_sbus.c,v 1.74 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: isp_sbus.c,v 1.75 2009/05/12 14:43:59 cegger 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.74 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.75 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,13 +95,13 @@
};
-static int isp_match(struct device *, cfdata_t, void *);
-static void isp_sbus_attach(struct device *, struct device *, void *);
+static int isp_match(device_t, cfdata_t, void *);
+static void isp_sbus_attach(device_t, device_t, void *);
CFATTACH_DECL(isp_sbus, sizeof (struct isp_sbussoftc),
isp_match, isp_sbus_attach, NULL, NULL);
static int
-isp_match(struct device *parent, cfdata_t cf, void *aux)
+isp_match(device_t parent, cfdata_t cf, void *aux)
{
int rv;
struct sbus_attach_args *sa = aux;
@@ -117,7 +117,7 @@
static void
-isp_sbus_attach(struct device *parent, struct device *self, void *aux)
+isp_sbus_attach(device_t parent, device_t self, void *aux)
{
int freq, ispburst, sbusburst;
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/lebuffer.c
diff -u src/sys/dev/sbus/lebuffer.c:1.31 src/sys/dev/sbus/lebuffer.c:1.32
--- src/sys/dev/sbus/lebuffer.c:1.31 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/lebuffer.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffer.c,v 1.31 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: lebuffer.c,v 1.32 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.31 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.32 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,8 +47,8 @@
#include <dev/sbus/lebuffervar.h>
int lebufprint(void *, const char *);
-int lebufmatch(struct device *, cfdata_t, void *);
-void lebufattach(struct device *, struct device *, void *);
+int lebufmatch(device_t, cfdata_t, void *);
+void lebufattach(device_t, device_t, void *);
CFATTACH_DECL(lebuffer, sizeof(struct lebuf_softc),
lebufmatch, lebufattach, NULL, NULL);
@@ -62,7 +62,7 @@
}
int
-lebufmatch(struct device *parent, cfdata_t cf, void *aux)
+lebufmatch(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -73,7 +73,7 @@
* Attach all the sub-devices we can find
*/
void
-lebufattach(struct device *parent, struct device *self, void *aux)
+lebufattach(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa = aux;
struct lebuf_softc *sc = (void *)self;
Index: src/sys/dev/sbus/magma.c
diff -u src/sys/dev/sbus/magma.c:1.51 src/sys/dev/sbus/magma.c:1.52
--- src/sys/dev/sbus/magma.c:1.51 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/magma.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: magma.c,v 1.51 2009/05/12 13:20:06 cegger Exp $ */
+/* $NetBSD: magma.c,v 1.52 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1998 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.51 2009/05/12 13:20:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.52 2009/05/12 14:43:59 cegger Exp $");
#if 0
#define MAGMA_DEBUG
@@ -302,7 +302,7 @@
*/
int
-magma_match(struct device *parent, cfdata_t cf, void *aux)
+magma_match(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
struct magma_board_info *card;
@@ -330,7 +330,7 @@
}
void
-magma_attach(struct device *parent, struct device *self, void *aux)
+magma_attach(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa = aux;
struct magma_softc *sc = device_private(self);
@@ -819,7 +819,7 @@
*/
int
-mtty_match(struct device *parent, cfdata_t cf, void *args)
+mtty_match(device_t parent, cfdata_t cf, void *args)
{
struct magma_softc *sc = device_private(parent);
@@ -827,7 +827,7 @@
}
void
-mtty_attach(struct device *parent, struct device *dev, void *args)
+mtty_attach(device_t parent, device_t dev, void *args)
{
struct magma_softc *sc = device_private(parent);
struct mtty_softc *ms = device_private(dev);
@@ -1388,7 +1388,7 @@
*/
int
-mbpp_match(struct device *parent, cfdata_t cf, void *args)
+mbpp_match(device_t parent, cfdata_t cf, void *args)
{
struct magma_softc *sc = device_private(parent);
@@ -1396,7 +1396,7 @@
}
void
-mbpp_attach(struct device *parent, struct device *dev, void *args)
+mbpp_attach(device_t parent, device_t dev, void *args)
{
struct magma_softc *sc = device_private(parent);
struct mbpp_softc *ms = device_private(dev);
Index: src/sys/dev/sbus/magmareg.h
diff -u src/sys/dev/sbus/magmareg.h:1.14 src/sys/dev/sbus/magmareg.h:1.15
--- src/sys/dev/sbus/magmareg.h:1.14 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/magmareg.h Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: magmareg.h,v 1.14 2009/05/12 13:20:06 cegger Exp $ */
+/* $NetBSD: magmareg.h,v 1.15 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1998 Iain Hibbert
@@ -203,19 +203,19 @@
__inline void cd1400_write_reg(struct cd1400 *, int, u_char);
void cd1400_enable_transmitter(struct cd1400 *, int);
-int magma_match(struct device *, cfdata_t, void *);
-void magma_attach(struct device *, struct device *, void *);
+int magma_match(device_t, cfdata_t, void *);
+void magma_attach(device_t, device_t, void *);
int magma_hard(void *);
void magma_soft(void *);
-int mtty_match(struct device *, cfdata_t, void *);
-void mtty_attach(struct device *, struct device *, void *);
+int mtty_match(device_t, cfdata_t, void *);
+void mtty_attach(device_t, device_t, void *);
int mtty_modem_control(struct mtty_port *, int, int);
int mtty_param(struct tty *, struct termios *);
void mtty_start(struct tty *);
-int mbpp_match(struct device *, cfdata_t, void *);
-void mbpp_attach(struct device *, struct device *, void *);
+int mbpp_match(device_t, cfdata_t, void *);
+void mbpp_attach(device_t, device_t, void *);
void mbpp_timeout(void *);
void mbpp_start(void *);
int mbpp_send(struct mbpp_port *, void *, int);
Index: src/sys/dev/sbus/p9100.c
diff -u src/sys/dev/sbus/p9100.c:1.42 src/sys/dev/sbus/p9100.c:1.43
--- src/sys/dev/sbus/p9100.c:1.42 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/p9100.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.42 2009/05/12 13:20:06 cegger Exp $ */
+/* $NetBSD: p9100.c,v 1.43 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.42 2009/05/12 13:20:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.43 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -149,10 +149,10 @@
};
/* autoconfiguration driver */
-static int p9100_sbus_match(struct device *, cfdata_t, void *);
-static void p9100_sbus_attach(struct device *, struct device *, void *);
+static int p9100_sbus_match(device_t, cfdata_t, void *);
+static void p9100_sbus_attach(device_t, device_t, void *);
-static void p9100unblank(struct device *);
+static void p9100unblank(device_t);
static void p9100_shutdown(void *);
CFATTACH_DECL(pnozz, sizeof(struct p9100_softc),
@@ -260,7 +260,7 @@
* Match a p9100.
*/
static int
-p9100_sbus_match(struct device *parent, cfdata_t cf, void *aux)
+p9100_sbus_match(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -272,7 +272,7 @@
* Attach a display. We need to notice if it is the console, too.
*/
static void
-p9100_sbus_attach(struct device *parent, struct device *self, void *args)
+p9100_sbus_attach(device_t parent, device_t self, void *args)
{
struct p9100_softc *sc = device_private(self);
struct sbus_attach_args *sa = args;
@@ -893,7 +893,7 @@
* Undo the effect of an FBIOSVIDEO that turns the video off.
*/
static void
-p9100unblank(struct device *dev)
+p9100unblank(device_t dev)
{
struct p9100_softc *sc = device_private(dev);
Index: src/sys/dev/sbus/qec.c
diff -u src/sys/dev/sbus/qec.c:1.42 src/sys/dev/sbus/qec.c:1.43
--- src/sys/dev/sbus/qec.c:1.42 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/qec.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: qec.c,v 1.42 2009/05/12 13:20:06 cegger Exp $ */
+/* $NetBSD: qec.c,v 1.43 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.42 2009/05/12 13:20:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.43 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,8 +48,8 @@
#include <dev/sbus/qecvar.h>
static int qecprint(void *, const char *);
-static int qecmatch(struct device *, cfdata_t, void *);
-static void qecattach(struct device *, struct device *, void *);
+static int qecmatch(device_t, cfdata_t, void *);
+static void qecattach(device_t, device_t, void *);
void qec_init(struct qec_softc *);
static int qec_bus_map(
@@ -84,7 +84,7 @@
}
int
-qecmatch(struct device *parent, cfdata_t cf, void *aux)
+qecmatch(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -95,7 +95,7 @@
* Attach all the sub-devices we can find
*/
void
-qecattach(struct device *parent, struct device *self, void *aux)
+qecattach(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa = aux;
struct qec_softc *sc = (void *)self;
Index: src/sys/dev/sbus/qe.c
diff -u src/sys/dev/sbus/qe.c:1.50 src/sys/dev/sbus/qe.c:1.51
--- src/sys/dev/sbus/qe.c:1.50 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/qe.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: qe.c,v 1.50 2009/05/12 13:20:06 cegger Exp $ */
+/* $NetBSD: qe.c,v 1.51 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.50 2009/05/12 13:20:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.51 2009/05/12 14:43:59 cegger Exp $");
#define QEDEBUG
@@ -149,8 +149,8 @@
#endif
};
-int qematch(struct device *, cfdata_t, void *);
-void qeattach(struct device *, struct device *, void *);
+int qematch(device_t, cfdata_t, void *);
+void qeattach(device_t, device_t, void *);
void qeinit(struct qe_softc *);
void qestart(struct ifnet *);
@@ -177,7 +177,7 @@
qematch, qeattach, NULL, NULL);
int
-qematch(struct device *parent, cfdata_t cf, void *aux)
+qematch(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -185,7 +185,7 @@
}
void
-qeattach(struct device *parent, struct device *self, void *aux)
+qeattach(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa = aux;
struct qec_softc *qec = (struct qec_softc *)parent;
Index: src/sys/dev/sbus/sio16.c
diff -u src/sys/dev/sbus/sio16.c:1.20 src/sys/dev/sbus/sio16.c:1.21
--- src/sys/dev/sbus/sio16.c:1.20 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/sio16.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sio16.c,v 1.20 2009/05/12 13:20:06 cegger Exp $ */
+/* $NetBSD: sio16.c,v 1.21 2009/05/12 14:43:59 cegger Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.20 2009/05/12 13:20:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.21 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -64,8 +64,8 @@
* device cfattach and cfdriver definitions, plus the routine we pass
* to the cd18xx code or interrupt acknowledgement.
*/
-static int sio16_match(struct device *, cfdata_t, void *);
-static void sio16_attach(struct device *, struct device *, void *);
+static int sio16_match(device_t, cfdata_t, void *);
+static void sio16_attach(device_t, device_t, void *);
static u_char sio16_ackfunc(void *, int who);
/*
@@ -108,7 +108,7 @@
*/
#define SIO16_ROM_NAME "sio16"
int
-sio16_match(struct device *parent, cfdata_t cf, void *aux)
+sio16_match(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -123,7 +123,7 @@
* device attach routine: go attach all sub devices.
*/
void
-sio16_attach(struct device *parent, struct device *self, void *aux)
+sio16_attach(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa = aux;
struct sio16_softc *sc = (struct sio16_softc *)self;
@@ -268,14 +268,14 @@
* we attach two `clcd' instances per 1600se, that each call the
* backend cd18xx driver for help.
*/
-static int clcd_match(struct device *, cfdata_t, void *);
-static void clcd_attach(struct device *, struct device *, void *);
+static int clcd_match(device_t, cfdata_t, void *);
+static void clcd_attach(device_t, device_t, void *);
CFATTACH_DECL(clcd, sizeof(struct cd18xx_softc),
clcd_match, clcd_attach, NULL, NULL);
static int
-clcd_match(struct device *parent, cfdata_t cf, void *aux)
+clcd_match(device_t parent, cfdata_t cf, void *aux)
{
/* XXX */
@@ -283,7 +283,7 @@
}
static void
-clcd_attach(struct device *parent, struct device *self, void *aux)
+clcd_attach(device_t parent, device_t self, void *aux)
{
struct cd18xx_softc *sc = (struct cd18xx_softc *)self;
struct sio16_attach_args *args = aux;
Index: src/sys/dev/sbus/spif.c
diff -u src/sys/dev/sbus/spif.c:1.22 src/sys/dev/sbus/spif.c:1.23
--- src/sys/dev/sbus/spif.c:1.22 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/spif.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: spif.c,v 1.22 2009/05/12 13:20:06 cegger Exp $ */
+/* $NetBSD: spif.c,v 1.23 2009/05/12 14:43:59 cegger Exp $ */
/* $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $ */
/*
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.22 2009/05/12 13:20:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.23 2009/05/12 14:43:59 cegger Exp $");
#include "spif.h"
#if NSPIF > 0
@@ -143,7 +143,7 @@
int
-spif_match(struct device *parent, cfdata_t vcf, void *aux)
+spif_match(device_t parent, cfdata_t vcf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -154,7 +154,7 @@
}
void
-spif_attach(struct device *parent, struct device *self, void *aux)
+spif_attach(device_t parent, device_t self, void *aux)
{
struct spif_softc *sc = device_private(self);
struct sbus_attach_args *sa = aux;
@@ -269,7 +269,7 @@
}
int
-stty_match(struct device *parent, cfdata_t vcf, void *aux)
+stty_match(device_t parent, cfdata_t vcf, void *aux)
{
struct spif_softc *sc = device_private(parent);
@@ -277,7 +277,7 @@
}
void
-stty_attach(struct device *parent, struct device *dev, void *aux)
+stty_attach(device_t parent, device_t dev, void *aux)
{
struct spif_softc *sc = device_private(parent);
struct stty_softc *ssc = device_private(dev);
@@ -974,7 +974,7 @@
}
int
-sbpp_match(struct device *parent, cfdata_t vcf, void *aux)
+sbpp_match(device_t parent, cfdata_t vcf, void *aux)
{
struct spif_softc *sc = device_private(parent);
@@ -982,7 +982,7 @@
}
void
-sbpp_attach(struct device *parent, struct device *dev, void *aux)
+sbpp_attach(device_t parent, device_t dev, void *aux)
{
struct spif_softc *sc = device_private(parent);
struct sbpp_softc *psc = device_private(dev);
Index: src/sys/dev/sbus/spifreg.h
diff -u src/sys/dev/sbus/spifreg.h:1.3 src/sys/dev/sbus/spifreg.h:1.4
--- src/sys/dev/sbus/spifreg.h:1.3 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/spifreg.h Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: spifreg.h,v 1.3 2009/05/12 13:20:06 cegger Exp $ */
+/* $NetBSD: spifreg.h,v 1.4 2009/05/12 14:43:59 cegger Exp $ */
/* $OpenBSD: spifreg.h,v 1.5 2003/06/02 18:32:41 jason Exp $ */
/*
@@ -390,11 +390,11 @@
/*
* internal function prototypes
*/
-int spif_match(struct device *, cfdata_t, void *);
-void spif_attach(struct device *, struct device *, void *);
+int spif_match(device_t, cfdata_t, void *);
+void spif_attach(device_t, device_t, void *);
-int stty_match(struct device *, cfdata_t, void *);
-void stty_attach(struct device *, struct device *, void *);
+int stty_match(device_t, cfdata_t, void *);
+void stty_attach(device_t, device_t, void *);
int spif_stcintr(void *);
int spif_stcintr_mx(struct spif_softc *, int *);
@@ -409,8 +409,8 @@
int stty_compute_baud(speed_t, int, u_int8_t *, u_int8_t *);
void stty_start(struct tty *);
-int sbpp_match(struct device *, cfdata_t, void *);
-void sbpp_attach(struct device *, struct device *, void *);
+int sbpp_match(device_t, cfdata_t, void *);
+void sbpp_attach(device_t, device_t, void *);
int sbpp_rw(dev_t, struct uio *);
int spif_ppcintr(void *);
Index: src/sys/dev/sbus/stp4020.c
diff -u src/sys/dev/sbus/stp4020.c:1.60 src/sys/dev/sbus/stp4020.c:1.61
--- src/sys/dev/sbus/stp4020.c:1.60 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/stp4020.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: stp4020.c,v 1.60 2009/05/12 13:20:06 cegger Exp $ */
+/* $NetBSD: stp4020.c,v 1.61 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.60 2009/05/12 13:20:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.61 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,8 +135,8 @@
static int stp4020print(void *, const char *);
-static int stp4020match(struct device *, cfdata_t, void *);
-static void stp4020attach(struct device *, struct device *, void *);
+static int stp4020match(device_t, cfdata_t, void *);
+static void stp4020attach(device_t, device_t, void *);
static int stp4020_intr(void *);
static void stp4020_map_window(struct stp4020_socket *h, int win, int speed);
static void stp4020_calc_speed(int bus_speed, int ns, int *length, int *cmd_delay);
@@ -312,7 +312,7 @@
}
int
-stp4020match(struct device *parent, cfdata_t cf, void *aux)
+stp4020match(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -323,7 +323,7 @@
* Attach all the sub-devices we can find
*/
void
-stp4020attach(struct device *parent, struct device *self, void *aux)
+stp4020attach(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa = aux;
struct stp4020_softc *sc = (void *)self;
Index: src/sys/dev/sbus/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.30 src/sys/dev/sbus/tcx.c:1.31
--- src/sys/dev/sbus/tcx.c:1.30 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/tcx.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.30 2009/05/12 13:20:06 cegger Exp $ */
+/* $NetBSD: tcx.c,v 1.31 2009/05/12 14:43:59 cegger Exp $ */
/*
* Copyright (c) 1996,1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.30 2009/05/12 13:20:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.31 2009/05/12 14:43:59 cegger Exp $");
/*
* define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -106,9 +106,9 @@
#define TCX_CTL_PIXELMASK 0x00FFFFFF /* mask for index/level */
/* autoconfiguration driver */
-static void tcxattach(struct device *, struct device *, void *);
-static int tcxmatch(struct device *, cfdata_t, void *);
-static void tcx_unblank(struct device *);
+static void tcxattach(device_t, device_t, void *);
+static int tcxmatch(device_t, cfdata_t, void *);
+static void tcx_unblank(device_t);
CFATTACH_DECL(tcx, sizeof(struct tcx_softc),
tcxmatch, tcxattach, NULL, NULL);
@@ -153,7 +153,7 @@
* Match a tcx.
*/
int
-tcxmatch(struct device *parent, cfdata_t cf, void *aux)
+tcxmatch(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -164,7 +164,7 @@
* Attach a display.
*/
void
-tcxattach(struct device *parent, struct device *self, void *args)
+tcxattach(device_t parent, device_t self, void *args)
{
struct tcx_softc *sc = device_private(self);
struct sbus_attach_args *sa = args;
@@ -518,7 +518,7 @@
}
static void
-tcx_unblank(struct device *dev)
+tcx_unblank(device_t dev)
{
struct tcx_softc *sc = device_private(dev);
Index: src/sys/dev/sbus/xbox.c
diff -u src/sys/dev/sbus/xbox.c:1.18 src/sys/dev/sbus/xbox.c:1.19
--- src/sys/dev/sbus/xbox.c:1.18 Tue May 12 13:20:06 2009
+++ src/sys/dev/sbus/xbox.c Tue May 12 14:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xbox.c,v 1.18 2009/05/12 13:20:06 cegger Exp $ */
+/* $NetBSD: xbox.c,v 1.19 2009/05/12 14:43:59 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.18 2009/05/12 13:20:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.19 2009/05/12 14:43:59 cegger Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -91,8 +91,8 @@
};
/* autoconfiguration driver */
-int xbox_match(struct device *, cfdata_t, void *);
-void xbox_attach(struct device *, struct device *, void *);
+int xbox_match(device_t, cfdata_t, void *);
+void xbox_attach(device_t, device_t, void *);
int xbox_print( void *, const char *);
CFATTACH_DECL(xbox, sizeof(struct xbox_softc),
@@ -109,7 +109,7 @@
}
int
-xbox_match(struct device *parent, cfdata_t cf, void *aux)
+xbox_match(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -120,7 +120,7 @@
* Attach an Xbox.
*/
void
-xbox_attach(struct device *parent, struct device *self, void *aux)
+xbox_attach(device_t parent, device_t self, void *aux)
{
struct xbox_softc *sc = (struct xbox_softc *)self;
struct sbus_attach_args *sa = aux;
