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

Merge thorpej-cfargs branch: 

Simplify and make extensible the config_search() / config_found() /
config_attach() interfaces: rather than having different variants for
which arguments you want pass along, just have a single call that
takes a variadic list of tag-value arguments.

Adjust all call sites:
- Simplify wherever possible; don't pass along arguments that aren't
  actually needed.
- Don't be explicit about what interface attribute is attaching if
  the device only has one.  (More simplification.)
- Add a config_probe() function to be used in indirect configuiration
  situations, making is visibly easier to see when indirect config is
  in play, and allowing for future change in semantics.  (As of now,
  this is just a wrapper around config_match(), but that is an
  implementation detail.)

Remove unnecessary or redundant interface attributes where they're not
needed.

There are currently 5 "cfargs" defined:
- CFARG_SUBMATCH (submatch function for direct config)
- CFARG_SEARCH (search function for indirect config)
- CFARG_IATTR (interface attribte)
- CFARG_LOCATORS (locators array)
- CFARG_DEVHANDLE (devhandle_t - wraps OFW, ACPI, etc. handles)

...and a sentinel value CFARG_EOL.

Add some extra sanity checking to ensure that interface attributes
aren't ambiguous.

Use CFARG_DEVHANDLE in MI FDT, OFW, and ACPI code, and macppc and shark
ports to associate those device handles with device_t instance.  This
will trickle trough to more places over time (need back-end for pre-OFW
Sun OBP; any others?).
This commit is contained in:
thorpej 2021-04-24 23:36:23 +00:00
parent 0973f141b9
commit 2685996b0e
1148 changed files with 5818 additions and 4535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/acorn32/eb7500atx/rsbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rsbus.c,v 1.10 2012/10/27 17:17:23 chs Exp $ */
/* $NetBSD: rsbus.c,v 1.11 2021/04/24 23:36:23 thorpej Exp $ */
/*
* Copyright (c) 2002
@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.10 2012/10/27 17:17:23 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.11 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -70,7 +70,9 @@ rsbus_attach(device_t parent, device_t self, void *aux)
/*
* Attach each devices
*/
config_search_ia(rsbus_search, self, "rsbus", NULL);
config_search(self, NULL,
CFARG_SEARCH, rsbus_search,
CFARG_EOL);
}
static int
@ -84,8 +86,8 @@ rsbus_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
sa.sa_size = cf->cf_loc[RSBUSCF_SIZE];
sa.sa_intr = cf->cf_loc[RSBUSCF_IRQ];
if (config_match(parent, cf, &sa) > 0)
config_attach(parent, cf, &sa, rsbus_print);
if (config_probe(parent, cf, &sa))
config_attach(parent, cf, &sa, rsbus_print, CFARG_EOL);
return (0);
}

6
sys/arch/acorn32/mainbus/fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.62 2020/11/20 17:38:05 thorpej Exp $ */
/* $NetBSD: fd.c,v 1.63 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.62 2020/11/20 17:38:05 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.63 2021/04/24 23:36:23 thorpej Exp $");
#include "opt_ddb.h"
@ -431,7 +431,7 @@ fdcattach(device_t parent, device_t self, void *aux)
type, fa.fa_drive);
else
fa.fa_deftype = NULL; /* unknown */
(void)config_found(self, (void *)&fa, fdprint);
(void)config_found(self, (void *)&fa, fdprint, CFARG_EOL);
}
}

41
sys/arch/acorn32/mainbus/pioc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pioc.c,v 1.18 2012/10/27 17:17:23 chs Exp $ */
/* $NetBSD: pioc.c,v 1.19 2021/04/24 23:36:23 thorpej Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@ -41,7 +41,7 @@
/*#define PIOC_DEBUG*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.18 2012/10/27 17:17:23 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.19 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -233,8 +233,8 @@ piocsearch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
}
tryagain = 0;
if (config_match(parent, cf, &pa) > 0) {
config_attach(parent, cf, &pa, piocprint);
if (config_probe(parent, cf, &pa)) {
config_attach(parent, cf, &pa, piocprint, CFARG_EOL);
/* tryagain = (cf->cf_fstate == FSTATE_STAR);*/
}
} while (tryagain);
@ -266,8 +266,8 @@ piocsubmatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
if (pa->pa_irq == -1)
pa->pa_irq = cf->cf_loc[PIOCCF_IRQ];
tryagain = 0;
if (config_match(parent, cf, pa) > 0) {
config_attach(parent, cf, pa, piocprint);
if (config_probe(parent, cf, pa)) {
config_attach(parent, cf, pa, piocprint, CFARG_EOL);
/* tryagain = (cf->cf_fstate == FSTATE_STAR);*/
}
} while (tryagain);
@ -382,8 +382,9 @@ piocattach(device_t parent, device_t self, void *aux)
pa.pa_offset = (PIOC_WDC_PRIMARY_OFFSET << 2);
pa.pa_drq = -1;
pa.pa_irq = -1;
config_found_sm_loc(self, "pioc", NULL, &pa, piocprint,
piocsubmatch);
config_found(self, &pa, piocprint,
CFARG_SUBMATCH, piocsubmatch,
CFARG_EOL);
}
/*
@ -401,8 +402,9 @@ piocattach(device_t parent, device_t self, void *aux)
pa.pa_offset = (PIOC_FDC_PRIMARY_OFFSET << 2);
pa.pa_drq = -1;
pa.pa_irq = -1;
config_found_sm_loc(self, "pioc", NULL, &pa, piocprint,
piocsubmatch);
config_found(self, &pa, piocprint,
CFARG_SUBMATCH, piocsubmatch,
CFARG_EOL);
}
/*
@ -437,8 +439,9 @@ piocattach(device_t parent, device_t self, void *aux)
}
pa.pa_drq = -1;
pa.pa_irq = -1;
config_found_sm_loc(self, "pioc", NULL, &pa, piocprint,
piocsubmatch);
config_found(self, &pa, piocprint,
CFARG_SUBMATCH, piocsubmatch,
CFARG_EOL);
}
if (sc->sc_config[PIOC_CM_CR2] & PIOC_UART2_ENABLE) {
@ -462,8 +465,9 @@ piocattach(device_t parent, device_t self, void *aux)
}
pa.pa_drq = -1;
pa.pa_irq = -1;
config_found_sm_loc(self, "pioc", NULL, &pa, piocprint,
piocsubmatch);
config_found(self, &pa, piocprint,
CFARG_SUBMATCH, piocsubmatch,
CFARG_EOL);
}
/*
@ -488,12 +492,15 @@ piocattach(device_t parent, device_t self, void *aux)
}
pa.pa_drq = -1;
pa.pa_irq = -1;
config_found_sm_loc(self, "pioc", NULL, &pa, piocprint,
piocsubmatch);
config_found(self, &pa, piocprint,
CFARG_SUBMATCH, piocsubmatch,
CFARG_EOL);
}
#if 0
config_search_ia(piocsearch, self, "pioc", NULL);
config_search(self, NULL,
CFARG_SEARCH, piocsearch,
CFARG_EOL);
#endif
}

6
sys/arch/acorn32/podulebus/amps.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: amps.c,v 1.21 2018/12/08 17:46:09 thorpej Exp $ */
/* $NetBSD: amps.c,v 1.22 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amps.c,v 1.21 2018/12/08 17:46:09 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: amps.c,v 1.22 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -182,7 +182,7 @@ amps_attach(device_t parent, device_t self, void *aux)
aa.aa_irq = pa->pa_podule->interrupt;
for (aa.aa_port = 0; aa.aa_port < MAX_AMPS_PORTS; ++aa.aa_port) {
aa.aa_base -= AMPS_PORT_SPACING;
config_found(self, &aa, amps_print);
config_found(self, &aa, amps_print, CFARG_EOL);
}
}

6
sys/arch/acorn32/podulebus/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $ */
/* $NetBSD: asc.c,v 1.21 2021/04/24 23:36:23 thorpej Exp $ */
/*
* Copyright (c) 2001 Richard Earnshaw
@ -98,7 +98,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.21 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -277,7 +277,7 @@ ascattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, &sbic->sc_channel, scsiprint);
config_found(self, &sbic->sc_channel, scsiprint, CFARG_EOL);
}

6
sys/arch/acorn32/podulebus/cosc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cosc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $ */
/* $NetBSD: cosc.c,v 1.21 2021/04/24 23:36:23 thorpej Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.21 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -280,7 +280,7 @@ coscattach(device_t parent, device_t self, void *aux)
printf("\n");
/* attach all scsi units on us */
config_found(self, &sc->sc_softc.sc_channel, scsiprint);
config_found(self, &sc->sc_softc.sc_channel, scsiprint, CFARG_EOL);
}

6
sys/arch/acorn32/podulebus/csc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: csc.c,v 1.19 2014/01/21 19:50:40 christos Exp $ */
/* $NetBSD: csc.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: csc.c,v 1.19 2014/01/21 19:50:40 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: csc.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -197,7 +197,7 @@ cscattach(device_t parent, device_t self, void *aux)
printf("\n");
/* attach all scsi units on us */
config_found(self, &sc->sc_softc.sc_channel, scsiprint);
config_found(self, &sc->sc_softc.sc_channel, scsiprint, CFARG_EOL);
}

14
sys/arch/acorn32/podulebus/podulebus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: podulebus.c,v 1.30 2020/11/20 17:38:05 thorpej Exp $ */
/* $NetBSD: podulebus.c,v 1.31 2021/04/24 23:36:23 thorpej Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -43,7 +43,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.30 2020/11/20 17:38:05 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.31 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -492,8 +492,9 @@ podulebusattach(device_t parent, device_t self, void *aux)
pa.pa_ih = pa.pa_podule_number;
pa.pa_podule = &podules[loop];
pa.pa_iot = &podulebus_bs_tag;
config_found_sm_loc(self, "podulebus", NULL, &pa,
podulebusprint, podulebussubmatch);
config_found(self, &pa, podulebusprint,
CFARG_SUBMATCH, podulebussubmatch,
CFARG_EOL);
continue;
}
if (value == 0xffff) {
@ -507,8 +508,9 @@ podulebusattach(device_t parent, device_t self, void *aux)
pa.pa_ih = pa.pa_podule_number;
pa.pa_podule = &podules[loop];
pa.pa_iot = &podulebus_bs_tag;
config_found_sm_loc(self, "podulebus", NULL, &pa,
podulebusprint, podulebussubmatch);
config_found(self, &pa, podulebusprint,
CFARG_SUBMATCH, podulebussubmatch,
CFARG_EOL);
}
}
}

6
sys/arch/acorn32/podulebus/ptsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ptsc.c,v 1.19 2014/09/13 18:08:38 matt Exp $ */
/* $NetBSD: ptsc.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.19 2014/09/13 18:08:38 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -237,7 +237,7 @@ ptscattach(device_t parent, device_t self, void *aux)
printf("\n");
/* attach all scsi units on us */
config_found(self, &sc->sc_softc.sc_channel, scsiprint);
config_found(self, &sc->sc_softc.sc_channel, scsiprint, CFARG_EOL);
}

6
sys/arch/algor/dev/bonito_mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bonito_mainbus.c,v 1.17 2016/05/31 03:51:55 dholland Exp $ */
/* $NetBSD: bonito_mainbus.c,v 1.18 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.17 2016/05/31 03:51:55 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.18 2021/04/24 23:36:23 thorpej Exp $");
#include "opt_algor_p6032.h"
@ -113,5 +113,5 @@ bonito_mainbus_attach(device_t parent, device_t self, void *aux)
}
#endif /* ALGOR_P6032 */
(void) config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}

