Module Name: src
Committed By: thorpej
Date: Mon Apr 26 19:10:38 UTC 2021
Modified Files:
src/sys/dev/isa: ess.c files.isa
Log Message:
- The "ess" device does not need a "midibus" interface attribute; it
attaches an "opl" instance which itself attaches the "midi".
- Be explicit about using the "ess" interface attribute when attaching
the "joy" and "opl" instances.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/isa/ess.c
cvs rdiff -u -r1.176 -r1.177 src/sys/dev/isa/files.isa
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/ess.c
diff -u src/sys/dev/isa/ess.c:1.87 src/sys/dev/isa/ess.c:1.88
--- src/sys/dev/isa/ess.c:1.87 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/isa/ess.c Mon Apr 26 19:10:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ess.c,v 1.87 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: ess.c,v 1.88 2021/04/26 19:10:38 thorpej Exp $ */
/*
* Copyright 1997
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.87 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.88 2021/04/26 19:10:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1045,7 +1045,9 @@ skip:
arg.type = AUDIODEV_TYPE_OPL;
arg.hwif = 0;
arg.hdl = 0;
- (void)config_found(sc->sc_dev, &arg, audioprint, CFARG_EOL);
+ (void)config_found(sc->sc_dev, &arg, audioprint,
+ CFARG_IATTR, "ess",
+ CFARG_EOL);
#if NJOY_ESS > 0
if (sc->sc_model == ESS_1888 && enablejoy) {
@@ -1056,7 +1058,9 @@ skip:
ess_write_mix_reg(sc, 0x40, m40);
arg.type = AUDIODEV_TYPE_AUX;
- (void)config_found(sc->sc_dev, &arg, audioprint, CFARG_EOL);
+ (void)config_found(sc->sc_dev, &arg, audioprint,
+ CFARG_IATTR, "ess",
+ CFARG_EOL);
}
#endif
Index: src/sys/dev/isa/files.isa
diff -u src/sys/dev/isa/files.isa:1.176 src/sys/dev/isa/files.isa:1.177
--- src/sys/dev/isa/files.isa:1.176 Sat May 23 13:48:08 2020
+++ src/sys/dev/isa/files.isa Mon Apr 26 19:10:38 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.176 2020/05/23 13:48:08 jmcneill Exp $
+# $NetBSD: files.isa,v 1.177 2021/04/26 19:10:38 thorpej Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -318,7 +318,7 @@ attach opl at wss with opl_wss
file dev/isa/opl_wss.c opl_wss
# ESS Technology ES1887/ES888/ES1888
-device ess { } : audiobus, isadma, midibus
+device ess { }: audiobus, isadma
file dev/isa/ess.c ess needs-flag
attach ess at isa with ess_isa
