Module Name: src
Committed By: thorpej
Date: Wed Aug 4 23:25:00 UTC 2021
Modified Files:
src/sys/dev [thorpej-cfargs2]: midi.c radio.c spkr.c video.c
src/sys/dev/flash [thorpej-cfargs2]: flash.c flash_mtdparts.c
src/sys/dev/gpib [thorpej-cfargs2]: cs80bus.c gpib.c
src/sys/dev/hdaudio [thorpej-cfargs2]: hdaudio.c
src/sys/dev/hid [thorpej-cfargs2]: hidms.c
src/sys/dev/isapnp [thorpej-cfargs2]: isapnp.c wss_isapnp.c
src/sys/dev/iscsi [thorpej-cfargs2]: iscsi_main.c
src/sys/dev/mii [thorpej-cfargs2]: mii.c
src/sys/dev/mscp [thorpej-cfargs2]: mscp.c
src/sys/dev/mvme [thorpej-cfargs2]: mvmebus.c pcctwo.c
src/sys/dev/nand [thorpej-cfargs2]: nand.c
src/sys/dev/nor [thorpej-cfargs2]: nor.c
src/sys/dev/ofisa [thorpej-cfargs2]: ofisa.c
src/sys/dev/ofw [thorpej-cfargs2]: ofbus.c
src/sys/dev/onewire [thorpej-cfargs2]: onewire.c
src/sys/dev/pckbport [thorpej-cfargs2]: pckbd.c pckbport.c pms.c
src/sys/dev/sdmmc [thorpej-cfargs2]: sdhc.c sdmmc.c
src/sys/dev/spi [thorpej-cfargs2]: mcp23s17.c oj6sh.c spi.c spiflash.c
src/sys/dev/std [thorpej-cfargs2]: ieee1212.c
src/sys/dev/wsfb [thorpej-cfargs2]: genfb.c
src/sys/dev/xmi [thorpej-cfargs2]: xmi.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.93.6.1 src/sys/dev/midi.c
cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/dev/radio.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/spkr.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/dev/video.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/flash/flash.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/dev/flash/flash_mtdparts.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/dev/gpib/cs80bus.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/dev/gpib/gpib.c
cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/dev/hdaudio/hdaudio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/hid/hidms.c
cvs rdiff -u -r1.61 -r1.61.8.1 src/sys/dev/isapnp/isapnp.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/isapnp/wss_isapnp.c
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/dev/iscsi/iscsi_main.c
cvs rdiff -u -r1.56 -r1.56.8.1 src/sys/dev/mii/mii.c
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/dev/mscp/mscp.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/mvme/mvmebus.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/dev/mvme/pcctwo.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/dev/nand/nand.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/dev/nor/nor.c
cvs rdiff -u -r1.33 -r1.33.6.1 src/sys/dev/ofisa/ofisa.c
cvs rdiff -u -r1.29 -r1.29.6.1 src/sys/dev/ofw/ofbus.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/dev/onewire/onewire.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/dev/pckbport/pckbd.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/dev/pckbport/pckbport.c
cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/dev/pckbport/pms.c
cvs rdiff -u -r1.110 -r1.110.4.1 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/dev/sdmmc/sdmmc.c
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/dev/spi/mcp23s17.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/spi/oj6sh.c
cvs rdiff -u -r1.18 -r1.18.4.1 src/sys/dev/spi/spi.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/dev/spi/spiflash.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/dev/std/ieee1212.c
cvs rdiff -u -r1.82 -r1.82.8.1 src/sys/dev/wsfb/genfb.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/dev/xmi/xmi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/midi.c
diff -u src/sys/dev/midi.c:1.93 src/sys/dev/midi.c:1.93.6.1
--- src/sys/dev/midi.c:1.93 Mon Apr 26 21:54:56 2021
+++ src/sys/dev/midi.c Wed Aug 4 23:24:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: midi.c,v 1.93 2021/04/26 21:54:56 thorpej Exp $ */
+/* $NetBSD: midi.c,v 1.93.6.1 2021/08/04 23:24:57 thorpej Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.93 2021/04/26 21:54:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.93.6.1 2021/08/04 23:24:57 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "midi.h"
@@ -1896,8 +1896,7 @@ midi_attach_mi(const struct midi_hw_if *
arg.hwif = mhwp;
arg.hdl = hdlp;
return (config_found(dev, &arg, audioprint,
- CFARG_IATTR, "midibus",
- CFARG_EOL));
+ CFARGS(.iattr = "midibus")));
}
#endif /* NMIDI > 0 || NMIDIBUS > 0 */
Index: src/sys/dev/radio.c
diff -u src/sys/dev/radio.c:1.30 src/sys/dev/radio.c:1.30.8.1
--- src/sys/dev/radio.c:1.30 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/radio.c Wed Aug 4 23:24:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radio.c,v 1.30 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: radio.c,v 1.30.8.1 2021/08/04 23:24:57 thorpej Exp $ */
/* $OpenBSD: radio.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */
@@ -30,7 +30,7 @@
/* This is the /dev/radio driver from OpenBSD */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.30 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.30.8.1 2021/08/04 23:24:57 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -177,7 +177,7 @@ radio_attach_mi(const struct radio_hw_if
arg.hwif = rhwp;
arg.hdl = hdlp;
- return (config_found(dev, &arg, radioprint, CFARG_EOL));
+ return (config_found(dev, &arg, radioprint, CFARGS_NONE));
}
static int
Index: src/sys/dev/spkr.c
diff -u src/sys/dev/spkr.c:1.20 src/sys/dev/spkr.c:1.20.8.1
--- src/sys/dev/spkr.c:1.20 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/spkr.c Wed Aug 4 23:24:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.20 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: spkr.c,v 1.20.8.1 2021/08/04 23:24:57 thorpej Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.20 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.20.8.1 2021/08/04 23:24:57 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "wsmux.h"
@@ -460,7 +460,7 @@ spkr_rescan(device_t self, const char *i
if (sc->sc_wsbelldev == NULL) {
a.accesscookie = sc;
sc->sc_wsbelldev = config_found(self, &a, wsbelldevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
#endif
return 0;
Index: src/sys/dev/video.c
diff -u src/sys/dev/video.c:1.40 src/sys/dev/video.c:1.40.8.1
--- src/sys/dev/video.c:1.40 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/video.c Wed Aug 4 23:24:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: video.c,v 1.40 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: video.c,v 1.40.8.1 2021/08/04 23:24:57 thorpej Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney <p...@polycrystal.org>
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: video.c,v 1.40 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: video.c,v 1.40.8.1 2021/08/04 23:24:57 thorpej Exp $");
#include "video.h"
#if NVIDEO > 0
@@ -434,8 +434,7 @@ video_attach_mi(const struct video_hw_if
args.hw_if = hw_if;
return config_found(parent, &args, video_print,
- CFARG_IATTR, "videobus",
- CFARG_EOL);
+ CFARGS(.iattr = "videobus"));
}
/* video_submit_payload - called by hardware driver to submit payload data */
Index: src/sys/dev/flash/flash.c
diff -u src/sys/dev/flash/flash.c:1.16 src/sys/dev/flash/flash.c:1.16.8.1
--- src/sys/dev/flash/flash.c:1.16 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/flash/flash.c Wed Aug 4 23:24:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: flash.c,v 1.16 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: flash.c,v 1.16.8.1 2021/08/04 23:24:58 thorpej Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.16 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.16.8.1 2021/08/04 23:24:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -241,8 +241,7 @@ flash_attach_mi(struct flash_interface *
arg.flash_if = flash_if;
return config_found(device, &arg, flash_print,
- CFARG_IATTR, "flashbus",
- CFARG_EOL);
+ CFARGS(.iattr = "flashbus"));
}
/**
Index: src/sys/dev/flash/flash_mtdparts.c
diff -u src/sys/dev/flash/flash_mtdparts.c:1.2 src/sys/dev/flash/flash_mtdparts.c:1.2.8.1
--- src/sys/dev/flash/flash_mtdparts.c:1.2 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/flash/flash_mtdparts.c Wed Aug 4 23:24:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_mtdparts.c,v 1.2 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: flash_mtdparts.c,v 1.2.8.1 2021/08/04 23:24:58 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flash_mtdparts.c,v 1.2 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_mtdparts.c,v 1.2.8.1 2021/08/04 23:24:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -49,8 +49,7 @@ flash_attach_partition(struct flash_inte
faa.partinfo = *part;
config_found(parent, &faa, flash_print,
- CFARG_IATTR, "flashbus",
- CFARG_EOL);
+ CFARGS(.iattr = "flashbus"));
}
static flash_size_t
Index: src/sys/dev/gpib/cs80bus.c
diff -u src/sys/dev/gpib/cs80bus.c:1.18 src/sys/dev/gpib/cs80bus.c:1.18.8.1
--- src/sys/dev/gpib/cs80bus.c:1.18 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/gpib/cs80bus.c Wed Aug 4 23:24:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cs80bus.c,v 1.18 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: cs80bus.c,v 1.18.8.1 2021/08/04 23:24:58 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs80bus.c,v 1.18 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs80bus.c,v 1.18.8.1 2021/08/04 23:24:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,8 +135,7 @@ cs80busattach(device_t parent, device_t
ca.ca_id = id;
config_search(sc->sc_dev, &ca,
- CFARG_SEARCH, cs80bussearch,
- CFARG_EOL);
+ CFARGS(.search = cs80bussearch));
}
}
@@ -188,7 +187,7 @@ cs80bussearch(device_t parent, cfdata_t
/*
* This device is allowed; attach it.
*/
- config_attach(parent, cf, ca, cs80busprint, CFARG_EOL);
+ config_attach(parent, cf, ca, cs80busprint, CFARGS_NONE);
}
out:
return (0);
Index: src/sys/dev/gpib/gpib.c
diff -u src/sys/dev/gpib/gpib.c:1.25 src/sys/dev/gpib/gpib.c:1.25.8.1
--- src/sys/dev/gpib/gpib.c:1.25 Sat Apr 24 23:36:53 2021
+++ src/sys/dev/gpib/gpib.c Wed Aug 4 23:24:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpib.c,v 1.25 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: gpib.c,v 1.25.8.1 2021/08/04 23:24:58 thorpej Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.25 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.25.8.1 2021/08/04 23:24:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -141,15 +141,13 @@ gpibattach(device_t parent, device_t sel
ga.ga_ic = sc->sc_ic;
ga.ga_address = address;
config_search(sc->sc_dev, &ga,
- CFARG_SEARCH, gpibsubmatch1,
- CFARG_EOL);
+ CFARGS(.search = gpibsubmatch1));
}
/* attach the wild-carded devices - probably protocol busses */
ga.ga_ic = sc->sc_ic;
config_search(sc->sc_dev, &ga,
- CFARG_SEARCH, gpibsubmatch2,
- CFARG_EOL);
+ CFARGS(.search = gpibsubmatch2));
}
int
@@ -167,7 +165,7 @@ gpibsubmatch1(device_t parent, cfdata_t
if (config_probe(parent, cf, ga)) {
if (gpib_alloc(sc, ga->ga_address))
return (0);
- config_attach(parent, cf, ga, gpibprint, CFARG_EOL);
+ config_attach(parent, cf, ga, gpibprint, CFARGS_NONE);
return (0);
}
return (0);
@@ -183,7 +181,7 @@ gpibsubmatch2(device_t parent, cfdata_t
ga->ga_address = GPIBCF_ADDRESS_DEFAULT;
if (config_probe(parent, cf, ga)) {
- config_attach(parent, cf, ga, gpibdevprint, CFARG_EOL);
+ config_attach(parent, cf, ga, gpibdevprint, CFARGS_NONE);
return (0);
}
return (0);
Index: src/sys/dev/hdaudio/hdaudio.c
diff -u src/sys/dev/hdaudio/hdaudio.c:1.15 src/sys/dev/hdaudio/hdaudio.c:1.15.2.1
--- src/sys/dev/hdaudio/hdaudio.c:1.15 Tue Jun 29 21:03:36 2021
+++ src/sys/dev/hdaudio/hdaudio.c Wed Aug 4 23:24:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.15 2021/06/29 21:03:36 pgoyette Exp $ */
+/* $NetBSD: hdaudio.c,v 1.15.2.1 2021/08/04 23:24:58 thorpej Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.15 2021/06/29 21:03:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.15.2.1 2021/08/04 23:24:58 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -691,9 +691,8 @@ hdaudio_attach_fg(struct hdaudio_functio
locs[0] = fg->fg_nid;
fg->fg_device = config_found(sc->sc_dev, args, hdaudio_config_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
prop_object_release(args);
}
Index: src/sys/dev/hid/hidms.c
diff -u src/sys/dev/hid/hidms.c:1.5 src/sys/dev/hid/hidms.c:1.5.8.1
--- src/sys/dev/hid/hidms.c:1.5 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hid/hidms.c Wed Aug 4 23:24:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hidms.c,v 1.5 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: hidms.c,v 1.5.8.1 2021/08/04 23:24:58 thorpej Exp $ */
/*
* Copyright (c) 1998, 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hidms.c,v 1.5 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hidms.c,v 1.5.8.1 2021/08/04 23:24:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -250,7 +250,7 @@ hidms_attach(device_t self, struct hidms
a.accesscookie = device_private(self);
ms->hidms_wsmousedev = config_found(self, &a, wsmousedevprint,
- CFARG_EOL);
+ CFARGS_NONE);
return;
}
Index: src/sys/dev/isapnp/isapnp.c
diff -u src/sys/dev/isapnp/isapnp.c:1.61 src/sys/dev/isapnp/isapnp.c:1.61.8.1
--- src/sys/dev/isapnp/isapnp.c:1.61 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/isapnp/isapnp.c Wed Aug 4 23:24:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnp.c,v 1.61 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: isapnp.c,v 1.61.8.1 2021/08/04 23:24:58 thorpej Exp $ */
/*-
* Copyright (c) 1996, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.61 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.61.8.1 2021/08/04 23:24:58 thorpej Exp $");
#include "isadma.h"
@@ -993,8 +993,8 @@ isapnp_callback(device_t self)
isapnp_write_reg(sc, ISAPNP_ACTIVATE, 1);
#ifdef _KERNEL
if (config_found(self, lpa, isapnp_print,
- CFARG_SUBMATCH, isapnp_submatch,
- CFARG_EOL) == NULL)
+ CFARGS(.submatch =
+ isapnp_submatch)) == NULL)
isapnp_write_reg(sc, ISAPNP_ACTIVATE, 0);
#else
isapnp_print(lpa, NULL);
Index: src/sys/dev/isapnp/wss_isapnp.c
diff -u src/sys/dev/isapnp/wss_isapnp.c:1.29 src/sys/dev/isapnp/wss_isapnp.c:1.29.8.1
--- src/sys/dev/isapnp/wss_isapnp.c:1.29 Sat Apr 24 23:36:55 2021
+++ src/sys/dev/isapnp/wss_isapnp.c Wed Aug 4 23:24:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_isapnp.c,v 1.29 2021/04/24 23:36:55 thorpej Exp $ */
+/* $NetBSD: wss_isapnp.c,v 1.29.8.1 2021/08/04 23:24:58 thorpej Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.29 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.29.8.1 2021/08/04 23:24:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -174,6 +174,6 @@ wss_isapnp_attach(device_t parent, devic
arg.type = AUDIODEV_TYPE_OPL;
arg.hwif = 0;
arg.hdl = 0;
- (void)config_found(self, &arg, audioprint, CFARG_EOL);
+ (void)config_found(self, &arg, audioprint, CFARGS_NONE);
}
}
Index: src/sys/dev/iscsi/iscsi_main.c
diff -u src/sys/dev/iscsi/iscsi_main.c:1.36 src/sys/dev/iscsi/iscsi_main.c:1.36.2.1
--- src/sys/dev/iscsi/iscsi_main.c:1.36 Sun Jun 6 10:40:14 2021
+++ src/sys/dev/iscsi/iscsi_main.c Wed Aug 4 23:24:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_main.c,v 1.36 2021/06/06 10:40:14 mlelstv Exp $ */
+/* $NetBSD: iscsi_main.c,v 1.36.2.1 2021/08/04 23:24:58 thorpej Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -391,7 +391,7 @@ map_session(session_t *sess, device_t de
chan->chan_nluns = 16;
chan->chan_id = sess->s_id;
- sess->s_child_dev = config_found(dev, chan, scsiprint, CFARG_EOL);
+ sess->s_child_dev = config_found(dev, chan, scsiprint, CFARGS_NONE);
return sess->s_child_dev != NULL;
}
Index: src/sys/dev/mii/mii.c
diff -u src/sys/dev/mii/mii.c:1.56 src/sys/dev/mii/mii.c:1.56.8.1
--- src/sys/dev/mii/mii.c:1.56 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/mii/mii.c Wed Aug 4 23:24:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mii.c,v 1.56 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: mii.c,v 1.56.8.1 2021/08/04 23:24:58 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000, 2020 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii.c,v 1.56 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii.c,v 1.56.8.1 2021/08/04 23:24:58 thorpej Exp $");
#define __IFMEDIA_PRIVATE
@@ -174,10 +174,9 @@ mii_attach(device_t parent, struct mii_d
child = device_private(
config_found(parent, &ma, mii_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "mii",
- CFARG_LOCATORS, locs,
- CFARG_EOL));
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "mii",
+ .locators = locs)));
if (child) {
/* Link it up in the parent's MII data. */
callout_init(&child->mii_nway_ch, 0);
Index: src/sys/dev/mscp/mscp.c
diff -u src/sys/dev/mscp/mscp.c:1.37 src/sys/dev/mscp/mscp.c:1.37.8.1
--- src/sys/dev/mscp/mscp.c:1.37 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/mscp/mscp.c Wed Aug 4 23:24:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp.c,v 1.37 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: mscp.c,v 1.37.8.1 2021/08/04 23:24:58 thorpej Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.37 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.37.8.1 2021/08/04 23:24:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -496,7 +496,7 @@ mscp_worker(struct work *wk, void *dummy
da.da_mp = &mw->mw_mp;
da.da_typ = mi->mi_type;
- config_found(mi->mi_dev, (void *)&da, mscp_print, CFARG_EOL);
+ config_found(mi->mi_dev, (void *)&da, mscp_print, CFARGS_NONE);
mutex_spin_enter(&mi->mi_mtx);
SLIST_INSERT_HEAD(&mw->mw_mi->mi_freelist, mw, mw_list);
Index: src/sys/dev/mvme/mvmebus.c
diff -u src/sys/dev/mvme/mvmebus.c:1.23 src/sys/dev/mvme/mvmebus.c:1.23.8.1
--- src/sys/dev/mvme/mvmebus.c:1.23 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/mvme/mvmebus.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mvmebus.c,v 1.23 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: mvmebus.c,v 1.23.8.1 2021/08/04 23:24:59 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.23 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.23.8.1 2021/08/04 23:24:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -236,7 +236,7 @@ mvmebus_attach(struct mvmebus_softc *sc)
vaa.va_bdt = &sc->sc_mvmedmat;
vaa.va_slaveconfig = NULL;
- config_found(sc->sc_dev, &vaa, 0, CFARG_EOL);
+ config_found(sc->sc_dev, &vaa, 0, CFARGS_NONE);
}
int
Index: src/sys/dev/mvme/pcctwo.c
diff -u src/sys/dev/mvme/pcctwo.c:1.12 src/sys/dev/mvme/pcctwo.c:1.12.8.1
--- src/sys/dev/mvme/pcctwo.c:1.12 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/mvme/pcctwo.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcctwo.c,v 1.12 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: pcctwo.c,v 1.12.8.1 2021/08/04 23:24:59 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcctwo.c,v 1.12 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcctwo.c,v 1.12.8.1 2021/08/04 23:24:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -103,7 +103,7 @@ pcctwo_init(struct pcctwo_softc *sc, con
pd++;
/* Attach the device if configured. */
- (void) config_found(sc->sc_dev, &npa, pcctwoprint, CFARG_EOL);
+ (void) config_found(sc->sc_dev, &npa, pcctwoprint, CFARGS_NONE);
}
}
Index: src/sys/dev/nand/nand.c
diff -u src/sys/dev/nand/nand.c:1.28 src/sys/dev/nand/nand.c:1.28.8.1
--- src/sys/dev/nand/nand.c:1.28 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/nand/nand.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nand.c,v 1.28 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: nand.c,v 1.28.8.1 2021/08/04 23:24:59 thorpej Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -34,7 +34,7 @@
/* Common driver for NAND chips implementing the ONFI 2.2 specification */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.28 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.28.8.1 2021/08/04 23:24:59 thorpej Exp $");
#include "locators.h"
@@ -173,8 +173,7 @@ nand_attach(device_t parent, device_t se
* Attach all our devices
*/
config_search(self, NULL,
- CFARG_SEARCH, nand_search,
- CFARG_EOL);
+ CFARGS(.search = nand_search));
return;
error:
@@ -212,7 +211,7 @@ nand_search(device_t parent, cfdata_t cf
if (config_probe(parent, cf, &faa)) {
if (config_attach(parent, cf, &faa, nand_print,
- CFARG_EOL) != NULL) {
+ CFARGS_NONE) != NULL) {
return 0;
} else {
return 1;
@@ -288,8 +287,7 @@ nand_attach_mi(struct nand_interface *na
arg.naa_nand_if = nand_if;
return config_found(parent, &arg, nand_print,
- CFARG_IATTR, "nandbus",
- CFARG_EOL);
+ CFARGS(.iattr = "nandbus"));
}
/* default everything to reasonable values, to ease future api changes */
Index: src/sys/dev/nor/nor.c
diff -u src/sys/dev/nor/nor.c:1.6 src/sys/dev/nor/nor.c:1.6.8.1
--- src/sys/dev/nor/nor.c:1.6 Sat Apr 24 23:36:56 2021
+++ src/sys/dev/nor/nor.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nor.c,v 1.6 2021/04/24 23:36:56 thorpej Exp $ */
+/* $NetBSD: nor.c,v 1.6.8.1 2021/08/04 23:24:59 thorpej Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -34,7 +34,7 @@
/* Common driver for NOR chips implementing the ONFI CFI specification */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nor.c,v 1.6 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nor.c,v 1.6.8.1 2021/08/04 23:24:59 thorpej Exp $");
#include "locators.h"
#include "opt_nor.h"
@@ -183,8 +183,7 @@ nor_attach(device_t parent, device_t sel
* Attach all our devices
*/
config_search(self, NULL,
- CFARG_SEARCH, nor_search,
- CFARG_EOL);
+ CFARGS(.search = nor_search));
return;
@@ -221,7 +220,7 @@ nor_search(device_t parent, cfdata_t cf,
if (config_probe(parent, cf, &faa)) {
if (config_attach(parent, cf, &faa, nor_print,
- CFARG_EOL) != NULL) {
+ CFARGS_NONE) != NULL) {
return 0;
} else {
return 1;
@@ -287,8 +286,7 @@ nor_attach_mi(struct nor_interface * con
arg.naa_nor_if = nor_if;
device_t dev = config_found(parent, &arg, nor_print,
- CFARG_IATTR, "norbus",
- CFARG_EOL);
+ CFARGS(.iattr = "norbus"));
return dev;
}
Index: src/sys/dev/ofisa/ofisa.c
diff -u src/sys/dev/ofisa/ofisa.c:1.33 src/sys/dev/ofisa/ofisa.c:1.33.6.1
--- src/sys/dev/ofisa/ofisa.c:1.33 Fri Apr 30 02:13:15 2021
+++ src/sys/dev/ofisa/ofisa.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisa.c,v 1.33 2021/04/30 02:13:15 thorpej Exp $ */
+/* $NetBSD: ofisa.c,v 1.33.6.1 2021/08/04 23:24:59 thorpej Exp $ */
/*
* Copyright 1997, 1998
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.33 2021/04/30 02:13:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.33.6.1 2021/08/04 23:24:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,8 +142,7 @@ ofisaattach(device_t parent, device_t se
aa.ic = iba.iba_ic;
config_found(self, &aa, ofisaprint,
- CFARG_DEVHANDLE, devhandle_from_of(child),
- CFARG_EOL);
+ CFARGS(.devhandle = devhandle_from_of(child)));
}
}
Index: src/sys/dev/ofw/ofbus.c
diff -u src/sys/dev/ofw/ofbus.c:1.29 src/sys/dev/ofw/ofbus.c:1.29.6.1
--- src/sys/dev/ofw/ofbus.c:1.29 Fri Apr 30 02:34:12 2021
+++ src/sys/dev/ofw/ofbus.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofbus.c,v 1.29 2021/04/30 02:34:12 thorpej Exp $ */
+/* $NetBSD: ofbus.c,v 1.29.6.1 2021/08/04 23:24:59 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.29 2021/04/30 02:34:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.29.6.1 2021/08/04 23:24:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -181,8 +181,7 @@ ofbus_attach(device_t parent, device_t d
sizeof(oba2.oba_ofname));
}
config_found(dev, &oba2, ofbus_print,
- CFARG_DEVHANDLE, devhandle_from_of(child),
- CFARG_EOL);
+ CFARGS(.devhandle = devhandle_from_of(child)));
}
}
@@ -212,8 +211,7 @@ ofbus_attach(device_t parent, device_t d
sizeof(oba2.oba_ofname));
}
config_found(dev, &oba2, ofbus_print,
- CFARG_DEVHANDLE, devhandle_from_of(child),
- CFARG_EOL);
+ CFARGS(.devhandle = devhandle_from_of(child)));
}
}
}
Index: src/sys/dev/onewire/onewire.c
diff -u src/sys/dev/onewire/onewire.c:1.21 src/sys/dev/onewire/onewire.c:1.21.8.1
--- src/sys/dev/onewire/onewire.c:1.21 Sat Apr 24 23:36:57 2021
+++ src/sys/dev/onewire/onewire.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: onewire.c,v 1.21 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: onewire.c,v 1.21.8.1 2021/08/04 23:24:59 thorpej Exp $ */
/* $OpenBSD: onewire.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*-
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.21 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.21.8.1 2021/08/04 23:24:59 thorpej Exp $");
/*
* 1-Wire bus driver.
@@ -530,7 +530,7 @@ onewire_scan(struct onewire_softc *sc)
KERNEL_LOCK(1, NULL); /* XXXSMP */
d->d_dev = config_found(sc->sc_dev, &oa, onewire_print,
- CFARG_EOL);
+ CFARGS_NONE);
KERNEL_UNLOCK_ONE(NULL); /* XXXSMP */
mutex_enter(&sc->sc_lock);
Index: src/sys/dev/pckbport/pckbd.c
diff -u src/sys/dev/pckbport/pckbd.c:1.35 src/sys/dev/pckbport/pckbd.c:1.35.8.1
--- src/sys/dev/pckbport/pckbd.c:1.35 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pckbport/pckbd.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd.c,v 1.35 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: pckbd.c,v 1.35.8.1 2021/08/04 23:24:59 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.35 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.35.8.1 2021/08/04 23:24:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -409,7 +409,7 @@ pckbdattach(device_t parent, device_t se
* Attach the wskbd, saving a handle to it.
* XXX XXX XXX
*/
- sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
}
int
Index: src/sys/dev/pckbport/pckbport.c
diff -u src/sys/dev/pckbport/pckbport.c:1.19 src/sys/dev/pckbport/pckbport.c:1.19.8.1
--- src/sys/dev/pckbport/pckbport.c:1.19 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pckbport/pckbport.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbport.c,v 1.19 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: pckbport.c,v 1.19.8.1 2021/08/04 23:24:59 thorpej Exp $ */
/*
* Copyright (c) 2004 Ben Harris
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbport.c,v 1.19 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbport.c,v 1.19.8.1 2021/08/04 23:24:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,10 +154,9 @@ pckbport_attach_slot(device_t dev, pckbp
locs[PCKBPORTCF_SLOT] = slot;
found = config_found(dev, &pa, pckbportprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "pckbport",
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "pckbport",
+ .locators = locs));
if (found == NULL && alloced) {
free(t->t_slotdata[slot], M_DEVBUF);
Index: src/sys/dev/pckbport/pms.c
diff -u src/sys/dev/pckbport/pms.c:1.38 src/sys/dev/pckbport/pms.c:1.38.8.1
--- src/sys/dev/pckbport/pms.c:1.38 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pckbport/pms.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.38 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: pms.c,v 1.38.8.1 2021/08/04 23:24:59 thorpej Exp $ */
/*-
* Copyright (c) 2004 Kentaro Kurahone.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.38 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.38.8.1 2021/08/04 23:24:59 thorpej Exp $");
#include "opt_pms.h"
@@ -228,7 +228,7 @@ pmsattach(device_t parent, device_t self
* here or in pmsintr, because if this fails pms_enable() will
* never be called, so pmsinput() will never be called.
*/
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
/* no interrupts until enabled */
cmd[0] = PMS_DEV_DISABLE;
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.110 src/sys/dev/sdmmc/sdhc.c:1.110.4.1
--- src/sys/dev/sdmmc/sdhc.c:1.110 Thu May 13 05:54:14 2021
+++ src/sys/dev/sdmmc/sdhc.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.110 2021/05/13 05:54:14 msaitoh Exp $ */
+/* $NetBSD: sdhc.c,v 1.110.4.1 2021/08/04 23:24:59 thorpej Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.110 2021/05/13 05:54:14 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.110.4.1 2021/08/04 23:24:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -642,7 +642,7 @@ adma_done:
if (ISSET(sc->sc_flags, SDHC_FLAG_BROKEN_ADMA2_ZEROLEN))
saa.saa_max_seg = 65535;
- hp->sdmmc = config_found(sc->sc_dev, &saa, sdhc_cfprint, CFARG_EOL);
+ hp->sdmmc = config_found(sc->sc_dev, &saa, sdhc_cfprint, CFARGS_NONE);
return 0;
Index: src/sys/dev/sdmmc/sdmmc.c
diff -u src/sys/dev/sdmmc/sdmmc.c:1.42 src/sys/dev/sdmmc/sdmmc.c:1.42.2.1
--- src/sys/dev/sdmmc/sdmmc.c:1.42 Sun Jun 13 09:58:28 2021
+++ src/sys/dev/sdmmc/sdmmc.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc.c,v 1.42 2021/06/13 09:58:28 mlelstv Exp $ */
+/* $NetBSD: sdmmc.c,v 1.42.2.1 2021/08/04 23:24:59 thorpej Exp $ */
/* $OpenBSD: sdmmc.c,v 1.18 2009/01/09 10:58:38 jsg Exp $ */
/*
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.42 2021/06/13 09:58:28 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.42.2.1 2021/08/04 23:24:59 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -479,7 +479,7 @@ sdmmc_card_attach(struct sdmmc_softc *sc
saa.sf = sf;
sf->child =
- config_found(sc->sc_dev, &saa, sdmmc_print, CFARG_EOL);
+ config_found(sc->sc_dev, &saa, sdmmc_print, CFARGS_NONE);
}
SET(sc->sc_flags, SMF_CARD_ATTACHED);
Index: src/sys/dev/spi/mcp23s17.c
diff -u src/sys/dev/spi/mcp23s17.c:1.3 src/sys/dev/spi/mcp23s17.c:1.3.2.1
--- src/sys/dev/spi/mcp23s17.c:1.3 Sat Jul 24 21:31:38 2021
+++ src/sys/dev/spi/mcp23s17.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mcp23s17.c,v 1.3 2021/07/24 21:31:38 andvar Exp $ */
+/* $NetBSD: mcp23s17.c,v 1.3.2.1 2021/08/04 23:24:59 thorpej Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcp23s17.c,v 1.3 2021/07/24 21:31:38 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcp23s17.c,v 1.3.2.1 2021/08/04 23:24:59 thorpej Exp $");
/*
* Driver for Microchip MCP23S17 GPIO
@@ -150,7 +150,7 @@ mcp23s17gpio_attach(device_t parent, dev
gba.gba_pins = sc->sc_gpio_pins;
gba.gba_npins = MCP23x17_GPIO_NPINS;
- config_found(self, &gba, gpiobus_print, CFARG_EOL);
+ config_found(self, &gba, gpiobus_print, CFARGS_NONE);
#else
aprint_normal_dev(sc->sc_dev, "no GPIO configured in kernel");
#endif
Index: src/sys/dev/spi/oj6sh.c
diff -u src/sys/dev/spi/oj6sh.c:1.8 src/sys/dev/spi/oj6sh.c:1.8.8.1
--- src/sys/dev/spi/oj6sh.c:1.8 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/spi/oj6sh.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: oj6sh.c,v 1.8 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: oj6sh.c,v 1.8.8.1 2021/08/04 23:24:59 thorpej Exp $ */
/*
* Copyright (c) 2014 Genetec Corporation. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oj6sh.c,v 1.8 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oj6sh.c,v 1.8.8.1 2021/08/04 23:24:59 thorpej Exp $");
#include "opt_oj6sh.h"
@@ -202,7 +202,7 @@ oj6sh_attach(device_t parent, device_t s
a.accessops = &oj6sh_accessops;
a.accesscookie = sc;
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
config_interrupts(self, oj6sh_doattach);
}
Index: src/sys/dev/spi/spi.c
diff -u src/sys/dev/spi/spi.c:1.18 src/sys/dev/spi/spi.c:1.18.4.1
--- src/sys/dev/spi/spi.c:1.18 Sun May 16 08:48:20 2021
+++ src/sys/dev/spi/spi.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spi.c,v 1.18 2021/05/16 08:48:20 mlelstv Exp $ */
+/* $NetBSD: spi.c,v 1.18.4.1 2021/08/04 23:24:59 thorpej Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.18 2021/05/16 08:48:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.18.4.1 2021/08/04 23:24:59 thorpej Exp $");
#include "locators.h"
@@ -161,7 +161,7 @@ spi_search(device_t parent, cfdata_t cf,
if (config_probe(parent, cf, &sa)) {
SET(sa.sa_handle->sh_flags, SPIH_ATTACHED);
- config_attach(parent, cf, &sa, spi_print, CFARG_EOL);
+ config_attach(parent, cf, &sa, spi_print, CFARGS_NONE);
}
return 0;
@@ -251,8 +251,7 @@ spi_direct_attach_child_devices(device_t
prop_data_value(cdata),
prop_data_size(cdata), &buf);
config_found(parent, &sa, spi_print,
- CFARG_LOCATORS, loc,
- CFARG_EOL);
+ CFARGS(.locators = loc));
if (sa.sa_compat)
free(sa.sa_compat, M_TEMP);
@@ -317,8 +316,7 @@ spi_attach(device_t parent, device_t sel
}
/* Then do any other devices the user may have manually wired */
config_search(self, NULL,
- CFARG_SEARCH, spi_search,
- CFARG_EOL);
+ CFARGS(.search = spi_search));
}
static int
Index: src/sys/dev/spi/spiflash.c
diff -u src/sys/dev/spi/spiflash.c:1.24 src/sys/dev/spi/spiflash.c:1.24.8.1
--- src/sys/dev/spi/spiflash.c:1.24 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/spi/spiflash.c Wed Aug 4 23:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spiflash.c,v 1.24 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: spiflash.c,v 1.24.8.1 2021/08/04 23:24:59 thorpej Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.24 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.24.8.1 2021/08/04 23:24:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -179,7 +179,7 @@ spiflash_attach_mi(const struct spiflash
sfa.cookie = cookie;
return (spiflash_handle_t)config_found(dev, &sfa, spiflash_print,
- CFARG_EOL);
+ CFARGS_NONE);
}
int
Index: src/sys/dev/std/ieee1212.c
diff -u src/sys/dev/std/ieee1212.c:1.14 src/sys/dev/std/ieee1212.c:1.14.8.1
--- src/sys/dev/std/ieee1212.c:1.14 Sat Apr 24 23:36:59 2021
+++ src/sys/dev/std/ieee1212.c Wed Aug 4 23:25:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee1212.c,v 1.14 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: ieee1212.c,v 1.14.8.1 2021/08/04 23:25:00 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee1212.c,v 1.14 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee1212.c,v 1.14.8.1 2021/08/04 23:25:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1231,8 +1231,7 @@ p1212_match_units(device_t sc, struct p1
if (udirs) {
do {
dev = config_found(sc, udirs, print,
- CFARG_IATTR, "fwnode",
- CFARG_EOL);
+ CFARGS(.iattr = "fwnode"));
if (dev && numdev) {
devret = realloc(devret,
sizeof(device_t) *
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.82 src/sys/dev/wsfb/genfb.c:1.82.8.1
--- src/sys/dev/wsfb/genfb.c:1.82 Sat Apr 24 23:37:00 2021
+++ src/sys/dev/wsfb/genfb.c Wed Aug 4 23:25:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.82 2021/04/24 23:37:00 thorpej Exp $ */
+/* $NetBSD: genfb.c,v 1.82.8.1 2021/08/04 23:25:00 thorpej Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.82 2021/04/24 23:37:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.82.8.1 2021/08/04 23:25:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -378,8 +378,7 @@ genfb_attach(struct genfb_softc *sc, str
#endif
config_found(sc->sc_dev, &aa, wsemuldisplaydevprint,
- CFARG_IATTR, "wsemuldisplaydev",
- CFARG_EOL);
+ CFARGS(.iattr = "wsemuldisplaydev"));
return 0;
}
Index: src/sys/dev/xmi/xmi.c
diff -u src/sys/dev/xmi/xmi.c:1.12 src/sys/dev/xmi/xmi.c:1.12.8.1
--- src/sys/dev/xmi/xmi.c:1.12 Sat Apr 24 23:37:00 2021
+++ src/sys/dev/xmi/xmi.c Wed Aug 4 23:25:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xmi.c,v 1.12 2021/04/24 23:37:00 thorpej Exp $ */
+/* $NetBSD: xmi.c,v 1.12.8.1 2021/08/04 23:25:00 thorpej Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmi.c,v 1.12 2021/04/24 23:37:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmi.c,v 1.12.8.1 2021/08/04 23:25:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,6 +117,6 @@ xmi_attach(struct xmi_softc *sc)
xa.xa_nodenr = nodenr;
xa.xa_ivec = 256 + lastiv;
lastiv += 4;
- config_found(sc->sc_dev, &xa, xmi_print, CFARG_EOL);
+ config_found(sc->sc_dev, &xa, xmi_print, CFARGS_NONE);
}
}