9
sys/arch/algor/dev/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.28 2020/07/07 03:38:45 thorpej Exp $ */
/* $NetBSD: mainbus.c,v 1.29 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.28 2020/07/07 03:38:45 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29 2021/04/24 23:36:23 thorpej Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@ -220,8 +220,9 @@ mainbus_attach(device_t parent, device_t self, void *aux)
ma.ma_st = st;
ma.ma_addr = md->md_addr;
ma.ma_irq = md->md_irq;
(void) config_found_sm_loc(self, "mainbus", NULL, &ma,
mainbus_print, mainbus_submatch);
config_found(self, &ma, mainbus_print,
CFARG_SUBMATCH, mainbus_submatch,
CFARG_EOL);
}
}

6
sys/arch/algor/dev/vtpbc_mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vtpbc_mainbus.c,v 1.19 2012/10/27 17:17:24 chs Exp $ */
/* $NetBSD: vtpbc_mainbus.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.19 2012/10/27 17:17:24 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@ -128,5 +128,5 @@ vtpbc_mainbus_attach(device_t parent, device_t self, void *aux)
}
#endif /* ALGOR_P4032 || ALGOR_P5064 */
(void) config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}

6
sys/arch/algor/pci/pcib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcib.c,v 1.26 2020/11/14 02:23:04 thorpej Exp $ */
/* $NetBSD: pcib.c,v 1.27 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.26 2020/11/14 02:23:04 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.27 2021/04/24 23:36:23 thorpej Exp $");
#include "opt_algor_p5064.h"
#include "opt_algor_p6032.h"
@ -317,7 +317,7 @@ pcib_bridge_callback(device_t self)
iba.iba_ic->ic_attach_hook = pcib_isa_attach_hook;
iba.iba_ic->ic_detach_hook = pcib_isa_detach_hook;
(void) config_found_ia(sc->sc_dev, "isabus", &iba, isabusprint);
config_found(sc->sc_dev, &iba, isabusprint, CFARG_EOL);
}
void

10
sys/arch/alpha/alpha/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.34 2020/09/27 23:59:37 thorpej Exp $ */
/* $NetBSD: mainbus.c,v 1.35 2021/04/24 23:36:23 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.34 2020/09/27 23:59:37 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.35 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -85,7 +85,7 @@ mbattach(device_t parent, device_t self, void *aux)
ma.ma_name = "cpu";
ma.ma_slot = i;
if (config_found(self, &ma, mbprint) != NULL)
if (config_found(self, &ma, mbprint, CFARG_EOL) != NULL)
cpuattachcnt++;
}
if (ncpus != cpuattachcnt)
@ -95,13 +95,13 @@ mbattach(device_t parent, device_t self, void *aux)
if (alpha_is_qemu) {
ma.ma_name = "qemu";
ma.ma_slot = 0; /* meaningless */
config_found(self, &ma, mbprint);
config_found(self, &ma, mbprint, CFARG_EOL);
}
if (platform.iobus != NULL) {
ma.ma_name = platform.iobus;
ma.ma_slot = 0; /* meaningless */
config_found(self, &ma, mbprint);
config_found(self, &ma, mbprint, CFARG_EOL);
}
}

19
sys/arch/alpha/jensenio/jensenio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: jensenio.c,v 1.19 2009/08/19 15:00:24 dyoung Exp $ */
/* $NetBSD: jensenio.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@ -43,7 +43,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.19 2009/08/19 15:00:24 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -185,8 +185,11 @@ jensenio_attach(device_t parent, device_t self, void *aux)
ja.ja_ec = &jcp->jc_ec;
locs[JENSENIOCF_PORT] = jensenio_devs[i].jd_ioaddr;
(void) config_found_sm_loc(self, "jensenio", locs, &ja,
jensenio_print, config_stdsubmatch);
config_found(self, &ja, jensenio_print,
CFARG_SUBMATCH, config_stdsubmatch,
CFARG_IATTR, "jensenio",
CFARG_LOCATORS, locs,
CFARG_EOL);
}
/*
@ -199,7 +202,9 @@ jensenio_attach(device_t parent, device_t self, void *aux)
ja.ja_eisa.eba_memt = &jcp->jc_eisa_memt;
ja.ja_eisa.eba_dmat = &jcp->jc_dmat_eisa;
ja.ja_eisa.eba_ec = &jcp->jc_ec;
(void) config_found_ia(self, "eisabus", &ja.ja_eisa, eisabusprint);
config_found(self, &ja.ja_eisa, eisabusprint,
CFARG_IATTR, "eisabus",
CFARG_EOL);
/*
* Attach the ISA bus.
@ -211,7 +216,9 @@ jensenio_attach(device_t parent, device_t self, void *aux)
ja.ja_isa.iba_memt = &jcp->jc_eisa_memt;
ja.ja_isa.iba_dmat = &jcp->jc_dmat_isa;
ja.ja_isa.iba_ic = &jcp->jc_ic;
(void) config_found_ia(self, "isabus", &ja.ja_isa, isabusprint);
config_found(self, &ja.ja_isa, isabusprint,
CFARG_IATTR, "isabus",
CFARG_EOL);
}
static int

23
sys/arch/alpha/mcbus/mcbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mcbus.c,v 1.22 2012/02/06 02:14:14 matt Exp $ */
/* $NetBSD: mcbus.c,v 1.23 2021/04/24 23:36:23 thorpej Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@ -37,7 +37,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: mcbus.c,v 1.22 2012/02/06 02:14:14 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: mcbus.c,v 1.23 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -146,8 +146,10 @@ mcbusattach(device_t parent, device_t self, void *aux)
ta.ma_type = MCBUS_TYPE_MEM;
mbp->mcbus_types[1] = MCBUS_TYPE_MEM;
locs[MCBUSCF_MID] = 1;
(void) config_found_sm_loc(self, "mcbus", locs, &ta,
mcbusprint, config_stdsubmatch);
config_found(self, &ta, mcbusprint,
CFARG_SUBMATCH, config_stdsubmatch,
CFARG_LOCATORS, locs,
CFARG_EOL);
/*
* Now find PCI busses.
@ -164,9 +166,10 @@ mcbusattach(device_t parent, device_t self, void *aux)
ta.ma_type = MCBUS_TYPE_PCI;
locs[MCBUSCF_MID] = mid;
if (MCPCIA_EXISTS(ta.ma_mid, ta.ma_gid))
(void) config_found_sm_loc(self, "mcbus", locs, &ta,
mcbusprint,
config_stdsubmatch);
config_found(self, &ta, mcbusprint,
CFARG_SUBMATCH, config_stdsubmatch,
CFARG_LOCATORS, locs,
CFARG_EOL);
}
#if 0
@ -193,8 +196,10 @@ mcbusattach(device_t parent, device_t self, void *aux)
ta.ma_type = MCBUS_TYPE_CPU;
mbp->mcbus_types[mid] = MCBUS_TYPE_CPU;
locs[MCBUSCF_MID] = mid;
(void) config_found_sm_loc(self, "mcbus", locs, &ta,
mcbusprint, config_stdsubmatch);
config_found(self, &ta, mcbusprint,
CFARG_SUBMATCH, config_stdsubmatch,
CFARG_LOCATORS, locs,
CFARG_EOL);
}
#endif

6
sys/arch/alpha/pci/apecs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: apecs.c,v 1.54 2012/02/06 02:14:14 matt Exp $ */
/* $NetBSD: apecs.c,v 1.55 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -63,7 +63,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.54 2012/02/06 02:14:14 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.55 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -230,7 +230,7 @@ apecsattach(device_t parent, device_t self, void *aux)
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}
static int

6
sys/arch/alpha/pci/cia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cia.c,v 1.74 2015/10/11 08:46:43 martin Exp $ */
/* $NetBSD: cia.c,v 1.75 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.74 2015/10/11 08:46:43 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.75 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -401,7 +401,7 @@ ciaattach(device_t parent, device_t self, void *aux)
if ((ccp->cc_flags & CCF_PYXISBUG) == 0)
pba.pba_flags |= PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY |
PCI_FLAGS_MWI_OKAY;
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}
int

6
sys/arch/alpha/pci/dwlpx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dwlpx.c,v 1.39 2020/09/25 03:40:11 thorpej Exp $ */
/* $NetBSD: dwlpx.c,v 1.40 2021/04/24 23:36:23 thorpej Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dwlpx.c,v 1.39 2020/09/25 03:40:11 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dwlpx.c,v 1.40 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -181,7 +181,7 @@ dwlpxattach(device_t parent, device_t self, void *aux)
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}
void

12
sys/arch/alpha/pci/irongate.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: irongate.c,v 1.16 2011/06/14 15:34:22 matt Exp $ */
/* $NetBSD: irongate.c,v 1.17 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: irongate.c,v 1.16 2011/06/14 15:34:22 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: irongate.c,v 1.17 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -196,10 +196,14 @@ irongate_attach(device_t parent, device_t self, void *aux)
irongate_conf_read0(icp, tag, PCI_CLASS_REG);
apa.apa_pci_args.pa_flags = pba.pba_flags;
(void) config_found_ia(self, "agpbus", &apa, agpbusprint);
config_found(self, &apa, agpbusprint,
CFARG_IATTR, "agpbus",
CFARG_EOL);
}
(void) config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint,
CFARG_IATTR, "pcibus",
CFARG_EOL);
}
int

6
sys/arch/alpha/pci/lca.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lca.c,v 1.51 2012/02/06 02:14:14 matt Exp $ */
/* $NetBSD: lca.c,v 1.52 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -62,7 +62,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.51 2012/02/06 02:14:14 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.52 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -237,7 +237,7 @@ lcaattach(device_t parent, device_t self, void *aux)
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}
int

6
sys/arch/alpha/pci/mcpcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mcpcia.c,v 1.30 2020/11/18 02:04:29 thorpej Exp $ */
/* $NetBSD: mcpcia.c,v 1.31 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: mcpcia.c,v 1.30 2020/11/18 02:04:29 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mcpcia.c,v 1.31 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -190,7 +190,7 @@ mcpciaattach(device_t parent, device_t self, void *aux)
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
(void) config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
/*
* Clear any errors that may have occurred during the probe

13
sys/arch/alpha/pci/sio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sio.c,v 1.54 2020/11/18 02:04:29 thorpej Exp $ */
/* $NetBSD: sio.c,v 1.55 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -63,7 +63,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.54 2020/11/18 02:04:29 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.55 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -238,8 +238,9 @@ sio_bridge_callback(device_t self)
sa.sa_eba.eba_dmat =
alphabus_dma_get_tag(sc->sc_parent_dmat, ALPHA_BUS_EISA);
sa.sa_eba.eba_ec = &ec;
config_found_ia(sc->sc_dev, "eisabus", &sa.sa_eba,
eisabusprint);
config_found(sc->sc_dev, &sa.sa_eba, eisabusprint,
CFARG_IATTR, "eisabus",
CFARG_EOL);
}
#endif /* NPCEB */
@ -283,7 +284,9 @@ sio_bridge_callback(device_t self)
sa.sa_iba.iba_dmat =
alphabus_dma_get_tag(sc->sc_parent_dmat, ALPHA_BUS_ISA);
sa.sa_iba.iba_ic = sc->sc_ic;
config_found_ia(sc->sc_dev, "isabus", &sa.sa_iba, isabusprint);
config_found(sc->sc_dev, &sa.sa_iba, isabusprint,
CFARG_IATTR, "isabus",
CFARG_EOL);
}
void

