From 71a93464d5d445ed2e88880ed517e3914244b32d Mon Sep 17 00:00:00 2001 From: dfr Date: Tue, 4 May 1999 21:18:20 +0000 Subject: [PATCH] Use unit, not device_id as an argument to an old-style ISA interrupt handler. This fixes pnp interrupts and would have fixed pccard interrupts but a workaround has been applied there. This the sound driver problems which people have reported with new-bus. --- sys/amd64/isa/intr_machdep.c | 6 +++--- sys/amd64/isa/nmi.c | 6 +++--- sys/i386/isa/intr_machdep.c | 6 +++--- sys/i386/isa/nmi.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c index 6eb9a7967cdf..cfb6b54b3240 100644 --- a/sys/amd64/isa/intr_machdep.c +++ b/sys/amd64/isa/intr_machdep.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: intr_machdep.c,v 1.19 1999/04/21 07:26:27 peter Exp $ + * $Id: intr_machdep.c,v 1.20 1999/04/23 21:01:19 peter Exp $ */ /* * This file contains an aggregated module marked: @@ -521,7 +521,7 @@ icu_unset(intr, handler) * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: intr_machdep.c,v 1.19 1999/04/21 07:26:27 peter Exp $ + * $Id: intr_machdep.c,v 1.20 1999/04/23 21:01:19 peter Exp $ * */ @@ -868,7 +868,7 @@ register_intr(int intr, int device_id, u_int flags, if (irec == NULL) return NULL; bzero(irec, sizeof *irec); - irec->id_unit = device_id; + irec->id_unit = unit; irec->id_handler = handler; flags |= INTR_EXCL; diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c index 6eb9a7967cdf..cfb6b54b3240 100644 --- a/sys/amd64/isa/nmi.c +++ b/sys/amd64/isa/nmi.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: intr_machdep.c,v 1.19 1999/04/21 07:26:27 peter Exp $ + * $Id: intr_machdep.c,v 1.20 1999/04/23 21:01:19 peter Exp $ */ /* * This file contains an aggregated module marked: @@ -521,7 +521,7 @@ icu_unset(intr, handler) * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: intr_machdep.c,v 1.19 1999/04/21 07:26:27 peter Exp $ + * $Id: intr_machdep.c,v 1.20 1999/04/23 21:01:19 peter Exp $ * */ @@ -868,7 +868,7 @@ register_intr(int intr, int device_id, u_int flags, if (irec == NULL) return NULL; bzero(irec, sizeof *irec); - irec->id_unit = device_id; + irec->id_unit = unit; irec->id_handler = handler; flags |= INTR_EXCL; diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c index 6eb9a7967cdf..cfb6b54b3240 100644 --- a/sys/i386/isa/intr_machdep.c +++ b/sys/i386/isa/intr_machdep.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: intr_machdep.c,v 1.19 1999/04/21 07:26:27 peter Exp $ + * $Id: intr_machdep.c,v 1.20 1999/04/23 21:01:19 peter Exp $ */ /* * This file contains an aggregated module marked: @@ -521,7 +521,7 @@ icu_unset(intr, handler) * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: intr_machdep.c,v 1.19 1999/04/21 07:26:27 peter Exp $ + * $Id: intr_machdep.c,v 1.20 1999/04/23 21:01:19 peter Exp $ * */ @@ -868,7 +868,7 @@ register_intr(int intr, int device_id, u_int flags, if (irec == NULL) return NULL; bzero(irec, sizeof *irec); - irec->id_unit = device_id; + irec->id_unit = unit; irec->id_handler = handler; flags |= INTR_EXCL; diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c index 6eb9a7967cdf..cfb6b54b3240 100644 --- a/sys/i386/isa/nmi.c +++ b/sys/i386/isa/nmi.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: intr_machdep.c,v 1.19 1999/04/21 07:26:27 peter Exp $ + * $Id: intr_machdep.c,v 1.20 1999/04/23 21:01:19 peter Exp $ */ /* * This file contains an aggregated module marked: @@ -521,7 +521,7 @@ icu_unset(intr, handler) * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: intr_machdep.c,v 1.19 1999/04/21 07:26:27 peter Exp $ + * $Id: intr_machdep.c,v 1.20 1999/04/23 21:01:19 peter Exp $ * */ @@ -868,7 +868,7 @@ register_intr(int intr, int device_id, u_int flags, if (irec == NULL) return NULL; bzero(irec, sizeof *irec); - irec->id_unit = device_id; + irec->id_unit = unit; irec->id_handler = handler; flags |= INTR_EXCL;