Module Name: src
Committed By: matt
Date: Mon Jun 6 16:42:19 UTC 2011
Modified Files:
src/sys/arch/evbppc/explora/dev: elb.c
src/sys/arch/evbppc/pmppc/dev: cpc_mainbus.c
src/sys/arch/evbppc/virtex/dev: xcvbus.c
src/sys/arch/evbppc/walnut/dev: pbus.c
src/sys/arch/evbppc/walnut/pci: pchb.c
src/sys/arch/powerpc/ibm4xx/dev: plb.c
src/sys/arch/powerpc/ibm4xx/pci: pchb.c
src/sys/arch/powerpc/pci: pchb.c
src/sys/arch/prep/isa: isabeep.c
src/sys/arch/prep/pci: pceb.c
src/sys/arch/sandpoint/sandpoint: eumb.c
Log Message:
More device_t, cfdata, CFATTACH_DECL_NEW cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/explora/dev/elb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/virtex/dev/xcvbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/walnut/dev/pbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/walnut/pci/pchb.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/ibm4xx/dev/plb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/ibm4xx/pci/pchb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/pci/pchb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/prep/isa/isabeep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/prep/pci/pceb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sandpoint/sandpoint/eumb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/explora/dev/elb.c
diff -u src/sys/arch/evbppc/explora/dev/elb.c:1.6 src/sys/arch/evbppc/explora/dev/elb.c:1.7
--- src/sys/arch/evbppc/explora/dev/elb.c:1.6 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbppc/explora/dev/elb.c Mon Jun 6 16:42:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: elb.c,v 1.6 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: elb.c,v 1.7 2011/06/06 16:42:17 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.6 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.7 2011/06/06 16:42:17 matt Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -54,8 +54,8 @@
bus_space_tag_t elb_bt;
};
-static int elb_match(struct device *, struct cfdata *, void *);
-static void elb_attach(struct device *, struct device *, void *);
+static int elb_match(device_t, cfdata_t, void *);
+static void elb_attach(device_t, device_t, void *);
static int elb_print(void *, const char *);
static struct powerpc_bus_space elb_tag = {
@@ -109,14 +109,14 @@
{ "le", BASE_LE, 0, 28, &elb_fb_tag },
};
-CFATTACH_DECL(elb, sizeof(struct device),
+CFATTACH_DECL_NEW(elb, 0,
elb_match, elb_attach, NULL, NULL);
/*
* Probe for the elb; always succeeds.
*/
static int
-elb_match(struct device *parent, struct cfdata *cf, void *aux)
+elb_match(device_t parent, cfdata_t cf, void *aux)
{
return (1);
}
@@ -125,7 +125,7 @@
* Attach the Explora local bus.
*/
static void
-elb_attach(struct device *parent, struct device *self, void *aux)
+elb_attach(device_t parent, device_t self, void *aux)
{
struct elb_attach_args eaa;
int i;
Index: src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c
diff -u src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.3 src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.4
--- src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.3 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c Mon Jun 6 16:42:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpc_mainbus.c,v 1.3 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: cpc_mainbus.c,v 1.4 2011/06/06 16:42:17 matt Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.c,v 1.3 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.c,v 1.4 2011/06/06 16:42:17 matt Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -55,18 +55,18 @@
struct genppc_pci_chipset *genppc_pct;
void
-cpc_attach(struct device *self, pci_chipset_tag_t pc, bus_space_tag_t mem,
+cpc_attach(device_t self, pci_chipset_tag_t pc, bus_space_tag_t mem,
bus_space_tag_t pciio, bus_dma_tag_t tag, int attachpci,
uint freq);
-static int cpc_mainbus_match(struct device *, struct cfdata *, void *);
-static void cpc_mainbus_attach(struct device *, struct device *, void *);
+static int cpc_mainbus_match(device_t, cfdata_t, void *);
+static void cpc_mainbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(cpc_mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(cpc_mainbus, 0,
cpc_mainbus_match, cpc_mainbus_attach, NULL, NULL);
int
-cpc_mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+cpc_mainbus_match(device_t parent, cfdata_t cf, void *aux)
{
struct mainbus_attach_args *maa = aux;
@@ -74,7 +74,7 @@
}
void
-cpc_mainbus_attach(struct device *parent, struct device *self, void *aux)
+cpc_mainbus_attach(device_t parent, device_t self, void *aux)
{
struct genppc_pci_chipset_businfo *pbi;
Index: src/sys/arch/evbppc/virtex/dev/xcvbus.c
diff -u src/sys/arch/evbppc/virtex/dev/xcvbus.c:1.1 src/sys/arch/evbppc/virtex/dev/xcvbus.c:1.2
--- src/sys/arch/evbppc/virtex/dev/xcvbus.c:1.1 Sat Dec 2 22:18:47 2006
+++ src/sys/arch/evbppc/virtex/dev/xcvbus.c Mon Jun 6 16:42:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xcvbus.c,v 1.1 2006/12/02 22:18:47 freza Exp $ */
+/* $NetBSD: xcvbus.c,v 1.2 2011/06/06 16:42:18 matt Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcvbus.c,v 1.1 2006/12/02 22:18:47 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcvbus.c,v 1.2 2011/06/06 16:42:18 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@
static void xcvbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(xcvbus, sizeof(struct device),
+CFATTACH_DECL_NEW(xcvbus, 0,
xcvbus_match, xcvbus_attach, NULL, NULL);
@@ -101,7 +101,7 @@
}
int
-xcvbus_child_match(struct device *parent, struct cfdata *cf, void *aux)
+xcvbus_child_match(device_t parent, cfdata_t cf, void *aux)
{
struct xcvbus_attach_args *vaa = aux;
Index: src/sys/arch/evbppc/walnut/dev/pbus.c
diff -u src/sys/arch/evbppc/walnut/dev/pbus.c:1.10 src/sys/arch/evbppc/walnut/dev/pbus.c:1.11
--- src/sys/arch/evbppc/walnut/dev/pbus.c:1.10 Thu May 4 10:53:06 2006
+++ src/sys/arch/evbppc/walnut/dev/pbus.c Mon Jun 6 16:42:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pbus.c,v 1.10 2006/05/04 10:53:06 simonb Exp $ */
+/* $NetBSD: pbus.c,v 1.11 2011/06/06 16:42:18 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.10 2006/05/04 10:53:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.11 2011/06/06 16:42:18 matt Exp $");
#include "locators.h"
#include "pckbc.h"
@@ -96,11 +96,11 @@
{ NULL }
};
-static int pbus_match(struct device *, struct cfdata *, void *);
-static void pbus_attach(struct device *, struct device *, void *);
+static int pbus_match(device_t, cfdata_t, void *);
+static void pbus_attach(device_t, device_t, void *);
static int pbus_print(void *, const char *);
-CFATTACH_DECL(pbus, sizeof(struct device),
+CFATTACH_DECL_NEW(pbus, 0,
pbus_match, pbus_attach, NULL, NULL);
static struct powerpc_bus_space pbus_tag = {
@@ -114,7 +114,7 @@
* Probe for the peripheral bus.
*/
static int
-pbus_match(struct device *parent, struct cfdata *cf, void *aux)
+pbus_match(device_t parent, cfdata_t cf, void *aux)
{
struct pbus_attach_args *pba = aux;
@@ -129,7 +129,7 @@
* Attach the peripheral bus.
*/
static void
-pbus_attach(struct device *parent, struct device *self, void *aux)
+pbus_attach(device_t parent, device_t self, void *aux)
{
struct plb_attach_args *paa = aux;
struct pbus_attach_args pba;
Index: src/sys/arch/evbppc/walnut/pci/pchb.c
diff -u src/sys/arch/evbppc/walnut/pci/pchb.c:1.9 src/sys/arch/evbppc/walnut/pci/pchb.c:1.10
--- src/sys/arch/evbppc/walnut/pci/pchb.c:1.9 Tue May 17 17:34:49 2011
+++ src/sys/arch/evbppc/walnut/pci/pchb.c Mon Jun 6 16:42:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.9 2011/05/17 17:34:49 dyoung Exp $ */
+/* $NetBSD: pchb.c,v 1.10 2011/06/06 16:42:18 matt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.9 2011/05/17 17:34:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.10 2011/06/06 16:42:18 matt Exp $");
#include "pci.h"
#include "opt_pci.h"
@@ -52,11 +52,11 @@
#include <dev/pci/pcidevs.h>
#include <dev/pci/pciconf.h>
-static int pchbmatch(struct device *, struct cfdata *, void *);
-static void pchbattach(struct device *, struct device *, void *);
+static int pchbmatch(device_t, cfdata_t, void *);
+static void pchbattach(device_t, device_t, void *);
static int pchbprint(void *, const char *);
-CFATTACH_DECL(pchb, sizeof(struct device),
+CFATTACH_DECL_NEW(pchb, 0,
pchbmatch, pchbattach, NULL, NULL);
static int pcifound = 0;
@@ -79,7 +79,7 @@
static int
-pchbmatch(struct device *parent, struct cfdata *cf, void *aux)
+pchbmatch(device_t parent, cfdata_t cf, void *aux)
{
struct plb_attach_args *paa = aux;
/* XXX chipset tag unused by walnut, so just pass 0 */
@@ -115,7 +115,7 @@
}
static void
-pchbattach(struct device *parent, struct device *self, void *aux)
+pchbattach(device_t parent, device_t self, void *aux)
{
struct plb_attach_args *paa = aux;
struct pcibus_attach_args pba;
Index: src/sys/arch/powerpc/ibm4xx/dev/plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.18 src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.19
--- src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.18 Mon Dec 13 07:29:12 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/plb.c Mon Jun 6 16:42:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.18 2010/12/13 07:29:12 kiyohara Exp $ */
+/* $NetBSD: plb.c,v 1.19 2011/06/06 16:42:18 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.18 2010/12/13 07:29:12 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.19 2011/06/06 16:42:18 matt Exp $");
#include "locators.h"
#include "emac.h"
@@ -111,11 +111,11 @@
{ 0, NULL }
};
-static int plb_match(struct device *, struct cfdata *, void *);
-static void plb_attach(struct device *, struct device *, void *);
+static int plb_match(device_t, cfdata_t, void *);
+static void plb_attach(device_t, device_t, void *);
static int plb_print(void *, const char *);
-CFATTACH_DECL(plb, sizeof(struct device), plb_match, plb_attach, NULL, NULL);
+CFATTACH_DECL_NEW(plb, 0, plb_match, plb_attach, NULL, NULL);
/*
* "generic" DMA struct, nothing special.
@@ -143,7 +143,7 @@
* Probe for the plb; always succeeds.
*/
static int
-plb_match(struct device *parent, struct cfdata *cf, void *aux)
+plb_match(device_t parent, cfdata_t cf, void *aux)
{
return 1;
@@ -153,7 +153,7 @@
* Attach the processor local bus.
*/
static void
-plb_attach(struct device *parent, struct device *self, void *aux)
+plb_attach(device_t parent, device_t self, void *aux)
{
struct plb_attach_args paa;
struct plb_dev *local_plb_devs = aux;
Index: src/sys/arch/powerpc/ibm4xx/pci/pchb.c
diff -u src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.7 src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.8
--- src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.7 Tue May 17 17:34:52 2011
+++ src/sys/arch/powerpc/ibm4xx/pci/pchb.c Mon Jun 6 16:42:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.7 2011/05/17 17:34:52 dyoung Exp $ */
+/* $NetBSD: pchb.c,v 1.8 2011/06/06 16:42:18 matt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.7 2011/05/17 17:34:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.8 2011/06/06 16:42:18 matt Exp $");
#include "pci.h"
#include "opt_pci.h"
@@ -51,12 +51,12 @@
#include <dev/pci/pcidevs.h>
#include <dev/pci/pciconf.h>
-static int pchbmatch(struct device *, struct cfdata *, void *);
-static void pchbattach(struct device *, struct device *, void *);
+static int pchbmatch(device_t, cfdata_t, void *);
+static void pchbattach(device_t, device_t, void *);
static int pchbprint(void *, const char *);
static pci_chipset_tag_t alloc_chipset_tag(int);
-CFATTACH_DECL(pchb, sizeof(struct device),
+CFATTACH_DECL_NEW(pchb, 0,
pchbmatch, pchbattach, NULL, NULL);
static int pcifound = 0;
@@ -79,7 +79,7 @@
static int
-pchbmatch(struct device *parent, struct cfdata *cf, void *aux)
+pchbmatch(device_t parent, cfdata_t cf, void *aux)
{
struct plb_attach_args *paa = aux;
/* XXX chipset tag unused by walnut, so just pass 0 */
@@ -115,7 +115,7 @@
}
static void
-pchbattach(struct device *parent, struct device *self, void *aux)
+pchbattach(device_t parent, device_t self, void *aux)
{
struct plb_attach_args *paa = aux;
struct pcibus_attach_args pba;
Index: src/sys/arch/powerpc/pci/pchb.c
diff -u src/sys/arch/powerpc/pci/pchb.c:1.4 src/sys/arch/powerpc/pci/pchb.c:1.5
--- src/sys/arch/powerpc/pci/pchb.c:1.4 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/pci/pchb.c Mon Jun 6 16:42:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.4 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: pchb.c,v 1.5 2011/06/06 16:42:18 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.4 2008/04/28 20:23:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.5 2011/06/06 16:42:18 matt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -52,14 +52,14 @@
#include "agp.h"
-int pchbmatch(struct device *, struct cfdata *, void *);
-void pchbattach(struct device *, struct device *, void *);
+int pchbmatch(device_t, cfdata_t, void *);
+void pchbattach(device_t, device_t, void *);
-CFATTACH_DECL(pchb, sizeof(struct device),
+CFATTACH_DECL_NEW(pchb, 0,
pchbmatch, pchbattach, NULL, NULL);
int
-pchbmatch(struct device *parent, struct cfdata *cf, void *aux)
+pchbmatch(device_t parent, cfdata_t cf, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -75,7 +75,7 @@
}
static void
-mpc105_print(struct pci_attach_args *pa, struct device *self)
+mpc105_print(struct pci_attach_args *pa, device_t self)
{
pcireg_t reg1, reg2;
const char *s1;
@@ -118,7 +118,7 @@
}
static void
-mpc106_print(struct pci_attach_args *pa, struct device *self)
+mpc106_print(struct pci_attach_args *pa, device_t self)
{
pcireg_t reg1, reg2;
const char *s1;
@@ -177,7 +177,7 @@
}
static void
-ibm82660_print(struct pci_attach_args *pa, struct device *self)
+ibm82660_print(struct pci_attach_args *pa, device_t self)
{
pcireg_t reg1;
#ifdef PREP_BUS_SPACE_IO
@@ -231,7 +231,7 @@
}
void
-pchbattach(struct device *parent, struct device *self, void *aux)
+pchbattach(device_t parent, device_t self, void *aux)
{
struct pci_attach_args *pa = aux;
char devinfo[256];
Index: src/sys/arch/prep/isa/isabeep.c
diff -u src/sys/arch/prep/isa/isabeep.c:1.9 src/sys/arch/prep/isa/isabeep.c:1.10
--- src/sys/arch/prep/isa/isabeep.c:1.9 Wed Oct 17 19:56:50 2007
+++ src/sys/arch/prep/isa/isabeep.c Mon Jun 6 16:42:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isabeep.c,v 1.9 2007/10/17 19:56:50 garbled Exp $ */
+/* $NetBSD: isabeep.c,v 1.10 2011/06/06 16:42:18 matt Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isabeep.c,v 1.9 2007/10/17 19:56:50 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isabeep.c,v 1.10 2011/06/06 16:42:18 matt Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
@@ -46,23 +46,23 @@
#if NPCPPI > 0
#include <dev/isa/pcppivar.h>
-int isabeepmatch(struct device *, struct cfdata *, void *);
-void isabeepattach(struct device *, struct device *, void *);
+int isabeepmatch(device_t, cfdata_t, void *);
+void isabeepattach(device_t, device_t, void *);
-CFATTACH_DECL(isabeep, sizeof(struct device),
+CFATTACH_DECL_NEW(isabeep, 0,
isabeepmatch, isabeepattach, NULL, NULL);
static int ppi_attached;
static pcppi_tag_t ppicookie;
int
-isabeepmatch(struct device *parent, struct cfdata *match, void *aux)
+isabeepmatch(device_t parent, cfdata_t match, void *aux)
{
return (!ppi_attached);
}
void
-isabeepattach(struct device *parent, struct device *self, void *aux)
+isabeepattach(device_t parent, device_t self, void *aux)
{
aprint_normal("\n");
Index: src/sys/arch/prep/pci/pceb.c
diff -u src/sys/arch/prep/pci/pceb.c:1.3 src/sys/arch/prep/pci/pceb.c:1.4
--- src/sys/arch/prep/pci/pceb.c:1.3 Mon Apr 28 20:23:33 2008
+++ src/sys/arch/prep/pci/pceb.c Mon Jun 6 16:42:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pceb.c,v 1.3 2008/04/28 20:23:33 martin Exp $ */
+/* $NetBSD: pceb.c,v 1.4 2011/06/06 16:42:18 matt Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.3 2008/04/28 20:23:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.4 2011/06/06 16:42:18 matt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -50,13 +50,13 @@
#include "eisa.h"
#include "isa.h"
-int pcebmatch(struct device *, struct cfdata *, void *);
-void pcebattach(struct device *, struct device *, void *);
+int pcebmatch(device_t, cfdata_t, void *);
+void pcebattach(device_t, device_t, void *);
-CFATTACH_DECL(pceb, sizeof(struct device),
+CFATTACH_DECL_NEW(pceb, 0,
pcebmatch, pcebattach, NULL, NULL);
-void pceb_callback(struct device *);
+void pceb_callback(device_t);
union pceb_attach_args {
const char *ea_name; /* XXX should be common */
@@ -65,7 +65,7 @@
};
int
-pcebmatch(struct device *parent, struct cfdata *match, void *aux)
+pcebmatch(device_t parent, cfdata_t match, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -94,7 +94,7 @@
}
void
-pcebattach(struct device *parent, struct device *self, void *aux)
+pcebattach(device_t parent, device_t self, void *aux)
{
struct pci_attach_args *pa = aux;
char devinfo[256];
@@ -124,7 +124,7 @@
}
void
-pceb_callback(struct device *self)
+pceb_callback(device_t self)
{
union pceb_attach_args ea;
Index: src/sys/arch/sandpoint/sandpoint/eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/eumb.c:1.3 src/sys/arch/sandpoint/sandpoint/eumb.c:1.4
--- src/sys/arch/sandpoint/sandpoint/eumb.c:1.3 Mon Apr 28 20:23:34 2008
+++ src/sys/arch/sandpoint/sandpoint/eumb.c Mon Jun 6 16:42:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eumb.c,v 1.3 2008/04/28 20:23:34 martin Exp $ */
+/* $NetBSD: eumb.c,v 1.4 2011/06/06 16:42:19 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.3 2008/04/28 20:23:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.4 2011/06/06 16:42:19 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -43,18 +43,18 @@
#include <sandpoint/sandpoint/eumbvar.h>
#include "locators.h"
-static int eumb_match(struct device *, struct cfdata *, void *);
-static void eumb_attach(struct device *, struct device *, void *);
+static int eumb_match(device_t, cfdata_t, void *);
+static void eumb_attach(device_t, device_t, void *);
static int eumb_print(void *, const char *);
-static int eumb_search(struct device *, struct cfdata *, const int *, void *);
+static int eumb_search(device_t, cfdata_t, const int *, void *);
-CFATTACH_DECL(eumb, sizeof(struct device),
+CFATTACH_DECL_NEW(eumb, 0,
eumb_match, eumb_attach, NULL, NULL);
extern struct cfdriver eumb_cd;
static int
-eumb_match(struct device *parent, struct cfdata *cf, void *aux)
+eumb_match(device_t parent, cfdata_t cf, void *aux)
{
const char **ca_name = aux; /* XXX */
@@ -64,7 +64,7 @@
}
static void
-eumb_attach(struct device *parent, struct device *self, void *aux)
+eumb_attach(device_t parent, device_t self, void *aux)
{
printf("\n");
@@ -72,8 +72,7 @@
}
static int
-eumb_search(struct device *parent, struct cfdata *cf,
- const int *ldesc, void *aux)
+eumb_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
{
struct eumb_attach_args eaa;
