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

Prototype the probe and attach functions.

This commit is contained in:
mycroft 1996-02-16 08:18:32 +00:00
parent 9cbadb3ec2
commit 19f59bf3c2
4 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/isa/gus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gus.c,v 1.6 1996/02/05 02:22:01 jtc Exp $ */
/* $NetBSD: gus.c,v 1.7 1996/02/16 08:18:37 mycroft Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -342,8 +342,6 @@ int dmarecord_index = 0;
int gusopen __P((dev_t, int));
void gusclose __P((void *));
void gusmax_close __P((void *));
int gusprobe ()/*__P((struct device *, struct device *, void *))*/;
void gusattach __P((struct device *, struct device *, void *));
int gusintr __P((void *));
int gus_set_in_gain __P((caddr_t, u_int, u_char));
int gus_get_in_gain __P((caddr_t));
@ -450,6 +448,9 @@ static void gusics_cd_mute __P((struct ics2101_softc *, int));
* ISA bus driver routines
*/
int gusprobe __P((struct device *, void *, void *));
void gusattach __P((struct device *, struct device *, void *));
struct cfdriver guscd = {
NULL, "gus", gusprobe, gusattach, DV_DULL, sizeof(struct gus_softc)
};
@ -659,11 +660,11 @@ struct audio_device gus_device = {
int
gusprobe(parent, self, aux)
gusprobe(parent, match, aux)
struct device *parent, *self;
void *aux;
void *match, *aux;
{
register struct gus_softc *sc = (void *) self;
register struct gus_softc *sc = match;
register struct isa_attach_args *ia = aux;
struct cfdata *cf = sc->sc_dev.dv_cfdata;
register int iobase = ia->ia_iobase;

17
sys/dev/isa/pas.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pas.c,v 1.11 1995/12/24 02:31:43 mycroft Exp $ */
/* $NetBSD: pas.c,v 1.12 1996/02/16 08:18:34 mycroft Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@ -100,10 +100,6 @@ struct pas_softc {
};
int pasopen __P((dev_t, int));
int pasprobe();
void pasattach();
int pas_getdev __P((void *, struct audio_device *));
@ -250,6 +246,9 @@ pasconf(int model, int sbbase, int sbirq, int sbdrq)
paswrite(P_M_MV508_INPUTMIX | 30, PARALLEL_MIXER);
}
int pasprobe __P((struct device *, void *, void *));
void pasattach __P((struct device *, struct device *, void *));
struct cfdriver pascd = {
NULL, "pas", pasprobe, pasattach, DV_DULL, sizeof(struct pas_softc)
};
@ -262,11 +261,11 @@ struct cfdriver pascd = {
* Probe for the soundblaster hardware.
*/
int
pasprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
pasprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
register struct pas_softc *sc = (void *)self;
register struct pas_softc *sc = match;
register struct isa_attach_args *ia = aux;
register int iobase;
u_char id, t;

16
sys/dev/isa/sb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sb.c,v 1.29 1995/12/24 02:31:49 mycroft Exp $ */
/* $NetBSD: sb.c,v 1.30 1996/02/16 08:18:32 mycroft Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@ -71,7 +71,7 @@ struct sb_softc {
struct sbdsp_softc sc_sbdsp;
};
int sbprobe();
int sbprobe __P((struct device *, void *, void *));
void sbattach __P((struct device *, struct device *, void *));
struct cfdriver sbcd = {
@ -85,10 +85,6 @@ struct audio_device sb_device = {
};
int sbopen __P((dev_t, int));
int sbprobe();
void sbattach();
int sb_getdev __P((void *, struct audio_device *));
/*
@ -143,11 +139,11 @@ struct audio_hw_if sb_hw_if = {
* Probe for the soundblaster hardware.
*/
int
sbprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
sbprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
register struct sbdsp_softc *sc = (void *)self;
register struct sbdsp_softc *sc = match;
register struct isa_attach_args *ia = aux;
register int iobase = ia->ia_iobase;
static u_char drq_conf[4] = {

16
sys/dev/isa/wss.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wss.c,v 1.8 1995/12/24 02:32:03 mycroft Exp $ */
/* $NetBSD: wss.c,v 1.9 1996/02/16 08:18:36 mycroft Exp $ */
/*
* Copyright (c) 1994 John Brezak
@ -101,10 +101,7 @@ struct audio_device wss_device = {
"WSS"
};
int wssprobe();
void wssattach();
int wssopen __P((dev_t, int));
int wss_getdev __P((void *, struct audio_device *));
int wss_setfd __P((void *, int));
@ -164,6 +161,9 @@ struct audio_hw_if wss_hw_if = {
#define at_dma(flags, ptr, cc, chan) isa_dmastart(flags, ptr, cc, chan)
#endif
int wssprobe __P((struct device *, void *, void *));
void wssattach __P((struct device *, struct device *, void *));
struct cfdriver wsscd = {
NULL, "wss", wssprobe, wssattach, DV_DULL, sizeof(struct wss_softc)
};
@ -172,11 +172,11 @@ struct cfdriver wsscd = {
* Probe for the Microsoft Sound System hardware.
*/
int
wssprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
wssprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
register struct wss_softc *sc = (void *)self;
register struct wss_softc *sc = match;
register struct isa_attach_args *ia = aux;
register int iobase = ia->ia_iobase;
static u_char interrupt_bits[12] = {