Make this compile on alpha and, presumably, other non

_BROKEN_INDIRECT_CONFIG machines.
This commit is contained in:
cjs 1997-10-03 07:32:50 +00:00
parent 7d508b124f
commit 432b9f1831
2 changed files with 20 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ast.c,v 1.37 1997/09/12 13:31:10 drochner Exp $ */
/* $NetBSD: ast.c,v 1.38 1997/10/03 07:32:50 cjs Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -60,7 +60,11 @@ struct ast_softc {
bus_space_handle_t sc_slaveioh[NSLAVES];
};
#ifdef __BROKEN_INDIRECT_CONFIG
int astprobe __P((struct device *, void *, void *));
#else
int astprobe __P((struct device *, struct cfdata *, void *));
#endif
void astattach __P((struct device *, struct device *, void *));
int astintr __P((void *));
int astprint __P((void *, const char *));
@ -76,7 +80,11 @@ struct cfdriver ast_cd = {
int
astprobe(parent, self, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *self;
#else
struct cfdata *self;
#endif
void *aux;
{
struct isa_attach_args *ia = aux;

View File

@ -1,4 +1,4 @@
/* $NetBSD: com_multi.c,v 1.6 1997/09/16 20:34:28 is Exp $ */
/* $NetBSD: com_multi.c,v 1.7 1997/10/03 07:32:52 cjs Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1996
@ -63,7 +63,11 @@
#include <dev/isa/comvar.h>
#include <dev/isa/com_multi.h>
#ifdef __BROKEN_INDIRECT_CONFIG
int com_multi_probe __P((struct device *, void *, void *));
#else
int com_multi_probe __P((struct device *, struct cfdata *, void *));
#endif
void com_multi_attach __P((struct device *, struct device *, void *));
struct cfattach com_multi_ca = {
@ -73,7 +77,12 @@ struct cfattach com_multi_ca = {
int
com_multi_probe(parent, match, aux)
struct device *parent;
void *match, *aux;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match;
#endif
void *aux;
{
int iobase;
struct cfdata *cf = match;