 @@ -1,14 +1,14 @@
-/*	$NetBSD: isa.c,v 1.138.76.3 2021/03/22 16:23:45 thorpej Exp $	*/
+/*	$NetBSD: isa.c,v 1.138.76.4 2021/03/28 20:34:44 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998, 2001, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum; by Jason R. Thorpe of Wasabi Systems, Inc.
+ *
  * 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.
 @@ -20,27 +20,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: isa.c,v 1.138.76.3 2021/03/22 16:23:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.138.76.4 2021/03/28 20:34:44 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
 #include <dev/isa/isadmareg.h>
 @@ -76,29 +76,33 @@ int
 isamatch(device_t parent, cfdata_t cf, void *aux)
+{
 	/* XXX check other indicators */
 	return (1);
+}
 void
 isaattach(device_t parent, device_t self, void *aux)
+{
 	struct isa_softc *sc = device_private(self);
 	struct isabus_attach_args *iba = aux;
 	static const int wildcard[ISACF_NLOCS] = {
-		ISACF_PORT_DEFAULT, ISACF_SIZE_DEFAULT,
+		[ISACF_PORT]  = ISACF_PORT_DEFAULT,
-		ISACF_IOMEM_DEFAULT, ISACF_IOSIZ_DEFAULT,
+		[ISACF_SIZE]  = ISACF_SIZE_DEFAULT,
-		ISACF_IRQ_DEFAULT, ISACF_DRQ_DEFAULT, ISACF_DRQ2_DEFAULT
+		[ISACF_IOMEM] = ISACF_IOMEM_DEFAULT,
 		[ISACF_IOSIZ] = ISACF_IOSIZ_DEFAULT,
 		[ISACF_IRQ]   = ISACF_IRQ_DEFAULT,
 		[ISACF_DRQ]   = ISACF_DRQ_DEFAULT,
 		[ISACF_DRQ2]  = ISACF_DRQ2_DEFAULT,
 	};
 	TAILQ_INIT(&sc->sc_knowndevs);
 	sc->sc_dynamicdevs = 0;
 	sc->sc_dev = self;
 	isa_attach_hook(parent, self, iba);
 	aprint_naive("\n");
 	aprint_normal("\n");
 	/* XXX Add code to fetch known-devices. */
 @@ -122,27 +126,27 @@ isaattach(device_t parent, device_t self
 #endif
 	/* Attach all direct-config children. */
 	isa_attach_knowndevs(sc);
 	/*
 	 * If we don't support dynamic hello/goodbye of devices,
 	 * then free the knowndevs info now.
 	 */
 	if (sc->sc_dynamicdevs == 0)
 		isa_free_knowndevs(sc);
 	/* Attach all indirect-config children. */
-	isarescan(self, "isa", wildcard);
+	isarescan(self, NULL, wildcard);
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}
 int
 isadetach(device_t self, int flags)
+{
 	struct isa_softc *sc = device_private(self);
 	int rc;
 	if ((rc = config_detach_children(self, flags)) != 0)
 		return rc;
 @@ -178,27 +182,26 @@ isarescan(device_t self, const char *ifa
 	/*
 	 * XXX Bus independent code calling this function does not
 	 * know the locator default values. It assumes "-1" for now.
 	 * (should be made available by "config" one day)
 	 * So fixup where the "-1" is not correct.
 	 */
 	if (locs[ISACF_SIZE] == -1)
 		locs[ISACF_SIZE] = ISACF_SIZE_DEFAULT;
 	if (locs[ISACF_IOSIZ] == -1)
 		locs[ISACF_IOSIZ] = ISACF_IOSIZ_DEFAULT;
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, isasearch,
 	    CFARG_IATTR, ifattr,
 	    CFARG_LOCATORS, locs,
 	    CFARG_EOL);
 	return (0);
+}
 void
 isachilddetached(device_t self, device_t child)
+{
 	struct isa_knowndev *ik;
 	struct isa_softc *sc = device_private(self);
 	TAILQ_FOREACH(ik, &sc->sc_knowndevs, ik_list) {
 		if (ik->ik_claimed == child)