diff --git a/sys/dev/ic/i82586.c b/sys/dev/ic/i82586.c index 6cc00d881c99..baa6e4aa3b41 100644 --- a/sys/dev/ic/i82586.c +++ b/sys/dev/ic/i82586.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82586.c,v 1.35 2001/03/10 19:59:13 jdolecek Exp $ */ +/* $NetBSD: i82586.c,v 1.36 2001/03/10 20:04:30 jdolecek Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -147,7 +147,7 @@ Mode of operation: #include -__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.35 2001/03/10 19:59:13 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.36 2001/03/10 20:04:30 jdolecek Exp $"); #include #include @@ -359,7 +359,7 @@ i82586_start_cmd(sc, cmd, iecmdbuf, mask, async) off = IE_SCB_CMD(sc->scb); sc->ie_bus_write16(sc, off, cmd); IE_BUS_BARRIER(sc, off, 2, BUS_SPACE_BARRIER_WRITE); - (sc->chan_attn)(sc); + (sc->chan_attn)(sc, CARD_RESET); if (async != 0) { sc->async_cmd_inprogress = 1; @@ -1266,7 +1266,7 @@ i82586_proberam(sc) if (sc->hwreset) (sc->hwreset)(sc, CHIP_PROBE); - (sc->chan_attn) (sc); + (sc->chan_attn) (sc, CHIP_PROBE); delay(100); /* wait a while... */ diff --git a/sys/dev/ic/i82586var.h b/sys/dev/ic/i82586var.h index 79dc6752b8e2..f04dfa627188 100644 --- a/sys/dev/ic/i82586var.h +++ b/sys/dev/ic/i82586var.h @@ -1,4 +1,4 @@ -/* $NetBSD: i82586var.h,v 1.15 2001/01/22 22:28:45 bjh21 Exp $ */ +/* $NetBSD: i82586var.h,v 1.16 2001/03/10 20:04:30 jdolecek Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -192,7 +192,7 @@ struct ie_softc { /* Bus glue */ void (*hwreset) __P((struct ie_softc *, int)); void (*hwinit) __P((struct ie_softc *)); - void (*chan_attn) __P((struct ie_softc *)); + void (*chan_attn) __P((struct ie_softc *, int)); int (*intrhook) __P((struct ie_softc *, int where)); void (*memcopyin) __P((struct ie_softc *, void *, int, size_t)); diff --git a/sys/dev/isa/if_ai.c b/sys/dev/isa/if_ai.c index 3d50e8363455..e38e049871a7 100644 --- a/sys/dev/isa/if_ai.c +++ b/sys/dev/isa/if_ai.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ai.c,v 1.9 2001/01/22 22:28:46 bjh21 Exp $ */ +/* $NetBSD: if_ai.c,v 1.10 2001/03/10 20:04:30 jdolecek Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -87,7 +87,7 @@ const char *ai_names[] = { /* Functions required by the i82586 MI driver */ static void ai_reset __P((struct ie_softc *, int)); -static void ai_atten __P((struct ie_softc *)); +static void ai_atten __P((struct ie_softc *, int)); static void ai_copyin __P((struct ie_softc *, void *, int, size_t)); static void ai_copyout __P((struct ie_softc *, const void *, int, size_t)); @@ -132,8 +132,9 @@ ai_reset(sc, why) } static void -ai_atten(sc) +ai_atten(sc, why) struct ie_softc *sc; + int why; { struct ai_softc* asc = (struct ai_softc *) sc; bus_space_write_1(asc->sc_regt, asc->sc_regh, AI_ATTN, 0); diff --git a/sys/dev/isa/if_ef.c b/sys/dev/isa/if_ef.c index 24f8dea688e6..f67146c2ba03 100644 --- a/sys/dev/isa/if_ef.c +++ b/sys/dev/isa/if_ef.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ef.c,v 1.8 2001/01/22 22:28:46 bjh21 Exp $ */ +/* $NetBSD: if_ef.c,v 1.9 2001/03/10 20:04:30 jdolecek Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -94,7 +94,7 @@ int eftp_media[] = { /* Routines required by the MI i82586 driver API */ static void ef_reset __P((struct ie_softc *, int)); static void ef_hwinit __P((struct ie_softc *)); -static void ef_atten __P((struct ie_softc *)); +static void ef_atten __P((struct ie_softc *, int)); static int ef_intrhook __P((struct ie_softc *, int)); static void ef_copyin __P((struct ie_softc *, void *, int, size_t)); @@ -197,8 +197,9 @@ ef_reset(sc, why) } static void -ef_atten(sc) +ef_atten(sc, why) struct ie_softc *sc; + int why; { struct ef_softc* esc = (struct ef_softc *) sc; bus_space_write_1(esc->sc_regt, esc->sc_regh, EF_ATTN, 1); diff --git a/sys/dev/isa/if_ix.c b/sys/dev/isa/if_ix.c index 337c1257734b..8c37d86c4902 100644 --- a/sys/dev/isa/if_ix.c +++ b/sys/dev/isa/if_ix.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ix.c,v 1.8 2001/01/22 22:28:46 bjh21 Exp $ */ +/* $NetBSD: if_ix.c,v 1.9 2001/03/10 20:04:30 jdolecek Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -86,7 +86,7 @@ struct ix_softc { }; static void ix_reset __P((struct ie_softc *, int)); -static void ix_atten __P((struct ie_softc *)); +static void ix_atten __P((struct ie_softc *, int)); static int ix_intrhook __P((struct ie_softc *, int)); static void ix_copyin __P((struct ie_softc *, void *, int, size_t)); @@ -134,8 +134,9 @@ ix_reset(sc, why) } static void -ix_atten(sc) +ix_atten(sc, why) struct ie_softc *sc; + int why; { struct ix_softc* isc = (struct ix_softc *) sc; bus_space_write_1(isc->sc_regt, isc->sc_regh, IX_ATTN, 0);