Module Name: src
Committed By: cegger
Date: Tue May 12 13:20:06 UTC 2009
Modified Files:
src/sys/dev/sbus: agten.c be.c bwtwo_sbus.c cgsix_sbus.c cgthree_sbus.c
cs4231_sbus.c dbri.c dma_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 zx.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/sbus/agten.c src/sys/dev/sbus/xbox.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/sbus/be.c
cvs rdiff -u -r1.23 -r1.24 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.27 -r1.28 src/sys/dev/sbus/cgsix_sbus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/sbus/cs4231_sbus.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/sbus/dbri.c src/sys/dev/sbus/spif.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/sbus/dma_sbus.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/sbus/esp_sbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/sbus/genfb_sbus.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/sbus/if_gem_sbus.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/sbus/if_hme_sbus.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/sbus/isp_sbus.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/sbus/lebuffer.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/sbus/magma.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/sbus/magmareg.h
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/sbus/p9100.c src/sys/dev/sbus/qec.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/sbus/qe.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/sbus/sio16.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/sbus/spifreg.h
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/sbus/stp4020.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sbus/tcx.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/sbus/zx.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/agten.c
diff -u src/sys/dev/sbus/agten.c:1.17 src/sys/dev/sbus/agten.c:1.18
--- src/sys/dev/sbus/agten.c:1.17 Thu Apr 16 17:00:39 2009
+++ src/sys/dev/sbus/agten.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: agten.c,v 1.17 2009/04/16 17:00:39 macallan Exp $ */
+/* $NetBSD: agten.c,v 1.18 2009/05/12 13:20:05 cegger Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.17 2009/04/16 17:00:39 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.18 2009/05/12 13:20:05 cegger Exp $");
/*
* a driver for the Fujitsu AG-10e SBus framebuffer
@@ -76,7 +76,7 @@
#include "opt_agten.h"
-static int agten_match(device_t, struct cfdata *, void *);
+static int agten_match(device_t, cfdata_t, void *);
static void agten_attach(device_t, device_t, void *);
static int agten_ioctl(void *, void *, u_long, void *, int, struct lwp *);
@@ -200,7 +200,7 @@
}
static int
-agten_match(device_t dev, struct cfdata *cf, void *aux)
+agten_match(device_t dev, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/xbox.c
diff -u src/sys/dev/sbus/xbox.c:1.17 src/sys/dev/sbus/xbox.c:1.18
--- src/sys/dev/sbus/xbox.c:1.17 Wed Mar 18 16:00:20 2009
+++ src/sys/dev/sbus/xbox.c Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xbox.c,v 1.17 2009/03/18 16:00:20 cegger Exp $ */
+/* $NetBSD: xbox.c,v 1.18 2009/05/12 13:20:06 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.17 2009/03/18 16:00:20 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.18 2009/05/12 13:20:06 cegger Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -91,7 +91,7 @@
};
/* autoconfiguration driver */
-int xbox_match(struct device *, struct cfdata *, void *);
+int xbox_match(struct device *, cfdata_t, void *);
void xbox_attach(struct device *, struct device *, void *);
int xbox_print( void *, const char *);
@@ -109,7 +109,7 @@
}
int
-xbox_match(struct device *parent, struct cfdata *cf, void *aux)
+xbox_match(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/be.c
diff -u src/sys/dev/sbus/be.c:1.63 src/sys/dev/sbus/be.c:1.64
--- src/sys/dev/sbus/be.c:1.63 Sat Mar 14 21:04:22 2009
+++ src/sys/dev/sbus/be.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.63 2009/03/14 21:04:22 dsl Exp $ */
+/* $NetBSD: be.c,v 1.64 2009/05/12 13:20:05 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.63 2009/03/14 21:04:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.64 2009/05/12 13:20:05 cegger Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -159,7 +159,7 @@
#endif
};
-int bematch(struct device *, struct cfdata *, void *);
+int bematch(struct device *, cfdata_t, void *);
void beattach(struct device *, struct device *, void *);
void beinit(struct be_softc *);
@@ -209,7 +209,7 @@
bematch, beattach, NULL, NULL);
int
-bematch(struct device *parent, struct cfdata *cf, void *aux)
+bematch(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/bwtwo_sbus.c
diff -u src/sys/dev/sbus/bwtwo_sbus.c:1.23 src/sys/dev/sbus/bwtwo_sbus.c:1.24
--- src/sys/dev/sbus/bwtwo_sbus.c:1.23 Sat Mar 14 21:04:22 2009
+++ src/sys/dev/sbus/bwtwo_sbus.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo_sbus.c,v 1.23 2009/03/14 21:04:22 dsl Exp $ */
+/* $NetBSD: bwtwo_sbus.c,v 1.24 2009/05/12 13:20:05 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.23 2009/03/14 21:04:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.24 2009/05/12 13:20:05 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,7 +104,7 @@
/* autoconfiguration driver */
static void bwtwoattach_sbus (struct device *, struct device *, void *);
-static int bwtwomatch_sbus (struct device *, struct cfdata *, void *);
+static int bwtwomatch_sbus (struct device *, 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, struct cfdata *cf, void *aux)
+bwtwomatch_sbus(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/cgthree_sbus.c
diff -u src/sys/dev/sbus/cgthree_sbus.c:1.23 src/sys/dev/sbus/cgthree_sbus.c:1.24
--- src/sys/dev/sbus/cgthree_sbus.c:1.23 Sat Mar 14 21:04:22 2009
+++ src/sys/dev/sbus/cgthree_sbus.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree_sbus.c,v 1.23 2009/03/14 21:04:22 dsl Exp $ */
+/* $NetBSD: cgthree_sbus.c,v 1.24 2009/05/12 13:20:05 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.23 2009/03/14 21:04:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.24 2009/05/12 13:20:05 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,7 @@
/* autoconfiguration driver */
-static int cgthreematch_sbus(struct device *, struct cfdata *, void *);
+static int cgthreematch_sbus(struct device *, cfdata_t, void *);
static void cgthreeattach_sbus(struct device *, struct device *, void *);
CFATTACH_DECL(cgthree_sbus, sizeof(struct cgthree_softc),
@@ -121,7 +121,7 @@
* Match a cgthree.
*/
int
-cgthreematch_sbus(struct device *parent, struct cfdata *cf, void *aux)
+cgthreematch_sbus(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/if_en.c
diff -u src/sys/dev/sbus/if_en.c:1.23 src/sys/dev/sbus/if_en.c:1.24
--- src/sys/dev/sbus/if_en.c:1.23 Sat Apr 5 18:35:32 2008
+++ src/sys/dev/sbus/if_en.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_en.c,v 1.23 2008/04/05 18:35:32 cegger Exp $ */
+/* $NetBSD: if_en.c,v 1.24 2009/05/12 13:20:05 cegger Exp $ */
/*
*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.23 2008/04/05 18:35:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.24 2009/05/12 13:20:05 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,7 @@
/*
* prototypes
*/
-static int en_sbus_match(struct device *, struct cfdata *, void *);
+static int en_sbus_match(struct device *, cfdata_t, void *);
static void en_sbus_attach(struct device *, struct device *, void *);
/*
@@ -98,7 +98,7 @@
static int
en_sbus_match(parent, cf, aux)
struct device *parent;
- struct cfdata *cf;
+ cfdata_t cf;
void *aux;
{
Index: src/sys/dev/sbus/cgsix_sbus.c
diff -u src/sys/dev/sbus/cgsix_sbus.c:1.27 src/sys/dev/sbus/cgsix_sbus.c:1.28
--- src/sys/dev/sbus/cgsix_sbus.c:1.27 Sat Mar 14 21:04:22 2009
+++ src/sys/dev/sbus/cgsix_sbus.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix_sbus.c,v 1.27 2009/03/14 21:04:22 dsl Exp $ */
+/* $NetBSD: cgsix_sbus.c,v 1.28 2009/05/12 13:20:05 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.27 2009/03/14 21:04:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.28 2009/05/12 13:20:05 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,7 @@
#include <dev/sun/cgsixvar.h>
/* autoconfiguration driver */
-static int cgsixmatch(device_t, struct cfdata *, void *);
+static int cgsixmatch(device_t, cfdata_t, void *);
static void cgsixattach(device_t, device_t, void *);
/* Allocate an `sbusdev' in addition to the cgsix softc */
@@ -80,7 +80,7 @@
* Match a cgsix.
*/
int
-cgsixmatch(device_t parent, struct cfdata *cf, void *aux)
+cgsixmatch(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/cs4231_sbus.c
diff -u src/sys/dev/sbus/cs4231_sbus.c:1.43 src/sys/dev/sbus/cs4231_sbus.c:1.44
--- src/sys/dev/sbus/cs4231_sbus.c:1.43 Tue Dec 16 22:35:35 2008
+++ src/sys/dev/sbus/cs4231_sbus.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231_sbus.c,v 1.43 2008/12/16 22:35:35 christos Exp $ */
+/* $NetBSD: cs4231_sbus.c,v 1.44 2009/05/12 13:20:05 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.43 2008/12/16 22:35:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.44 2009/05/12 13:20:05 cegger Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -79,7 +79,7 @@
};
-static int cs4231_sbus_match(struct device *, struct cfdata *, void *);
+static int cs4231_sbus_match(struct device *, cfdata_t, void *);
static void cs4231_sbus_attach(struct device *, struct device *, 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, struct cfdata *cf, void *aux)
+cs4231_sbus_match(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa;
Index: src/sys/dev/sbus/dbri.c
diff -u src/sys/dev/sbus/dbri.c:1.21 src/sys/dev/sbus/dbri.c:1.22
--- src/sys/dev/sbus/dbri.c:1.21 Sat Jan 3 03:43:22 2009
+++ src/sys/dev/sbus/dbri.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dbri.c,v 1.21 2009/01/03 03:43:22 yamt Exp $ */
+/* $NetBSD: dbri.c,v 1.22 2009/05/12 13:20:05 cegger Exp $ */
/*
* Copyright (C) 1997 Rudolf Koenig ([email protected])
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.21 2009/01/03 03:43:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.22 2009/05/12 13:20:05 cegger Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -94,7 +94,7 @@
/* softc stuff */
static void dbri_attach_sbus(device_t, device_t, void *);
-static int dbri_match_sbus(device_t, struct cfdata *, void *);
+static int dbri_match_sbus(device_t, cfdata_t, void *);
static void dbri_config_interrupts(device_t);
@@ -249,7 +249,7 @@
* Autoconfig routines
*/
static int
-dbri_match_sbus(device_t parent, struct cfdata *match, void *aux)
+dbri_match_sbus(device_t parent, cfdata_t match, void *aux)
{
struct sbus_attach_args *sa = aux;
char *ver;
Index: src/sys/dev/sbus/spif.c
diff -u src/sys/dev/sbus/spif.c:1.21 src/sys/dev/sbus/spif.c:1.22
--- src/sys/dev/sbus/spif.c:1.21 Sat Mar 14 21:04:23 2009
+++ src/sys/dev/sbus/spif.c Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: spif.c,v 1.21 2009/03/14 21:04:23 dsl Exp $ */
+/* $NetBSD: spif.c,v 1.22 2009/05/12 13:20:06 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.21 2009/03/14 21:04:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.22 2009/05/12 13:20:06 cegger Exp $");
#include "spif.h"
#if NSPIF > 0
@@ -143,7 +143,7 @@
int
-spif_match(struct device *parent, struct cfdata *vcf, void *aux)
+spif_match(struct device *parent, cfdata_t vcf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -269,7 +269,7 @@
}
int
-stty_match(struct device *parent, struct cfdata *vcf, void *aux)
+stty_match(struct device *parent, cfdata_t vcf, void *aux)
{
struct spif_softc *sc = device_private(parent);
@@ -974,7 +974,7 @@
}
int
-sbpp_match(struct device *parent, struct cfdata *vcf, void *aux)
+sbpp_match(struct device *parent, cfdata_t vcf, void *aux)
{
struct spif_softc *sc = device_private(parent);
Index: src/sys/dev/sbus/dma_sbus.c
diff -u src/sys/dev/sbus/dma_sbus.c:1.33 src/sys/dev/sbus/dma_sbus.c:1.34
--- src/sys/dev/sbus/dma_sbus.c:1.33 Sat May 17 18:09:03 2008
+++ src/sys/dev/sbus/dma_sbus.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dma_sbus.c,v 1.33 2008/05/17 18:09:03 macallan Exp $ */
+/* $NetBSD: dma_sbus.c,v 1.34 2009/05/12 13:20:05 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.33 2008/05/17 18:09:03 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.34 2009/05/12 13:20:05 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -115,7 +115,7 @@
}
int
-dmamatch_sbus(device_t parent, struct cfdata *cf, void *aux)
+dmamatch_sbus(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/esp_sbus.c
diff -u src/sys/dev/sbus/esp_sbus.c:1.46 src/sys/dev/sbus/esp_sbus.c:1.47
--- src/sys/dev/sbus/esp_sbus.c:1.46 Mon Apr 28 20:23:57 2008
+++ src/sys/dev/sbus/esp_sbus.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_sbus.c,v 1.46 2008/04/28 20:23:57 martin Exp $ */
+/* $NetBSD: esp_sbus.c,v 1.47 2009/05/12 13:20:05 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.46 2008/04/28 20:23:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.47 2009/05/12 13:20:05 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,7 +132,7 @@
};
int
-espmatch_sbus(struct device *parent, struct cfdata *cf, void *aux)
+espmatch_sbus(struct device *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.5 src/sys/dev/sbus/genfb_sbus.c:1.6
--- src/sys/dev/sbus/genfb_sbus.c:1.5 Tue Apr 29 06:53:03 2008
+++ src/sys/dev/sbus/genfb_sbus.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_sbus.c,v 1.5 2008/04/29 06:53:03 martin Exp $ */
+/* $NetBSD: genfb_sbus.c,v 1.6 2009/05/12 13:20:05 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.5 2008/04/29 06:53:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_sbus.c,v 1.6 2009/05/12 13:20:05 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,7 @@
paddr_t sc_paddr;
};
-static int genfb_match_sbus(struct device *, struct cfdata *, void *);
+static int genfb_match_sbus(struct device *, cfdata_t, void *);
static void genfb_attach_sbus(struct device *, struct device *, void *);
static int genfb_ioctl_sbus(void *, void *, u_long, void *, int,
struct lwp*);
@@ -70,7 +70,7 @@
* Match a graphics device.
*/
static int
-genfb_match_sbus(struct device *parent, struct cfdata *cf, void *aux)
+genfb_match_sbus(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/if_gem_sbus.c
diff -u src/sys/dev/sbus/if_gem_sbus.c:1.8 src/sys/dev/sbus/if_gem_sbus.c:1.9
--- src/sys/dev/sbus/if_gem_sbus.c:1.8 Thu Nov 20 20:56:56 2008
+++ src/sys/dev/sbus/if_gem_sbus.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gem_sbus.c,v 1.8 2008/11/20 20:56:56 jdc Exp $ */
+/* $NetBSD: if_gem_sbus.c,v 1.9 2009/05/12 13:20:05 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.8 2008/11/20 20:56:56 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.9 2009/05/12 13:20:05 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 *, struct cfdata *, void *);
+int gemmatch_sbus(struct device *, cfdata_t, void *);
void gemattach_sbus(struct device *, struct device *, void *);
CFATTACH_DECL(gem_sbus, sizeof(struct gem_sbus_softc),
gemmatch_sbus, gemattach_sbus, NULL, NULL);
int
-gemmatch_sbus(struct device *parent, struct cfdata *cf, void *aux)
+gemmatch_sbus(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/if_hme_sbus.c
diff -u src/sys/dev/sbus/if_hme_sbus.c:1.26 src/sys/dev/sbus/if_hme_sbus.c:1.27
--- src/sys/dev/sbus/if_hme_sbus.c:1.26 Sat Mar 14 21:04:22 2009
+++ src/sys/dev/sbus/if_hme_sbus.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_sbus.c,v 1.26 2009/03/14 21:04:22 dsl Exp $ */
+/* $NetBSD: if_hme_sbus.c,v 1.27 2009/05/12 13:20:05 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.26 2009/03/14 21:04:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.27 2009/05/12 13:20:05 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 *, struct cfdata *, void *);
+int hmematch_sbus(struct device *, cfdata_t, void *);
void hmeattach_sbus(struct device *, struct device *, void *);
CFATTACH_DECL(hme_sbus, sizeof(struct hmesbus_softc),
hmematch_sbus, hmeattach_sbus, NULL, NULL);
int
-hmematch_sbus(struct device *parent, struct cfdata *cf, void *aux)
+hmematch_sbus(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/isp_sbus.c
diff -u src/sys/dev/sbus/isp_sbus.c:1.73 src/sys/dev/sbus/isp_sbus.c:1.74
--- src/sys/dev/sbus/isp_sbus.c:1.73 Mon Apr 7 19:21:55 2008
+++ src/sys/dev/sbus/isp_sbus.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_sbus.c,v 1.73 2008/04/07 19:21:55 cegger Exp $ */
+/* $NetBSD: isp_sbus.c,v 1.74 2009/05/12 13:20:05 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.73 2008/04/07 19:21:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.74 2009/05/12 13:20:05 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,13 +95,13 @@
};
-static int isp_match(struct device *, struct cfdata *, void *);
+static int isp_match(struct device *, cfdata_t, void *);
static void isp_sbus_attach(struct device *, struct device *, void *);
CFATTACH_DECL(isp_sbus, sizeof (struct isp_sbussoftc),
isp_match, isp_sbus_attach, NULL, NULL);
static int
-isp_match(struct device *parent, struct cfdata *cf, void *aux)
+isp_match(struct device *parent, cfdata_t cf, void *aux)
{
int rv;
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/lebuffer.c
diff -u src/sys/dev/sbus/lebuffer.c:1.30 src/sys/dev/sbus/lebuffer.c:1.31
--- src/sys/dev/sbus/lebuffer.c:1.30 Sat Mar 14 21:04:22 2009
+++ src/sys/dev/sbus/lebuffer.c Tue May 12 13:20:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffer.c,v 1.30 2009/03/14 21:04:22 dsl Exp $ */
+/* $NetBSD: lebuffer.c,v 1.31 2009/05/12 13:20:05 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.30 2009/03/14 21:04:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.31 2009/05/12 13:20:05 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@
#include <dev/sbus/lebuffervar.h>
int lebufprint(void *, const char *);
-int lebufmatch(struct device *, struct cfdata *, void *);
+int lebufmatch(struct device *, cfdata_t, void *);
void lebufattach(struct device *, struct device *, void *);
CFATTACH_DECL(lebuffer, sizeof(struct lebuf_softc),
@@ -62,7 +62,7 @@
}
int
-lebufmatch(struct device *parent, struct cfdata *cf, void *aux)
+lebufmatch(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/magma.c
diff -u src/sys/dev/sbus/magma.c:1.50 src/sys/dev/sbus/magma.c:1.51
--- src/sys/dev/sbus/magma.c:1.50 Sat Mar 14 21:04:22 2009
+++ src/sys/dev/sbus/magma.c Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: magma.c,v 1.50 2009/03/14 21:04:22 dsl Exp $ */
+/* $NetBSD: magma.c,v 1.51 2009/05/12 13:20:06 cegger Exp $ */
/*-
* Copyright (c) 1998 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.50 2009/03/14 21:04:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.51 2009/05/12 13:20:06 cegger Exp $");
#if 0
#define MAGMA_DEBUG
@@ -302,7 +302,7 @@
*/
int
-magma_match(struct device *parent, struct cfdata *cf, void *aux)
+magma_match(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
struct magma_board_info *card;
@@ -819,7 +819,7 @@
*/
int
-mtty_match(struct device *parent, struct cfdata *cf, void *args)
+mtty_match(struct device *parent, cfdata_t cf, void *args)
{
struct magma_softc *sc = device_private(parent);
@@ -1388,7 +1388,7 @@
*/
int
-mbpp_match(struct device *parent, struct cfdata *cf, void *args)
+mbpp_match(struct device *parent, cfdata_t cf, void *args)
{
struct magma_softc *sc = device_private(parent);
Index: src/sys/dev/sbus/magmareg.h
diff -u src/sys/dev/sbus/magmareg.h:1.13 src/sys/dev/sbus/magmareg.h:1.14
--- src/sys/dev/sbus/magmareg.h:1.13 Wed Jul 2 10:16:20 2008
+++ src/sys/dev/sbus/magmareg.h Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: magmareg.h,v 1.13 2008/07/02 10:16:20 plunky Exp $ */
+/* $NetBSD: magmareg.h,v 1.14 2009/05/12 13:20:06 cegger Exp $ */
/*-
* Copyright (c) 1998 Iain Hibbert
@@ -203,18 +203,18 @@
__inline void cd1400_write_reg(struct cd1400 *, int, u_char);
void cd1400_enable_transmitter(struct cd1400 *, int);
-int magma_match(struct device *, struct cfdata *, void *);
+int magma_match(struct device *, cfdata_t, void *);
void magma_attach(struct device *, struct device *, void *);
int magma_hard(void *);
void magma_soft(void *);
-int mtty_match(struct device *, struct cfdata *, void *);
+int mtty_match(struct device *, cfdata_t, void *);
void mtty_attach(struct device *, struct device *, 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 *, struct cfdata *, void *);
+int mbpp_match(struct device *, cfdata_t, void *);
void mbpp_attach(struct device *, struct device *, void *);
void mbpp_timeout(void *);
void mbpp_start(void *);
Index: src/sys/dev/sbus/p9100.c
diff -u src/sys/dev/sbus/p9100.c:1.41 src/sys/dev/sbus/p9100.c:1.42
--- src/sys/dev/sbus/p9100.c:1.41 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/sbus/p9100.c Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.41 2009/03/14 15:36:20 dsl Exp $ */
+/* $NetBSD: p9100.c,v 1.42 2009/05/12 13:20:06 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.41 2009/03/14 15:36:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.42 2009/05/12 13:20:06 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -149,7 +149,7 @@
};
/* autoconfiguration driver */
-static int p9100_sbus_match(struct device *, struct cfdata *, void *);
+static int p9100_sbus_match(struct device *, cfdata_t, void *);
static void p9100_sbus_attach(struct device *, struct device *, void *);
static void p9100unblank(struct device *);
@@ -260,7 +260,7 @@
* Match a p9100.
*/
static int
-p9100_sbus_match(struct device *parent, struct cfdata *cf, void *aux)
+p9100_sbus_match(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/qec.c
diff -u src/sys/dev/sbus/qec.c:1.41 src/sys/dev/sbus/qec.c:1.42
--- src/sys/dev/sbus/qec.c:1.41 Sat Mar 14 21:04:23 2009
+++ src/sys/dev/sbus/qec.c Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: qec.c,v 1.41 2009/03/14 21:04:23 dsl Exp $ */
+/* $NetBSD: qec.c,v 1.42 2009/05/12 13:20:06 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.41 2009/03/14 21:04:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.42 2009/05/12 13:20:06 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <dev/sbus/qecvar.h>
static int qecprint(void *, const char *);
-static int qecmatch(struct device *, struct cfdata *, void *);
+static int qecmatch(struct device *, cfdata_t, void *);
static void qecattach(struct device *, struct device *, void *);
void qec_init(struct qec_softc *);
@@ -84,7 +84,7 @@
}
int
-qecmatch(struct device *parent, struct cfdata *cf, void *aux)
+qecmatch(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/qe.c
diff -u src/sys/dev/sbus/qe.c:1.49 src/sys/dev/sbus/qe.c:1.50
--- src/sys/dev/sbus/qe.c:1.49 Sat Mar 14 21:04:22 2009
+++ src/sys/dev/sbus/qe.c Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: qe.c,v 1.49 2009/03/14 21:04:22 dsl Exp $ */
+/* $NetBSD: qe.c,v 1.50 2009/05/12 13:20:06 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.49 2009/03/14 21:04:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.50 2009/05/12 13:20:06 cegger Exp $");
#define QEDEBUG
@@ -149,7 +149,7 @@
#endif
};
-int qematch(struct device *, struct cfdata *, void *);
+int qematch(struct device *, cfdata_t, void *);
void qeattach(struct device *, struct device *, void *);
void qeinit(struct qe_softc *);
@@ -177,7 +177,7 @@
qematch, qeattach, NULL, NULL);
int
-qematch(struct device *parent, struct cfdata *cf, void *aux)
+qematch(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/sio16.c
diff -u src/sys/dev/sbus/sio16.c:1.19 src/sys/dev/sbus/sio16.c:1.20
--- src/sys/dev/sbus/sio16.c:1.19 Sat Mar 14 21:04:23 2009
+++ src/sys/dev/sbus/sio16.c Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sio16.c,v 1.19 2009/03/14 21:04:23 dsl Exp $ */
+/* $NetBSD: sio16.c,v 1.20 2009/05/12 13:20:06 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.19 2009/03/14 21:04:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.20 2009/05/12 13:20:06 cegger Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -64,7 +64,7 @@
* device cfattach and cfdriver definitions, plus the routine we pass
* to the cd18xx code or interrupt acknowledgement.
*/
-static int sio16_match(struct device *, struct cfdata *, void *);
+static int sio16_match(struct device *, cfdata_t, void *);
static void sio16_attach(struct device *, struct device *, void *);
static u_char sio16_ackfunc(void *, int who);
@@ -108,7 +108,7 @@
*/
#define SIO16_ROM_NAME "sio16"
int
-sio16_match(struct device *parent, struct cfdata *cf, void *aux)
+sio16_match(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
@@ -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 *, struct cfdata *, void *);
+static int clcd_match(struct device *, cfdata_t, void *);
static void clcd_attach(struct device *, struct device *, void *);
CFATTACH_DECL(clcd, sizeof(struct cd18xx_softc),
clcd_match, clcd_attach, NULL, NULL);
static int
-clcd_match(struct device *parent, struct cfdata *cf, void *aux)
+clcd_match(struct device *parent, cfdata_t cf, void *aux)
{
/* XXX */
Index: src/sys/dev/sbus/spifreg.h
diff -u src/sys/dev/sbus/spifreg.h:1.2 src/sys/dev/sbus/spifreg.h:1.3
--- src/sys/dev/sbus/spifreg.h:1.2 Sun Dec 11 12:23:44 2005
+++ src/sys/dev/sbus/spifreg.h Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: spifreg.h,v 1.2 2005/12/11 12:23:44 christos Exp $ */
+/* $NetBSD: spifreg.h,v 1.3 2009/05/12 13:20:06 cegger Exp $ */
/* $OpenBSD: spifreg.h,v 1.5 2003/06/02 18:32:41 jason Exp $ */
/*
@@ -390,10 +390,10 @@
/*
* internal function prototypes
*/
-int spif_match(struct device *, struct cfdata *, void *);
+int spif_match(struct device *, cfdata_t, void *);
void spif_attach(struct device *, struct device *, void *);
-int stty_match(struct device *, struct cfdata *, void *);
+int stty_match(struct device *, cfdata_t, void *);
void stty_attach(struct device *, struct device *, void *);
int spif_stcintr(void *);
@@ -409,7 +409,7 @@
int stty_compute_baud(speed_t, int, u_int8_t *, u_int8_t *);
void stty_start(struct tty *);
-int sbpp_match(struct device *, struct cfdata *, void *);
+int sbpp_match(struct device *, cfdata_t, void *);
void sbpp_attach(struct device *, struct device *, void *);
int sbpp_rw(dev_t, struct uio *);
Index: src/sys/dev/sbus/stp4020.c
diff -u src/sys/dev/sbus/stp4020.c:1.59 src/sys/dev/sbus/stp4020.c:1.60
--- src/sys/dev/sbus/stp4020.c:1.59 Mon Mar 16 23:11:16 2009
+++ src/sys/dev/sbus/stp4020.c Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: stp4020.c,v 1.59 2009/03/16 23:11:16 dsl Exp $ */
+/* $NetBSD: stp4020.c,v 1.60 2009/05/12 13:20:06 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.59 2009/03/16 23:11:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.60 2009/05/12 13:20:06 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,7 +135,7 @@
static int stp4020print(void *, const char *);
-static int stp4020match(struct device *, struct cfdata *, void *);
+static int stp4020match(struct device *, cfdata_t, void *);
static void stp4020attach(struct device *, struct device *, void *);
static int stp4020_intr(void *);
static void stp4020_map_window(struct stp4020_socket *h, int win, int speed);
@@ -312,7 +312,7 @@
}
int
-stp4020match(struct device *parent, struct cfdata *cf, void *aux)
+stp4020match(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.29 src/sys/dev/sbus/tcx.c:1.30
--- src/sys/dev/sbus/tcx.c:1.29 Sat Apr 18 14:58:03 2009
+++ src/sys/dev/sbus/tcx.c Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.29 2009/04/18 14:58:03 tsutsui Exp $ */
+/* $NetBSD: tcx.c,v 1.30 2009/05/12 13:20:06 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.29 2009/04/18 14:58:03 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.30 2009/05/12 13:20:06 cegger Exp $");
/*
* define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -107,7 +107,7 @@
/* autoconfiguration driver */
static void tcxattach(struct device *, struct device *, void *);
-static int tcxmatch(struct device *, struct cfdata *, void *);
+static int tcxmatch(struct device *, cfdata_t, void *);
static void tcx_unblank(struct device *);
CFATTACH_DECL(tcx, sizeof(struct tcx_softc),
@@ -153,7 +153,7 @@
* Match a tcx.
*/
int
-tcxmatch(struct device *parent, struct cfdata *cf, void *aux)
+tcxmatch(struct device *parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
Index: src/sys/dev/sbus/zx.c
diff -u src/sys/dev/sbus/zx.c:1.28 src/sys/dev/sbus/zx.c:1.29
--- src/sys/dev/sbus/zx.c:1.28 Tue May 5 23:55:04 2009
+++ src/sys/dev/sbus/zx.c Tue May 12 13:20:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: zx.c,v 1.28 2009/05/05 23:55:04 macallan Exp $ */
+/* $NetBSD: zx.c,v 1.29 2009/05/12 13:20:06 cegger Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.28 2009/05/05 23:55:04 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.29 2009/05/12 13:20:06 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,7 +94,7 @@
ZX_ATTR_OE_ENABLE | ZX_ATTR_FORCE_WID)
static void zx_attach(device_t, device_t, void *);
-static int zx_match(device_t, struct cfdata *, void *);
+static int zx_match(device_t, cfdata_t, void *);
static void zx_blank(device_t);
static int zx_cmap_put(struct zx_softc *);
@@ -196,7 +196,7 @@
#endif /* NWSDISPLAY > 0 */
static int
-zx_match(device_t parent, struct cfdata *cf, void *aux)
+zx_match(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa;
