 @@ -1,14 +1,14 @@
-/*	$NetBSD: cmpci.c,v 1.60 2022/05/31 08:43:15 andvar Exp $	*/
+/*	$NetBSD: cmpci.c,v 1.60.4.1 2024/01/14 15:24:06 martin Exp $	*/
 /*
  * Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Takuya SHIOZAKI <tshiozak@NetBSD.org> .
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by ITOH Yasufumi.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -33,27 +33,27 @@
+ *
  */
 /*
  * C-Media CMI8x38 Audio Chip Support.
+ *
  * TODO:
  *   - 4ch / 6ch support.
  *   - Joystick support.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.60 2022/05/31 08:43:15 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.60.4.1 2024/01/14 15:24:06 martin Exp $");
 #if defined(AUDIO_DEBUG) || defined(DEBUG)
 #define DPRINTF(x) if (cmpcidebug) printf x
 int cmpcidebug = 0;
 #else
 #define DPRINTF(x)
 #endif
 #include "mpu.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 @@ -409,36 +409,36 @@ cmpci_attach(device_t parent, device_t s
 		mutex_destroy(&sc->sc_intr_lock);
 		return;
+	}
 	aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", strintr);
 	sc->sc_dmat = pa->pa_dmat;
 	audio_attach_mi(&cmpci_hw_if, sc, sc->sc_dev);
 	/* attach OPL device */
 	aa.type = AUDIODEV_TYPE_OPL;
 	aa.hwif = NULL;
 	aa.hdl = NULL;
