Module Name: src
Committed By: isaki
Date: Sat Feb 6 07:16:18 UTC 2021
Modified Files:
src/sys/dev/isa: gus.c
Log Message:
Calling halt_{input,output} is done by the MI audio layer if necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/isa/gus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/isa/gus.c
diff -u src/sys/dev/isa/gus.c:1.118 src/sys/dev/isa/gus.c:1.119
--- src/sys/dev/isa/gus.c:1.118 Sat Feb 29 05:51:11 2020
+++ src/sys/dev/isa/gus.c Sat Feb 6 07:16:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.118 2020/02/29 05:51:11 isaki Exp $ */
+/* $NetBSD: gus.c,v 1.119 2021/02/06 07:16:18 isaki Exp $ */
/*-
* Copyright (c) 1996, 1999, 2008 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.118 2020/02/29 05:51:11 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.119 2021/02/06 07:16:18 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1359,14 +1359,10 @@ gusclose(void *addr)
sc = addr;
DPRINTF(("gus_close: sc=%p\n", sc));
+ KASSERT((sc->sc_flags & (GUS_DMAOUT_ACTIVE | GUS_LOCKED)) == 0);
+ KASSERT((sc->sc_flags & GUS_DMAIN_ACTIVE) == 0);
-/* if (sc->sc_flags & GUS_DMAOUT_ACTIVE) */ {
- gus_halt_out_dma(sc);
- }
-/* if (sc->sc_flags & GUS_DMAIN_ACTIVE) */ {
- gus_halt_in_dma(sc);
- }
- sc->sc_flags &= ~(GUS_OPEN|GUS_LOCKED|GUS_DMAOUT_ACTIVE|GUS_DMAIN_ACTIVE);
+ sc->sc_flags &= ~GUS_OPEN;
/* turn off speaker, etc. */
