 @@ -1,14 +1,14 @@
-/*	$NetBSD: sb_isapnp.c,v 1.53 2019/05/08 13:40:18 isaki Exp $	*/
+/*	$NetBSD: sb_isapnp.c,v 1.53.28.1 2023/08/01 14:57:27 martin Exp $	*/
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
  * 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.
 @@ -25,27 +25,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 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.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.53 2019/05/08 13:40:18 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.53.28.1 2023/08/01 14:57:27 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
 #include <sys/audioio.h>
 #include <dev/audio/audio_if.h>
 @@ -148,20 +148,23 @@ sb_isapnp_attach(device_t parent, device
 		sc->sc_hasmpu = SBMPU_NONE;
 	else if (ipa->ipa_nio > 1) {
 		sc->sc_hasmpu = SBMPU_EXTERNAL;
 		sc->sc_mpu_iot = ipa->ipa_iot;
 		sc->sc_mpu_ioh = ipa->ipa_io[1].h;
+	}
 #endif
 	if (!sbmatch(sc, 0, device_cfdata(self))) {
 		aprint_error_dev(self, "sbmatch failed\n");
 		return;
+	}
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
 	sc->sc_ih = isa_intr_establish(ipa->ipa_ic, ipa->ipa_irq[0].num,
 	    ipa->ipa_irq[0].type, IPL_AUDIO, sbdsp_intr, sc);
 	aprint_normal_dev(self, "%s %s", ipa->ipa_devident, ipa->ipa_devclass);
 	sbattach(sc);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sb_ofisa.c,v 1.23 2021/01/27 03:10:21 thorpej Exp $	*/
+/*	$NetBSD: sb_ofisa.c,v 1.23.18.1 2023/08/01 14:57:27 martin Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.23 2021/01/27 03:10:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.23.18.1 2023/08/01 14:57:27 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <sys/audioio.h>
 #include <dev/audio/audio_if.h>
 #include <dev/midi_if.h>
 #include <dev/ofw/openfirm.h>
 @@ -160,20 +160,23 @@ sb_ofisa_attach(device_t parent, device_
+		}
+	}
 	if (sc->sc_drq8 == DRQUNK) {
 		aprint_error(": no 8-bit DMA channel\n");
 		return;
+	}
 	if (sbmatch(sc) == 0) {
 		aprint_error(": sbmatch failed\n");
 		return;
+	}
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
 	sc->sc_ih = isa_intr_establish(aa->ic, intr.irq, IST_EDGE, IPL_AUDIO,
 	    sbdsp_intr, sc);
 	ofisa_print_model(self, aa->oba.oba_phandle);
 	sbattach(sc);
+}