From 5b00b99befdb39c9cd3745ea022c972d5ea4bb8a Mon Sep 17 00:00:00 2001 From: mycroft Date: Fri, 19 Mar 1999 12:40:21 +0000 Subject: Allow DRQ[A-C] to be used on the 1888 as well. --- sys/dev/isa/ess.c | 4 ++-- sys/dev/isa/essreg.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c index ae31abd0b1c..30dba076900 100644 --- a/sys/dev/isa/ess.c +++ b/sys/dev/isa/ess.c @@ -1,4 +1,4 @@ -/* $NetBSD: ess.c,v 1.43 1999/03/18 06:04:21 mycroft Exp $ */ +/* $NetBSD: ess.c,v 1.44 1999/03/19 12:40:21 mycroft Exp $ */ /* * Copyright 1997 @@ -786,7 +786,7 @@ essmatch(sc) if (!isa_drq_isfree(sc->sc_ic, sc->sc_audio1.drq)) return (0); if (sc->sc_model != ESS_1788) { - if (!ESS_DRQ2_VALID(sc->sc_audio2.drq, sc->sc_model)) { + if (!ESS_DRQ2_VALID(sc->sc_audio2.drq)) { printf("ess: play drq %d invalid\n", sc->sc_audio2.drq); return (0); } diff --git a/sys/dev/isa/essreg.h b/sys/dev/isa/essreg.h index 9d30ae572f6..16880953476 100644 --- a/sys/dev/isa/essreg.h +++ b/sys/dev/isa/essreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: essreg.h,v 1.10 1999/03/18 07:11:21 mycroft Exp $ */ +/* $NetBSD: essreg.h,v 1.11 1999/03/19 12:40:21 mycroft Exp $ */ /* * Copyright 1997 * Digital Equipment Corporation. All rights reserved. @@ -33,7 +33,7 @@ */ /* -** @(#) $RCSfile: essreg.h,v $ $Revision: 1.10 $ (SHARK) $Date: 1999/03/18 07:11:21 $ +** @(#) $RCSfile: essreg.h,v $ $Revision: 1.11 $ (SHARK) $Date: 1999/03/19 12:40:21 $ ** **++ ** @@ -172,7 +172,7 @@ #define ESS_DRQ1_VALID(chan) ((chan) == 0 || (chan) == 1 || (chan) == 3) -#define ESS_DRQ2_VALID(chan, model) (((model) != ESS_1887) ? ((chan) == 5) : ((chan) == 0 || (chan) == 1 || (chan) == 3 || (chan) == 5)) +#define ESS_DRQ2_VALID(chan) ((chan) == 0 || (chan) == 1 || (chan) == 3 || (chan) == 5) #define ESS_BASE_VALID(base) ((base) == 0x220 || (base) == 0x230 || (base) == 0x240 || (base) == 0x250) -- cgit