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

update these so they compile whether or not __BROKEN_INDIRECT_CONFIG 

is defined.
This commit is contained in:
cgd 1996-12-05 01:39:27 +00:00
parent 197d80c63a
commit 8b6a32d1c1
24 changed files with 286 additions and 43 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.15 1996/11/13 23:18:07 cgd Exp $ */ /* $NetBSD: cpu.c,v 1.16 1996/12/05 01:39:27 cgd Exp $ */
/* /*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -35,7 +35,11 @@
#include <machine/rpb.h> #include <machine/rpb.h>
/* Definition of the driver for autoconfig. */ /* Definition of the driver for autoconfig. */
#ifdef __BROKEN_INDIRECT_CONFIG
static int cpumatch(struct device *, void *, void *); 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 *); static void cpuattach(struct device *, struct device *, void *);
struct cfattach cpu_ca = { struct cfattach cpu_ca = {
@ -49,7 +53,11 @@ struct cfdriver cpu_cd = {
static int static int
cpumatch(parent, cfdata, aux) cpumatch(parent, cfdata, aux)
struct device *parent; struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *cfdata; void *cfdata;
#else
struct cfdata *cfdata;
#endif
void *aux; void *aux;
{ {
struct confargs *ca = aux; struct confargs *ca = aux;

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

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

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

@ -1,4 +1,4 @@
/* $NetBSD: mcclock_isa.c,v 1.4 1996/11/23 06:21:43 cgd Exp $ */ /* $NetBSD: mcclock_isa.c,v 1.5 1996/12/05 01:39:29 cgd Exp $ */
/* /*
* Copyright (c) 1995, 1996 Carnegie-Mellon University. * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -46,7 +46,11 @@ struct mcclock_isa_softc {
bus_space_handle_t sc_ioh; bus_space_handle_t sc_ioh;
}; };
#ifdef __BROKEN_INDIRECT_CONFIG
int mcclock_isa_match __P((struct device *, void *, void *)); 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 *)); void mcclock_isa_attach __P((struct device *, struct device *, void *));
struct cfattach mcclock_isa_ca = { struct cfattach mcclock_isa_ca = {
@ -64,7 +68,12 @@ const struct mcclock_busfns mcclock_isa_busfns = {
int int
mcclock_isa_match(parent, match, aux) mcclock_isa_match(parent, match, aux)
struct device *parent; struct device *parent;
void *match, *aux; #ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{ {
struct isa_attach_args *ia = aux; struct isa_attach_args *ia = aux;
bus_space_handle_t ioh; bus_space_handle_t ioh;

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

@ -1,4 +1,4 @@
/* $NetBSD: pckbd.c,v 1.13 1996/11/25 03:26:33 cgd Exp $ */ /* $NetBSD: pckbd.c,v 1.14 1996/12/05 01:39:30 cgd Exp $ */
/*- /*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum. All rights reserved. * Copyright (c) 1993, 1994, 1995 Charles Hannum. All rights reserved.
@ -99,7 +99,11 @@ struct pckbd_softc {
int sc_bellpitch; /* last pitch programmed */ int sc_bellpitch; /* last pitch programmed */
}; };
#ifdef __BROKEN_INDIRECT_CONFIG
int pckbdprobe __P((struct device *, void *, void *)); 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 *)); void pckbdattach __P((struct device *, struct device *, void *));
int pckbdintr __P((void *)); int pckbdintr __P((void *));
@ -297,7 +301,12 @@ kbd_cmd(val, polling)
int int
pckbdprobe(parent, match, aux) pckbdprobe(parent, match, aux)
struct device *parent; struct device *parent;
void *match, *aux; #ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{ {
struct pcppi_attach_args *pa = aux; struct pcppi_attach_args *pa = aux;
u_int i, rv; u_int i, rv;

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

@ -1,4 +1,4 @@
/* $NetBSD: pcppi.c,v 1.2 1996/11/25 03:30:43 cgd Exp $ */ /* $NetBSD: pcppi.c,v 1.3 1996/12/05 01:39:31 cgd Exp $ */
/* /*
* Copyright (c) 1996 Carnegie-Mellon University. * Copyright (c) 1996 Carnegie-Mellon University.
@ -46,7 +46,11 @@ struct pcppi_softc {
bus_space_handle_t sc_pit1_ioh, sc_ppi_ioh; bus_space_handle_t sc_pit1_ioh, sc_ppi_ioh;
}; };
#ifdef __BROKEN_INDIRECT_CONFIG
int pcppi_match __P((struct device *, void *, void *)); 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 *)); void pcppi_attach __P((struct device *, struct device *, void *));
struct cfattach pcppi_ca = { struct cfattach pcppi_ca = {
@ -62,7 +66,12 @@ int pcppiprint __P((void *, const char *));
int int
pcppi_match(parent, match, aux) pcppi_match(parent, match, aux)
struct device *parent; struct device *parent;
void *match, *aux; #ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{ {
struct isa_attach_args *ia = aux; struct isa_attach_args *ia = aux;
bus_space_handle_t ppi_ioh, pit1_ioh; bus_space_handle_t ppi_ioh, pit1_ioh;

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

@ -1,4 +1,4 @@
/* $NetBSD: pms.c,v 1.6 1996/11/25 03:26:38 cgd Exp $ */ /* $NetBSD: pms.c,v 1.7 1996/12/05 01:39:31 cgd Exp $ */
/*- /*-
* Copyright (c) 1994 Charles Hannum. * Copyright (c) 1994 Charles Hannum.
@ -96,7 +96,11 @@ bus_space_tag_t pms_iot;
bus_space_handle_t pms_ioh; bus_space_handle_t pms_ioh;
isa_chipset_tag_t pms_ic; isa_chipset_tag_t pms_ic;
#ifdef __BROKEN_INDIRECT_CONFIG
int pmsprobe __P((struct device *, void *, void *)); 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 *)); void pmsattach __P((struct device *, struct device *, void *));
int pmsintr __P((void *)); int pmsintr __P((void *));
@ -171,7 +175,12 @@ pms_pit_cmd(value)
int int
pmsprobe(parent, match, aux) pmsprobe(parent, match, aux)
struct device *parent; struct device *parent;
void *match, *aux; #ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{ {
struct pcppi_attach_args *pa = aux; struct pcppi_attach_args *pa = aux;
u_char x; u_char x;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

19
sys/arch/alpha/tc/esp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: esp.c,v 1.25 1996/11/27 21:38:35 pk Exp $ */ /* $NetBSD: esp.c,v 1.26 1996/12/05 01:39:40 cgd Exp $ */
#ifdef __sparc__ #ifdef __sparc__
#define SPARC_DRIVER #define SPARC_DRIVER
@ -107,7 +107,11 @@
int esp_debug = 0; /*ESP_SHOWPHASE|ESP_SHOWMISC|ESP_SHOWTRAC|ESP_SHOWCMDS;*/ int esp_debug = 0; /*ESP_SHOWPHASE|ESP_SHOWMISC|ESP_SHOWTRAC|ESP_SHOWCMDS;*/
/*static*/ void espattach __P((struct device *, struct device *, void *)); /*static*/ void espattach __P((struct device *, struct device *, void *));
#ifdef __BROKEN_INDIRECT_CONFIG
/*static*/ int espmatch __P((struct device *, void *, void *)); /*static*/ int espmatch __P((struct device *, void *, void *));
#else
/*static*/ int espmatch __P((struct device *, struct cfdata *, void *));
#endif
/*static*/ u_int esp_adapter_info __P((struct esp_softc *)); /*static*/ u_int esp_adapter_info __P((struct esp_softc *));
/*static*/ void espreadregs __P((struct esp_softc *)); /*static*/ void espreadregs __P((struct esp_softc *));
/*static*/ void esp_select __P((struct esp_softc *, struct esp_ecb *)); /*static*/ void esp_select __P((struct esp_softc *, struct esp_ecb *));
@ -156,12 +160,23 @@ struct scsi_device esp_dev = {
}; };
int int
#ifdef __BROKEN_INDIRECT_CONFIG
espmatch(parent, vcf, aux) espmatch(parent, vcf, aux)
#else
espmatch(parent, cf, aux)
#endif
struct device *parent; struct device *parent;
void *vcf, *aux; #ifdef __BROKEN_INDIRECT_CONFIG
void *vcf;
#else
struct cfdata *cf;
#endif
void *aux;
{ {
#ifdef SPARC_DRIVER #ifdef SPARC_DRIVER
#ifdef __BROKEN_INDIRECT_CONFIG
struct cfdata *cf = vcf; struct cfdata *cf = vcf;
#endif
register struct confargs *ca = aux; register struct confargs *ca = aux;
register struct romaux *ra = &ca->ca_ra; register struct romaux *ra = &ca->ca_ra;

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

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

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

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

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

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

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

@ -1,4 +1,4 @@
/* $NetBSD: sfb.c,v 1.6 1996/11/19 05:23:11 cgd Exp $ */ /* $NetBSD: sfb.c,v 1.7 1996/12/05 01:39:44 cgd Exp $ */
/* /*
* Copyright (c) 1995, 1996 Carnegie-Mellon University. * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -54,7 +54,11 @@
#include <machine/autoconf.h> #include <machine/autoconf.h>
#include <machine/pte.h> #include <machine/pte.h>
#ifdef __BROKEN_INDIRECT_CONFIG
int sfbmatch __P((struct device *, void *, void *)); 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 *)); void sfbattach __P((struct device *, struct device *, void *));
int sfbprint __P((void *, const char *)); int sfbprint __P((void *, const char *));
@ -89,7 +93,12 @@ void sfb_unblank __P((struct sfb_devconfig *));
int int
sfbmatch(parent, match, aux) sfbmatch(parent, match, aux)
struct device *parent; struct device *parent;
void *match, *aux; #ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{ {
struct tc_attach_args *ta = 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.13 1996/11/15 23:59:02 cgd Exp $ */ /* $NetBSD: tcasic.c,v 1.14 1996/12/05 01:39:45 cgd Exp $ */
/* /*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -38,7 +38,11 @@
#include <alpha/tc/tc_conf.h> #include <alpha/tc/tc_conf.h>
/* Definition of the driver for autoconfig. */ /* Definition of the driver for autoconfig. */
#ifdef __BROKEN_INDIRECT_CONFIG
int tcasicmatch(struct device *, void *, void *); int tcasicmatch(struct device *, void *, void *);
#else
int tcasicmatch(struct device *, struct cfdata *, void *);
#endif
void tcasicattach(struct device *, struct device *, void *); void tcasicattach(struct device *, struct device *, void *);
struct cfattach tcasic_ca = { struct cfattach tcasic_ca = {
@ -59,7 +63,11 @@ int tcasicfound;
int int
tcasicmatch(parent, cfdata, aux) tcasicmatch(parent, cfdata, aux)
struct device *parent; struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *cfdata; void *cfdata;
#else
struct cfdata *cfdata;
#endif
void *aux; void *aux;
{ {
struct confargs *ca = aux; struct confargs *ca = aux;

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

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

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

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

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

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

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

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