summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2021-04-26 19:28:24 +0000
committerthorpej <thorpej@NetBSD.org>2021-04-26 19:28:24 +0000
commite49feb7034c297d2ba97c5437c3efe97728e88ca (patch)
treeb4650a41971a43fb5421309a3d8b1884a4c4294d /sys/dev
parent05e1ba1e27664ece0732ebabb59521f177da18d2 (diff)
- 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 (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/eso.c16
-rw-r--r--sys/dev/pci/files.pci4
2 files changed, 13 insertions, 7 deletions
diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index 7e40217e735..87927431cab 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -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 self, void *aux)
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 self, void *aux)
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 --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 3d3a50724ce..e819a38eefd 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -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