 @@ -1,14 +1,14 @@
-/* $NetBSD: eumb.c,v 1.5 2011/07/01 19:16:06 dyoung Exp $ */
+/* $NetBSD: eumb.c,v 1.6 2011/12/18 14:28:59 phx Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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,79 +20,81 @@
  * ``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: eumb.c,v 1.5 2011/07/01 19:16:06 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.6 2011/12/18 14:28:59 phx Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/tty.h>
 #include <sys/systm.h>
-#include <sys/bus.h>
+#include <machine/autoconf.h>
 #include <machine/intr.h>
 #include <sandpoint/sandpoint/eumbvar.h>
 #include "locators.h"
 static int  eumb_match(device_t, cfdata_t, void *);
 static void eumb_attach(device_t, device_t, void *);
 static int  eumb_print(void *, const char *);
 static int  eumb_search(device_t, cfdata_t, const int *, void *);
 CFATTACH_DECL_NEW(eumb, 0,
     eumb_match, eumb_attach, NULL, NULL);
 extern struct cfdriver eumb_cd;
 static int
 eumb_match(device_t parent, cfdata_t cf, void *aux)
+{
-	const char **ca_name = aux; /* XXX */
+	struct mainbus_attach_args *ma = aux;
-	if (strcmp(*ca_name, eumb_cd.cd_name) != 0)
+	if (strcmp(ma->ma_name, eumb_cd.cd_name) != 0)
-		return (0);
+		return 0;
-	return (1);
+	return 1;
+}
 static void
 eumb_attach(device_t parent, device_t self, void *aux)
+{
-	printf("\n");
+	aprint_naive("\n");
-	config_search_ia(eumb_search, self, "eumb", NULL);
+	aprint_normal("\n");
 	config_search_ia(eumb_search, self, "eumb", aux);
+}
 static int
 eumb_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	struct eumb_attach_args eaa;
 	eaa.eumb_name = cf->cf_name;
-	eaa.eumb_bt = &sandpoint_eumb_space_tag;
+	eaa.eumb_bt = ma->ma_bst;
 	eaa.eumb_unit = cf->cf_loc[EUMBCF_UNIT];
         if (config_match(parent, cf, &eaa) > 0)
                 config_attach(parent, cf, &eaa, eumb_print);
-	return (0);
+	return 0;
+}
 static int
 eumb_print(void *aux, const char *pnp)
+{
 	struct eumb_attach_args *eaa = aux;
 	if (pnp)
 		printf("%s at %s", eaa->eumb_name, pnp);
 	if (eaa->eumb_unit != EUMBCF_UNIT_DEFAULT)
 		printf(" unit %d", eaa->eumb_unit);
-	return (UNCONF);
+	return UNCONF;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.25 2011/12/17 20:20:38 phx Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.26 2011/12/18 14:28:59 phx Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,87 +21,83 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: mainbus.c,v 1.25 2011/12/17 20:20:38 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.26 2011/12/18 14:28:59 phx Exp $");
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <machine/autoconf.h>
 #include <machine/isa_machdep.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 /* XXX go away! */
 struct conf_args {
 	const char *ca_name;
 };
 int	mainbus_match(device_t, cfdata_t, void *);
 void	mainbus_attach(device_t, device_t, void *);
 int	mainbus_print(void *, const char *);
 CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 struct powerpc_isa_chipset genppc_ict;
 /*
  * Probe for the mainbus; always succeeds.
  */
 int
 mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	return 1;
+}
 /*
  * Attach the mainbus.
  */
 void
 mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct conf_args ca;
 	struct mainbus_attach_args mba;
 	struct pcibus_attach_args pba;
 #if defined(PCI_NETBSD_CONFIGURE)
 	struct extent *ioext, *memext;
 #endif
 	aprint_naive("\n");
 	aprint_normal("\n");
-	ca.ca_name = "cpu";
+	mba.ma_name = "cpu";
-	config_found_ia(self, "mainbus", &ca, mainbus_print);
+	config_found_ia(self, "mainbus", &mba, mainbus_print);
 	ca.ca_name = "eumb";
-	config_found_ia(self, "mainbus", &ca, mainbus_print);
+	mba.ma_name = "eumb";
 	mba.ma_bst = &sandpoint_eumb_space_tag;
 	config_found_ia(self, "mainbus", &mba, mainbus_print);
 	mba.ma_name = "cfi";
 	mba.ma_bst = &sandpoint_flash_space_tag;
 	mba.ma_addr = 0xffe00000; /* smallest flash is 2 MiB */
 	config_found_ia(self, "mainbus", &mba, mainbus_print);
 	/*
 	 * XXX Note also that the presence of a PCI bus should
 	 * XXX _always_ be checked, and if present the bus should be
 	 * XXX 'found'.  However, because of the structure of the code,
 	 * XXX that's not currently possible.
 	 */
 #if NPCI > 0
 @@ -130,39 +126,39 @@ mainbus_attach(device_t parent, device_t
 #endif
+}
 static int	cpu_match(device_t, cfdata_t, void *);
 static void	cpu_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(cpu, 0, cpu_match, cpu_attach, NULL, NULL);
 extern struct cfdriver cpu_cd;
 int
 cpu_match(device_t parent, cfdata_t cf, void *aux)
+{
-	struct conf_args *ca = aux;
+	struct mainbus_attach_args *mba = aux;
-	if (strcmp(ca->ca_name, cpu_cd.cd_name) != 0)
+	if (strcmp(mba->ma_name, cpu_cd.cd_name) != 0)
 		return 0;
 	if (cpu_info[0].ci_dev != NULL)
 		return 0;
 	return 1;
+}
 void
 cpu_attach(device_t parent, device_t self, void *aux)
+{
-	(void) cpu_attach_common(self, 0);
+	(void)cpu_attach_common(self, 0);
+}
 int
 mainbus_print(void *aux, const char *pnp)
+{
-	struct conf_args *ca = aux;
+	struct mainbus_attach_args *mba = aux;
 	if (pnp)
-		aprint_normal("%s at %s", ca->ca_name, pnp);
+		aprint_normal("%s at %s", mba->ma_name, pnp);
-	return (UNCONF);
+	return UNCONF;
+}