16
sys/arch/alpha/pci/tsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tsc.c,v 1.24 2014/02/22 18:42:47 martin Exp $ */
/* $NetBSD: tsc.c,v 1.25 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@ -35,7 +35,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.24 2014/02/22 18:42:47 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.25 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -147,25 +147,25 @@ tscattach(device_t parent, device_t self, void * aux)
tsp.tsp_name = "tsp";
tsp.tsp_slot = 0;
config_found(self, &tsp, tscprint);
config_found(self, &tsp, tscprint, CFARG_EOL);
if (titan) {
tsp.tsp_slot += 2;
config_found(self, &tsp, tscprint);
config_found(self, &tsp, tscprint, CFARG_EOL);
}
if (csc & CSC_P1P) {
tsp.tsp_slot = 1;
config_found(self, &tsp, tscprint);
config_found(self, &tsp, tscprint, CFARG_EOL);
if (titan) {
tsp.tsp_slot += 2;
config_found(self, &tsp, tscprint);
config_found(self, &tsp, tscprint, CFARG_EOL);
}
}
memset(&tsciic, 0, sizeof tsciic);
tsciic.tsciic_name = "tsciic";
config_found(self, &tsciic, tsciicprint);
config_found(self, &tsciic, tsciicprint, CFARG_EOL);
}
static int
@ -237,7 +237,7 @@ tspattach(device_t parent, device_t self, void *aux)
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}
struct tsp_config *

10
sys/arch/alpha/pci/tsciic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tsciic.c,v 1.2 2019/12/22 23:23:29 thorpej Exp $ */
/* $NetBSD: tsciic.c,v 1.3 2021/04/24 23:36:23 thorpej Exp $ */
/*
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tsciic.c,v 1.2 2019/12/22 23:23:29 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: tsciic.c,v 1.3 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -71,7 +71,8 @@ static const struct i2c_bitbang_ops tsciicbb_ops = {
};
void
tsciic_init(device_t self) {
tsciic_init(device_t self)
{
struct tsciic_softc *sc = device_private(self);
struct i2cbus_attach_args iba;
@ -86,8 +87,7 @@ tsciic_init(device_t self) {
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
config_found_ia(self, "i2cbus", &iba, iicbus_print);
config_found(self, &iba, iicbus_print, CFARG_EOL);
}
/* I2C bitbanging */

15
sys/arch/alpha/pci/ttwoga.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ttwoga.c,v 1.15 2012/02/06 02:14:15 matt Exp $ */
/* $NetBSD: ttwoga.c,v 1.16 2021/04/24 23:36:23 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: ttwoga.c,v 1.15 2012/02/06 02:14:15 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: ttwoga.c,v 1.16 2021/04/24 23:36:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -145,7 +145,7 @@ ttwogaattach(device_t parent, device_t self, void *aux)
memset(&pba, 0, sizeof(pba));
pba.pba_bus = hose;
(void) config_found_ia(self, "ttwoga", &pba, ttwogaprint);
config_found(self, &pba, ttwogaprint, CFARG_EOL);
}
}
@ -263,11 +263,14 @@ ttwopciattach(device_t parent, device_t self, void *aux)
* Hose 0 has the STDIO module.
*/
if (pba->pba_bus == 0) {
(void) config_found_ia(self, "sableiobus", &npba,
ttwosableioprint);
config_found(self, &npba, ttwosableioprint,
CFARG_IATTR, "sableiobus",
CFARG_EOL);
}
(void) config_found_ia(self, "pcibus", &npba, pcibusprint);
config_found(self, &npba, pcibusprint,
CFARG_IATTR, "pcibus",
CFARG_EOL);
}
int

10
sys/arch/alpha/sableio/sableio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sableio.c,v 1.13 2011/06/14 15:34:22 matt Exp $ */
/* $NetBSD: sableio.c,v 1.14 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@ -48,7 +48,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: sableio.c,v 1.13 2011/06/14 15:34:22 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: sableio.c,v 1.14 2021/04/24 23:36:24 thorpej Exp $");
#include "isadma.h"
@ -169,8 +169,10 @@ sableio_attach(device_t parent, device_t self, void *aux)
locs[SABLEIOCF_PORT] = sableio_devs[i].sd_ioaddr;
(void) config_found_sm_loc(self, "sableio", locs, &sa,
sableio_print, config_stdsubmatch);
config_found(self, &sa, sableio_print,
CFARG_SUBMATCH, config_stdsubmatch,
CFARG_LOCATORS, locs,
CFARG_EOL);
}
}

6
sys/arch/alpha/tc/tcasic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcasic.c,v 1.49 2020/09/25 03:40:11 thorpej Exp $ */
/* $NetBSD: tcasic.c,v 1.50 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.49 2020/09/25 03:40:11 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.50 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -150,7 +150,7 @@ tcasicattach(device_t parent, device_t self, void *aux)
scb_set(0x800, iointr, NULL);
mutex_exit(&cpu_lock);
config_found(self, &tba, tcasicprint);
config_found(self, &tba, tcasicprint, CFARG_EOL);
}
int

10
sys/arch/alpha/tlsb/gbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gbus.c,v 1.22 2011/06/14 15:34:23 matt Exp $ */
/* $NetBSD: gbus.c,v 1.23 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@ -37,7 +37,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: gbus.c,v 1.22 2011/06/14 15:34:23 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: gbus.c,v 1.23 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -124,7 +124,9 @@ gbusattach(device_t parent, device_t self, void *aux)
for (ga = gbus_children; ga->ga_name != NULL; ga++) {
struct gbus_attach_args gaa = *ga;
locs[GBUSCF_OFFSET] = gaa.ga_offset;
(void) config_found_sm_loc(self, "gbus", locs, &gaa,
gbusprint, config_stdsubmatch);
config_found(self, &gaa, gbusprint,
CFARG_SUBMATCH, config_stdsubmatch,
CFARG_LOCATORS, locs,
CFARG_EOL);
}
}

6
sys/arch/alpha/tlsb/kftxx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kftxx.c,v 1.16 2011/06/14 15:34:23 matt Exp $ */
/* $NetBSD: kftxx.c,v 1.17 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: kftxx.c,v 1.16 2011/06/14 15:34:23 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: kftxx.c,v 1.17 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -129,6 +129,6 @@ kftattach(device_t parent, device_t self, void *aux)
ka.ka_node = sc->sc_node;
ka.ka_dtype = sc->sc_dtype;
ka.ka_hosenum = hoseno;
config_found(self, &ka, kftprint);
config_found(self, &ka, kftprint, CFARG_EOL);
}
}

16
sys/arch/alpha/tlsb/tlsb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tlsb.c,v 1.38 2014/03/26 08:09:06 christos Exp $ */
/* $NetBSD: tlsb.c,v 1.39 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
* NASA AMES Research Center.
@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: tlsb.c,v 1.38 2014/03/26 08:09:06 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: tlsb.c,v 1.39 2021/04/24 23:36:24 thorpej Exp $");
#include "opt_multiprocessor.h"
@ -180,8 +180,10 @@ tlsbattach(device_t parent, device_t self, void *aux)
locs[TLSBCF_NODE] = node;
locs[TLSBCF_OFFSET] = 0; /* XXX unused? */
config_found_sm_loc(self, "tlsb", locs, &ta,
tlsbprint, config_stdsubmatch);
config_found(self, &ta, tlsbprint,
CFARG_SUBMATCH, config_stdsubmatch,
CFARG_LOCATORS, locs,
CFARG_EOL);
}
/*
* *Now* search for I/O nodes (in descending order)
@ -226,8 +228,10 @@ tlsbattach(device_t parent, device_t self, void *aux)
locs[TLSBCF_NODE] = node;
locs[TLSBCF_OFFSET] = 0; /* XXX unused? */
config_found_sm_loc(self, "tlsb", locs, &ta,
tlsbprint, config_stdsubmatch);
config_found(self, &ta, tlsbprint,
CFARG_SUBMATCH, config_stdsubmatch,
CFARG_LOCATORS, locs,
CFARG_EOL);
}
}
}

21
sys/arch/amd64/amd64/amd64_mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: amd64_mainbus.c,v 1.5 2019/02/14 07:12:40 cherry Exp $ */
/* $NetBSD: amd64_mainbus.c,v 1.6 2021/04/24 23:36:24 thorpej Exp $ */
/* NetBSD: mainbus.c,v 1.39 2018/12/02 08:19:44 cherry Exp */
/*
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amd64_mainbus.c,v 1.5 2019/02/14 07:12:40 cherry Exp $");
__KERNEL_RCSID(0, "$NetBSD: amd64_mainbus.c,v 1.6 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -179,7 +179,9 @@ amd64_mainbus_attach(device_t parent, device_t self, void *aux)
mba.mba_acpi.aa_ic = &x86_isa_chipset;
mba.mba_acpi.aa_dmat = &pci_bus_dma_tag;
mba.mba_acpi.aa_dmat64 = &pci_bus_dma64_tag;
config_found_ia(self, "acpibus", &mba.mba_acpi, 0);
config_found(self, &mba.mba_acpi, NULL,
CFARG_IATTR, "acpibus",
CFARG_EOL);
}
#endif
@ -188,7 +190,9 @@ amd64_mainbus_attach(device_t parent, device_t self, void *aux)
mba.mba_ipmi.iaa_iot = x86_bus_space_io;
mba.mba_ipmi.iaa_memt = x86_bus_space_mem;
if (ipmi_probe(&mba.mba_ipmi))
config_found_ia(self, "ipmibus", &mba.mba_ipmi, 0);
config_found(self, &mba.mba_ipmi, NULL,
CFARG_IATTR, "ipmibus",
CFARG_EOL);
#endif
#if NPCI > 0
@ -215,8 +219,9 @@ amd64_mainbus_attach(device_t parent, device_t self, void *aux)
npcibus = mp_pci_scan(self, &mba.mba_pba, pcibusprint);
#endif
if (npcibus == 0)
config_found_ia(self, "pcibus", &mba.mba_pba,
pcibusprint);
config_found(self, &mba.mba_pba, pcibusprint,
CFARG_IATTR, "pcibus",
CFARG_EOL);
#if NACPICA > 0
if (mp_verbose)
@ -230,7 +235,9 @@ amd64_mainbus_attach(device_t parent, device_t self, void *aux)
mba.mba_iba = mba_iba;
mba.mba_iba.iba_iot = x86_bus_space_io;
mba.mba_iba.iba_memt = x86_bus_space_mem;
config_found_ia(self, "isabus", &mba.mba_iba, isabusprint);
config_found(self, &mba.mba_iba, isabusprint,
CFARG_IATTR, "isabus",
CFARG_EOL);
}
#endif

72
sys/arch/amiga/amiga/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.117 2014/08/24 12:18:21 mlelstv Exp $ */
/* $NetBSD: autoconf.c,v 1.118 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.117 2014/08/24 12:18:21 mlelstv Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.118 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -169,7 +169,7 @@ amiga_config_found(cfdata_t pcfp, device_t parent, void *aux, cfprint_t pfn)
const struct cfattach *ca;
if (amiga_realconfig)
return(config_found(parent, aux, pfn) != NULL);
return(config_found(parent, aux, pfn, CFARG_EOL) != NULL);
if (parent == NULL) {
memset(&temp, 0, sizeof temp);
@ -180,7 +180,7 @@ amiga_config_found(cfdata_t pcfp, device_t parent, void *aux, cfprint_t pfn)
parent->dv_cfdriver = config_cfdriver_lookup(pcfp->cf_name);
parent->dv_unit = pcfp->cf_unit;
if ((cf = config_search_ia(NULL, parent, NULL, aux)) != NULL) {
if ((cf = config_search(parent, aux, CFARG_EOL)) != NULL) {
ca = config_cfattach_lookup(cf->cf_name, cf->cf_atname);
if (ca != NULL) {
(*ca->ca_attach)(parent, NULL, aux);
@ -263,55 +263,75 @@ void
mbattach(device_t parent, device_t self, void *aux)
{
printf("\n");
config_found(self, __UNCONST("clock"), simple_devprint);
config_found(self, __UNCONST("clock"), simple_devprint, CFARG_EOL);
if (is_a3000() || is_a4000()) {
config_found(self, __UNCONST("a34kbbc"), simple_devprint);
config_found(self, __UNCONST("a34kbbc"), simple_devprint,
CFARG_EOL);
} else
#ifdef DRACO
if (!is_draco())
#endif
{
config_found(self, __UNCONST("a2kbbc"), simple_devprint);
config_found(self, __UNCONST("a2kbbc"), simple_devprint,
CFARG_EOL);
}
#ifdef DRACO
if (is_draco()) {
config_found(self, __UNCONST("drbbc"), simple_devprint);
config_found(self, __UNCONST("kbd"), simple_devprint);
config_found(self, __UNCONST("drsc"), simple_devprint);
config_found(self, __UNCONST("drsupio"), simple_devprint);
config_found(self, __UNCONST("drbbc"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("kbd"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("drsc"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("drsupio"), simple_devprint,
CFARG_EOL);
} else
#endif
{
config_found(self, __UNCONST("ser"), simple_devprint);
config_found(self, __UNCONST("par"), simple_devprint);
config_found(self, __UNCONST("kbd"), simple_devprint);
config_found(self, __UNCONST("ms"), simple_devprint);
config_found(self, __UNCONST("grfcc"), simple_devprint);
config_found(self, __UNCONST("amidisplaycc"), simple_devprint);
config_found(self, __UNCONST("fdc"), simple_devprint);
config_found(self, __UNCONST("ser"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("par"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("kbd"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("ms"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("grfcc"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("amidisplaycc"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("fdc"), simple_devprint,
CFARG_EOL);
}
if (is_a4000() || is_a1200() || is_a600())
config_found(self, __UNCONST("wdc"), simple_devprint);
config_found(self, __UNCONST("wdc"), simple_devprint,
CFARG_EOL);
if (is_a4000()) /* Try to configure A4000T SCSI */
config_found(self, __UNCONST("afsc"), simple_devprint);
config_found(self, __UNCONST("afsc"), simple_devprint,
CFARG_EOL);
if (is_a3000())
config_found(self, __UNCONST("ahsc"), simple_devprint);
config_found(self, __UNCONST("ahsc"), simple_devprint,
CFARG_EOL);
if (is_a600() || is_a1200())
config_found(self, __UNCONST("pccard"), simple_devprint);
config_found(self, __UNCONST("pccard"), simple_devprint,
CFARG_EOL);
if (is_a1200())
config_found(self, __UNCONST("a1k2cp"), simple_devprint);
config_found(self, __UNCONST("a1k2cp"), simple_devprint,
CFARG_EOL);
#ifdef DRACO
if (!is_draco())
#endif
config_found(self, __UNCONST("aucc"), simple_devprint);
config_found(self, __UNCONST("aucc"), simple_devprint,
CFARG_EOL);
#if NACAFH > 0
if (!is_a600() && !is_a1200() && !is_a3000() && !is_a4000())
if (acafh_mbattach_probe() == true)
config_found(self, __UNCONST("acafh"), simple_devprint);
config_found(self, __UNCONST("acafh"), simple_devprint,
CFARG_EOL);
#endif
config_found(self, __UNCONST("zbus"), simple_devprint);
config_found(self, __UNCONST("zbus"), simple_devprint, CFARG_EOL);
}
int

