Module Name: src
Committed By: phx
Date: Sun Dec 18 14:29:00 UTC 2011
Modified Files:
src/sys/arch/sandpoint/sandpoint: eumb.c mainbus.c
Log Message:
Replaced conf_args by mainbus_attach_args.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sandpoint/sandpoint/eumb.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sandpoint/sandpoint/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/sandpoint/eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/eumb.c:1.5 src/sys/arch/sandpoint/sandpoint/eumb.c:1.6
--- src/sys/arch/sandpoint/sandpoint/eumb.c:1.5 Fri Jul 1 19:16:06 2011
+++ src/sys/arch/sandpoint/sandpoint/eumb.c Sun Dec 18 14:28:59 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -30,14 +30,14 @@
*/
#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>
@@ -56,33 +56,35 @@ 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)
- return (0);
- return (1);
+ if (strcmp(ma->ma_name, eumb_cd.cd_name) != 0)
+ return 0;
+ return 1;
}
static void
eumb_attach(device_t parent, device_t self, void *aux)
{
- printf("\n");
- config_search_ia(eumb_search, self, "eumb", NULL);
+ aprint_naive("\n");
+ 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
@@ -94,5 +96,5 @@ eumb_print(void *aux, const char *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;
}
Index: src/sys/arch/sandpoint/sandpoint/mainbus.c
diff -u src/sys/arch/sandpoint/sandpoint/mainbus.c:1.25 src/sys/arch/sandpoint/sandpoint/mainbus.c:1.26
--- src/sys/arch/sandpoint/sandpoint/mainbus.c:1.25 Sat Dec 17 20:20:38 2011
+++ src/sys/arch/sandpoint/sandpoint/mainbus.c Sun Dec 18 14:28:59 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -31,7 +31,7 @@
*/
#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"
@@ -48,11 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#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 *);
@@ -78,7 +73,6 @@ mainbus_match(device_t parent, cfdata_t
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)
@@ -88,10 +82,12 @@ mainbus_attach(device_t parent, device_t
aprint_naive("\n");
aprint_normal("\n");
- ca.ca_name = "cpu";
- config_found_ia(self, "mainbus", &ca, mainbus_print);
- ca.ca_name = "eumb";
- config_found_ia(self, "mainbus", &ca, mainbus_print);
+ mba.ma_name = "cpu";
+ config_found_ia(self, "mainbus", &mba, 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;
@@ -140,9 +136,9 @@ 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;
@@ -154,15 +150,15 @@ 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);
- return (UNCONF);
+ aprint_normal("%s at %s", mba->ma_name, pnp);
+ return UNCONF;
}
