Use CFATTACH_DECL().

This commit is contained in:
thorpej 2002-10-02 04:17:21 +00:00
parent b96bc0d7bc
commit adb90ad2ae
24 changed files with 74 additions and 102 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: esp.c,v 1.41 2002/09/27 20:34:27 thorpej Exp $ */
/* $NetBSD: esp.c,v 1.42 2002/10/02 04:22:52 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -152,9 +152,8 @@ int esp_dma_nest = 0;
/* Linkup to the rest of the kernel */
const struct cfattach esp_ca = {
sizeof(struct esp_softc), espmatch_intio, espattach_intio
};
CFATTACH_DECL(esp, sizeof(struct esp_softc),
espmatch_intio, espattach_intio, NULL, NULL);
static int attached = 0;

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_xe.c,v 1.10 2002/10/01 20:41:22 provos Exp $ */
/* $NetBSD: if_xe.c,v 1.11 2002/10/02 04:22:52 thorpej Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@ -102,9 +102,8 @@ void xe_dma_tx_shutdown __P((void *));
static void findchannel_defer __P((struct device *));
const struct cfattach xe_ca = {
sizeof(struct xe_softc), xe_match, xe_attach
};
CFATTACH_DECL(xe, sizeof(struct xe_softc),
xe_match, xe_attach, NULL, NULL);
static int xe_dma_medias[] = {
IFM_ETHER|IFM_AUTO,

View File

@ -1,4 +1,4 @@
/* $NetBSD: intio.c,v 1.5 2002/09/27 20:34:29 thorpej Exp $ */
/* $NetBSD: intio.c,v 1.6 2002/10/02 04:22:53 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -54,9 +54,8 @@ void intioattach __P((struct device *, struct device *, void *));
int intioprint __P((void *, const char *));
int intiosearch __P((struct device *, struct cfdata *, void *));
const struct cfattach intio_ca = {
sizeof(struct device), intiomatch, intioattach
};
CFATTACH_DECL(intio, sizeof(struct device),
intiomatch, intioattach, NULL, NULL);
#if 0
struct cfdriver intio_cd = {

View File

@ -1,4 +1,4 @@
/* $NetBSD: nextdisplay.c,v 1.11 2002/09/27 20:34:30 thorpej Exp $ */
/* $NetBSD: nextdisplay.c,v 1.12 2002/10/02 04:22:53 thorpej Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
@ -56,11 +56,8 @@ extern int turbo;
int nextdisplay_match __P((struct device *, struct cfdata *, void *));
void nextdisplay_attach __P((struct device *, struct device *, void *));
const struct cfattach nextdisplay_ca = {
sizeof(struct nextdisplay_softc),
nextdisplay_match,
nextdisplay_attach,
};
CFATTACH_DECL(nextdisplay, sizeof(struct nextdisplay_softc),
nextdisplay_match, nextdisplay_attach, NULL, NULL);
const struct wsdisplay_emulops nextdisplay_mono_emulops = {
rcons_cursor,

View File

@ -1,4 +1,4 @@
/* $NetBSD: nextdma.c,v 1.33 2002/09/27 20:34:30 thorpej Exp $ */
/* $NetBSD: nextdma.c,v 1.34 2002/10/02 04:22:53 thorpej Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@ -114,9 +114,8 @@ static int nextdma_enet_intr __P((void *));
#define nd_bsr4(reg) bus_space_read_4(nsc->sc_bst, nsc->sc_bsh, (reg))
#define nd_bsw4(reg,val) bus_space_write_4(nsc->sc_bst, nsc->sc_bsh, (reg), (val))
const struct cfattach nextdma_ca = {
sizeof(struct nextdma_softc), nextdma_match, nextdma_attach
};
CFATTACH_DECL(nextdma, sizeof(struct nextdma_softc),
nextdma_match, nextdma_attach, NULL, NULL);
static struct nextdma_channel nextdma_channel[] = {
#if NESP > 0

View File

@ -1,4 +1,4 @@
/* $NetBSD: nextkbd.c,v 1.6 2002/09/27 20:34:31 thorpej Exp $ */
/* $NetBSD: nextkbd.c,v 1.7 2002/10/02 04:22:53 thorpej Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
* All rights reserved.
@ -82,9 +82,8 @@ void nextkbd_attach __P((struct device *, struct device *, void *));
int nextkbc_cnattach __P((bus_space_tag_t));
const struct cfattach nextkbd_ca = {
sizeof(struct nextkbd_softc), nextkbd_match, nextkbd_attach
};
CFATTACH_DECL(nextkbd, sizeof(struct nextkbd_softc),
nextkbd_match, nextkbd_attach, NULL, NULL);
int nextkbd_enable __P((void *, int));
void nextkbd_set_leds __P((void *, int));

View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.19 2002/09/27 20:34:32 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.20 2002/10/02 04:22:53 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -171,9 +171,8 @@ static int zs_print __P((void *, const char *name));
extern int zs_getc __P((void *arg));
extern void zs_putc __P((void *arg, int c));
const struct cfattach zsc_ca = {
sizeof(struct zsc_softc), zs_match, zs_attach
};
CFATTACH_DECL(zsc, sizeof(struct zsc_softc),
zs_match, zs_attach, NULL, NULL);
extern struct cfdriver zsc_cd;

View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.3 2002/09/27 20:34:32 thorpej Exp $ */
/* $NetBSD: mainbus.c,v 1.4 2002/10/02 04:22:54 thorpej Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -47,9 +47,8 @@ static int mainbus_match __P((struct device *, struct cfdata *, void *));
static void mainbus_attach __P((struct device *, struct device *, void *));
static int mainbus_search __P((struct device *, struct cfdata *, void *));
const struct cfattach mainbus_ca = {
sizeof(struct device), mainbus_match, mainbus_attach
};
CFATTACH_DECL(mainbus, sizeof(struct device),
mainbus_match, mainbus_attach, NULL, NULL);
struct m68k_bus_dma_tag next68k_bus_dma_tag = {
NULL, /* _cookie */