4
sys/arch/amiga/clockport/a1k2cp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: a1k2cp.c,v 1.3 2012/10/27 17:17:26 chs Exp $ */
/* $NetBSD: a1k2cp.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@ -104,5 +104,5 @@ a1k2cp_attach(device_t parent, device_t self, void *aux)
A1K2CP_BASE, (void*) a1k2cp_bst.base);
#endif /* A1K2CP_DEBUG */
config_found(sc->sc_dev, &a1k2cp_aa, 0);
config_found(sc->sc_dev, &a1k2cp_aa, 0, CFARG_EOL);
}

14
sys/arch/amiga/clockport/clockport.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clockport.c,v 1.5 2012/10/30 01:17:24 rkujawa Exp $ */
/* $NetBSD: clockport.c,v 1.6 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@ -43,7 +43,7 @@
static int clockport_match(device_t, cfdata_t , void *);
static void clockport_attach(device_t, device_t, void *);
static int clockport_print(void *, const char *);
static int clockport_submatch(device_t, cfdata_t, const int *, void *);
static int clockport_search(device_t, cfdata_t, const int *, void *);
CFATTACH_DECL_NEW(clockport, sizeof(struct clockportbus_softc),
clockport_match, clockport_attach, NULL, NULL);
@ -65,11 +65,13 @@ clockport_attach(device_t parent, device_t self, void *aux)
sc->sc_dev = self;
sc->cpb_aa = (struct clockportbus_attach_args *) aux;
config_search_ia(clockport_submatch, self, "clockport", 0);
config_search(self, NULL,
CFARG_SEARCH, clockport_search,
CFARG_EOL);
}
static int
clockport_submatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
clockport_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
{
struct clockportbus_softc *sc;
struct clockport_attach_args a;
@ -80,8 +82,8 @@ clockport_submatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
a.cp_iot = sc->cpb_aa->cp_iot;
a.cp_intr_establish = sc->cpb_aa->cp_intr_establish;
if (config_match(parent, cf, &a)) {
config_attach(parent, cf, &a, clockport_print);
if (config_probe(parent, cf, &a)) {
config_attach(parent, cf, &a, clockport_print, CFARG_EOL);
return 1;
}

4
sys/arch/amiga/clockport/gencp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gencp.c,v 1.1 2012/05/15 17:35:43 rkujawa Exp $ */
/* $NetBSD: gencp.c,v 1.2 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@ -56,6 +56,6 @@ gencp_attach(struct gencp_softc *gsc)
gsc->cpb_aa->cp_intr_establish = clockport_generic_intr_establish;
config_found(gsc->sc_dev, gsc->cpb_aa, 0);
config_found(gsc->sc_dev, gsc->cpb_aa, 0, CFARG_EOL);
}

8
sys/arch/amiga/dev/acafh.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acafh.c,v 1.3 2013/12/26 20:38:11 rkujawa Exp $ */
/* $NetBSD: acafh.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acafh.c,v 1.3 2013/12/26 20:38:11 rkujawa Exp $");
__KERNEL_RCSID(0, "$NetBSD: acafh.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $");
/*
* Individual Computers ACA500 driver.
@ -200,11 +200,11 @@ acafh_attach(device_t parent, device_t self, void *aux)
aaa_wdc.aaa_pbase = (bus_addr_t) GAYLE_IDE_BASE + 2;
strcpy(aaa_wdc.aaa_name, "wdc_acafh");
config_found_ia(sc->sc_dev, "acafhbus", &aaa_wdc, acafh_print);
config_found(sc->sc_dev, &aaa_wdc, acafh_print, CFARG_EOL);
aaa_cp.aaa_pbase = (bus_addr_t) ACAFH_CLOCKPORT_BASE;
strcpy(aaa_cp.aaa_name, "gencp_acafh");
config_found_ia(sc->sc_dev, "acafhbus", &aaa_cp, acafh_print);
config_found(sc->sc_dev, &aaa_cp, acafh_print, CFARG_EOL);
}
uint8_t

6
sys/arch/amiga/dev/afsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: afsc.c,v 1.44 2012/10/27 17:17:26 chs Exp $ */
/* $NetBSD: afsc.c,v 1.45 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: afsc.c,v 1.44 2012/10/27 17:17:26 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: afsc.c,v 1.45 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -190,7 +190,7 @@ afscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
int

6
sys/arch/amiga/dev/ahsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ahsc.c,v 1.38 2012/10/27 17:17:26 chs Exp $ */
/* $NetBSD: ahsc.c,v 1.39 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ahsc.c,v 1.38 2012/10/27 17:17:26 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: ahsc.c,v 1.39 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -202,7 +202,7 @@ ahscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
void

6
sys/arch/amiga/dev/amidisplaycc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: amidisplaycc.c,v 1.33 2021/01/06 13:00:51 jandberg Exp $ */
/* $NetBSD: amidisplaycc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 2000 Jukka Andberg.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.33 2021/01/06 13:00:51 jandberg Exp $");
__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $");
/*
* wscons interface to amiga custom chips. Contains the necessary functions
@ -472,7 +472,7 @@ amidisplaycc_attach(device_t parent, device_t self, void *aux)
waa.console = amidisplaycc_consolescreen.isconsole;
waa.accessops = &amidisplaycc_accessops;
waa.accesscookie = adp;
config_found(self, &waa, wsemuldisplaydevprint);
config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
wsfont_init();
}

6
sys/arch/amiga/dev/atzsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atzsc.c,v 1.43 2012/10/27 17:17:27 chs Exp $ */
/* $NetBSD: atzsc.c,v 1.44 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: atzsc.c,v 1.43 2012/10/27 17:17:27 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: atzsc.c,v 1.44 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -211,7 +211,7 @@ atzscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
void

6
sys/arch/amiga/dev/bppcsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bppcsc.c,v 1.3 2012/10/27 17:17:28 chs Exp $ */
/* $NetBSD: bppcsc.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bppcsc.c,v 1.3 2012/10/27 17:17:28 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: bppcsc.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -169,7 +169,7 @@ bppcscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
int

6
sys/arch/amiga/dev/cbiiisc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cbiiisc.c,v 1.21 2012/10/27 17:17:28 chs Exp $ */
/* $NetBSD: cbiiisc.c,v 1.22 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cbiiisc.c,v 1.21 2012/10/27 17:17:28 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: cbiiisc.c,v 1.22 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -166,7 +166,7 @@ cbiiiscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
int

6
sys/arch/amiga/dev/drsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: drsc.c,v 1.33 2014/03/22 01:52:44 christos Exp $ */
/* $NetBSD: drsc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1996 Ignatios Souvatzis
@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: drsc.c,v 1.33 2014/03/22 01:52:44 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: drsc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -170,7 +170,7 @@ drscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
/*

6
sys/arch/amiga/dev/drsupio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: drsupio.c,v 1.21 2012/10/27 17:17:28 chs Exp $ */
/* $NetBSD: drsupio.c,v 1.22 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: drsupio.c,v 1.21 2012/10/27 17:17:28 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: drsupio.c,v 1.22 2021/04/24 23:36:24 thorpej Exp $");
/*
* DraCo multi-io chip bus space stuff
@ -113,7 +113,7 @@ drsupioattach(device_t parent, device_t self, void *aux)
supa.supio_name = drsd->name;
supa.supio_iobase = drsd->off;
supa.supio_arg = drsd->arg;
config_found(self, &supa, drsupprint); /* XXX */
config_found(self, &supa, drsupprint, CFARG_EOL); /* XXX */
++drsd;
}

