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

make it compile without "__BROKEN_INDIRECT_CONFIG"

Browse Source
This commit is contained in:
drochner 1997-11-30 15:13:30 +00:00
parent 5be326ee70
commit 8e7686a76b
4 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/isapnp/com_isapnp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_isapnp.c,v 1.8 1997/10/28 21:27:55 christos Exp $ */
/* $NetBSD: com_isapnp.c,v 1.9 1997/11/30 15:13:30 drochner Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -62,7 +62,11 @@ struct com_isapnp_softc {
void *sc_ih; /* interrupt handler */
};
#ifdef __BROKEN_INDIRECT_CONFIG
int com_isapnp_match __P((struct device *, void *, void *));
#else
int com_isapnp_match __P((struct device *, struct cfdata *, void *));
#endif
void com_isapnp_attach __P((struct device *, struct device *, void *));
struct cfattach com_isapnp_ca = {
@ -72,7 +76,12 @@ struct cfattach com_isapnp_ca = {
int
com_isapnp_match(parent, match, aux)
struct device *parent;
void *match, *aux;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct isapnp_attach_args *ipa = aux;

13
sys/dev/isapnp/gus_isapnp.c
View File

@ -1,7 +1,7 @@
#include "guspnp.h"
#if NGUSPNP > 0
/* $NetBSD: gus_isapnp.c,v 1.4 1997/11/19 14:19:59 augustss Exp $ */
/* $NetBSD: gus_isapnp.c,v 1.5 1997/11/30 15:13:31 drochner Exp $ */
/*
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -70,7 +70,11 @@
#include <dev/ic/interwavereg.h>
#ifdef __BROKEN_INDIRECT_CONFIG
int gus_isapnp_match __P((struct device *, void *, void *));
#else
int gus_isapnp_match __P((struct device *, struct cfdata *, void *));
#endif
void gus_isapnp_attach __P((struct device *, struct device *, void *));
static int gus_isapnp_open __P((void *, int));
@ -133,7 +137,12 @@ static int gus_0 = 0; /* XXX what's this */
int
gus_isapnp_match(parent, match, aux)
struct device *parent;
void *match, *aux;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct isapnp_attach_args *ipa = aux;

9
sys/dev/isapnp/isapnp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isapnp.c,v 1.12 1997/10/28 21:28:10 christos Exp $ */
/* $NetBSD: isapnp.c,v 1.13 1997/11/30 15:13:31 drochner Exp $ */
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
@ -64,7 +64,11 @@ static void isapnp_configure __P((struct isapnp_softc *,
static void isapnp_print_pin __P((const char *, struct isapnp_pin *, size_t));
static int isapnp_print __P((void *, const char *));
#ifdef _KERNEL
#ifdef __BROKEN_INDIRECT_CONFIG
static int isapnp_submatch __P((struct device *, void *, void *));
#else
static int isapnp_submatch __P((struct device *, struct cfdata *, void *));
#endif
#endif
static int isapnp_find __P((struct isapnp_softc *, int));
#ifdef __BROKEN_INDIRECT_CONFIG
@ -568,7 +572,8 @@ isapnp_print(aux, str)
static int
isapnp_submatch(parent, match, aux)
struct device *parent;
void *match, *aux;
struct cfdata *match;
void *aux;
{
struct cfdata *cf = match;
return ((*cf->cf_attach->ca_match)(parent, match, aux));

13
sys/dev/isapnp/sb_isapnp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sb_isapnp.c,v 1.16 1997/11/20 08:53:39 augustss Exp $ */
/* $NetBSD: sb_isapnp.c,v 1.17 1997/11/30 15:13:32 drochner Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@ -58,7 +58,11 @@
#include <dev/isa/sbvar.h>
#include <dev/isa/sbdspvar.h>
#ifdef __BROKEN_INDIRECT_CONFIG
int sb_isapnp_match __P((struct device *, void *, void *));
#else
int sb_isapnp_match __P((struct device *, struct cfdata *, void *));
#endif
void sb_isapnp_attach __P((struct device *, struct device *, void *));
struct cfattach sb_isapnp_ca = {
@ -76,7 +80,12 @@ struct cfattach sb_isapnp_ca = {
int
sb_isapnp_match(parent, match, aux)
struct device *parent;
void *match, *aux;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
struct isapnp_attach_args *ipa = aux;