View File

@ -1,4 +1,4 @@
/* $NetBSD: firepower.c,v 1.5 2002/09/27 20:34:33 thorpej Exp $ */
/* $NetBSD: firepower.c,v 1.6 2002/10/02 04:19:44 thorpej Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -230,9 +230,8 @@ firepower_device_register(struct device *dev, void *aux)
int firepower_match(struct device *, struct cfdata *, void *);
void firepower_attach(struct device *, struct device *, void *);
const struct cfattach firepower_ca = {
sizeof(struct firepower_softc), firepower_match, firepower_attach,
};
CFATTACH_DECL(firepower, sizeof(struct firepower_softc),
firepower_match, firepower_attach, NULL, NULL);
int firepower_print(void *, const char *);

View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.4 2002/09/27 20:34:34 thorpej Exp $ */
/* $NetBSD: cpu.c,v 1.5 2002/10/02 04:19:45 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@ -46,9 +46,8 @@
static int cpu_match(struct device *, struct cfdata *, void *);
static void cpu_attach(struct device *, struct device *, void *);
const struct cfattach cpu_ca = {
sizeof(struct cpu_softc), cpu_match, cpu_attach
};
CFATTACH_DECL(cpu, sizeof(struct cpu_softc),
cpu_match, cpu_attach, NULL, NULL);
int
cpu_match(struct device *parent, struct cfdata *cfdata, void *aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.9 2002/09/27 20:34:34 thorpej Exp $ */
/* $NetBSD: mainbus.c,v 1.10 2002/10/02 04:19:45 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@ -47,9 +47,8 @@
int mainbus_match(struct device *, struct cfdata *, void *);
void mainbus_attach(struct device *, struct device *, void *);
const struct cfattach mainbus_ca = {
sizeof(struct device), mainbus_match, mainbus_attach
};
CFATTACH_DECL(mainbus, sizeof(struct device),
mainbus_match, mainbus_attach, NULL, NULL);
int mainbus_print(void *, const char *);

View File

@ -1,4 +1,4 @@
/* $NetBSD: lpt.c,v 1.36 2002/09/27 20:34:35 thorpej Exp $ */
/* $NetBSD: lpt.c,v 1.37 2002/10/02 04:18:56 thorpej Exp $ */
/*
* Copyright (c) 1994 Matthias Pfaller.
@ -205,9 +205,8 @@ static
int pliptransmit __P((volatile struct i8255 *, u_char *, int));
#endif
const struct cfattach lpt_ca = {
sizeof(struct lpt_softc), lptmatch, lptattach
};
CFATTACH_DECL(lpt, sizeof(struct lpt_softc),
lptmatch, lptattach, NULL, NULL);
extern struct cfdriver lpt_cd;

View File

@ -1,4 +1,4 @@
/* $NetBSD: ncr.c,v 1.47 2002/09/27 20:34:36 thorpej Exp $ */
/* $NetBSD: ncr.c,v 1.48 2002/10/02 04:18:56 thorpej Exp $ */
/*
* Copyright (c) 1996, 1997 Matthias Pfaller.
@ -81,9 +81,8 @@ static void ncr_wait_not_req __P((struct ncr5380_softc *sc));
*/
int ncr_default_options = 0;
const struct cfattach ncr_ca = {
sizeof(struct ncr5380_softc), ncr_match, ncr_attach
};
CFATTACH_DECL(ncr, sizeof(struct ncr5380_softc),
ncr_match, ncr_attach, NULL, NULL);
static int
ncr_match(parent, cf, aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: scn.c,v 1.55 2002/09/27 20:34:37 thorpej Exp $ */
/* $NetBSD: scn.c,v 1.56 2002/10/02 04:18:57 thorpej Exp $ */
/*
* Copyright (c) 1996, 1997 Philip L. Budne.
@ -92,9 +92,8 @@ int scninit __P((dev_t, int));
void scncnreinit __P((void *));
int scnhwiflow __P((struct tty *, int));
const struct cfattach scn_ca = {sizeof(struct scn_softc), scnprobe, scnattach};
extern struct cfdriver scn_cd;
CFATTACH_DECL(scn, sizeof(struct scn_softc),
scnprobe, scnattach, NULL, NULL);
dev_type_open(scnopen);
dev_type_close(scnclose);

View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.23 2002/09/27 20:34:39 thorpej Exp $ */
/* $NetBSD: clock.c,v 1.24 2002/10/02 04:18:58 thorpej Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -70,16 +70,14 @@ static void write_rtc __P((u_char *));
static int clock_match __P((struct device *, struct cfdata *, void *args));
static void clock_attach __P((struct device *, struct device *, void *));
const struct cfattach clock_ca = {
sizeof(struct device), clock_match, clock_attach
};
CFATTACH_DECL(clock, sizeof(struct device),
clock_match, clock_attach, NULL, NULL);
static int rtc_match __P((struct device *, struct cfdata *, void *args));
static void rtc_attach __P((struct device *, struct device *, void *));
const struct cfattach rtc_ca = {
sizeof(struct device), rtc_match, rtc_attach
};
CFATTACH_DECL(rtc, sizeof(struct device),
rtc_match, rtc_attach, NULL, NULL);
static int
clock_match(parent, cf, aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.12 2002/09/27 20:34:39 thorpej Exp $ */
/* $NetBSD: mainbus.c,v 1.13 2002/10/02 04:18:58 thorpej Exp $ */
/*
* Copyright (c) 1997 Matthias Pfaller.
@ -43,9 +43,8 @@ static void mbattach __P((struct device *, struct device *, void *));
static int mbsearch __P((struct device *, struct cfdata *, void *));
static int mbprint __P((void *, const char *));
const struct cfattach mainbus_ca = {
sizeof(struct device), mbprobe, mbattach
};
CFATTACH_DECL(mainbus, sizeof(struct device),
mbprobe, mbattach, NULL, NULL);
static int
mbprobe(parent, cf, aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_smap.c,v 1.2 2002/09/27 20:34:40 thorpej Exp $ */
/* $NetBSD: if_smap.c,v 1.3 2002/10/02 04:17:21 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -132,9 +132,8 @@ struct smap_softc {
STATIC int smap_match(struct device *, struct cfdata *, void *);
STATIC void smap_attach(struct device *, struct device *, void *);
const struct cfattach smap_ca = {
sizeof (struct smap_softc), smap_match, smap_attach
};
CFATTACH_DECL(smap, sizeof (struct smap_softc),
smap_match, smap_attach, NULL, NULL);
STATIC int smap_intr(void *);
STATIC void smap_rxeof(void *);

View File

@ -1,4 +1,4 @@
/* $NetBSD: ohci_sbus.c,v 1.2 2002/09/27 20:34:40 thorpej Exp $ */
/* $NetBSD: ohci_sbus.c,v 1.3 2002/10/02 04:17:21 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -106,10 +106,8 @@ struct ohci_sbus_softc {
LIST_HEAD(, ohci_dma_segment) sc_dmaseg_head;
};
const struct cfattach ohci_sbus_ca = {
sizeof(struct ohci_sbus_softc), ohci_sbus_match,
ohci_sbus_attach,
};
CFATTACH_DECL(ohci_sbus, sizeof(struct ohci_sbus_softc),
ohci_sbus_match, ohci_sbus_attach, NULL, NULL);
int
ohci_sbus_match(struct device *parent, struct cfdata *cf, void *aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: sbus.c,v 1.4 2002/09/27 20:34:41 thorpej Exp $ */
/* $NetBSD: sbus.c,v 1.5 2002/10/02 04:17:21 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -87,9 +87,8 @@ STATIC void sbus_attach(struct device *, struct device *, void *);
STATIC int sbus_search(struct device *, struct cfdata *, void *);
STATIC int sbus_print(void *, const char *);
const struct cfattach sbus_ca = {
sizeof (struct device), sbus_match, sbus_attach
};
CFATTACH_DECL(sbus, sizeof (struct device),
sbus_match, sbus_attach, NULL, NULL);
extern struct cfdriver sbus_cd;
STATIC int __sbus_attached;

View File

@ -1,4 +1,4 @@
/* $NetBSD: spd.c,v 1.2 2002/09/27 20:34:41 thorpej Exp $ */
/* $NetBSD: spd.c,v 1.3 2002/10/02 04:17:21 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -66,9 +66,8 @@ STATIC struct {
const char *name;
} __spd_table[2];
const struct cfattach spd_ca = {
sizeof(struct device), spd_match, spd_attach
};
CFATTACH_DECL(spd, sizeof(struct device),
spd_match, spd_attach, NULL, NULL);
#ifdef DEBUG
#define LEGAL_SLOT(slot) ((slot) >= 0 && (slot) < 2)

View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc_spd.c,v 1.2 2002/09/27 20:34:41 thorpej Exp $ */
/* $NetBSD: wdc_spd.c,v 1.3 2002/10/02 04:17:21 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -86,9 +86,8 @@ struct wdc_spd_softc {
STATIC int wdc_spd_match(struct device *, struct cfdata *, void *);
STATIC void wdc_spd_attach(struct device *, struct device *, void *);
const struct cfattach wdc_spd_ca = {
sizeof (struct wdc_spd_softc), wdc_spd_match, wdc_spd_attach
};
CFATTACH_DECL(wdc_spd, sizeof (struct wdc_spd_softc),
wdc_spd_match, wdc_spd_attach, NULL, NULL);
extern struct cfdriver wdc_cd;

View File

@ -1,4 +1,4 @@
/* $NetBSD: gsfb.c,v 1.5 2002/09/27 20:34:42 thorpej Exp $ */
/* $NetBSD: gsfb.c,v 1.6 2002/10/02 04:17:22 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -184,9 +184,8 @@ STATIC char _gsfb_debug_buf[80 * 2];
STATIC int gsfb_match(struct device *, struct cfdata *, void *);
STATIC void gsfb_attach(struct device *, struct device *, void *);
const struct cfattach gsfb_ca = {
sizeof(struct device), gsfb_match, gsfb_attach
};
CFATTACH_DECL(gsfb, sizeof(struct device),
gsfb_match, gsfb_attach, NULL, NULL);
STATIC void gsfb_hwinit(void);
STATIC int gsfb_swinit(void);

View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.3 2002/09/27 20:34:43 thorpej Exp $ */
/* $NetBSD: cpu.c,v 1.4 2002/10/02 04:17:22 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@ -33,9 +33,8 @@
static int cpumatch(struct device *, struct cfdata *, void *);
static void cpuattach(struct device *, struct device *, void *);
const struct cfattach cpu_ca = {
sizeof (struct device), cpumatch, cpuattach
};
CFATTACH_DECL(cpu, sizeof (struct device),
cpumatch, cpuattach, NULL, NULL);
extern struct cfdriver cpu_cd;
static int __attached; /* PlayStation 2 has only one CPU */

View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.4 2002/09/27 20:34:44 thorpej Exp $ */
/* $NetBSD: mainbus.c,v 1.5 2002/10/02 04:17:22 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -43,9 +43,8 @@ static void mainbus_attach(struct device *, struct device *, void *);
static int mainbus_search(struct device *, struct cfdata *, void *);
static int mainbus_print(void *, const char *);
const struct cfattach mainbus_ca = {
sizeof(struct device), mainbus_match, mainbus_attach
};
CFATTACH_DECL(mainbus, sizeof(struct device),
mainbus_match, mainbus_attach, NULL, NULL);
static int
mainbus_match(struct device *parent, struct cfdata *cf, void *aux)