Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some autoconf cleanup fallout, leftover of last week, mostly from 

Havard Eidnes
This commit is contained in:
drochner 2005-07-04 15:18:17 +00:00
parent 5b4bcc52c2
commit e224b50008
5 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/hp300/dev/hpib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpib.c,v 1.28 2005/02/19 16:31:49 tsutsui Exp $ */
/* $NetBSD: hpib.c,v 1.29 2005/07/04 15:18:17 drochner Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.28 2005/02/19 16:31:49 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.29 2005/07/04 15:18:17 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -96,7 +96,8 @@ CFATTACH_DECL(hpibbus, sizeof(struct hpibbus_softc),
hpibbusmatch, hpibbusattach, NULL, NULL);
static void hpibbus_attach_children(struct hpibbus_softc *);
static int hpibbussearch(struct device *, struct cfdata *, void *);
static int hpibbussearch(struct device *, struct cfdata *,
const locdesc_t *, void *);
static int hpibbusprint(void *, const char *);
static int hpibbus_alloc(struct hpibbus_softc *, int, int);
@ -204,12 +205,13 @@ hpibbus_attach_children(struct hpibbus_softc *sc)
/*
* Search though all configured children for this bus.
*/
(void)config_search(hpibbussearch, &sc->sc_dev, &ha);
config_search_ia(hpibbussearch, &sc->sc_dev, "hpibbus", &ha);
}
}
static int
hpibbussearch(struct device *parent, struct cfdata *cf, void *aux)
hpibbussearch(struct device *parent, struct cfdata *cf,
const locdesc_t *ldesc, void *aux)
{
struct hpibbus_softc *sc = (struct hpibbus_softc *)parent;
struct hpibbus_attach_args *ha = aux;

12
sys/arch/hp300/hp300/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.71 2005/06/02 16:44:27 tsutsui Exp $ */
/* $NetBSD: autoconf.c,v 1.72 2005/07/04 15:18:17 drochner Exp $ */
/*-
* Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc.
@ -143,7 +143,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.71 2005/06/02 16:44:27 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.72 2005/07/04 15:18:17 drochner Exp $");
#include "hil.h"
#include "dvbox.h"
@ -288,7 +288,8 @@ static void dev_data_insert(struct dev_data *, ddlist_t *);
static int mainbusmatch(struct device *, struct cfdata *, void *);
static void mainbusattach(struct device *, struct device *, void *);
static int mainbussearch(struct device *, struct cfdata *, void *);
static int mainbussearch(struct device *, struct cfdata *,
const locdesc_t *, void *);
CFATTACH_DECL(mainbus, sizeof(struct device),
mainbusmatch, mainbusattach, NULL, NULL);
@ -313,11 +314,12 @@ mainbusattach(struct device *parent, struct device *self, void *aux)
printf("\n");
/* Search for and attach children. */
config_search(mainbussearch, self, NULL);
config_search_ia(mainbussearch, self, "mainbus", NULL);
}
static int
mainbussearch(struct device *parent, struct cfdata *cf, void *aux)
mainbussearch(struct device *parent, struct cfdata *cf,
const locdesc_t *ldesc, void *aux)
{
if (config_match(parent, cf, NULL) > 0)

4
sys/arch/hp700/dev/phantomas.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: phantomas.c,v 1.1 2003/11/18 04:04:42 chs Exp $ */
/* $NetBSD: phantomas.c,v 1.2 2005/07/04 15:18:17 drochner Exp $ */
/* $OpenBSD: phantomas.c,v 1.1 2002/12/18 23:52:45 mickey Exp $ */
/*
@ -76,5 +76,5 @@ static void
phantomas_callback(struct device *self, struct confargs *ca)
{
config_found_sm(self, ca, mbprint, mbsubmatch);
config_found_sm_loc(self, "phantomas", NULL, ca, mbprint, mbsubmatch);
}

6
sys/arch/hp700/gsc/gscbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gscbus.c,v 1.9 2003/11/20 03:58:47 chs Exp $ */
/* $NetBSD: gscbus.c,v 1.10 2005/07/04 15:18:17 drochner Exp $ */
/* $OpenBSD: gscbus.c,v 1.13 2001/08/01 20:32:04 miod Exp $ */
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.9 2003/11/20 03:58:47 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.10 2005/07/04 15:18:17 drochner Exp $");
#define GSCDEBUG
@ -125,7 +125,7 @@ gsc_module_callback(struct device *self, struct confargs *ca)
ga.ga_dmatag = sc->sc_ga.ga_dmatag;
(*sc->sc_ga.ga_fix_args)(sc->sc_ga.ga_fix_args_cookie, &ga);
config_found_sm(self, &ga, mbprint, mbsubmatch);
config_found_sm(self, "gsc", NULL, &ga, mbprint, mbsubmatch);
}
int

6
sys/arch/hp700/hp700/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.27 2005/06/28 18:29:59 drochner Exp $ */
/* $NetBSD: mainbus.c,v 1.28 2005/07/04 15:18:17 drochner Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.27 2005/06/28 18:29:59 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.28 2005/07/04 15:18:17 drochner Exp $");
#include "locators.h"
#include "opt_power_switch.h"
@ -1704,7 +1704,7 @@ mbprint(void *aux, const char *pnp)
int
mbsubmatch(struct device *parent, struct cfdata *cf,
const locdesc_t *, void *aux)
const locdesc_t *ldesc, void *aux)
{
struct confargs *ca = aux;
int ret;