[src/trunk]: src/sys/dev/isa - The "ess" device does not need a "midibus" int...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/62549614918c
branches:  trunk
changeset: 982802:62549614918c
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Apr 26 19:10:38 2021 +0000

description:
- 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.

diffstat:

 sys/dev/isa/ess.c     |  12 ++++++++----
 sys/dev/isa/files.isa |   4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 320a8de108d5 -r 62549614918c sys/dev/isa/ess.c
--- a/sys/dev/isa/ess.c Mon Apr 26 18:06:09 2021 +0000
+++ b/sys/dev/isa/ess.c Mon Apr 26 19:10:38 2021 +0000
@@ -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 @@
        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 @@
                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
 
diff -r 320a8de108d5 -r 62549614918c sys/dev/isa/files.isa
--- a/sys/dev/isa/files.isa     Mon Apr 26 18:06:09 2021 +0000
+++ b/sys/dev/isa/files.isa     Mon Apr 26 19:10:38 2021 +0000
@@ -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 @@
 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