6
sys/arch/amiga/dev/empsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: empsc.c,v 1.28 2014/01/22 00:25:16 christos Exp $ */
/* $NetBSD: empsc.c,v 1.29 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: empsc.c,v 1.28 2014/01/22 00:25:16 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: empsc.c,v 1.29 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -175,7 +175,7 @@ empscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
int

8
sys/arch/amiga/dev/fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.97 2018/09/03 16:29:22 riastradh Exp $ */
/* $NetBSD: fd.c,v 1.98 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.97 2018/09/03 16:29:22 riastradh Exp $");
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.98 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -371,11 +371,11 @@ fdcattach(device_t parent, device_t self, void *aux)
args.type = fdcgetfdtype(args.unit);
fdc_side = -1;
config_found(self, &args, fdcprint);
config_found(self, &args, fdcprint, CFARG_EOL);
for (args.unit++; args.unit < FDMAXUNITS; args.unit++) {
if ((args.type = fdcgetfdtype(args.unit)) == NULL)
continue;
config_found(self, &args, fdcprint);
config_found(self, &args, fdcprint, CFARG_EOL);
}
}

6
sys/arch/amiga/dev/gayle_pcmcia.c
View File

@ -1,9 +1,9 @@
/* $NetBSD: gayle_pcmcia.c,v 1.32 2020/03/02 19:48:23 is Exp $ */
/* $NetBSD: gayle_pcmcia.c,v 1.33 2021/04/24 23:36:24 thorpej Exp $ */
/* public domain */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.32 2020/03/02 19:48:23 is Exp $");
__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.33 2021/04/24 23:36:24 thorpej Exp $");
/* PCMCIA front-end driver for A1200's and A600's. */
@ -173,7 +173,7 @@ pccard_attach(device_t parent, device_t self, void *aux)
paa.paa_busname = "pcmcia";
paa.pct = &chip_functions;
paa.pch = &sc->devs[0];
sc->devs[0].card = config_found(self, &paa, simple_devprint);
sc->devs[0].card = config_found(self, &paa, simple_devprint, CFARG_EOL);
if (sc->devs[0].card == NULL) {
printf("attach failed, config_found() returned NULL\n");
pmap_remove(kernel_map->pmap, pcmcia_base,

6
sys/arch/amiga/dev/grf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf.c,v 1.64 2015/11/12 12:01:53 phx Exp $ */
/* $NetBSD: grf.c,v 1.65 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.64 2015/11/12 12:01:53 phx Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.65 2021/04/24 23:36:24 thorpej Exp $");
/*
* Graphics display driver for the Amiga
@ -213,7 +213,7 @@ grfattach(device_t parent, device_t self, void *aux)
wa.scrdata = gp->g_scrlist;
wa.accessops = gp->g_accessops;
wa.accesscookie = &gp->g_vd;
config_found(self, &wa, wsemuldisplaydevprint);
config_found(self, &wa, wsemuldisplaydevprint, CFARG_EOL);
#endif /* NWSDISPLAY > 0 */
}

6
sys/arch/amiga/dev/gtsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gtsc.c,v 1.41 2012/10/27 17:17:29 chs Exp $ */
/* $NetBSD: gtsc.c,v 1.42 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gtsc.c,v 1.41 2012/10/27 17:17:29 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: gtsc.c,v 1.42 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -239,7 +239,7 @@ gtscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
void

8
sys/arch/amiga/dev/gvpbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gvpbus.c,v 1.26 2012/10/27 17:17:29 chs Exp $ */
/* $NetBSD: gvpbus.c,v 1.27 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gvpbus.c,v 1.26 2012/10/27 17:17:29 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: gvpbus.c,v 1.27 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -145,11 +145,11 @@ gvpbusattach(device_t parent, device_t self, void *aux)
if (flags & GVP_SCSI) {
ga.flags = flags0 | GVP_SCSI;
config_found(self, &ga, gvpbusprint);
config_found(self, &ga, gvpbusprint, CFARG_EOL);
}
if (flags & GVP_IO) {
ga.flags = flags0 | GVP_IO;
config_found(self, &ga, gvpbusprint);
config_found(self, &ga, gvpbusprint, CFARG_EOL);
}
}

6
sys/arch/amiga/dev/gvpio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gvpio.c,v 1.20 2012/10/27 17:17:29 chs Exp $ */
/* $NetBSD: gvpio.c,v 1.21 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1997 Ignatios Souvatzis
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.20 2012/10/27 17:17:29 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.21 2021/04/24 23:36:24 thorpej Exp $");
/*
* GVP I/O Extender
@ -131,7 +131,7 @@ gvpioattach(device_t parent, device_t self, void *aux)
supa.supio_iobase = giosd->off;
supa.supio_arg = giosd->arg;
supa.supio_ipl = giosd->ipl;
config_found(self, &supa, gvpioprint); /* XXX */
config_found(self, &supa, gvpioprint, CFARG_EOL); /* XXX */
++giosd;
}
if (giosc->sc_comhdls.lh_first) {

6
sys/arch/amiga/dev/hyper.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hyper.c,v 1.22 2012/10/27 17:17:29 chs Exp $ */
/* $NetBSD: hyper.c,v 1.23 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 1997,1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hyper.c,v 1.22 2012/10/27 17:17:29 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: hyper.c,v 1.23 2021/04/24 23:36:24 thorpej Exp $");
/*
* zbus HyperCom driver
@ -149,7 +149,7 @@ hyperattach(device_t parent, device_t self, void *aux)
supa.supio_name = hprsd->name;
supa.supio_iobase = hprsd->off;
supa.supio_arg = hprsd->arg;
config_found(self, &supa, hyperprint); /* XXX */
config_found(self, &supa, hyperprint, CFARG_EOL); /* XXX */
}
++hprsd;
}

6
sys/arch/amiga/dev/ioblix_zbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ioblix_zbus.c,v 1.19 2012/10/27 17:17:29 chs Exp $ */
/* $NetBSD: ioblix_zbus.c,v 1.20 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ioblix_zbus.c,v 1.19 2012/10/27 17:17:29 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: ioblix_zbus.c,v 1.20 2021/04/24 23:36:24 thorpej Exp $");
/* IOBlix Zorro driver */
/* XXX to be done: we need to probe the com clock speed! */
@ -130,7 +130,7 @@ iobzattach(device_t parent, device_t self, void *aux)
supa.supio_name = iobzd->name;
supa.supio_iobase = iobzd->off;
supa.supio_arg = iobzd->arg ? iobzclock : 0 /* XXX iobzd->arg */;
config_found(self, &supa, iobzprint); /* XXX */
config_found(self, &supa, iobzprint, CFARG_EOL); /* XXX */
++iobzd;
}

6
sys/arch/amiga/dev/ivsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ivsc.c,v 1.37 2014/01/22 00:25:16 christos Exp $ */
/* $NetBSD: ivsc.c,v 1.38 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ivsc.c,v 1.37 2014/01/22 00:25:16 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ivsc.c,v 1.38 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -186,7 +186,7 @@ ivscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
int

7
sys/arch/amiga/dev/kbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kbd.c,v 1.58 2019/02/24 19:25:35 jandberg Exp $ */
/* $NetBSD: kbd.c,v 1.59 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.58 2019/02/24 19:25:35 jandberg Exp $");
__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.59 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -219,7 +219,8 @@ kbdattach(device_t parent, device_t self, void *aux)
waa.keymap = &kbd_mapdata;
waa.accessops = &kbd_accessops;
waa.accesscookie = NULL;
kbd_softc.k_wskbddev = config_found(self, &waa, wskbddevprint);
kbd_softc.k_wskbddev = config_found(self, &waa, wskbddevprint,
CFARG_EOL);
kbd_softc.k_pollingmode = 0;
}

13
sys/arch/amiga/dev/mfc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mfc.c,v 1.57 2014/07/25 08:10:31 dholland Exp $ */
/* $NetBSD: mfc.c,v 1.58 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -55,7 +55,7 @@
#include "opt_kgdb.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mfc.c,v 1.57 2014/07/25 08:10:31 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: mfc.c,v 1.58 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -416,14 +416,17 @@ mfcattach(device_t parent, device_t self, void *aux)
/* configure ports */
memcpy(&ma.zargs, zap, sizeof(struct zbus_args));
ma.subdev = "mfcs";
ma.unit = unit * 2;
config_found(self, &ma, mfcprint);
config_found(self, &ma, mfcprint, CFARG_EOL);
ma.unit = unit * 2 + 1;
config_found(self, &ma, mfcprint);
config_found(self, &ma, mfcprint, CFARG_EOL);
ma.subdev = "mfcp";
ma.unit = unit;
config_found(self, &ma, mfcprint);
config_found(self, &ma, mfcprint, CFARG_EOL);
}
/*

6
sys/arch/amiga/dev/mgnsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mgnsc.c,v 1.46 2012/10/27 17:17:30 chs Exp $ */
/* $NetBSD: mgnsc.c,v 1.47 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mgnsc.c,v 1.46 2012/10/27 17:17:30 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: mgnsc.c,v 1.47 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -162,7 +162,7 @@ mgnscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
/*

6
sys/arch/amiga/dev/mlhsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mlhsc.c,v 1.32 2014/01/22 00:25:16 christos Exp $ */
/* $NetBSD: mlhsc.c,v 1.33 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mlhsc.c,v 1.32 2014/01/22 00:25:16 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: mlhsc.c,v 1.33 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -172,7 +172,7 @@ mlhscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
int

6
sys/arch/amiga/dev/mntva.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mntva.c,v 1.3 2017/10/04 09:44:09 rkujawa Exp $ */
/* $NetBSD: mntva.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 2012, 2016 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mntva.c,v 1.3 2017/10/04 09:44:09 rkujawa Exp $");
__KERNEL_RCSID(0, "$NetBSD: mntva.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -238,7 +238,7 @@ mntva_attach(device_t parent, device_t self, void *aux)
ws_aa.accessops = &mntva_accessops;
ws_aa.accesscookie = &sc->vd;
config_found(sc->sc_dev, &ws_aa, wsemuldisplaydevprint);
config_found(sc->sc_dev, &ws_aa, wsemuldisplaydevprint, CFARG_EOL);
}
static void

6
sys/arch/amiga/dev/ms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ms.c,v 1.39 2014/07/25 08:10:31 dholland Exp $ */
/* $NetBSD: ms.c,v 1.40 2021/04/24 23:36:24 thorpej Exp $ */
/*
* based on:
@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.39 2014/07/25 08:10:31 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.40 2021/04/24 23:36:24 thorpej Exp $");
/*
* Mouse driver.
@ -202,7 +202,7 @@ msattach(device_t parent, device_t self, void *aux)
sc->sc_ports[i].ms_wsenabled = 0;
sc->sc_ports[i].ms_wsmousedev =
config_found(self, &waa, wsmousedevprint);
config_found(self, &waa, wsmousedevprint, CFARG_EOL);
#endif
}
}

6
sys/arch/amiga/dev/otgsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: otgsc.c,v 1.33 2014/01/22 00:25:16 christos Exp $ */
/* $NetBSD: otgsc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: otgsc.c,v 1.33 2014/01/22 00:25:16 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: otgsc.c,v 1.34 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -179,7 +179,7 @@ otgscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
int

8
sys/arch/amiga/dev/p5bus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: p5bus.c,v 1.4 2012/10/27 17:17:30 chs Exp $ */
/* $NetBSD: p5bus.c,v 1.5 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
@ -143,11 +143,11 @@ p5bus_attach(device_t parent, device_t self, void *aux)
switch (sc->sc_has_scsi) {
case P5BUS_SCSI_710:
strcpy(p5baa.p5baa_name, "bppcsc");
config_found_ia(sc->sc_dev, "p5bus", &p5baa, p5bus_print);
config_found(sc->sc_dev, &p5baa, p5bus_print, CFARG_EOL);
break;
case P5BUS_SCSI_770:
strcpy(p5baa.p5baa_name, "cbiiisc");
config_found_ia(sc->sc_dev, "p5bus", &p5baa, p5bus_print);
config_found(sc->sc_dev, &p5baa, p5bus_print, CFARG_EOL);
break;
default:
break;
@ -173,7 +173,7 @@ p5bus_callback(device_t self) {
/* p5pb is always found, probe is inside of p5pb driver */
strcpy(p5baa.p5baa_name, "p5pb");
config_found_ia(sc->sc_dev, "p5bus", &p5baa, p5bus_print);
config_found(sc->sc_dev, &p5baa, p5bus_print, CFARG_EOL);
}
/* Get serial number of the card. */

