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

remove all traces of __BROKEN_INDIRECT_CONFIG (except in shared drivers)

This commit is contained in:
cgd 1996-12-08 00:22:08 +00:00
parent 74187419b6
commit e9abc8540f
23 changed files with 23 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/alpha/alpha/cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.16 1996/12/05 01:39:27 cgd Exp $ */
/* $NetBSD: cpu.c,v 1.17 1996/12/08 00:22:08 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -35,11 +35,7 @@
#include <machine/rpb.h>
/* Definition of the driver for autoconfig. */
#ifdef __BROKEN_INDIRECT_CONFIG
static int cpumatch(struct device *, void *, void *);
#else
static int cpumatch(struct device *, struct cfdata *, void *);
#endif
static void cpuattach(struct device *, struct device *, void *);
struct cfattach cpu_ca = {
@ -53,11 +49,7 @@ struct cfdriver cpu_cd = {
static int
cpumatch(parent, cfdata, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *cfdata;
#else
struct cfdata *cfdata;
#endif
void *aux;
{
struct confargs *ca = aux;

17
sys/arch/alpha/alpha/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.15 1996/12/05 01:39:28 cgd Exp $ */
/* $NetBSD: mainbus.c,v 1.16 1996/12/08 00:22:09 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -42,11 +42,7 @@ struct mainbus_softc {
};
/* Definition of the mainbus driver. */
#ifdef __BROKEN_INDIRECT_CONFIG
static int mbmatch __P((struct device *, void *, void *));
#else
static int mbmatch __P((struct device *, struct cfdata *, void *));
#endif
static void mbattach __P((struct device *, struct device *, void *));
static int mbprint __P((void *, const char *));
@ -64,22 +60,11 @@ caddr_t mb_cvtaddr __P((struct confargs *));
int mb_matchname __P((struct confargs *, char *));
static int
#ifdef __BROKEN_INDIRECT_CONFIG
mbmatch(parent, cfdata, aux)
#else
mbmatch(parent, cf, aux)
#endif
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *cfdata;
#else
struct cfdata *cf;
#endif
void *aux;
{
#ifdef __BROKEN_INDIRECT_CONFIG
struct cfdata *cf = cfdata;
#endif
/*
* Only one mainbus, but some people are stupid...

10
sys/arch/alpha/isa/mcclock_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mcclock_isa.c,v 1.5 1996/12/05 01:39:29 cgd Exp $ */
/* $NetBSD: mcclock_isa.c,v 1.6 1996/12/08 00:22:10 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -46,11 +46,7 @@ struct mcclock_isa_softc {
bus_space_handle_t sc_ioh;
};
#ifdef __BROKEN_INDIRECT_CONFIG
int mcclock_isa_match __P((struct device *, void *, void *));
#else
int mcclock_isa_match __P((struct device *, struct cfdata *, void *));
#endif
void mcclock_isa_attach __P((struct device *, struct device *, void *));
struct cfattach mcclock_isa_ca = {
@ -68,11 +64,7 @@ const struct mcclock_busfns mcclock_isa_busfns = {
int
mcclock_isa_match(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct isa_attach_args *ia = aux;

10
sys/arch/alpha/isa/pckbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbd.c,v 1.14 1996/12/05 01:39:30 cgd Exp $ */
/* $NetBSD: pckbd.c,v 1.15 1996/12/08 00:22:11 cgd Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum. All rights reserved.
@ -99,11 +99,7 @@ struct pckbd_softc {
int sc_bellpitch; /* last pitch programmed */
};
#ifdef __BROKEN_INDIRECT_CONFIG
int pckbdprobe __P((struct device *, void *, void *));
#else
int pckbdprobe __P((struct device *, struct cfdata *, void *));
#endif
void pckbdattach __P((struct device *, struct device *, void *));
int pckbdintr __P((void *));
@ -301,11 +297,7 @@ kbd_cmd(val, polling)
int
pckbdprobe(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct pcppi_attach_args *pa = aux;

10
sys/arch/alpha/isa/pcppi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcppi.c,v 1.3 1996/12/05 01:39:31 cgd Exp $ */
/* $NetBSD: pcppi.c,v 1.4 1996/12/08 00:22:12 cgd Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@ -46,11 +46,7 @@ struct pcppi_softc {
bus_space_handle_t sc_pit1_ioh, sc_ppi_ioh;
};
#ifdef __BROKEN_INDIRECT_CONFIG
int pcppi_match __P((struct device *, void *, void *));
#else
int pcppi_match __P((struct device *, struct cfdata *, void *));
#endif
void pcppi_attach __P((struct device *, struct device *, void *));
struct cfattach pcppi_ca = {
@ -66,11 +62,7 @@ int pcppiprint __P((void *, const char *));
int
pcppi_match(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct isa_attach_args *ia = aux;

10
sys/arch/alpha/isa/pms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pms.c,v 1.7 1996/12/05 01:39:31 cgd Exp $ */
/* $NetBSD: pms.c,v 1.8 1996/12/08 00:22:12 cgd Exp $ */
/*-
* Copyright (c) 1994 Charles Hannum.
@ -96,11 +96,7 @@ bus_space_tag_t pms_iot;
bus_space_handle_t pms_ioh;
isa_chipset_tag_t pms_ic;
#ifdef __BROKEN_INDIRECT_CONFIG
int pmsprobe __P((struct device *, void *, void *));
#else
int pmsprobe __P((struct device *, struct cfdata *, void *));
#endif
void pmsattach __P((struct device *, struct device *, void *));
int pmsintr __P((void *));
@ -175,11 +171,7 @@ pms_pit_cmd(value)
int
pmsprobe(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct pcppi_attach_args *pa = aux;

10
sys/arch/alpha/isa/vga_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vga_isa.c,v 1.4 1996/12/05 01:39:32 cgd Exp $ */
/* $NetBSD: vga_isa.c,v 1.5 1996/12/08 00:22:13 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -47,11 +47,7 @@ struct vga_isa_softc {
struct vga_config *sc_vc; /* VGA configuration */
};
#ifdef __BROKEN_INDIRECT_CONFIG
int vga_isa_match __P((struct device *, void *, void *));
#else
int vga_isa_match __P((struct device *, struct cfdata *, void *));
#endif
void vga_isa_attach __P((struct device *, struct device *, void *));
struct cfattach vga_isa_ca = {
@ -64,11 +60,7 @@ struct vga_config vga_isa_console_vc;
int
vga_isa_match(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct isa_attach_args *ia = aux;

10
sys/arch/alpha/pci/apecs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: apecs.c,v 1.16 1996/12/05 01:39:34 cgd Exp $ */
/* $NetBSD: apecs.c,v 1.17 1996/12/08 00:22:14 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -48,11 +48,7 @@
#include <alpha/pci/pci_2100_a50.h>
#endif
#ifdef __BROKEN_INDIRECT_CONFIG
int apecsmatch __P((struct device *, void *, void *));
#else
int apecsmatch __P((struct device *, struct cfdata *, void *));
#endif
void apecsattach __P((struct device *, struct device *, void *));
struct cfattach apecs_ca = {
@ -72,11 +68,7 @@ struct apecs_config apecs_configuration;
int
apecsmatch(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct confargs *ca = aux;

10
sys/arch/alpha/pci/cia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cia.c,v 1.15 1996/12/05 01:39:35 cgd Exp $ */
/* $NetBSD: cia.c,v 1.16 1996/12/08 00:22:15 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -51,11 +51,7 @@
#include <alpha/pci/pci_eb164.h>
#endif
#ifdef __BROKEN_INDIRECT_CONFIG
int ciamatch __P((struct device *, void *, void *));
#else
int ciamatch __P((struct device *, struct cfdata *, void *));
#endif
void ciaattach __P((struct device *, struct device *, void *));
struct cfattach cia_ca = {
@ -75,11 +71,7 @@ struct cia_config cia_configuration;
int
ciamatch(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct confargs *ca = aux;

10
sys/arch/alpha/pci/lca.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lca.c,v 1.14 1996/12/05 01:39:35 cgd Exp $ */
/* $NetBSD: lca.c,v 1.15 1996/12/08 00:22:16 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -48,11 +48,7 @@
#include <alpha/pci/pci_axppci_33.h>
#endif
#ifdef __BROKEN_INDIRECT_CONFIG
int lcamatch __P((struct device *, void *, void *));
#else
int lcamatch __P((struct device *, struct cfdata *, void *));
#endif
void lcaattach __P((struct device *, struct device *, void *));
struct cfattach lca_ca = {
@ -72,11 +68,7 @@ struct lca_config lca_configuration;
int
lcamatch(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct confargs *ca = aux;

18
sys/arch/alpha/pci/sio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sio.c,v 1.15 1996/12/05 01:39:36 cgd Exp $ */
/* $NetBSD: sio.c,v 1.16 1996/12/08 00:22:16 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -51,11 +51,7 @@ struct sio_softc {
int sc_haseisa;
};
#ifdef __BROKEN_INDIRECT_CONFIG
int siomatch __P((struct device *, void *, void *));
#else
int siomatch __P((struct device *, struct cfdata *, void *));
#endif
void sioattach __P((struct device *, struct device *, void *));
struct cfattach sio_ca = {
@ -66,11 +62,7 @@ struct cfdriver sio_cd = {
NULL, "sio", DV_DULL,
};
#ifdef __BROKEN_INDIRECT_CONFIG
int pcebmatch __P((struct device *, void *, void *));
#else
int pcebmatch __P((struct device *, struct cfdata *, void *));
#endif
struct cfattach pceb_ca = {
sizeof(struct device), pcebmatch, sioattach,
@ -99,11 +91,7 @@ void sio_bridge_callback __P((void *));
int
siomatch(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct pci_attach_args *pa = aux;
@ -118,11 +106,7 @@ siomatch(parent, match, aux)
int
pcebmatch(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct pci_attach_args *pa = aux;

10
sys/arch/alpha/pci/tga.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tga.c,v 1.13 1996/12/05 01:39:37 cgd Exp $ */
/* $NetBSD: tga.c,v 1.14 1996/12/08 00:22:17 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -54,11 +54,7 @@
#include <machine/autoconf.h>
#include <machine/pte.h>
#ifdef __BROKEN_INDIRECT_CONFIG
int tgamatch __P((struct device *, void *, void *));
#else
int tgamatch __P((struct device *, struct cfdata *, void *));
#endif
void tgaattach __P((struct device *, struct device *, void *));
int tgaprint __P((void *, const char *));
@ -95,11 +91,7 @@ void tga_unblank __P((struct tga_devconfig *));
int
tgamatch(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct pci_attach_args *pa = aux;

10
sys/arch/alpha/pci/vga_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $ */
/* $NetBSD: vga_pci.c,v 1.5 1996/12/08 00:22:18 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -50,11 +50,7 @@ struct vga_pci_softc {
struct vga_config *sc_vc; /* VGA configuration */
};
#ifdef __BROKEN_INDIRECT_CONFIG
int vga_pci_match __P((struct device *, void *, void *));
#else
int vga_pci_match __P((struct device *, struct cfdata *, void *));
#endif
void vga_pci_attach __P((struct device *, struct device *, void *));
struct cfattach vga_pci_ca = {
@ -67,11 +63,7 @@ struct vga_config vga_pci_console_vc;
int
vga_pci_match(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct pci_attach_args *pa = aux;

10
sys/arch/alpha/tc/cfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cfb.c,v 1.7 1996/12/05 01:39:39 cgd Exp $ */
/* $NetBSD: cfb.c,v 1.8 1996/12/08 00:22:19 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -54,11 +54,7 @@
#include <machine/autoconf.h>
#include <machine/pte.h>
#ifdef __BROKEN_INDIRECT_CONFIG
int cfbmatch __P((struct device *, void *, void *));
#else
int cfbmatch __P((struct device *, struct cfdata *, void *));
#endif
void cfbattach __P((struct device *, struct device *, void *));
int cfbprint __P((void *, const char *));
@ -90,11 +86,7 @@ int cfbintr __P((void *));
int
cfbmatch(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct tc_attach_args *ta = aux;

10
sys/arch/alpha/tc/ioasic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ioasic.c,v 1.10 1996/12/05 01:39:41 cgd Exp $ */
/* $NetBSD: ioasic.c,v 1.11 1996/12/08 00:22:20 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -51,11 +51,7 @@ struct ioasic_softc {
};
/* Definition of the driver for autoconfig. */
#ifdef __BROKEN_INDIRECT_CONFIG
int ioasicmatch __P((struct device *, void *, void *));
#else
int ioasicmatch __P((struct device *, struct cfdata *, void *));
#endif
void ioasicattach __P((struct device *, struct device *, void *));
int ioasicprint(void *, const char *);
@ -111,11 +107,7 @@ extern int cputype;
int
ioasicmatch(parent, cfdata, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *cfdata;
#else
struct cfdata *cfdata;
#endif
void *aux;
{
struct tc_attach_args *ta = aux;

10
sys/arch/alpha/tc/mcclock_ioasic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mcclock_ioasic.c,v 1.3 1996/12/05 01:39:42 cgd Exp $ */
/* $NetBSD: mcclock_ioasic.c,v 1.4 1996/12/08 00:22:21 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -50,11 +50,7 @@ struct mcclock_ioasic_softc {
struct mcclock_ioasic_clockdatum *sc_dp;
};
#ifdef __BROKEN_INDIRECT_CONFIG
int mcclock_ioasic_match __P((struct device *, void *, void *));
#else
int mcclock_ioasic_match __P((struct device *, struct cfdata *, void *));
#endif
void mcclock_ioasic_attach __P((struct device *, struct device *, void *));
struct cfattach mcclock_ioasic_ca = {
@ -72,11 +68,7 @@ const struct mcclock_busfns mcclock_ioasic_busfns = {
int
mcclock_ioasic_match(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct ioasicdev_attach_args *d = aux;

18
sys/arch/alpha/tc/scc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scc.c,v 1.28 1996/12/05 01:39:43 cgd Exp $ */
/* $NetBSD: scc.c,v 1.29 1996/12/08 00:22:22 cgd Exp $ */
/*
* Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@ -195,13 +195,8 @@ struct speedtab sccspeedtab[] = {
#endif
/* Definition of the driver for autoconfig. */
#ifdef __BROKEN_INDIRECT_CONFIG
static int sccmatch __P((struct device * parent, void *cfdata,
void *aux));
#else
static int sccmatch __P((struct device * parent, struct cfdata *cf,
void *aux));
#endif
static void sccattach __P((struct device *parent, struct device *self,
void *aux));
struct cfattach scc_ca = {
@ -324,22 +319,11 @@ scc_oconsinit(sc, dev)
* Return true if found.
*/
int
#ifdef __BROKEN_INDIRECT_CONFIG
sccmatch(parent, cfdata, aux)
#else
sccmatch(parent, cf, aux)
#endif
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *cfdata;
#else
struct cfdata *cf;
#endif
void *aux;
{
#ifdef __BROKEN_INDIRECT_CONFIG
struct cfdata *cf = cfdata;
#endif
struct ioasicdev_attach_args *d = aux;
void *sccaddr;

10
sys/arch/alpha/tc/sfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sfb.c,v 1.7 1996/12/05 01:39:44 cgd Exp $ */
/* $NetBSD: sfb.c,v 1.8 1996/12/08 00:22:23 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -54,11 +54,7 @@
#include <machine/autoconf.h>
#include <machine/pte.h>
#ifdef __BROKEN_INDIRECT_CONFIG
int sfbmatch __P((struct device *, void *, void *));
#else
int sfbmatch __P((struct device *, struct cfdata *, void *));
#endif
void sfbattach __P((struct device *, struct device *, void *));
int sfbprint __P((void *, const char *));
@ -93,11 +89,7 @@ void sfb_unblank __P((struct sfb_devconfig *));
int
sfbmatch(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct tc_attach_args *ta = aux;

10
sys/arch/alpha/tc/tcasic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcasic.c,v 1.14 1996/12/05 01:39:45 cgd Exp $ */
/* $NetBSD: tcasic.c,v 1.15 1996/12/08 00:22:23 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -38,11 +38,7 @@
#include <alpha/tc/tc_conf.h>
/* Definition of the driver for autoconfig. */
#ifdef __BROKEN_INDIRECT_CONFIG
int tcasicmatch(struct device *, void *, void *);
#else
int tcasicmatch(struct device *, struct cfdata *, void *);
#endif
void tcasicattach(struct device *, struct device *, void *);
struct cfattach tcasic_ca = {
@ -63,11 +59,7 @@ int tcasicfound;
int
tcasicmatch(parent, cfdata, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *cfdata;
#else
struct cfdata *cfdata;
#endif
void *aux;
{
struct confargs *ca = aux;

10
sys/arch/alpha/tc/tcds.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcds.c,v 1.16 1996/12/05 01:39:45 cgd Exp $ */
/* $NetBSD: tcds.c,v 1.17 1996/12/08 00:22:24 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -55,11 +55,7 @@ struct tcds_softc {
};
/* Definition of the driver for autoconfig. */
#ifdef __BROKEN_INDIRECT_CONFIG
int tcdsmatch __P((struct device *, void *, void *));
#else
int tcdsmatch __P((struct device *, struct cfdata *, void *));
#endif
void tcdsattach __P((struct device *, struct device *, void *));
int tcdsprint(void *, const char *);
@ -77,11 +73,7 @@ struct cfdriver tcds_cd = {
int
tcdsmatch(parent, cfdata, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *cfdata;
#else
struct cfdata *cfdata;
#endif
void *aux;
{
struct tc_attach_args *ta = aux;

17
sys/arch/alpha/wscons/wscons.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wscons.c,v 1.10 1996/12/05 01:39:47 cgd Exp $ */
/* $NetBSD: wscons.c,v 1.11 1996/12/08 00:22:25 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -64,11 +64,7 @@ struct wscons_softc {
wscons_mmap_t sc_mmap;
};
#ifdef __BROKEN_INDIRECT_CONFIG
int wsconsmatch __P((struct device *, void *, void *));
#else
int wsconsmatch __P((struct device *, struct cfdata *, void *));
#endif
void wsconsattach __P((struct device *, struct device *, void *));
struct cfattach wscons_ca = {
@ -113,23 +109,12 @@ int wsconsparam __P((struct tty *, struct termios *));
*/
int
#ifdef __BROKEN_INDIRECT_CONFIG
wsconsmatch(parent, cfdata, aux)
#else
wsconsmatch(parent, cf, aux)
#endif
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *cfdata;
#else
struct cfdata *cf;
#endif
void *aux;
{
struct wscons_attach_args *waa = aux;
#ifdef __BROKEN_INDIRECT_CONFIG
struct cfdata *cf = cfdata;
#endif
if (waa->waa_isconsole && wscons_console_unit != -1)
panic("wsconsmatch: multiple consoles?");

10
sys/dev/dec/mcclock_pad32.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mcclock_pad32.c,v 1.3 1996/12/05 01:39:42 cgd Exp $ */
/* $NetBSD: mcclock_pad32.c,v 1.4 1996/12/08 00:22:21 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -50,11 +50,7 @@ struct mcclock_ioasic_softc {
struct mcclock_ioasic_clockdatum *sc_dp;
};
#ifdef __BROKEN_INDIRECT_CONFIG
int mcclock_ioasic_match __P((struct device *, void *, void *));
#else
int mcclock_ioasic_match __P((struct device *, struct cfdata *, void *));
#endif
void mcclock_ioasic_attach __P((struct device *, struct device *, void *));
struct cfattach mcclock_ioasic_ca = {
@ -72,11 +68,7 @@ const struct mcclock_busfns mcclock_ioasic_busfns = {
int
mcclock_ioasic_match(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct ioasicdev_attach_args *d = aux;

10
sys/dev/dec/mcclock_pad32.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: mcclock_pad32.h,v 1.3 1996/12/05 01:39:42 cgd Exp $ */
/* $NetBSD: mcclock_pad32.h,v 1.4 1996/12/08 00:22:21 cgd Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -50,11 +50,7 @@ struct mcclock_ioasic_softc {
struct mcclock_ioasic_clockdatum *sc_dp;
};
#ifdef __BROKEN_INDIRECT_CONFIG
int mcclock_ioasic_match __P((struct device *, void *, void *));
#else
int mcclock_ioasic_match __P((struct device *, struct cfdata *, void *));
#endif
void mcclock_ioasic_attach __P((struct device *, struct device *, void *));
struct cfattach mcclock_ioasic_ca = {
@ -72,11 +68,7 @@ const struct mcclock_busfns mcclock_ioasic_busfns = {
int
mcclock_ioasic_match(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct ioasicdev_attach_args *d = aux;