[src/trunk]: src/sys/dev/pci - The "eso" device does not need to carry the "m...

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

details:   https://anonhg.NetBSD.org/src/rev/150285de85f6
branches:  trunk
changeset: 378867:150285de85f6
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Apr 26 19:28:24 2021 +0000

description:
- The "eso" device does not need to carry the "midibus" interface attribute.
  It attaches "opl" and "mpu" instances, which themselves attach "midi".
- Be explicit about specifying the "eso" interface attribute when attaching
  "opl", "mpu", and "joy" instances.

diffstat:

 sys/dev/pci/eso.c     |  16 +++++++++++-----
 sys/dev/pci/files.pci |   4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r 2da618b1fede -r 150285de85f6 sys/dev/pci/eso.c
--- a/sys/dev/pci/eso.c Mon Apr 26 19:22:14 2021 +0000
+++ b/sys/dev/pci/eso.c Mon Apr 26 19:28:24 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eso.c,v 1.73 2021/04/24 23:36:57 thorpej Exp $ */
+/*     $NetBSD: eso.c,v 1.74 2021/04/26 19:28:24 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.73 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.74 2021/04/26 19:28:24 thorpej Exp $");
 
 #include "mpu.h"
 
@@ -426,12 +426,16 @@ eso_attach(device_t parent, device_t sel
        aa.type = AUDIODEV_TYPE_OPL;
        aa.hwif = NULL;
        aa.hdl = NULL;
-       (void)config_found(sc->sc_dev, &aa, audioprint, CFARG_EOL);
+       (void)config_found(sc->sc_dev, &aa, audioprint,
+           CFARG_IATTR, "eso",
+           CFARG_EOL);
 
        aa.type = AUDIODEV_TYPE_MPU;
        aa.hwif = NULL;
        aa.hdl = NULL;
-       sc->sc_mpudev = config_found(sc->sc_dev, &aa, audioprint, CFARG_EOL);
+       sc->sc_mpudev = config_found(sc->sc_dev, &aa, audioprint,
+           CFARG_IATTR, "eso",
+           CFARG_EOL);
        if (sc->sc_mpudev != NULL) {
                /* Unmask the MPU irq. */
                mutex_spin_enter(&sc->sc_intr_lock);
@@ -444,7 +448,9 @@ eso_attach(device_t parent, device_t sel
        aa.type = AUDIODEV_TYPE_AUX;
        aa.hwif = NULL;
        aa.hdl = NULL;
-       (void)config_found(sc->sc_dev, &aa, eso_print, CFARG_EOL);
+       (void)config_found(sc->sc_dev, &aa, eso_print,
+           CFARG_IATTR, "eso",
+           CFARG_EOL);
 }
 
 static void
diff -r 2da618b1fede -r 150285de85f6 sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Mon Apr 26 19:22:14 2021 +0000
+++ b/sys/dev/pci/files.pci     Mon Apr 26 19:28:24 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.436 2021/03/09 10:03:18 msaitoh Exp $
+#      $NetBSD: files.pci,v 1.437 2021/04/26 19:28:24 thorpej Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -516,7 +516,7 @@ attach      esa at pci
 file   dev/pci/esa.c                   esa
 
 # ESS Solo-1 PCI AudioDrive
-device eso { }: audiobus, midibus
+device eso { }: audiobus
 attach eso at pci
 file   dev/pci/eso.c                   eso