6
sys/arch/amiga/dev/wesc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wesc.c,v 1.40 2012/10/27 17:17:31 chs Exp $ */
/* $NetBSD: wesc.c,v 1.41 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wesc.c,v 1.40 2012/10/27 17:17:31 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: wesc.c,v 1.41 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -160,7 +160,7 @@ wescattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
int

6
sys/arch/amiga/dev/wstsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wstsc.c,v 1.35 2019/02/06 04:07:31 mrg Exp $ */
/* $NetBSD: wstsc.c,v 1.36 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wstsc.c,v 1.35 2019/02/06 04:07:31 mrg Exp $");
__KERNEL_RCSID(0, "$NetBSD: wstsc.c,v 1.36 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -197,7 +197,7 @@ wstscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, chan, scsiprint);
config_found(self, chan, scsiprint, CFARG_EOL);
}
int

6
sys/arch/amiga/dev/xsh.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xsh.c,v 1.2 2013/08/09 12:56:31 rkujawa Exp $ */
/* $NetBSD: xsh.c,v 1.3 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xsh.c,v 1.2 2013/08/09 12:56:31 rkujawa Exp $");
__KERNEL_RCSID(0, "$NetBSD: xsh.c,v 1.3 2021/04/24 23:36:24 thorpej Exp $");
/*
* X-Surf 100 driver.
@ -90,7 +90,7 @@ xsh_attach(device_t parent, device_t self, void *aux)
/* Add ne(4). */
xaa_ne.xaa_base = (bus_addr_t)zap->va + XSURF100_NE_OFFSET;
strcpy(xaa_ne.xaa_name, "ne_xsh");
config_found_ia(sc->sc_dev, "xshbus", &xaa_ne, xsh_print);
config_found(sc->sc_dev, &xaa_ne, xsh_print, CFARG_EOL);
/* TODO: add USB module... */
}

12
sys/arch/amiga/dev/xsurf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xsurf.c,v 1.3 2012/11/19 22:36:11 rkujawa Exp $ */
/* $NetBSD: xsurf.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xsurf.c,v 1.3 2012/11/19 22:36:11 rkujawa Exp $");
__KERNEL_RCSID(0, "$NetBSD: xsurf.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $");
/*
* X-Surf driver, split from ne_zbus.
@ -128,7 +128,7 @@ xsurf_attach(device_t parent, device_t self, void *aux)
/* Add clockport. */
xaa_gencp1.xaa_base = (bus_addr_t)zap->va + XSURF_CP2_BASE;
strcpy(xaa_gencp1.xaa_name, "gencp_xsurf");
config_found_ia(sc->sc_dev, "xsurfbus", &xaa_gencp1, xsurf_print);
config_found(sc->sc_dev, &xaa_gencp1, xsurf_print, CFARG_EOL);
/* Now... if we are a fake X-Surf that's enough. */
if (zap->serno == DENEB_XSURF_SERNO) {
@ -139,17 +139,17 @@ xsurf_attach(device_t parent, device_t self, void *aux)
/* Otherwise add one more clockport and continue... */
xaa_gencp2.xaa_base = (bus_addr_t)zap->va + XSURF_CP1_BASE;
strcpy(xaa_gencp2.xaa_name, "gencp_xsurf");
config_found_ia(sc->sc_dev, "xsurfbus", &xaa_gencp2, xsurf_print);
config_found(sc->sc_dev, &xaa_gencp2, xsurf_print, CFARG_EOL);
/* Add ne(4). */
xaa_ne.xaa_base = (bus_addr_t)zap->va + XSURF_NE_OFFSET;
strcpy(xaa_ne.xaa_name, "ne_xsurf");
config_found_ia(sc->sc_dev, "xsurfbus", &xaa_ne, xsurf_print);
config_found(sc->sc_dev, &xaa_ne, xsurf_print, CFARG_EOL);
/* Add wdc(4). */
xaa_wdc.xaa_base = (bus_addr_t)zap->va + XSURF_WDC_OFFSET;
strcpy(xaa_wdc.xaa_name, "wdc_xsurf");
config_found_ia(sc->sc_dev, "xsurfbus", &xaa_wdc, xsurf_print);
config_found(sc->sc_dev, &xaa_wdc, xsurf_print, CFARG_EOL);
}

6
sys/arch/amiga/dev/z3rambd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: z3rambd.c,v 1.3 2015/06/01 17:09:46 phx Exp $ */
/* $NetBSD: z3rambd.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: z3rambd.c,v 1.3 2015/06/01 17:09:46 phx Exp $");
__KERNEL_RCSID(0, "$NetBSD: z3rambd.c,v 1.4 2021/04/24 23:36:24 thorpej Exp $");
/*
* Z3 RAM virtual block device. Supports ZorRAM, BigRamPlus and FastLane Z3 so
@ -114,7 +114,7 @@ z3rambd_attach(device_t parent, device_t self, void *aux)
aaa.cookie = sc;
aaa.memops = &z3rambd_altmem_memops;
config_found_ia(self, "altmemdev", &aaa, z3rambd_altmem_print);
config_found(self, &aaa, z3rambd_altmem_print, CFARG_EOL);
}
static int

6
sys/arch/amiga/dev/zssc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zssc.c,v 1.46 2019/11/12 13:17:43 msaitoh Exp $ */
/* $NetBSD: zssc.c,v 1.47 2021/04/24 23:36:24 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zssc.c,v 1.46 2019/11/12 13:17:43 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: zssc.c,v 1.47 2021/04/24 23:36:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -149,7 +149,7 @@ zsscattach(device_t parent, device_t self, void *aux)
/*
* attach all scsi units on us
*/
config_found(self, &sc->sc_channel, scsiprint);
config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
}
/*

4
sys/arch/amiga/pci/cv3dpb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cv3dpb.c,v 1.4 2020/06/17 06:37:57 thorpej Exp $ */
/* $NetBSD: cv3dpb.c,v 1.5 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
@ -141,7 +141,7 @@ cv3dpb_attach(device_t parent, device_t self, void *aux)
pba.pba_bus = 0;
pba.pba_bridgetag = NULL;
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}
pcireg_t

4
sys/arch/amiga/pci/em4k.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: em4k.c,v 1.6 2020/07/07 03:38:45 thorpej Exp $ */
/* $NetBSD: em4k.c,v 1.7 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -235,7 +235,7 @@ em4k_callback(device_t self) {
em4k_intr_enable(sc);
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}
#ifdef PCI_NETBSD_CONFIGURE

10
sys/arch/amiga/pci/empb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: empb.c,v 1.13 2020/07/07 03:38:45 thorpej Exp $ */
/* $NetBSD: empb.c,v 1.14 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@ -268,7 +268,9 @@ empb_callback(device_t self) {
empb_intr_enable(sc);
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint,
CFARG_IATTR, "pcibus",
CFARG_EOL);
}
static void
@ -277,7 +279,9 @@ empb_empm_attach(struct empb_softc *sc)
struct empm_attach_args aa;
aa.setup_area_t = sc->setup_area_t;
config_found_ia(sc->sc_dev, "empmdev", &aa, empb_empm_print);
config_found(sc->sc_dev, &aa, empb_empm_print,
CFARG_IATTR, "empmdev",
CFARG_EOL);
}
static int

4
sys/arch/amiga/pci/mppb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mppb.c,v 1.10 2020/07/07 03:38:45 thorpej Exp $ */
/* $NetBSD: mppb.c,v 1.11 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@ -186,7 +186,7 @@ mppb_attach(device_t parent, device_t self, void *aux)
pba.pba_bus = 0;
pba.pba_bridgetag = NULL;
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}
pcireg_t

4
sys/arch/amiga/pci/p5pb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: p5pb.c,v 1.17 2020/07/07 03:38:45 thorpej Exp $ */
/* $NetBSD: p5pb.c,v 1.18 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
@ -219,7 +219,7 @@ p5pb_attach(device_t parent, device_t self, void *aux)
p5pb_set_props(sc);
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}
/*

8
sys/arch/amigappc/amigappc/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.6 2012/10/27 17:17:34 chs Exp $ */
/* $NetBSD: autoconf.c,v 1.7 2021/04/24 23:36:25 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2012/10/27 17:17:34 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.7 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -129,7 +129,7 @@ amiga_config_found(cfdata_t pcfp, device_t parent, void *aux, cfprint_t pfn)
const struct cfattach *ca;
if (amiga_realconfig)
return config_found(parent, aux, pfn) != NULL;
return config_found(parent, aux, pfn, CFARG_EOL) != NULL;
if (parent == NULL) {
memset(&temp, 0, sizeof temp);
@ -140,7 +140,7 @@ amiga_config_found(cfdata_t pcfp, device_t parent, void *aux, cfprint_t pfn)
parent->dv_cfdriver = config_cfdriver_lookup(pcfp->cf_name);
parent->dv_unit = pcfp->cf_unit;
if ((cf = config_search_ia(NULL, parent, NULL, aux)) != NULL) {
if ((cf = config_search(parent, aux, CFARG_EOL)) != NULL) {
ca = config_cfattach_lookup(cf->cf_name, cf->cf_atname);
if (ca != NULL) {
(*ca->ca_attach)(parent, NULL, aux);

43
sys/arch/amigappc/amigappc/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.4 2011/07/18 17:51:17 dyoung Exp $ */
/* $NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 2008,2009 Frank Wille.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2011/07/18 17:51:17 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -102,33 +102,40 @@ mbattach(device_t parent, device_t self, void *aux)
/*
* Always find the CPU
*/
config_found_ia(self, "mainbus", __UNCONST("cpu"), mbprint);
config_found(self, __UNCONST("cpu"), mbprint, CFARG_EOL);
/*
* "find" all the things that should be there.
*/
if (is_a3000() || is_a4000())
config_found(self, __UNCONST("a34kbbc"), simple_devprint);
config_found(self, __UNCONST("a34kbbc"), simple_devprint,
CFARG_EOL);
else
config_found(self, __UNCONST("a2kbbc"), simple_devprint);
config_found(self, __UNCONST("ser"), simple_devprint);
config_found(self, __UNCONST("par"), simple_devprint);
config_found(self, __UNCONST("kbd"), simple_devprint);
config_found(self, __UNCONST("ms"), simple_devprint);
config_found(self, __UNCONST("grfcc"), simple_devprint);
config_found(self, __UNCONST("amidisplaycc"), simple_devprint);
config_found(self, __UNCONST("fdc"), simple_devprint);
config_found(self, __UNCONST("a2kbbc"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("ser"), simple_devprint, CFARG_EOL);
config_found(self, __UNCONST("par"), simple_devprint, CFARG_EOL);
config_found(self, __UNCONST("kbd"), simple_devprint, CFARG_EOL);
config_found(self, __UNCONST("ms"), simple_devprint, CFARG_EOL);
config_found(self, __UNCONST("grfcc"), simple_devprint, CFARG_EOL);
config_found(self, __UNCONST("amidisplaycc"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("fdc"), simple_devprint, CFARG_EOL);
if (is_a4000() || is_a1200())
config_found(self, __UNCONST("wdc"), simple_devprint);
config_found(self, __UNCONST("wdc"), simple_devprint,
CFARG_EOL);
if (is_a4000()) /* Try to configure A4000T SCSI */
config_found(self, __UNCONST("afsc"), simple_devprint);
config_found(self, __UNCONST("afsc"), simple_devprint,
CFARG_EOL);
if (is_a3000())
config_found(self, __UNCONST("ahsc"), simple_devprint);
config_found(self, __UNCONST("ahsc"), simple_devprint,
CFARG_EOL);
if (is_a1200())
config_found(self, __UNCONST("pccard"), simple_devprint);
config_found(self, __UNCONST("aucc"), simple_devprint);
config_found(self, __UNCONST("pccard"), simple_devprint,
CFARG_EOL);
config_found(self, __UNCONST("aucc"), simple_devprint, CFARG_EOL);
config_found(self, __UNCONST("zbus"), simple_devprint);
config_found(self, __UNCONST("zbus"), simple_devprint, CFARG_EOL);
}
int

8
sys/arch/arc/arc/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.23 2011/03/06 14:58:42 tsutsui Exp $ */
/* $NetBSD: mainbus.c,v 1.24 2021/04/24 23:36:25 thorpej Exp $ */
/* $OpenBSD: mainbus.c,v 1.4 1998/10/15 21:30:15 imp Exp $ */
/* NetBSD: mainbus.c,v 1.3 1995/06/28 02:45:10 cgd Exp */
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.23 2011/03/06 14:58:42 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.24 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -78,13 +78,13 @@ mbattach(device_t parent, device_t self, void *aux)
nca.ca_name = "cpu";
nca.ca_slot = 0;
nca.ca_offset = 0;
config_found(self, &nca, mbprint);
config_found(self, &nca, mbprint, CFARG_EOL);
for (i = 0; platform->mainbusdevs[i] != NULL; i++) {
nca.ca_name = platform->mainbusdevs[i];
nca.ca_slot = 0;
nca.ca_offset = 0;
config_found(self, &nca, mbprint);
config_found(self, &nca, mbprint, CFARG_EOL);
}
}