-	(void)config_found(sc->sc_dev, &aa, audioprint, CFARGS_NONE);
+	(void)config_found(sc->sc_dev, &aa, audioprint, CFARGS(.iattr = "cmpci"));
 	/* attach MPU-401 device */
 	aa.type = AUDIODEV_TYPE_MPU;
 	aa.hwif = NULL;
 	aa.hdl = NULL;
 	if (bus_space_subregion(sc->sc_iot, sc->sc_ioh,
 	    CMPCI_REG_MPU_BASE, CMPCI_REG_MPU_SIZE, &sc->sc_mpu_ioh) == 0)
 		sc->sc_mpudev = config_found(sc->sc_dev, &aa, audioprint,
-		    CFARGS_NONE);
+		    CFARGS(.iattr = "cmpci"));
 	/* get initial value (this is 0 and may be omitted but just in case) */
 	sc->sc_reg_misc = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
 	    CMPCI_REG_MISC) & ~CMPCI_REG_SPDIF48K;
 	cmpci_mixerreg_write(sc, CMPCI_SB16_MIXER_RESET, 0);
 	cmpci_mixerreg_write(sc, CMPCI_SB16_MIXER_ADCMIX_L, 0);
 	cmpci_mixerreg_write(sc, CMPCI_SB16_MIXER_ADCMIX_R, 0);
 	cmpci_mixerreg_write(sc, CMPCI_SB16_MIXER_OUTMIX,
 	    CMPCI_SB16_SW_CD|CMPCI_SB16_SW_MIC | CMPCI_SB16_SW_LINE);
 	for (i = 0; i < CMPCI_NDEVS; i++) {
 		switch (i) {
 		/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fms.c,v 1.49 2021/08/07 16:19:14 thorpej Exp $	*/
+/*	$NetBSD: fms.c,v 1.49.6.1 2024/01/14 15:24:06 martin Exp $	*/
 /*-
  * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Witold J. Wnuk.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Forte Media FM801 Audio Device Driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.49 2021/08/07 16:19:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.49.6.1 2024/01/14 15:24:06 martin Exp $");
 #include "mpu.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/audioio.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 @@ -315,32 +315,33 @@ fms_attach(device_t parent, device_t sel
 	sc->host_if.reset = fms_reset_codec;
 	if (ac97_attach(&sc->host_if, self, &sc->sc_lock) != 0) {
 		mutex_destroy(&sc->sc_intr_lock);
 		mutex_destroy(&sc->sc_lock);
 		return;
+	}
 	audio_attach_mi(&fms_hw_if, sc, sc->sc_dev);
 	aa.type = AUDIODEV_TYPE_OPL;
 	aa.hwif = NULL;
 	aa.hdl = NULL;
-	config_found(sc->sc_dev, &aa, audioprint, CFARGS_NONE);
+	config_found(sc->sc_dev, &aa, audioprint, CFARGS(.iattr = "fms"));
 	aa.type = AUDIODEV_TYPE_MPU;
 	aa.hwif = NULL;
 	aa.hdl = NULL;
-	sc->sc_mpu_dev = config_found(sc->sc_dev, &aa, audioprint, CFARGS_NONE);
+	sc->sc_mpu_dev = config_found(sc->sc_dev, &aa, audioprint,
 	    CFARGS(.iattr = "fms"));
+}
 /*
  * Each AC-link frame takes 20.8us, data should be ready in next frame,
  * we allow more than two.
  */
 #define TIMO 50
 static int
 fms_read_codec(void *addr, uint8_t reg, uint16_t *val)
+{
 	struct fms_softc *sc;
 	int i;

 @@ -1,14 +1,14 @@
-/*      $NetBSD: sv.c,v 1.61 2021/08/07 16:19:14 thorpej Exp $ */
+/*      $NetBSD: sv.c,v 1.61.6.1 2024/01/14 15:24:06 martin Exp $ */
 /*      $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
 /*
  * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -57,27 +57,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * S3 SonicVibes driver
  *   Heavily based on the eap driver by Lennart Augustsson
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.61 2021/08/07 16:19:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.61.6.1 2024/01/14 15:24:06 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <sys/audioio.h>
 #include <dev/audio/audio_if.h>
 @@ -439,27 +439,27 @@ sv_attach(device_t parent, device_t self
 	reg = sv_read(sc, SV_CODEC_INTMASK);
 	reg &= ~(SV_INTMASK_DMAA | SV_INTMASK_DMAC);
 	reg |= SV_INTMASK_UD | SV_INTMASK_SINT | SV_INTMASK_MIDI;
 	sv_write(sc, SV_CODEC_INTMASK, reg);
 	sv_read(sc, SV_CODEC_STATUS);
 	sv_init_mixer(sc);
 	audio_attach_mi(&sv_hw_if, sc, self);
 	arg.type = AUDIODEV_TYPE_OPL;
 	arg.hwif = 0;
 	arg.hdl = 0;
-	(void)config_found(self, &arg, audioprint, CFARGS_NONE);
+	(void)config_found(self, &arg, audioprint, CFARGS(.iattr = "sv"));
 	sc->sc_pa = *pa;	/* for deferred setup */
 	config_defer(self, sv_defer);
+}
 #ifdef AUDIO_DEBUG
 void
 sv_dumpregs(struct sv_softc *sc)
+{
 	int idx;
 #if 0
 	for (idx = 0; idx < 0x50; idx += 4)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: yds.c,v 1.68 2021/08/07 16:19:14 thorpej Exp $	*/
+/*	$NetBSD: yds.c,v 1.68.6.1 2024/01/14 15:24:06 martin Exp $	*/
 /*
  * Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * Yamaha YMF724[B-F]/740[B-C]/744/754
+ *
  * Documentation links:
  * - ftp://ftp.alsa-project.org/pub/manuals/yamaha/
  * - ftp://ftp.alsa-project.org/pub/manuals/yamaha/pci/
+ *
  * TODO:
  * - FM synth volume (difficult: mixed before ac97)
  * - Digital in/out (SPDIF) support
  * - Effect??
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.68 2021/08/07 16:19:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.68.6.1 2024/01/14 15:24:06 martin Exp $");
 #include "mpu.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
 @@ -582,27 +582,28 @@ yds_configure_legacy(device_t self)
 		if (SELECTABLE) {
 			pci_conf_write(sc->sc_pc, sc->sc_pcitag,
 				       YDS_PCI_LEGACY, reg | (i << (0+16)));
 			delay(100*1000);	/* wait 100ms */
 		} else
 			pci_conf_write(sc->sc_pc, sc->sc_pcitag,
 				       YDS_PCI_FM_BA, opl_addrs[i]);
 		if (bus_space_map(sc->sc_opl_iot,
 				  opl_addrs[i], 4, 0, &sc->sc_opl_ioh) == 0) {
 			struct audio_attach_args aa;
 			aa.type = AUDIODEV_TYPE_OPL;
 			aa.hwif = aa.hdl = NULL;
-			dev = config_found(self, &aa, audioprint, CFARGS_NONE);
+			dev = config_found(self, &aa, audioprint,
 			    CFARGS(.iattr = "yds"));
 			if (dev == 0)
 				bus_space_unmap(sc->sc_opl_iot,
 						sc->sc_opl_ioh, 4);
 			else {
 				if (SELECTABLE)
 					reg |= (i << (0+16));
 				break;
+			}
+		}
+	}
 	if (dev == 0) {
 		reg &= ~YDS_PCI_LEGACY_FMEN;
 		pci_conf_write(sc->sc_pc, sc->sc_pcitag,
 @@ -618,27 +619,28 @@ yds_configure_legacy(device_t self)
 	for (i = 0; i < sizeof(mpu_addrs) / sizeof(bus_addr_t); i++) {
 		if (SELECTABLE)
 			pci_conf_write(sc->sc_pc, sc->sc_pcitag,
 				       YDS_PCI_LEGACY, reg | (i << (4+16)));
 		else
 			pci_conf_write(sc->sc_pc, sc->sc_pcitag,
 				       YDS_PCI_MPU_BA, mpu_addrs[i]);
 		if (bus_space_map(sc->sc_mpu_iot,
 				  mpu_addrs[i], 2, 0, &sc->sc_mpu_ioh) == 0) {
 			struct audio_attach_args aa;
 			aa.type = AUDIODEV_TYPE_MPU;
 			aa.hwif = aa.hdl = NULL;
-			dev = config_found(self, &aa, audioprint, CFARGS_NONE);
+			dev = config_found(self, &aa, audioprint,
 			    CFARGS(.iattr = "yds"));
 			if (dev == 0)
 				bus_space_unmap(sc->sc_mpu_iot,
 						sc->sc_mpu_ioh, 2);
 			else {
 				if (SELECTABLE)
 					reg |= (i << (4+16));
 				break;
+			}
+		}
+	}
 	if (dev == 0) {
 		reg &= ~(YDS_PCI_LEGACY_MEN | YDS_PCI_LEGACY_MIEN);
 		pci_conf_write(sc->sc_pc, sc->sc_pcitag, YDS_PCI_LEGACY, reg);