Module Name: src
Committed By: thorpej
Date: Mon Apr 26 19:28:24 UTC 2021
Modified Files:
src/sys/dev/pci: eso.c files.pci
Log Message:
- 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.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.436 -r1.437 src/sys/dev/pci/files.pci
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/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.73 src/sys/dev/pci/eso.c:1.74
--- src/sys/dev/pci/eso.c:1.73 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/eso.c Mon Apr 26 19:28:24 2021
@@ -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
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.436 src/sys/dev/pci/files.pci:1.437
--- src/sys/dev/pci/files.pci:1.436 Tue Mar 9 10:03:18 2021
+++ src/sys/dev/pci/files.pci Mon Apr 26 19:28:24 2021
@@ -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