6
sys/arch/arc/dti/btl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: btl.c,v 1.28 2018/09/03 16:29:22 riastradh Exp $ */
/* $NetBSD: btl.c,v 1.29 2021/04/24 23:36:25 thorpej Exp $ */
/* NetBSD: bt.c,v 1.10 1996/05/12 23:51:54 mycroft Exp */
#undef BTDIAG
@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: btl.c,v 1.28 2018/09/03 16:29:22 riastradh Exp $");
__KERNEL_RCSID(0, "$NetBSD: btl.c,v 1.29 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -411,7 +411,7 @@ btattach(device_t parent, device_t self, void *aux)
/*
* ask the adapter what subunits are present
*/
config_found(self, &sc->sc_link, scsiprint);
config_found(self, &sc->sc_link, scsiprint, CFARG_EOL);
}
integrate void

8
sys/arch/arc/isa/isabus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isabus.c,v 1.51 2020/11/18 02:14:13 thorpej Exp $ */
/* $NetBSD: isabus.c,v 1.52 2021/04/24 23:36:25 thorpej Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@ -120,7 +120,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.51 2020/11/18 02:14:13 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.52 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@ -207,7 +207,9 @@ isabrattach(struct isabr_softc *sc)
iba.iba_memt = &arc_bus_mem;
iba.iba_dmat = &sc->sc_dmat;
iba.iba_ic = &sc->arc_isa_cs;
config_found_ia(sc->sc_dev, "isabus", &iba, isabrprint);
config_found(sc->sc_dev, &iba, isabrprint,
CFARG_IATTR, "isabus",
CFARG_EOL);
}
static int

7
sys/arch/arc/jazz/fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.49 2019/02/08 08:47:35 mrg Exp $ */
/* $NetBSD: fd.c,v 1.50 2021/04/24 23:36:25 thorpej Exp $ */
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.49 2019/02/08 08:47:35 mrg Exp $");
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.50 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -281,7 +281,8 @@ fdcattach(struct fdc_softc *fdc)
/* physical limit: two drives per controller. */
for (fa.fa_drive = 0; fa.fa_drive < 2; fa.fa_drive++) {
fa.fa_deftype = &fd_types[type];
(void)config_found(fdc->sc_dev, (void *)&fa, fdprint);
(void)config_found(fdc->sc_dev, (void *)&fa, fdprint,
CFARG_EOL);
}
}

6
sys/arch/arc/jazz/jazzio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: jazzio.c,v 1.22 2011/07/01 19:25:41 dyoung Exp $ */
/* $NetBSD: jazzio.c,v 1.23 2021/04/24 23:36:25 thorpej Exp $ */
/* $OpenBSD: picabus.c,v 1.11 1999/01/11 05:11:10 millert Exp $ */
/* NetBSD: tc.c,v 1.2 1995/03/08 00:39:05 cgd Exp */
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: jazzio.c,v 1.22 2011/07/01 19:25:41 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: jazzio.c,v 1.23 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -149,7 +149,7 @@ jazzioattach(device_t parent, device_t self, void *aux)
ja.ja_dma = 0;
/* Tell the autoconfig machinery we've found the hardware. */
config_found(self, &ja, jazzioprint);
config_found(self, &ja, jazzioprint, CFARG_EOL);
}
}

6
sys/arch/arc/pci/necpb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: necpb.c,v 1.46 2020/11/18 02:14:13 thorpej Exp $ */
/* $NetBSD: necpb.c,v 1.47 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.46 2020/11/18 02:14:13 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.47 2021/04/24 23:36:25 thorpej Exp $");
#include "opt_pci.h"
@ -276,7 +276,7 @@ necpbattach(device_t parent, device_t self, void *aux)
pba.pba_bus = 0;
pba.pba_bridgetag = NULL;
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}
static void

16
sys/arch/arm/acpi/acpi_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_machdep.c,v 1.21 2020/12/13 20:24:26 jmcneill Exp $ */
/* $NetBSD: acpi_machdep.c,v 1.22 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@ -32,7 +32,7 @@
#include "pci.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.21 2020/12/13 20:24:26 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.22 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -305,7 +305,9 @@ acpi_md_madt_probe_cpu(ACPI_SUBTABLE_HEADER *hdrp, void *aux)
struct acpi_softc * const sc = aux;
if (hdrp->Type == ACPI_MADT_TYPE_GENERIC_INTERRUPT)
config_found_ia(sc->sc_dev, "acpimadtbus", hdrp, NULL);
config_found(sc->sc_dev, hdrp, NULL,
CFARG_IATTR, "acpimadtbus",
CFARG_EOL);
return AE_OK;
}
@ -316,7 +318,9 @@ acpi_md_madt_probe_gic(ACPI_SUBTABLE_HEADER *hdrp, void *aux)
struct acpi_softc * const sc = aux;
if (hdrp->Type == ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR)
config_found_ia(sc->sc_dev, "acpimadtbus", hdrp, NULL);
config_found(sc->sc_dev, hdrp, NULL,
CFARG_IATTR, "acpimadtbus",
CFARG_EOL);
return AE_OK;
}
@ -326,7 +330,9 @@ acpi_md_gtdt_probe(ACPI_GTDT_HEADER *hdrp, void *aux)
{
struct acpi_softc * const sc = aux;
config_found_ia(sc->sc_dev, "acpigtdtbus", hdrp, NULL);
config_found(sc->sc_dev, hdrp, NULL,
CFARG_IATTR, "acpigtdtbus",
CFARG_EOL);
return AE_OK;
}

6
sys/arch/arm/acpi/acpi_platform.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_platform.c,v 1.24 2021/02/12 12:26:09 jmcneill Exp $ */
/* $NetBSD: acpi_platform.c,v 1.25 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@ -35,7 +35,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.24 2021/02/12 12:26:09 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.25 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -287,9 +287,7 @@ acpi_platform_init_attach_args(struct fdt_attach_args *faa)
static void
acpi_platform_device_register(device_t self, void *aux)
{
/* XXX Not ideal, but the only reasonable solution atm. */
acpi_device_register(self, aux);
fdtbus_device_register(self, aux);
#if NCOM > 0
prop_dictionary_t prop = device_properties(self);

6
sys/arch/arm/acpi/acpipchb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpipchb.c,v 1.23 2021/01/26 00:29:22 jmcneill Exp $ */
/* $NetBSD: acpipchb.c,v 1.24 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpipchb.c,v 1.23 2021/01/26 00:29:22 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpipchb.c,v 1.24 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -174,7 +174,7 @@ acpipchb_attach(device_t parent, device_t self, void *aux)
acpipchb_setup_ranges(sc, &pba);
acpipchb_setup_quirks(sc, &pba);
config_found_ia(self, "pcibus", &pba, pcibusprint);
config_found(self, &pba, pcibusprint, CFARG_EOL);
}
struct acpipchb_setup_ranges_args {

6
sys/arch/arm/acpi/gic_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gic_acpi.c,v 1.5 2020/07/27 18:38:10 jmcneill Exp $ */
/* $NetBSD: gic_acpi.c,v 1.6 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@ -32,7 +32,7 @@
#include "pci.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gic_acpi.c,v 1.5 2020/07/27 18:38:10 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: gic_acpi.c,v 1.6 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -123,7 +123,7 @@ gic_acpi_attach(device_t parent, device_t self, void *aux)
.mpcaa_off2 = gicc->BaseAddress - addr,
};
armgic = config_found(self, &mpcaa, NULL);
armgic = config_found(self, &mpcaa, NULL, CFARG_EOL);
if (armgic != NULL) {
arm_fdt_irq_set_handler(armgic_irq_handler);

6
sys/arch/arm/acpi/gtmr_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gtmr_acpi.c,v 1.3 2019/04/29 12:53:15 christos Exp $ */
/* $NetBSD: gtmr_acpi.c,v 1.4 2021/04/24 23:36:25 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gtmr_acpi.c,v 1.3 2019/04/29 12:53:15 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: gtmr_acpi.c,v 1.4 2021/04/24 23:36:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -88,7 +88,7 @@ gtmr_acpi_attach(device_t parent, device_t self, void *aux)
memset(&mpcaa, 0, sizeof(mpcaa));
mpcaa.mpcaa_name = "armgtmr";
mpcaa.mpcaa_irq = -1;
config_found(self, &mpcaa, NULL);
config_found(self, &mpcaa, NULL, CFARG_EOL);
arm_fdt_cpu_hatch_register(self, gtmr_acpi_cpu_hatch);
arm_fdt_timer_register(gtmr_cpu_initclocks);

6
sys/arch/arm/altera/cycv_platform.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cycv_platform.c,v 1.17 2021/02/04 22:36:52 thorpej Exp $ */
/* $NetBSD: cycv_platform.c,v 1.18 2021/04/24 23:36:25 thorpej Exp $ */
/* This file is in the public domain. */
@ -7,7 +7,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.17 2021/02/04 22:36:52 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.18 2021/04/24 23:36:25 thorpej Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@ -141,8 +141,6 @@ cycv_platform_device_register(device_t dev, void *aux)
{
prop_dictionary_t dict = device_properties(dev);
fdtbus_device_register(dev, aux);
if (device_is_a(dev, "arma9tmr")) {
prop_dictionary_set_uint32(dict, "frequency",
cycv_clkmgr_early_get_mpu_clk() / 4);

6
sys/arch/arm/amlogic/meson_pinctrl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: meson_pinctrl.c,v 1.11 2021/01/27 03:10:18 thorpej Exp $ */
/* $NetBSD: meson_pinctrl.c,v 1.12 2021/04/24 23:36:26 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@ -29,7 +29,7 @@
#include "opt_soc.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: meson_pinctrl.c,v 1.11 2021/01/27 03:10:18 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: meson_pinctrl.c,v 1.12 2021/04/24 23:36:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -566,7 +566,7 @@ meson_pinctrl_initgpio(struct meson_pinctrl_softc *sc)
gba.gba_gc = gp;
gba.gba_pins = sc->sc_pins;
gba.gba_npins = npins;
config_found_ia(sc->sc_dev, "gpiobus", &gba, NULL);
config_found(sc->sc_dev, &gba, NULL, CFARG_EOL);
}
static int

8
sys/arch/arm/amlogic/meson_platform.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: meson_platform.c,v 1.19 2021/02/05 08:07:14 skrll Exp $ */
/* $NetBSD: meson_platform.c,v 1.20 2021/04/24 23:36:26 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcneill@invisible.ca>
@ -33,7 +33,7 @@
#include "arml2cc.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.19 2021/02/05 08:07:14 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.20 2021/04/24 23:36:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -182,8 +182,6 @@ meson_platform_device_register(device_t self, void *aux)
{
prop_dictionary_t dict = device_properties(self);
fdtbus_device_register(self, aux);
if (device_is_a(self, "awge") && device_unit(self) == 0) {
uint8_t enaddr[ETHER_ADDR_LEN];
if (get_bootconf_option(boot_args, "awge0.mac-address",
@ -234,8 +232,6 @@ meson8b_platform_device_register(device_t self, void *aux)
device_t parent = device_parent(self);
char *ptr;
fdtbus_device_register(self, aux);
if (device_is_a(self, "ld") &&
device_is_a(parent, "sdmmc") &&
(device_is_a(device_parent(parent), "mesonsdhc") ||

6
sys/arch/arm/amlogic/meson_sdhc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: meson_sdhc.c,v 1.3 2021/01/27 03:10:18 thorpej Exp $ */
/* $NetBSD: meson_sdhc.c,v 1.4 2021/04/24 23:36:26 thorpej Exp $ */
/*-
* Copyright (c) 2015-2019 Jared McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: meson_sdhc.c,v 1.3 2021/01/27 03:10:18 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: meson_sdhc.c,v 1.4 2021/04/24 23:36:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -294,7 +294,7 @@ meson_sdhc_attach_i(device_t self)
saa.saa_caps |= SMC_CAPS_8BIT_MODE;
}
sc->sc_sdmmc_dev = config_found(self, &saa, NULL);
sc->sc_sdmmc_dev = config_found(self, &saa, NULL, CFARG_EOL);
}
static int

6
sys/arch/arm/amlogic/meson_sdio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: meson_sdio.c,v 1.3 2021/01/27 03:10:18 thorpej Exp $ */
/* $NetBSD: meson_sdio.c,v 1.4 2021/04/24 23:36:26 thorpej Exp $ */
/*-
* Copyright (c) 2015-2019 Jared D. McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: meson_sdio.c,v 1.3 2021/01/27 03:10:18 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: meson_sdio.c,v 1.4 2021/04/24 23:36:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -265,7 +265,7 @@ meson_sdio_attach_i(device_t self)
SMC_CAPS_SD_HIGHSPEED|
SMC_CAPS_MMC_HIGHSPEED;
sc->sc_sdmmc_dev = config_found(self, &saa, NULL);
sc->sc_sdmmc_dev = config_found(self, &saa, NULL, CFARG_EOL);
}
static int

6
sys/arch/arm/amlogic/mesongx_mmc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mesongx_mmc.c,v 1.14 2021/01/28 11:45:31 jmcneill Exp $ */
/* $NetBSD: mesongx_mmc.c,v 1.15 2021/04/24 23:36:26 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.14 2021/01/28 11:45:31 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.15 2021/04/24 23:36:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -594,7 +594,7 @@ mesongx_mmc_attach_i(device_t self)
if (sc->sc_gpio_cd)
saa.saa_caps |= SMC_CAPS_POLL_CARD_DET;
sc->sc_sdmmc_dev = config_found(self, &saa, NULL);
sc->sc_sdmmc_dev = config_found(self, &saa, NULL, CFARG_EOL);
}
static int

18
sys/arch/arm/at91/at91bus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: at91bus.c,v 1.27 2020/04/18 11:00:37 skrll Exp $ */
/* $NetBSD: at91bus.c,v 1.28 2021/04/24 23:36:26 thorpej Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.27 2020/04/18 11:00:37 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.28 2021/04/24 23:36:26 thorpej Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@ -580,8 +580,10 @@ at91bus_found(device_t self, bus_addr_t addr, int pid)
sa.sa_size = 1;
sa.sa_pid = pid;
return config_found_sm_loc(self, "at91bus", locs, &sa,
at91bus_print, at91bus_submatch);
config_found(self, &sa, at91bus_print,
CFARG_SUBMATCH, at91bus_submatch,
CFARG_LOCATORS, locs,
CFARG_EOL);
}
static void
@ -620,7 +622,9 @@ at91bus_attach(device_t parent, device_t self, void *aux)
memset(&sa, 0, sizeof(sa));
sa.sa_iot = sc->sc_iot;
sa.sa_dmat = sc->sc_dmat;
config_search_ia(at91bus_search, self, "at91bus", &sa);
config_search(self, &sa,
CFARG_SEARCH, at91bus_search,
CFARG_EOL);
}
int
@ -647,8 +651,8 @@ at91bus_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
sa->sa_size = cf->cf_loc[AT91BUSCF_SIZE];
sa->sa_pid = cf->cf_loc[AT91BUSCF_PID];
if (config_match(parent, cf, aux) > 0)
config_attach(parent, cf, aux, at91bus_print);
if (config_probe(parent, cf, aux))
config_attach(parent, cf, aux, at91bus_print, CFARG_EOL);
return (0);
}

9
sys/arch/arm/at91/at91cf.c
View File

@ -1,5 +1,5 @@
/* $Id: at91cf.c,v 1.5 2019/11/10 21:16:23 chs Exp $ */
/* $NetBSD: at91cf.c,v 1.5 2019/11/10 21:16:23 chs Exp $ */
/* $Id: at91cf.c,v 1.6 2021/04/24 23:36:26 thorpej Exp $ */
/* $NetBSD: at91cf.c,v 1.6 2021/04/24 23:36:26 thorpej Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: at91cf.c,v 1.5 2019/11/10 21:16:23 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: at91cf.c,v 1.6 2021/04/24 23:36:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -223,8 +223,7 @@ at91cf_config_socket(struct at91cf_handle *ph)
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)&at91cf_functions;
paa.pch = (pcmcia_chipset_handle_t)ph;
ph->ph_card = config_found_ia(sc->sc_dev, "pcmciabus", &paa,
at91cf_print);
ph->ph_card = config_found(sc->sc_dev, &paa, at91cf_print, CFARG_EOL);
(*cscf->intr_establish)(sc, CD_IRQ, IPL_BIO, at91cf_intr_carddetect, ph);
wait = (*cscf->power_ctl)(sc, POWER_OFF);

9
sys/arch/arm/at91/at91ohci.c
View File

@ -1,5 +1,5 @@
/* $Id: at91ohci.c,v 1.7 2018/04/09 16:21:09 jakllsch Exp $ */
/* $NetBSD: at91ohci.c,v 1.7 2018/04/09 16:21:09 jakllsch Exp $ */
/* $Id: at91ohci.c,v 1.8 2021/04/24 23:36:26 thorpej Exp $ */
/* $NetBSD: at91ohci.c,v 1.8 2021/04/24 23:36:26 thorpej Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v 1.7 2018/04/09 16:21:09 jakllsch Exp $");
__KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v 1.8 2021/04/24 23:36:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -137,5 +137,6 @@ at91ohci_callback(device_t self)
}
/* Attach usb device. */
sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint);
sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint,
CFARG_EOL);
}

19
sys/arch/arm/at91/at91pio.c
View File

@ -1,5 +1,5 @@
/* $Id: at91pio.c,v 1.6 2012/11/12 18:00:36 skrll Exp $ */
/* $NetBSD: at91pio.c,v 1.6 2012/11/12 18:00:36 skrll Exp $ */
/* $Id: at91pio.c,v 1.7 2021/04/24 23:36:26 thorpej Exp $ */
/* $NetBSD: at91pio.c,v 1.7 2021/04/24 23:36:26 thorpej Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: at91pio.c,v 1.6 2012/11/12 18:00:36 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: at91pio.c,v 1.7 2021/04/24 23:36:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -183,11 +183,16 @@ at91pio_attach(device_t parent, device_t self, void *aux)
gba.gba_gc = &sc->gpio_chipset;
gba.gba_pins = sc->pins;
gba.gba_npins = n;
config_found_ia(self, "gpiobus", &gba, at91piobus_print);
config_found(self, &gba, at91piobus_print,
CFARG_IATTR, "gpiobus",
CFARG_EOL);
#endif
/* attach device */
config_search_ia(at91pio_search, self, "at91pio", at91pio_print);
config_search(self, NULL,
CFARG_SEARCH, at91pio_search,
CFARG_IATTR, "at91pio",
CFARG_EOL);
}
#if NGPIO > 0
@ -218,8 +223,8 @@ at91pio_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
paa.paa_pid = cf->cf_loc[AT91PIOCF_PID];
paa.paa_bit = cf->cf_loc[AT91PIOCF_BIT];
if (config_match(parent, cf, &paa) > 0)
config_attach(parent, cf, &paa, at91pio_print);
if (config_probe(parent, cf, &paa))
config_attach(parent, cf, &paa, at91pio_print, CFARG_EOL);
return 0;
}

8
sys/arch/arm/at91/at91spi.c
View File

@ -1,5 +1,5 @@
/* $Id: at91spi.c,v 1.5 2019/12/27 09:41:49 msaitoh Exp $ */
/* $NetBSD: at91spi.c,v 1.5 2019/12/27 09:41:49 msaitoh Exp $ */
/* $Id: at91spi.c,v 1.6 2021/04/24 23:36:26 thorpej Exp $ */
/* $NetBSD: at91spi.c,v 1.6 2021/04/24 23:36:26 thorpej Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: at91spi.c,v 1.5 2019/12/27 09:41:49 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: at91spi.c,v 1.6 2021/04/24 23:36:26 thorpej Exp $");
#include "locators.h"
@ -193,7 +193,7 @@ at91spi_attach_common(device_t parent, device_t self, void *aux,
PUTREG(sc, SPI_PDC_BASE + PDC_PTCR, PDC_PTCR_TXTEN | PDC_PTCR_RXTEN);
/* attach slave devices */
(void) config_found_ia(sc->sc_dev, "spibus", &sba, spibus_print);
config_found(sc->sc_dev, &sba, spibus_print, CFARG_EOL);
}
int

8
sys/arch/arm/at91/at91twi.c
View File

@ -1,5 +1,5 @@
/* $Id: at91twi.c,v 1.8 2019/12/22 23:23:29 thorpej Exp $ */
/* $NetBSD: at91twi.c,v 1.8 2019/12/22 23:23:29 thorpej Exp $ */
/* $Id: at91twi.c,v 1.9 2021/04/24 23:36:26 thorpej Exp $ */
/* $NetBSD: at91twi.c,v 1.9 2021/04/24 23:36:26 thorpej Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: at91twi.c,v 1.8 2019/12/22 23:23:29 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: at91twi.c,v 1.9 2021/04/24 23:36:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -127,7 +127,7 @@ found_ckdiv:
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
(void) config_found_ia(sc->sc_dev, "i2cbus", &iba, iicbus_print);
config_found(sc->sc_dev, &iba, iicbus_print, CFARG_EOL);
}
u_int

6
sys/arch/arm/broadcom/bcm2835_bsc_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bcm2835_bsc_acpi.c,v 1.2 2021/01/26 00:19:52 jmcneill Exp $ */
/* $NetBSD: bcm2835_bsc_acpi.c,v 1.3 2021/04/24 23:36:26 thorpej Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_acpi.c,v 1.2 2021/01/26 00:19:52 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_acpi.c,v 1.3 2021/04/24 23:36:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -161,7 +161,7 @@ bsciic_acpi_attach(device_t parent, device_t self, void *aux)
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
iba.iba_child_devices = acpi_enter_i2c_devs(self, aa->aa_node);
config_found_ia(self, "i2cbus", &iba, iicbus_print);
config_found(self, &iba, iicbus_print, CFARG_EOL);
done:
acpi_resource_cleanup(&res);

Some files were not shown because too many files have changed in this diff Show More