CVS commit: [thorpej-cfargs2] src/sys/sys

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Aug  7 14:21:28 UTC 2021

Modified Files:
src/sys/sys [thorpej-cfargs2]: device.h

Log Message:
Hide "struct cfargs" from user space.


To generate a diff of this commit:
cvs rdiff -u -r1.171.2.1 -r1.171.2.2 src/sys/sys/device.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/device.h
diff -u src/sys/sys/device.h:1.171.2.1 src/sys/sys/device.h:1.171.2.2
--- src/sys/sys/device.h:1.171.2.1	Tue Aug  3 15:00:15 2021
+++ src/sys/sys/device.h	Sat Aug  7 14:21:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.171.2.1 2021/08/03 15:00:15 thorpej Exp $ */
+/* $NetBSD: device.h,v 1.171.2.2 2021/08/07 14:21:28 thorpej Exp $ */
 
 /*
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -530,6 +530,7 @@ struct pdevinit {
 /* This allows us to wildcard a device unit. */
 #define	DVUNIT_ANY	-1
 
+#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_STANDALONE)
 /*
  * Arguments passed to config_search() and config_found().
  */
@@ -564,6 +565,7 @@ struct cfargs {
 		.cfargs_version = CFARGS_VERSION,			\
 		__VA_ARGS__		\
 	})
+#endif /* _KERNEL || _KMEMUSER || _STANDALONE */
 
 #ifdef _KERNEL
 

CVS commit: [thorpej-cfargs2] src/sys/dev/raidframe

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Thu Aug  5 03:37:41 UTC 2021

Modified Files:
src/sys/dev/raidframe [thorpej-cfargs2]: raidframeio.h raidframevar.h
rf_dagfuncs.c rf_netbsdkintf.c rf_pqdegdags.c rf_raid.h

Log Message:
Sync w/ HEAD.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.28.1 src/sys/dev/raidframe/raidframeio.h
cvs rdiff -u -r1.21 -r1.21.18.1 src/sys/dev/raidframe/raidframevar.h
cvs rdiff -u -r1.33 -r1.33.2.1 src/sys/dev/raidframe/rf_dagfuncs.c
cvs rdiff -u -r1.397 -r1.397.2.1 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/dev/raidframe/rf_pqdegdags.c
cvs rdiff -u -r1.49 -r1.49.2.1 src/sys/dev/raidframe/rf_raid.h

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/raidframe/raidframeio.h
diff -u src/sys/dev/raidframe/raidframeio.h:1.9 src/sys/dev/raidframe/raidframeio.h:1.9.28.1
--- src/sys/dev/raidframe/raidframeio.h:1.9	Sat Jan 20 01:32:45 2018
+++ src/sys/dev/raidframe/raidframeio.h	Thu Aug  5 03:37:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: raidframeio.h,v 1.9 2018/01/20 01:32:45 mrg Exp $ */
+/*	$NetBSD: raidframeio.h,v 1.9.28.1 2021/08/05 03:37:41 thorpej Exp $ */
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -133,5 +133,6 @@
 #define RAIDFRAME_SET_LAST_UNIT _IOW('r', 41, int)
 #define RAIDFRAME_GET_INFO  _IOWR('r', 42, RF_DeviceConfig_t *)	/* get configuration */
 #define RAIDFRAME_CONFIGURE _IOW ('r',  43, void *)	/* configure the driver */
-
+#define RAIDFRAME_RESCAN  _IO ('r', 44)
 #endif/* !_RF_RAIDFRAMEIO_H_ */
+

Index: src/sys/dev/raidframe/raidframevar.h
diff -u src/sys/dev/raidframe/raidframevar.h:1.21 src/sys/dev/raidframe/raidframevar.h:1.21.18.1
--- src/sys/dev/raidframe/raidframevar.h:1.21	Thu Oct 10 03:43:59 2019
+++ src/sys/dev/raidframe/raidframevar.h	Thu Aug  5 03:37:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: raidframevar.h,v 1.21 2019/10/10 03:43:59 christos Exp $ */
+/*	$NetBSD: raidframevar.h,v 1.21.18.1 2021/08/05 03:37:41 thorpej Exp $ */
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -355,6 +355,7 @@ typedef RF_uint32 RF_ReconReqFlags_t;
 /* flags that can be put in the rf_recon_req structure */
 #define RF_FDFLAGS_NONE   0x0	/* just fail the disk */
 #define RF_FDFLAGS_RECON  0x1	/* fail and initiate recon */
+#define RF_FDFLAGS_RECON_FORCE  0x2	/* fail and initiate recon, ignoring errors */
 
 struct rf_recon_req {		/* used to tell the kernel to fail a disk */
 	RF_RowCol_t col;

Index: src/sys/dev/raidframe/rf_dagfuncs.c
diff -u src/sys/dev/raidframe/rf_dagfuncs.c:1.33 src/sys/dev/raidframe/rf_dagfuncs.c:1.33.2.1
--- src/sys/dev/raidframe/rf_dagfuncs.c:1.33	Tue Jul 27 03:01:48 2021
+++ src/sys/dev/raidframe/rf_dagfuncs.c	Thu Aug  5 03:37:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_dagfuncs.c,v 1.33 2021/07/27 03:01:48 oster Exp $	*/
+/*	$NetBSD: rf_dagfuncs.c,v 1.33.2.1 2021/08/05 03:37:41 thorpej Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -48,7 +48,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.33 2021/07/27 03:01:48 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.33.2.1 2021/08/05 03:37:41 thorpej Exp $");
 
 #include 
 #include 
@@ -121,7 +121,7 @@ rf_TerminateUndoFunc(RF_DagNode_t *node)
  *
  * parameters:
  *
- * 0 - physical disk addres of data
+ * 0 - physical disk address of data
  * 1 - buffer for holding read data
  * 2 - parity stripe ID
  * 3 - flags

Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.397 src/sys/dev/raidframe/rf_netbsdkintf.c:1.397.2.1
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.397	Mon Jul 26 22:50:36 2021
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Thu Aug  5 03:37:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.397 2021/07/26 22:50:36 oster Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.397.2.1 2021/08/05 03:37:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.397 2021/07/26 22:50:36 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.397.2.1 2021/08/05 03:37:41 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_raid_autoconfig.h"
@@ -305,6 +305,7 @@ static void rf_RewriteParityThread(RF_Ra
 static void rf_CopybackThread(RF_Raid_t *raidPtr);
 static void rf_ReconstructInPlaceThread(struct rf_recon_req_internal *);
 static int rf_autoconfig(device_t);
+static int rf_rescan(void);
 static void rf_buildroothack(RF_ConfigSet_t *);
 
 static RF_AutoConfig_t *rf_find_raid_components(void);
@@ -480,6 +481,56 @@ rf_containsboot(RF_Raid_t *r, device_t b
 	return 0;
 }
 
+static int
+rf_rescan(void)
+{
+	

CVS commit: [thorpej-cfargs2] src/sys/rump

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Thu Aug  5 00:41:14 UTC 2021

Modified Files:
src/sys/rump/dev/lib/libpci [thorpej-cfargs2]: pci_at_mainbus.c
src/sys/rump/dev/lib/libugenhc [thorpej-cfargs2]: ugenhc.c
src/sys/rump/librump/rumpkern [thorpej-cfargs2]: rump_autoconf.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/rump/dev/lib/libugenhc/ugenhc.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/rump/librump/rumpkern/rump_autoconf.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/rump/dev/lib/libpci/pci_at_mainbus.c
diff -u src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.9 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.9.8.1
--- src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.9	Sat Apr 24 23:37:01 2021
+++ src/sys/rump/dev/lib/libpci/pci_at_mainbus.c	Thu Aug  5 00:41:14 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_at_mainbus.c,v 1.9 2021/04/24 23:37:01 thorpej Exp $	*/
+/*	$NetBSD: pci_at_mainbus.c,v 1.9.8.1 2021/08/05 00:41:14 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_at_mainbus.c,v 1.9 2021/04/24 23:37:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_at_mainbus.c,v 1.9.8.1 2021/08/05 00:41:14 thorpej Exp $");
 
 #include 
 #include 
@@ -99,6 +99,5 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV_AFTERM
 	if (!mainbus)
 		panic("no mainbus.  use maintaxi instead?");
 	config_found(mainbus, , pcibusprint,
-	CFARG_IATTR, "pcibus",
-	CFARG_EOL);
+	CFARGS(.iattr = "pcibus"));
 }

Index: src/sys/rump/dev/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.28 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.28.8.1
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.28	Sat Apr 24 23:37:01 2021
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c	Thu Aug  5 00:41:14 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ugenhc.c,v 1.28 2021/04/24 23:37:01 thorpej Exp $	*/
+/*	$NetBSD: ugenhc.c,v 1.28.8.1 2021/08/05 00:41:14 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  All Rights Reserved.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.28 2021/04/24 23:37:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.28.8.1 2021/08/05 00:41:14 thorpej Exp $");
 
 #include 
 #include 
@@ -959,5 +959,5 @@ ugenhc_attach(device_t parent, device_t 
 
 	mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_NONE);
 
-	config_found(self, >sc_bus, usbctlprint, CFARG_EOL);
+	config_found(self, >sc_bus, usbctlprint, CFARGS_NONE);
 }

Index: src/sys/rump/librump/rumpkern/rump_autoconf.c
diff -u src/sys/rump/librump/rumpkern/rump_autoconf.c:1.2 src/sys/rump/librump/rumpkern/rump_autoconf.c:1.2.8.1
--- src/sys/rump/librump/rumpkern/rump_autoconf.c:1.2	Sat Apr 24 23:37:01 2021
+++ src/sys/rump/librump/rumpkern/rump_autoconf.c	Thu Aug  5 00:41:14 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump_autoconf.c,v 1.2 2021/04/24 23:37:01 thorpej Exp $	*/
+/*	$NetBSD: rump_autoconf.c,v 1.2.8.1 2021/08/05 00:41:14 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rump_autoconf.c,v 1.2 2021/04/24 23:37:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_autoconf.c,v 1.2.8.1 2021/08/05 00:41:14 thorpej Exp $");
 
 #include 
 #include 
@@ -107,9 +107,7 @@ mainbus_attach(device_t parent, device_t
 
 	aprint_normal("\n");
 	config_search(self, NULL,
-	CFARG_SEARCH, mainbus_search,
-	CFARG_IATTR, "mainbus",
-	CFARG_EOL);
+	CFARGS(.search = mainbus_search));
 }
 
 static int
@@ -119,7 +117,7 @@ mainbus_search(device_t parent, cfdata_t
 
 	maa.maa_unit = cf->cf_unit;
 	if (config_probe(parent, cf, ))
-		config_attach(parent, cf, , NULL, CFARG_EOL);
+		config_attach(parent, cf, , NULL, CFARGS_NONE);
 
 	return 0;
 }

CVS commit: [thorpej-cfargs2] src/sys/netbt

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Thu Aug  5 00:40:42 UTC 2021

Modified Files:
src/sys/netbt [thorpej-cfargs2]: hci_unit.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/netbt/hci_unit.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/netbt/hci_unit.c
diff -u src/sys/netbt/hci_unit.c:1.15 src/sys/netbt/hci_unit.c:1.15.8.1
--- src/sys/netbt/hci_unit.c:1.15	Sat Apr 24 23:37:01 2021
+++ src/sys/netbt/hci_unit.c	Thu Aug  5 00:40:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: hci_unit.c,v 1.15 2021/04/24 23:37:01 thorpej Exp $	*/
+/*	$NetBSD: hci_unit.c,v 1.15.8.1 2021/08/05 00:40:42 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hci_unit.c,v 1.15 2021/04/24 23:37:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hci_unit.c,v 1.15.8.1 2021/08/05 00:40:42 thorpej Exp $");
 
 #include 
 #include 
@@ -194,8 +194,7 @@ hci_enable(struct hci_unit *unit)
 	 * Attach Bluetooth Device Hub
 	 */
 	unit->hci_bthub = config_found(unit->hci_dev, >hci_bdaddr, NULL,
-	CFARG_IATTR, "btbus",
-	CFARG_EOL);
+	CFARGS(.iattr = "btbus"));
 
 	return 0;
 

CVS commit: [thorpej-cfargs2] src/sys/external/bsd

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Thu Aug  5 00:39:17 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu [thorpej-cfargs2]:
amdgpu_fb.c
src/sys/external/bsd/drm2/dist/drm/i915 [thorpej-cfargs2]:
intel_fbdev.c
src/sys/external/bsd/drm2/dist/drm/nouveau [thorpej-cfargs2]:
nouveau_fbcon.c
src/sys/external/bsd/drm2/dist/drm/radeon [thorpej-cfargs2]:
radeon_fb.c
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm [thorpej-cfargs2]:
vchiq_netbsd_acpi.c vchiq_netbsd_fdt.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.8.1 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c
cvs rdiff -u -r1.14 -r1.14.8.1 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
cvs rdiff -u -r1.10 -r1.10.8.1 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c
cvs rdiff -u -r1.9 -r1.9.8.1 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
cvs rdiff -u -r1.4 -r1.4.8.1 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c
cvs rdiff -u -r1.6 -r1.6.8.1 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.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/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c:1.6 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c:1.6.8.1
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c:1.6	Sat Apr 24 23:37:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c	Thu Aug  5 00:39:16 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_fb.c,v 1.6 2021/04/24 23:37:00 thorpej Exp $	*/
+/*	$NetBSD: amdgpu_fb.c,v 1.6.8.1 2021/08/05 00:39:16 thorpej Exp $	*/
 
 /*
  * Copyright © 2007 David Airlie
@@ -26,7 +26,7 @@
  * David Airlie
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_fb.c,v 1.6 2021/04/24 23:37:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_fb.c,v 1.6.8.1 2021/08/05 00:39:16 thorpej Exp $");
 
 #include 
 #include 
@@ -235,8 +235,7 @@ static int amdgpufb_create(struct drm_fb
 	afa.afa_fb_linebytes = mode_cmd.pitches[0];
 
 	helper->fbdev = config_found(adev->ddev->dev, , NULL,
-	CFARG_IATTR, "amdgpufbbus",
-	CFARG_EOL);
+	CFARGS(.iattr = "amdgpufbbus"));
 	if (helper->fbdev == NULL) {
 		DRM_ERROR("failed to attach amdgpufb\n");
 		goto out_unref;

Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.14 src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.14.8.1
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.14	Sat Apr 24 23:37:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c	Thu Aug  5 00:39:17 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: intel_fbdev.c,v 1.14 2021/04/24 23:37:00 thorpej Exp $	*/
+/*	$NetBSD: intel_fbdev.c,v 1.14.8.1 2021/08/05 00:39:17 thorpej Exp $	*/
 
 /*
  * Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.14 2021/04/24 23:37:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.14.8.1 2021/08/05 00:39:17 thorpej Exp $");
 
 #include 
 #include 
@@ -254,8 +254,7 @@ static int intelfb_create(struct drm_fb_
 	 * dev->struct_mutex.
 	 */
 	helper->fbdev = config_found(dev->dev, , NULL,
-	CFARG_IATTR, "intelfbbus",
-	CFARG_EOL);
+	CFARGS(.iattr = "intelfbbus"));
 	if (helper->fbdev == NULL) {
 		DRM_ERROR("unable to attach intelfb\n");
 		ret = -ENXIO;

Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.10 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.10.8.1
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.10	Sat Apr 24 23:37:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c	Thu Aug  5 00:39:17 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: nouveau_fbcon.c,v 1.10 2021/04/24 23:37:00 thorpej Exp $	*/
+/*	$NetBSD: nouveau_fbcon.c,v 1.10.8.1 2021/08/05 00:39:17 thorpej Exp $	*/
 
 /*
  * Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.10 2021/04/24 23:37:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.10.8.1 2021/08/05 00:39:17 thorpej Exp $");
 
 #include 
 #include 
@@ -443,8 +443,7 @@ nouveau_fbcon_create(struct drm_fb_helpe
 	nfa.nfa_fb_linebytes = mode_cmd.pitches[0];
 
 	helper->fbdev = config_found(dev->dev, , nouveau_fbcon_print,
-	CFARG_IATTR, "nouveaufbbus",
-	CFARG_EOL);
+	CFARGS(.iattr = "nouveaufbbus"));
 	if (helper->fbdev == NULL) {
 		goto out_unlock;
 	}

Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.9 

CVS commit: [thorpej-cfargs2] src/sys/dev

[Jason R Thorpe]

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 
-__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, , 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 
-__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.30 2021/04/24 23:36:52 thorpej Exp 

CVS commit: [thorpej-cfargs2] src/sys/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 23:14:04 UTC 2021

Modified Files:
src/sys/dev/pcmcia [thorpej-cfargs2]: fdc_pcmcia.c mhzc.c pcmcia.c
pcmcom.c xirc.c
src/sys/dev/podulebus [thorpej-cfargs2]: acemidi.c
src/sys/dev/ppbus [thorpej-cfargs2]: ppbus_conf.c ppbus_gpio.c
src/sys/dev/qbus [thorpej-cfargs2]: rf.c rl.c uba.c uda.c
src/sys/dev/scsipi [thorpej-cfargs2]: atapi_wdc.c atapiconf.c
scsiconf.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/dev/pcmcia/fdc_pcmcia.c
cvs rdiff -u -r1.53 -r1.53.8.1 src/sys/dev/pcmcia/mhzc.c
cvs rdiff -u -r1.95 -r1.95.8.1 src/sys/dev/pcmcia/pcmcia.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/dev/pcmcia/pcmcom.c
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/dev/pcmcia/xirc.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/podulebus/acemidi.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/ppbus/ppbus_conf.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/dev/ppbus/ppbus_gpio.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/dev/qbus/rf.c
cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/dev/qbus/rl.c
cvs rdiff -u -r1.82 -r1.82.8.1 src/sys/dev/qbus/uba.c
cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/dev/qbus/uda.c
cvs rdiff -u -r1.139 -r1.139.8.1 src/sys/dev/scsipi/atapi_wdc.c
cvs rdiff -u -r1.92 -r1.92.8.1 src/sys/dev/scsipi/atapiconf.c
cvs rdiff -u -r1.291 -r1.291.8.1 src/sys/dev/scsipi/scsiconf.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/pcmcia/fdc_pcmcia.c
diff -u src/sys/dev/pcmcia/fdc_pcmcia.c:1.21 src/sys/dev/pcmcia/fdc_pcmcia.c:1.21.8.1
--- src/sys/dev/pcmcia/fdc_pcmcia.c:1.21	Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pcmcia/fdc_pcmcia.c	Wed Aug  4 23:14:04 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fdc_pcmcia.c,v 1.21 2021/04/24 23:36:58 thorpej Exp $	*/
+/*	$NetBSD: fdc_pcmcia.c,v 1.21.8.1 2021/08/04 23:14:04 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.21 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.21.8.1 2021/08/04 23:14:04 thorpej Exp $");
 
 #include 
 #include 
@@ -183,7 +183,7 @@ fdc_pcmcia_attach(device_t parent, devic
 			fa.fa_deftype = _types[0];
 		else
 			fa.fa_deftype = NULL;		/* unknown */
-		(void)config_found(self, (void *), fdprint, CFARG_EOL);
+		(void)config_found(self, (void *), fdprint, CFARGS_NONE);
 	}
 
 	return;

Index: src/sys/dev/pcmcia/mhzc.c
diff -u src/sys/dev/pcmcia/mhzc.c:1.53 src/sys/dev/pcmcia/mhzc.c:1.53.8.1
--- src/sys/dev/pcmcia/mhzc.c:1.53	Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pcmcia/mhzc.c	Wed Aug  4 23:14:04 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mhzc.c,v 1.53 2021/04/24 23:36:58 thorpej Exp $	*/
+/*	$NetBSD: mhzc.c,v 1.53.8.1 2021/08/04 23:14:04 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.53 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.53.8.1 2021/08/04 23:14:04 thorpej Exp $");
 
 #include "opt_inet.h"
 
@@ -245,10 +245,10 @@ mhzc_attach(device_t parent, device_t se
 
 	/*XXXUNCONST*/
 	sc->sc_modem = config_found(self, __UNCONST("com"), mhzc_print,
-	CFARG_EOL);
+	CFARGS_NONE);
 	/*XXXUNCONST*/
 	sc->sc_ethernet = config_found(self, __UNCONST("sm"), mhzc_print,
-	CFARG_EOL);
+	CFARGS_NONE);
 
 	mhzc_disable(sc, MHZC_MODEM_ENABLED|MHZC_ETHERNET_ENABLED);
 	return;

Index: src/sys/dev/pcmcia/pcmcia.c
diff -u src/sys/dev/pcmcia/pcmcia.c:1.95 src/sys/dev/pcmcia/pcmcia.c:1.95.8.1
--- src/sys/dev/pcmcia/pcmcia.c:1.95	Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pcmcia/pcmcia.c	Wed Aug  4 23:14:04 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcmcia.c,v 1.95 2021/04/24 23:36:58 thorpej Exp $	*/
+/*	$NetBSD: pcmcia.c,v 1.95.8.1 2021/08/04 23:14:04 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2004 Charles M. Hannum.  All rights reserved.
@@ -48,7 +48,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.95 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.95.8.1 2021/08/04 23:14:04 thorpej Exp $");
 
 #include "opt_pcmciaverbose.h"
 
@@ -246,9 +246,8 @@ pcmcia_rescan(device_t self, const char 
 		paa.pf = pf;
 
 		pf->child = config_found(self, , pcmcia_print,
-		CFARG_SUBMATCH, config_stdsubmatch,
-		CFARG_LOCATORS, locs,
-		CFARG_EOL);
+		CFARGS(.submatch = config_stdsubmatch,
+			   .locators = locs));
 	}
 
 	return (0);

Index: src/sys/dev/pcmcia/pcmcom.c
diff -u src/sys/dev/pcmcia/pcmcom.c:1.42 src/sys/dev/pcmcia/pcmcom.c:1.42.8.1
--- src/sys/dev/pcmcia/pcmcom.c:1.42	Sat Apr 24 23:36:58 2021
+++ src/sys/dev/pcmcia/pcmcom.c	Wed Aug  4 23:14:04 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcmcom.c,v 1.42 2021/04/24 23:36:58 thorpej Exp $	*/
+/*	$NetBSD: pcmcom.c,v 1.42.8.1 2021/08/04 23:14:04 

CVS commit: [thorpej-cfargs2] src/sys/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 23:09:02 UTC 2021

Modified Files:
src/sys/dev/sun [thorpej-cfargs2]: bwtwo.c cgsix.c cgthree.c kbd.c
sunms.c
src/sys/dev/vme [thorpej-cfargs2]: vme.c xd.c xy.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/dev/sun/bwtwo.c
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/dev/sun/cgsix.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/dev/sun/cgthree.c \
src/sys/dev/sun/sunms.c
cvs rdiff -u -r1.72 -r1.72.8.1 src/sys/dev/sun/kbd.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/dev/vme/vme.c
cvs rdiff -u -r1.97 -r1.97.8.1 src/sys/dev/vme/xd.c
cvs rdiff -u -r1.101 -r1.101.8.1 src/sys/dev/vme/xy.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/sun/bwtwo.c
diff -u src/sys/dev/sun/bwtwo.c:1.37 src/sys/dev/sun/bwtwo.c:1.37.8.1
--- src/sys/dev/sun/bwtwo.c:1.37	Sat Apr 24 23:36:59 2021
+++ src/sys/dev/sun/bwtwo.c	Wed Aug  4 23:09:02 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bwtwo.c,v 1.37 2021/04/24 23:36:59 thorpej Exp $ */
+/*	$NetBSD: bwtwo.c,v 1.37.8.1 2021/08/04 23:09:02 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.37 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.37.8.1 2021/08/04 23:09:02 thorpej Exp $");
 
 #include 
 #include 
@@ -324,7 +324,7 @@ bwtwoattach(struct bwtwo_softc *sc, cons
 		aa.console = isconsole;
 	aa.accessops = _accessops;
 	aa.accesscookie = >vd;
-	config_found(sc->sc_dev, , wsemuldisplaydevprint, CFARG_EOL);
+	config_found(sc->sc_dev, , wsemuldisplaydevprint, CFARGS_NONE);
 #endif
 
 }

Index: src/sys/dev/sun/cgsix.c
diff -u src/sys/dev/sun/cgsix.c:1.69 src/sys/dev/sun/cgsix.c:1.69.8.1
--- src/sys/dev/sun/cgsix.c:1.69	Sat Apr 24 23:36:59 2021
+++ src/sys/dev/sun/cgsix.c	Wed Aug  4 23:09:02 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgsix.c,v 1.69 2021/04/24 23:36:59 thorpej Exp $ */
+/*	$NetBSD: cgsix.c,v 1.69.8.1 2021/08/04 23:09:02 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.69 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.69.8.1 2021/08/04 23:09:02 thorpej Exp $");
 
 #include 
 #include 
@@ -629,7 +629,7 @@ cg6attach(struct cgsix_softc *sc, const 
 	aa.console = isconsole;
 	aa.accessops = _accessops;
 	aa.accesscookie = >vd;
-	config_found(sc->sc_dev, , wsemuldisplaydevprint, CFARG_EOL);
+	config_found(sc->sc_dev, , wsemuldisplaydevprint, CFARGS_NONE);
 }
 
 

Index: src/sys/dev/sun/cgthree.c
diff -u src/sys/dev/sun/cgthree.c:1.34 src/sys/dev/sun/cgthree.c:1.34.8.1
--- src/sys/dev/sun/cgthree.c:1.34	Sat Apr 24 23:36:59 2021
+++ src/sys/dev/sun/cgthree.c	Wed Aug  4 23:09:02 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgthree.c,v 1.34 2021/04/24 23:36:59 thorpej Exp $ */
+/*	$NetBSD: cgthree.c,v 1.34.8.1 2021/08/04 23:09:02 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.34 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.34.8.1 2021/08/04 23:09:02 thorpej Exp $");
 
 #include 
 #include 
@@ -244,7 +244,7 @@ cgthreeattach(struct cgthree_softc *sc, 
 	aa.console = isconsole;
 	aa.accessops = _accessops;
 	aa.accesscookie = >vd;
-	config_found(sc->sc_dev, , wsemuldisplaydevprint, CFARG_EOL);
+	config_found(sc->sc_dev, , wsemuldisplaydevprint, CFARGS_NONE);
 }
 
 
Index: src/sys/dev/sun/sunms.c
diff -u src/sys/dev/sun/sunms.c:1.34 src/sys/dev/sun/sunms.c:1.34.8.1
--- src/sys/dev/sun/sunms.c:1.34	Sat Apr 24 23:36:59 2021
+++ src/sys/dev/sun/sunms.c	Wed Aug  4 23:09:02 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunms.c,v 1.34 2021/04/24 23:36:59 thorpej Exp $	*/
+/*	$NetBSD: sunms.c,v 1.34.8.1 2021/08/04 23:09:02 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.34 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.34.8.1 2021/08/04 23:09:02 thorpej Exp $");
 
 #include 
 #include 
@@ -174,7 +174,7 @@ sunms_attach(device_t parent, device_t s
 	a.accessops = _accessops;
 	a.accesscookie = ms;
 
-	ms->ms_wsmousedev = config_found(self, , wsmousedevprint, CFARG_EOL);
+	ms->ms_wsmousedev = config_found(self, , wsmousedevprint, CFARGS_NONE);
 #endif
 }
 

Index: src/sys/dev/sun/kbd.c
diff -u src/sys/dev/sun/kbd.c:1.72 src/sys/dev/sun/kbd.c:1.72.8.1
--- src/sys/dev/sun/kbd.c:1.72	Sat Apr 24 23:36:59 2021
+++ src/sys/dev/sun/kbd.c	Wed Aug  4 23:09:02 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbd.c,v 1.72 2021/04/24 23:36:59 thorpej Exp $	*/
+/*	$NetBSD: kbd.c,v 1.72.8.1 2021/08/04 23:09:02 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
  */
 
 #include 

CVS commit: [thorpej-cfargs2] src/sys/dev/usb

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 23:07:57 UTC 2021

Modified Files:
src/sys/dev/usb [thorpej-cfargs2]: auvitek_audio.c auvitek_dtv.c
auvitek_i2c.c emdtv_dtv.c emdtv_ir.c irmce.c motg.c u3g.c uark.c
uatp.c ubsa.c uchcom.c udl.c udsir.c uep.c uftdi.c ugensa.c
uhidev.c uhmodem.c uipaq.c uirda.c ukbd.c umass_scsipi.c umcs.c
umct.c umodem_common.c uplcom.c usb_subr.c uslsa.c usscanner.c
ustir.c uts.c uvisor.c uvscom.c vhci.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/usb/auvitek_audio.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/usb/auvitek_dtv.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/dev/usb/auvitek_i2c.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/dev/usb/emdtv_dtv.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/usb/emdtv_ir.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/dev/usb/irmce.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/dev/usb/u3g.c src/sys/dev/usb/umct.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/usb/uark.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/usb/uatp.c src/sys/dev/usb/udl.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.39 -r1.39.2.1 src/sys/dev/usb/uchcom.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/dev/usb/udsir.c src/sys/dev/usb/uts.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/dev/usb/uep.c
cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.44 -r1.44.8.1 src/sys/dev/usb/ugensa.c
cvs rdiff -u -r1.80 -r1.80.8.1 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/usb/uhmodem.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/usb/uipaq.c
cvs rdiff -u -r1.49 -r1.49.8.1 src/sys/dev/usb/uirda.c \
src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.151 -r1.151.2.1 src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.68 -r1.68.4.1 src/sys/dev/usb/umass_scsipi.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/usb/umcs.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/dev/usb/umodem_common.c
cvs rdiff -u -r1.90 -r1.90.8.1 src/sys/dev/usb/uplcom.c
cvs rdiff -u -r1.265 -r1.265.2.1 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.56 -r1.56.8.1 src/sys/dev/usb/uvisor.c
cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/dev/usb/uvscom.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/dev/usb/vhci.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/usb/auvitek_audio.c
diff -u src/sys/dev/usb/auvitek_audio.c:1.4 src/sys/dev/usb/auvitek_audio.c:1.4.8.1
--- src/sys/dev/usb/auvitek_audio.c:1.4	Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/auvitek_audio.c	Wed Aug  4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_audio.c,v 1.4 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: auvitek_audio.c,v 1.4.8.1 2021/08/04 23:07:57 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill 
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: auvitek_audio.c,v 1.4 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_audio.c,v 1.4.8.1 2021/08/04 23:07:57 thorpej Exp $");
 
 #include 
 #include 
@@ -97,10 +97,9 @@ auvitek_audio_attach(struct auvitek_soft
 		ilocs[USBIFIFCF_INTERFACE] = uiaa.uiaa_ifaceno;
 		sc->sc_audiodev =
 		config_found(sc->sc_dev, , auvitek_ifprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "usbifif",
- CFARG_LOCATORS, ilocs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+	.iattr = "usbifif",
+	.locators = ilocs));
 		if (sc->sc_audiodev)
 			break;
 	}

Index: src/sys/dev/usb/auvitek_dtv.c
diff -u src/sys/dev/usb/auvitek_dtv.c:1.8 src/sys/dev/usb/auvitek_dtv.c:1.8.8.1
--- src/sys/dev/usb/auvitek_dtv.c:1.8	Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/auvitek_dtv.c	Wed Aug  4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_dtv.c,v 1.8 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: auvitek_dtv.c,v 1.8.8.1 2021/08/04 23:07:57 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill 
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: auvitek_dtv.c,v 1.8 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_dtv.c,v 1.8.8.1 2021/08/04 23:07:57 thorpej Exp $");
 
 #include 
 #include 
@@ -117,8 +117,7 @@ auvitek_dtv_rescan(struct auvitek_softc 
 
 	if (ifattr_match(ifattr, "dtvbus") && sc->sc_dtvdev == NULL)
 		sc->sc_dtvdev = config_found(sc->sc_dev, , dtv_print,
-		CFARG_IATTR, "dtvbus",
-		CFARG_EOL);
+		CFARGS(.iattr = "dtvbus"));
 }
 
 void

Index: src/sys/dev/usb/auvitek_i2c.c
diff -u src/sys/dev/usb/auvitek_i2c.c:1.6 src/sys/dev/usb/auvitek_i2c.c:1.6.8.1
--- src/sys/dev/usb/auvitek_i2c.c:1.6	Sat Apr 24 23:36:59 2021
+++ src/sys/dev/usb/auvitek_i2c.c	Wed Aug  4 23:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_i2c.c,v 1.6 2021/04/24 23:36:59 thorpej Exp $ 

CVS commit: [thorpej-cfargs2] src/sys/dev/sbus

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 21:35:17 UTC 2021

Modified Files:
src/sys/dev/sbus [thorpej-cfargs2]: agten.c cgtwelve.c dma_sbus.c
lebuffer.c magma.c mgx.c p9100.c qec.c sio16.c spif.c stp4020.c
tcx.c xbox.c zx.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/sbus/agten.c \
src/sys/dev/sbus/spif.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/dev/sbus/cgtwelve.c
cvs rdiff -u -r1.37 -r1.37.4.1 src/sys/dev/sbus/dma_sbus.c
cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/dev/sbus/lebuffer.c
cvs rdiff -u -r1.63 -r1.63.8.1 src/sys/dev/sbus/magma.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/dev/sbus/mgx.c
cvs rdiff -u -r1.64 -r1.64.8.1 src/sys/dev/sbus/p9100.c
cvs rdiff -u -r1.52 -r1.52.4.1 src/sys/dev/sbus/qec.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/sbus/sio16.c
cvs rdiff -u -r1.70 -r1.70.8.1 src/sys/dev/sbus/stp4020.c
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/dev/sbus/tcx.c
cvs rdiff -u -r1.23 -r1.23.4.1 src/sys/dev/sbus/xbox.c
cvs rdiff -u -r1.46 -r1.46.8.1 src/sys/dev/sbus/zx.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/sbus/agten.c
diff -u src/sys/dev/sbus/agten.c:1.33 src/sys/dev/sbus/agten.c:1.33.8.1
--- src/sys/dev/sbus/agten.c:1.33	Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/agten.c	Wed Aug  4 21:35:17 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: agten.c,v 1.33 2021/04/24 23:36:58 thorpej Exp $ */
+/*	$NetBSD: agten.c,v 1.33.8.1 2021/08/04 21:35:17 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.33 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.33.8.1 2021/08/04 21:35:17 thorpej Exp $");
 
 /*
  * a driver for the Fujitsu AG-10e SBus framebuffer
@@ -370,7 +370,7 @@ agten_attach(device_t parent, device_t d
 	aa.accessops = _accessops;
 	aa.accesscookie = >vd;
 
-	config_found(sc->sc_dev, , wsemuldisplaydevprint, CFARG_EOL);
+	config_found(sc->sc_dev, , wsemuldisplaydevprint, CFARGS_NONE);
 
 	fb->fb_driver = 
 	fb->fb_device = sc->sc_dev;
Index: src/sys/dev/sbus/spif.c
diff -u src/sys/dev/sbus/spif.c:1.33 src/sys/dev/sbus/spif.c:1.33.8.1
--- src/sys/dev/sbus/spif.c:1.33	Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/spif.c	Wed Aug  4 21:35:17 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: spif.c,v 1.33 2021/04/24 23:36:58 thorpej Exp $	*/
+/*	$NetBSD: spif.c,v 1.33.8.1 2021/08/04 21:35:17 thorpej Exp $	*/
 /*	$OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.33 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.33.8.1 2021/08/04 21:35:17 thorpej Exp $");
 
 #include "spif.h"
 #if NSPIF > 0
@@ -278,8 +278,8 @@ spif_attach(device_t parent, device_t se
 	printf(": rev %x chiprev %x osc %sMHz\n",
 	sc->sc_rev, sc->sc_rev2, clockfreq(sc->sc_osc));
 
-	(void)config_found(self, stty_match, NULL, CFARG_EOL);
-	(void)config_found(self, sbpp_match, NULL, CFARG_EOL);
+	(void)config_found(self, stty_match, NULL, CFARGS_NONE);
+	(void)config_found(self, sbpp_match, NULL, CFARGS_NONE);
 
 	return;
 

Index: src/sys/dev/sbus/cgtwelve.c
diff -u src/sys/dev/sbus/cgtwelve.c:1.7 src/sys/dev/sbus/cgtwelve.c:1.7.8.1
--- src/sys/dev/sbus/cgtwelve.c:1.7	Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/cgtwelve.c	Wed Aug  4 21:35:17 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgtwelve.c,v 1.7 2021/04/24 23:36:58 thorpej Exp $ */
+/*	$NetBSD: cgtwelve.c,v 1.7.8.1 2021/08/04 21:35:17 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2010 Michael Lorenz
@@ -29,7 +29,7 @@
 /* a console driver for the Sun CG12 / Matrox SG3 graphics board */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cgtwelve.c,v 1.7 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgtwelve.c,v 1.7.8.1 2021/08/04 21:35:17 thorpej Exp $");
 
 #include 
 #include 
@@ -256,7 +256,7 @@ cgtwelve_attach(device_t parent, device_
 	aa.accessops = _accessops;
 	aa.accesscookie = >vd;
 
-	config_found(self, , wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, , wsemuldisplaydevprint, CFARGS_NONE);
 #ifdef CG12_DEBUG
 	{
 		int i;

Index: src/sys/dev/sbus/dma_sbus.c
diff -u src/sys/dev/sbus/dma_sbus.c:1.37 src/sys/dev/sbus/dma_sbus.c:1.37.4.1
--- src/sys/dev/sbus/dma_sbus.c:1.37	Mon May 10 23:53:44 2021
+++ src/sys/dev/sbus/dma_sbus.c	Wed Aug  4 21:35:17 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: dma_sbus.c,v 1.37 2021/05/10 23:53:44 thorpej Exp $ */
+/*	$NetBSD: dma_sbus.c,v 1.37.4.1 2021/08/04 21:35:17 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.37 2021/05/10 23:53:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.37.4.1 2021/08/04 21:35:17 thorpej Exp $");
 
 #include 
 #include 
@@ -211,8 +211,7 @@ dmaattach_sbus(device_t 

CVS commit: [thorpej-cfargs2] src/sys/dev/pci

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 21:27:00 UTC 2021

Modified Files:
src/sys/dev/pci [thorpej-cfargs2]: alipm.c amdpm_smbus.c amr.c arcmsr.c
btvmei.c btvmeii.c cmpci.c coram.c cxdtv.c ehci_pci.c eso.c fms.c
genfb_pci.c gffb.c ibmcd.c ichsmb.c if_msk.c if_sk.c igma.c ips.c
ismt.c jmide.c joy_eap.c lynxfb.c machfb.c mfii.c mly.c mpii.c
nfsmb.c oboe.c ohci_pci.c pccbb.c pci.c piixpm.c pm2fb.c pm3fb.c
ppb.c puc.c r128fb.c radeonfb.c sisfb.c sv.c tdvfb.c tga.c trm.c
twa.c twe.c uhci_pci.c unichromefb.c vga_pci.c vioscsi.c
virtio_pci.c voodoofb.c voyager.c wcfb.c xhci_pci.c xmm7360.c yds.c
src/sys/dev/pci/cxgb [thorpej-cfargs2]: cxgb_main.c
src/sys/dev/pci/igma [thorpej-cfargs2]: igmafb.c
src/sys/dev/pci/voyager [thorpej-cfargs2]: voyagerfb.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/dev/pci/alipm.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/dev/pci/amdpm_smbus.c \
src/sys/dev/pci/jmide.c
cvs rdiff -u -r1.66 -r1.66.8.1 src/sys/dev/pci/amr.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/dev/pci/arcmsr.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/dev/pci/btvmei.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/dev/pci/btvmeii.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/pci/cmpci.c \
src/sys/dev/pci/ohci_pci.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/dev/pci/coram.c \
src/sys/dev/pci/cxdtv.c src/sys/dev/pci/wcfb.c
cvs rdiff -u -r1.71 -r1.71.8.1 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.74 -r1.74.6.1 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/pci/fms.c src/sys/dev/pci/oboe.c
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/dev/pci/genfb_pci.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/pci/gffb.c \
src/sys/dev/pci/voyager.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/pci/ibmcd.c
cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.116 -r1.116.6.1 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.108 -r1.108.6.1 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/pci/igma.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/pci/ips.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/pci/ismt.c src/sys/dev/pci/mfii.c
cvs rdiff -u -r1.16 -r1.16.6.1 src/sys/dev/pci/joy_eap.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/dev/pci/lynxfb.c src/sys/dev/pci/pm3fb.c \
src/sys/dev/pci/sisfb.c
cvs rdiff -u -r1.105 -r1.105.2.1 src/sys/dev/pci/machfb.c
cvs rdiff -u -r1.54 -r1.54.8.1 src/sys/dev/pci/mly.c \
src/sys/dev/pci/voodoofb.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/dev/pci/mpii.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/pci/nfsmb.c \
src/sys/dev/pci/vioscsi.c
cvs rdiff -u -r1.216 -r1.216.8.1 src/sys/dev/pci/pccbb.c
cvs rdiff -u -r1.160 -r1.160.4.1 src/sys/dev/pci/pci.c
cvs rdiff -u -r1.64 -r1.64.8.1 src/sys/dev/pci/piixpm.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/dev/pci/pm2fb.c
cvs rdiff -u -r1.72 -r1.72.4.1 src/sys/dev/pci/ppb.c
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/dev/pci/puc.c
cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/dev/pci/r128fb.c
cvs rdiff -u -r1.115 -r1.115.2.1 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/dev/pci/sv.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/dev/pci/tdvfb.c
cvs rdiff -u -r1.87 -r1.87.8.1 src/sys/dev/pci/tga.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/dev/pci/trm.c
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/dev/pci/twa.c
cvs rdiff -u -r1.109 -r1.109.8.1 src/sys/dev/pci/twe.c
cvs rdiff -u -r1.65 -r1.65.8.1 src/sys/dev/pci/uhci_pci.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/pci/unichromefb.c
cvs rdiff -u -r1.57 -r1.57.8.1 src/sys/dev/pci/vga_pci.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/pci/virtio_pci.c \
src/sys/dev/pci/xhci_pci.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/pci/xmm7360.c
cvs rdiff -u -r1.67 -r1.67.8.1 src/sys/dev/pci/yds.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/dev/pci/cxgb/cxgb_main.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/pci/igma/igmafb.c
cvs rdiff -u -r1.32 -r1.32.4.1 src/sys/dev/pci/voyager/voyagerfb.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/pci/alipm.c
diff -u src/sys/dev/pci/alipm.c:1.12 src/sys/dev/pci/alipm.c:1.12.8.1
--- src/sys/dev/pci/alipm.c:1.12	Sat Apr 24 23:36:57 2021
+++ src/sys/dev/pci/alipm.c	Wed Aug  4 21:27:00 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: alipm.c,v 1.12 2021/04/24 23:36:57 thorpej Exp $ */
+/*	$NetBSD: alipm.c,v 1.12.8.1 2021/08/04 21:27:00 thorpej Exp $ */
 /*	$OpenBSD: alipm.c,v 1.13 2007/05/03 12:19:01 dlg Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: alipm.c,v 1.12 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: alipm.c,v 1.12.8.1 2021/08/04 21:27:00 thorpej Exp $");
 
 #include 
 #include 
@@ -210,7 +210,7 @@ alipm_attach(device_t parent, device_t s
 
 	memset(, 0, sizeof iba);
 	iba.iba_tag = >sc_smb_tag;
-	config_found(sc->sc_dev, , iicbus_print, 

CVS commit: [thorpej-cfargs2] src/sys/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 21:00:41 UTC 2021

Modified Files:
src/sys/dev/marvell [thorpej-cfargs2]: ehci_mv.c gt.c gtpci.c if_gfe.c
if_mvgbe.c mvpex.c mvsdio.c mvspi.c obio.c
src/sys/dev/mca [thorpej-cfargs2]: edc_mca.c mca.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/dev/marvell/ehci_mv.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/marvell/gt.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/dev/marvell/gtpci.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/marvell/if_gfe.c
cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/dev/marvell/if_mvgbe.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/dev/marvell/mvpex.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/dev/marvell/mvsdio.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/dev/marvell/mvspi.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/marvell/obio.c
cvs rdiff -u -r1.53 -r1.53.8.1 src/sys/dev/mca/edc_mca.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/mca/mca.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/marvell/ehci_mv.c
diff -u src/sys/dev/marvell/ehci_mv.c:1.9 src/sys/dev/marvell/ehci_mv.c:1.9.8.1
--- src/sys/dev/marvell/ehci_mv.c:1.9	Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/ehci_mv.c	Wed Aug  4 21:00:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci_mv.c,v 1.9 2021/04/24 23:36:56 thorpej Exp $	*/
+/*	$NetBSD: ehci_mv.c,v 1.9.8.1 2021/08/04 21:00:41 thorpej Exp $	*/
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ehci_mv.c,v 1.9 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_mv.c,v 1.9.8.1 2021/08/04 21:00:41 thorpej Exp $");
 
 #include 
 #include 
@@ -247,7 +247,7 @@ mvusb_attach(device_t parent, device_t s
 
 	/* Attach usb device. */
 	sc->sc.sc_child = config_found(self, >sc.sc_bus, usbctlprint,
-	CFARG_EOL);
+	CFARGS_NONE);
 }
 
 static void

Index: src/sys/dev/marvell/gt.c
diff -u src/sys/dev/marvell/gt.c:1.29 src/sys/dev/marvell/gt.c:1.29.8.1
--- src/sys/dev/marvell/gt.c:1.29	Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/gt.c	Wed Aug  4 21:00:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gt.c,v 1.29 2021/04/24 23:36:56 thorpej Exp $	*/
+/*	$NetBSD: gt.c,v 1.29.8.1 2021/08/04 21:00:41 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.29 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.29.8.1 2021/08/04 21:00:41 thorpej Exp $");
 
 #include "opt_marvell.h"
 #include "gtmpsc.h"
@@ -236,8 +236,7 @@ gt_attach_peripherals(struct gt_softc *s
 		mva.mva_irq = gt_devs[i].irq;
 
 		config_found(sc->sc_dev, , gt_cfprint,
-		CFARG_SUBMATCH, gt_cfsearch,
-		CFARG_EOL);
+		CFARGS(.submatch = gt_cfsearch));
 	}
 }
 

Index: src/sys/dev/marvell/gtpci.c
diff -u src/sys/dev/marvell/gtpci.c:1.35 src/sys/dev/marvell/gtpci.c:1.35.8.1
--- src/sys/dev/marvell/gtpci.c:1.35	Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/gtpci.c	Wed Aug  4 21:00:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gtpci.c,v 1.35 2021/04/24 23:36:56 thorpej Exp $	*/
+/*	$NetBSD: gtpci.c,v 1.35.8.1 2021/08/04 21:00:41 thorpej Exp $	*/
 /*
  * Copyright (c) 2008, 2009 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.35 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.35.8.1 2021/08/04 21:00:41 thorpej Exp $");
 
 #include "opt_pci.h"
 #include "pci.h"
@@ -492,7 +492,7 @@ gtpci_pci_config(struct gtpci_softc *sc,
 	pba.pba_flags |= PCI_FLAGS_MWI_OKAY;
 	pba.pba_bus = GTPCI_P2PC_BUSNUMBER(p2pc);
 	pba.pba_bridgetag = NULL;
-	config_found(sc->sc_dev, , NULL, CFARG_EOL);
+	config_found(sc->sc_dev, , NULL, CFARGS_NONE);
 }
 
 

Index: src/sys/dev/marvell/if_gfe.c
diff -u src/sys/dev/marvell/if_gfe.c:1.58 src/sys/dev/marvell/if_gfe.c:1.58.8.1
--- src/sys/dev/marvell/if_gfe.c:1.58	Sat Apr 24 23:36:56 2021
+++ src/sys/dev/marvell/if_gfe.c	Wed Aug  4 21:00:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gfe.c,v 1.58 2021/04/24 23:36:56 thorpej Exp $	*/
+/*	$NetBSD: if_gfe.c,v 1.58.8.1 2021/08/04 21:00:41 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.58 2021/04/24 23:36:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.58.8.1 2021/08/04 21:00:41 thorpej Exp $");
 
 #include "opt_inet.h"
 
@@ -250,8 +250,7 @@ gfec_attach(device_t parent, device_t se
 		gfea.mva_dmat = mva->mva_dmat;
 		gfea.mva_irq = gfe_irqs[i];
 		config_found(sc->sc_dev, , gfec_print,
-		CFARG_SUBMATCH, gfec_search,
-		CFARG_EOL);
+		CFARGS(.submatch = gfec_search));
 	}
 }
 

Index: src/sys/dev/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.60 

CVS commit: [thorpej-cfargs2] src/sys/dev/tc

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 20:31:00 UTC 2021

Modified Files:
src/sys/dev/tc [thorpej-cfargs2]: cfb.c ioasic_subr.c mfb.c sfb.c
sfbplus.c stic.c tc.c tcds.c tcu.c tfb.c xcfb.c zs_ioasic.c zskbd.c
zsms.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.64.8.1 src/sys/dev/tc/cfb.c src/sys/dev/tc/tfb.c
cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/dev/tc/ioasic_subr.c
cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/dev/tc/mfb.c
cvs rdiff -u -r1.87 -r1.87.8.1 src/sys/dev/tc/sfb.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/dev/tc/sfbplus.c
cvs rdiff -u -r1.55 -r1.55.8.1 src/sys/dev/tc/stic.c
cvs rdiff -u -r1.58 -r1.58.6.1 src/sys/dev/tc/tc.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/dev/tc/tcds.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/tc/tcu.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/tc/xcfb.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/dev/tc/zs_ioasic.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/tc/zskbd.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/dev/tc/zsms.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/tc/cfb.c
diff -u src/sys/dev/tc/cfb.c:1.64 src/sys/dev/tc/cfb.c:1.64.8.1
--- src/sys/dev/tc/cfb.c:1.64	Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/cfb.c	Wed Aug  4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.64 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: cfb.c,v 1.64.8.1 2021/08/04 20:31:00 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.64 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.64.8.1 2021/08/04 20:31:00 thorpej Exp $");
 
 #include 
 #include 
@@ -282,7 +282,7 @@ cfbattach(device_t parent, device_t self
 	waa.accessops = _accessops;
 	waa.accesscookie = sc;
 
-	config_found(self, , wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, , wsemuldisplaydevprint, CFARGS_NONE);
 }
 
 static void
Index: src/sys/dev/tc/tfb.c
diff -u src/sys/dev/tc/tfb.c:1.64 src/sys/dev/tc/tfb.c:1.64.8.1
--- src/sys/dev/tc/tfb.c:1.64	Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/tfb.c	Wed Aug  4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tfb.c,v 1.64 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: tfb.c,v 1.64.8.1 2021/08/04 20:31:00 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.64 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.64.8.1 2021/08/04 20:31:00 thorpej Exp $");
 
 #include 
 #include 
@@ -316,7 +316,7 @@ tfbattach(device_t parent, device_t self
 	waa.accessops = _accessops;
 	waa.accesscookie = sc;
 
-	config_found(self, , wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, , wsemuldisplaydevprint, CFARGS_NONE);
 }
 
 static void

Index: src/sys/dev/tc/ioasic_subr.c
diff -u src/sys/dev/tc/ioasic_subr.c:1.15 src/sys/dev/tc/ioasic_subr.c:1.15.6.1
--- src/sys/dev/tc/ioasic_subr.c:1.15	Fri May  7 16:55:58 2021
+++ src/sys/dev/tc/ioasic_subr.c	Wed Aug  4 20:31:00 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ioasic_subr.c,v 1.15 2021/05/07 16:55:58 thorpej Exp $	*/
+/*	$NetBSD: ioasic_subr.c,v 1.15.6.1 2021/08/04 20:31:00 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ioasic_subr.c,v 1.15 2021/05/07 16:55:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioasic_subr.c,v 1.15.6.1 2021/08/04 20:31:00 thorpej Exp $");
 
 #include 
 #include 
@@ -73,8 +73,7 @@ ioasic_attach_devs(struct ioasic_softc *
 /* Tell the autoconfig machinery we've found the hardware. */
 		locs[IOASICCF_OFFSET] = ioasic_devs[i].iad_offset;
 		config_found(sc->sc_dev, , ioasicprint,
-		CFARG_SUBMATCH, config_stdsubmatch,
-		CFARG_LOCATORS, locs,
-		CFARG_EOL);
+		CFARGS(.submatch = config_stdsubmatch,
+			   .locators = locs));
 }
 }

Index: src/sys/dev/tc/mfb.c
diff -u src/sys/dev/tc/mfb.c:1.62 src/sys/dev/tc/mfb.c:1.62.8.1
--- src/sys/dev/tc/mfb.c:1.62	Sat Apr 24 23:36:59 2021
+++ src/sys/dev/tc/mfb.c	Wed Aug  4 20:31:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.62 2021/04/24 23:36:59 thorpej Exp $ */
+/* $NetBSD: mfb.c,v 1.62.8.1 2021/08/04 20:31:00 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.62 2021/04/24 23:36:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.62.8.1 2021/08/04 20:31:00 thorpej Exp $");
 
 #include 
 #include 
@@ -262,7 +262,7 @@ mfbattach(device_t parent, device_t self
 	waa.accessops = _accessops;
 	waa.accesscookie = sc;
 
-	config_found(self, , wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, , wsemuldisplaydevprint, CFARGS_NONE);
 }
 
 static void

Index: src/sys/dev/tc/sfb.c
diff 

CVS commit: [thorpej-cfargs2] src/sys/dev/isa

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 20:27:36 UTC 2021

Modified Files:
src/sys/dev/isa [thorpej-cfargs2]: addcom_isa.c ast.c boca.c cec.c
ega.c ess.c fd.c if_le_isa.c ioat66.c isa.c moxa_isa.c nct.c
nsclpcsio_isa.c pcdisplay.c pcppi.c ptcd.c rtfps.c sb.c seagate.c
soekrisgpio.c tcom.c tsdio.c wbsio.c wds.c wss.c ym.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/isa/addcom_isa.c \
src/sys/dev/isa/moxa_isa.c
cvs rdiff -u -r1.67 -r1.67.8.1 src/sys/dev/isa/ast.c
cvs rdiff -u -r1.56 -r1.56.8.1 src/sys/dev/isa/boca.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/dev/isa/cec.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/dev/isa/ega.c
cvs rdiff -u -r1.88 -r1.88.6.1 src/sys/dev/isa/ess.c
cvs rdiff -u -r1.115 -r1.115.8.1 src/sys/dev/isa/fd.c
cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/dev/isa/if_le_isa.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/isa/ioat66.c
cvs rdiff -u -r1.139 -r1.139.8.1 src/sys/dev/isa/isa.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/isa/nct.c src/sys/dev/isa/ptcd.c \
src/sys/dev/isa/soekrisgpio.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/isa/nsclpcsio_isa.c
cvs rdiff -u -r1.46 -r1.46.8.1 src/sys/dev/isa/pcdisplay.c \
src/sys/dev/isa/pcppi.c
cvs rdiff -u -r1.61 -r1.61.8.1 src/sys/dev/isa/rtfps.c
cvs rdiff -u -r1.92 -r1.92.8.1 src/sys/dev/isa/sb.c
cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/dev/isa/seagate.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/dev/isa/tcom.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/dev/isa/tsdio.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/isa/wbsio.c
cvs rdiff -u -r1.78 -r1.78.8.1 src/sys/dev/isa/wds.c
cvs rdiff -u -r1.76 -r1.76.6.1 src/sys/dev/isa/wss.c
cvs rdiff -u -r1.49 -r1.49.6.1 src/sys/dev/isa/ym.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/isa/addcom_isa.c
diff -u src/sys/dev/isa/addcom_isa.c:1.22 src/sys/dev/isa/addcom_isa.c:1.22.8.1
--- src/sys/dev/isa/addcom_isa.c:1.22	Sat Apr 24 23:36:55 2021
+++ src/sys/dev/isa/addcom_isa.c	Wed Aug  4 20:27:35 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: addcom_isa.c,v 1.22 2021/04/24 23:36:55 thorpej Exp $	*/
+/*	$NetBSD: addcom_isa.c,v 1.22.8.1 2021/08/04 20:27:35 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Michael Graff.  All rights reserved.
@@ -55,7 +55,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.22 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.22.8.1 2021/08/04 20:27:35 thorpej Exp $");
 
 #include 
 #include 
@@ -225,7 +225,7 @@ addcomattach(device_t parent, device_t s
 		ca.ca_noien = 0;
 
 		sc->sc_slaves[i] = config_found(self, , commultiprint,
-		CFARG_EOL);
+		CFARGS_NONE);
 		if (sc->sc_slaves[i] != NULL)
 			sc->sc_alive |= 1 << i;
 	}
Index: src/sys/dev/isa/moxa_isa.c
diff -u src/sys/dev/isa/moxa_isa.c:1.22 src/sys/dev/isa/moxa_isa.c:1.22.8.1
--- src/sys/dev/isa/moxa_isa.c:1.22	Sat Apr 24 23:36:55 2021
+++ src/sys/dev/isa/moxa_isa.c	Wed Aug  4 20:27:35 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: moxa_isa.c,v 1.22 2021/04/24 23:36:55 thorpej Exp $	*/
+/*	$NetBSD: moxa_isa.c,v 1.22.8.1 2021/08/04 20:27:35 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.22 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.22.8.1 2021/08/04 20:27:35 thorpej Exp $");
 
 #include 
 #include 
@@ -172,7 +172,7 @@ moxa_isaattach(device_t parent, device_t
 		ca.ca_noien = 1;
 
 		sc->sc_slaves[i] = config_found(self, , commultiprint,
-		CFARG_EOL);
+		CFARGS_NONE);
 		if (sc->sc_slaves[i] != NULL)
 			sc->sc_alive |= 1 << i;
 	}

Index: src/sys/dev/isa/ast.c
diff -u src/sys/dev/isa/ast.c:1.67 src/sys/dev/isa/ast.c:1.67.8.1
--- src/sys/dev/isa/ast.c:1.67	Sat Apr 24 23:36:55 2021
+++ src/sys/dev/isa/ast.c	Wed Aug  4 20:27:35 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ast.c,v 1.67 2021/04/24 23:36:55 thorpej Exp $	*/
+/*	$NetBSD: ast.c,v 1.67.8.1 2021/08/04 20:27:35 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.67 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.67.8.1 2021/08/04 20:27:35 thorpej Exp $");
 
 #include 
 #include 
@@ -178,7 +178,7 @@ astattach(device_t parent, device_t self
 		ca.ca_iobase = sc->sc_iobase + i * COM_NPORTS;
 		ca.ca_noien = 1;
 
-		slave = config_found(self, , commultiprint, CFARG_EOL);
+		slave = config_found(self, , commultiprint, CFARGS_NONE);
 		if (slave != NULL) {
 			sc->sc_alive |= 1 << i;
 			sc->sc_slaves[i] = device_private(slave);

Index: src/sys/dev/isa/boca.c
diff -u src/sys/dev/isa/boca.c:1.56 src/sys/dev/isa/boca.c:1.56.8.1
--- src/sys/dev/isa/boca.c:1.56	Sat Apr 24 23:36:55 2021
+++ src/sys/dev/isa/boca.c	Wed 

CVS commit: [thorpej-cfargs2] src/sys/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 20:24:28 UTC 2021

Modified Files:
src/sys/dev/hil [thorpej-cfargs2]: hil.c hilkbd.c hilms.c
src/sys/dev/ieee1394 [thorpej-cfargs2]: firewire.c fwohci.c sbp.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/hil/hil.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/hil/hilkbd.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/hil/hilms.c
cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/dev/ieee1394/firewire.c
cvs rdiff -u -r1.145 -r1.145.8.1 src/sys/dev/ieee1394/fwohci.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/dev/ieee1394/sbp.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/hil/hil.c
diff -u src/sys/dev/hil/hil.c:1.4 src/sys/dev/hil/hil.c:1.4.8.1
--- src/sys/dev/hil/hil.c:1.4	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hil/hil.c	Wed Aug  4 20:24:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: hil.c,v 1.4 2021/04/24 23:36:54 thorpej Exp $	*/
+/*	$NetBSD: hil.c,v 1.4.8.1 2021/08/04 20:24:27 thorpej Exp $	*/
 /*	$OpenBSD: hil.c,v 1.24 2010/11/20 16:45:46 miod Exp $	*/
 /*
  * Copyright (c) 2003, 2004, Miodrag Vallat.
@@ -540,8 +540,7 @@ hilconfig(struct hil_softc *sc, u_int kn
 
 			sc->sc_devices[id] =
 			config_found(sc->sc_dev, , hildevprint,
-	 CFARG_SUBMATCH, hilsubmatch,
-	 CFARG_EOL);
+	 CFARGS(.submatch = hilsubmatch));
 
 #if NHILKBD > 0
 			/*

Index: src/sys/dev/hil/hilkbd.c
diff -u src/sys/dev/hil/hilkbd.c:1.5 src/sys/dev/hil/hilkbd.c:1.5.8.1
--- src/sys/dev/hil/hilkbd.c:1.5	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hil/hilkbd.c	Wed Aug  4 20:24:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: hilkbd.c,v 1.5 2021/04/24 23:36:54 thorpej Exp $	*/
+/*	$NetBSD: hilkbd.c,v 1.5.8.1 2021/08/04 20:24:27 thorpej Exp $	*/
 /*	$OpenBSD: hilkbd.c,v 1.14 2009/01/21 21:53:59 grange Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
@@ -203,7 +203,7 @@ hilkbdattach(device_t parent, device_t s
 		sc->sc_console = sc->sc_enabled = 0;
 	}
 
-	sc->sc_wskbddev = config_found(self, , wskbddevprint, CFARG_EOL);
+	sc->sc_wskbddev = config_found(self, , wskbddevprint, CFARGS_NONE);
 
 	/*
 	 * If this is an old keyboard with a numeric pad but no ``num lock''

Index: src/sys/dev/hil/hilms.c
diff -u src/sys/dev/hil/hilms.c:1.3 src/sys/dev/hil/hilms.c:1.3.8.1
--- src/sys/dev/hil/hilms.c:1.3	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hil/hilms.c	Wed Aug  4 20:24:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: hilms.c,v 1.3 2021/04/24 23:36:54 thorpej Exp $	*/
+/*	$NetBSD: hilms.c,v 1.3.8.1 2021/08/04 20:24:27 thorpej Exp $	*/
 /*	$OpenBSD: hilms.c,v 1.5 2007/04/10 22:37:17 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
@@ -161,7 +161,7 @@ hilmsattach(device_t parent, device_t se
 	a.accessops = _accessops;
 	a.accesscookie = sc;
 
-	sc->sc_wsmousedev = config_found(self, , wsmousedevprint, CFARG_EOL);
+	sc->sc_wsmousedev = config_found(self, , wsmousedevprint, CFARGS_NONE);
 }
 
 int

Index: src/sys/dev/ieee1394/firewire.c
diff -u src/sys/dev/ieee1394/firewire.c:1.51 src/sys/dev/ieee1394/firewire.c:1.51.8.1
--- src/sys/dev/ieee1394/firewire.c:1.51	Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ieee1394/firewire.c	Wed Aug  4 20:24:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: firewire.c,v 1.51 2021/04/24 23:36:55 thorpej Exp $	*/
+/*	$NetBSD: firewire.c,v 1.51.8.1 2021/08/04 20:24:27 thorpej Exp $	*/
 /*-
  * Copyright (c) 2003 Hidetoshi Shimokawa
  * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.51 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.51.8.1 2021/08/04 20:24:27 thorpej Exp $");
 
 #include 
 #include 
@@ -246,7 +246,7 @@ firewireattach(device_t parent, device_t
 	faa.name = "fwip";
 	faa.fc = fc;
 	faa.fwdev = NULL;
-	devlist->dev = config_found(sc->dev, , firewire_print, CFARG_EOL);
+	devlist->dev = config_found(sc->dev, , firewire_print, CFARGS_NONE);
 	if (devlist->dev == NULL)
 		free(devlist, M_DEVBUF);
 	else
@@ -2042,9 +2042,8 @@ fw_attach_dev(struct firewire_comm *fc)
 			fwa.name = fw_get_devclass(fwdev);
 			fwa.fwdev = fwdev;
 			fwdev->dev = config_found(sc->dev, , firewire_print,
-			CFARG_SUBMATCH, config_stdsubmatch,
-			CFARG_LOCATORS, locs,
-			CFARG_EOL);
+			CFARGS(.submatch = config_stdsubmatch,
+   .locators = locs));
 			if (fwdev->dev == NULL) {
 free(devlist, M_DEVBUF);
 break;

Index: src/sys/dev/ieee1394/fwohci.c
diff -u src/sys/dev/ieee1394/fwohci.c:1.145 src/sys/dev/ieee1394/fwohci.c:1.145.8.1
--- src/sys/dev/ieee1394/fwohci.c:1.145	Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ieee1394/fwohci.c	Wed Aug  4 20:24:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fwohci.c,v 1.145 2021/04/24 23:36:55 thorpej Exp $	*/
+/*	$NetBSD: fwohci.c,v 1.145.8.1 2021/08/04 20:24:27 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 

CVS commit: [thorpej-cfargs2] src/sys/dev/ic

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 20:14:42 UTC 2021

Modified Files:
src/sys/dev/ic [thorpej-cfargs2]: aac.c adv.c adw.c aha.c
ahcisata_core.c aic6360.c aic79xx_osm.c aic7xxx_osm.c apple_smc.c
atppc.c bha.c cac.c ciss.c cpc700.c ct65550.c depca.c dpt.c
dwc_mmc.c esiop.c gcscpcib.c i82365.c icp.c icpsp.c igsfb.c iha.c
isp_netbsd.c mb89352.c mfi.c mlx.c mpt_netbsd.c mvsata.c
ncr5380sbc.c ncr53c9x.c ninjascsi32.c nvme.c oosiop.c osiop.c
pca9564.c pcf8584.c pl061.c pl181.c rtsx.c siisata.c siop.c
sl811hs.c spic.c ssdfb.c sti.c sunscpal.c tcic2.c uha.c vga.c
vga_raster.c w83l518d_sdmmc.c wd33c93.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/ic/aac.c src/sys/dev/ic/uha.c
cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/dev/ic/adv.c src/sys/dev/ic/ciss.c
cvs rdiff -u -r1.58 -r1.58.2.1 src/sys/dev/ic/adw.c
cvs rdiff -u -r1.64 -r1.64.8.1 src/sys/dev/ic/aha.c src/sys/dev/ic/mfi.c
cvs rdiff -u -r1.99 -r1.99.2.1 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.103 -r1.103.8.1 src/sys/dev/ic/aic6360.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/dev/ic/aic79xx_osm.c \
src/sys/dev/ic/icp.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/dev/ic/aic7xxx_osm.c \
src/sys/dev/ic/tcic2.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/dev/ic/apple_smc.c
cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/dev/ic/atppc.c \
src/sys/dev/ic/mpt_netbsd.c
cvs rdiff -u -r1.78 -r1.78.8.1 src/sys/dev/ic/bha.c
cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/dev/ic/cac.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/ic/cpc700.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/dev/ic/ct65550.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/dev/ic/depca.c \
src/sys/dev/ic/pcf8584.c
cvs rdiff -u -r1.76 -r1.76.8.1 src/sys/dev/ic/dpt.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/dev/ic/dwc_mmc.c \
src/sys/dev/ic/icpsp.c src/sys/dev/ic/ninjascsi32.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/ic/esiop.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/ic/gcscpcib.c \
src/sys/dev/ic/pca9564.c
cvs rdiff -u -r1.117 -r1.117.8.1 src/sys/dev/ic/i82365.c
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/dev/ic/igsfb.c \
src/sys/dev/ic/mb89352.c src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.44 -r1.44.8.1 src/sys/dev/ic/iha.c
cvs rdiff -u -r1.97 -r1.97.8.1 src/sys/dev/ic/isp_netbsd.c
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/dev/ic/mlx.c
cvs rdiff -u -r1.68 -r1.68.8.1 src/sys/dev/ic/ncr5380sbc.c
cvs rdiff -u -r1.154 -r1.154.8.1 src/sys/dev/ic/ncr53c9x.c
cvs rdiff -u -r1.57 -r1.57.4.1 src/sys/dev/ic/nvme.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/ic/oosiop.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/dev/ic/osiop.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/ic/pl061.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/ic/pl181.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/ic/rtsx.c \
src/sys/dev/ic/w83l518d_sdmmc.c
cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/dev/ic/siisata.c
cvs rdiff -u -r1.101 -r1.101.8.1 src/sys/dev/ic/siop.c
cvs rdiff -u -r1.105 -r1.105.8.1 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/ic/spic.c
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/dev/ic/ssdfb.c
cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/dev/ic/sti.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/dev/ic/sunscpal.c
cvs rdiff -u -r1.119 -r1.119.8.1 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.49 -r1.49.8.1 src/sys/dev/ic/vga_raster.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/ic/wd33c93.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/ic/aac.c
diff -u src/sys/dev/ic/aac.c:1.48 src/sys/dev/ic/aac.c:1.48.8.1
--- src/sys/dev/ic/aac.c:1.48	Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/aac.c	Wed Aug  4 20:14:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: aac.c,v 1.48 2021/04/24 23:36:55 thorpej Exp $	*/
+/*	$NetBSD: aac.c,v 1.48.8.1 2021/08/04 20:14:42 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.48 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.48.8.1 2021/08/04 20:14:42 thorpej Exp $");
 
 #include 
 #include 
@@ -211,9 +211,8 @@ aac_devscan(struct aac_softc *sc)
 		locs[AACCF_UNIT] = i;
 
 		config_found(sc->sc_dv, , aac_print,
-		CFARG_SUBMATCH, config_stdsubmatch,
-		CFARG_LOCATORS, locs,
-		CFARG_EOL);
+		CFARGS(.submatch = config_stdsubmatch,
+			   .locators = locs));
 	}
 	return 0;
 }
Index: src/sys/dev/ic/uha.c
diff -u src/sys/dev/ic/uha.c:1.48 src/sys/dev/ic/uha.c:1.48.8.1
--- src/sys/dev/ic/uha.c:1.48	Sat Apr 24 23:36:55 2021
+++ src/sys/dev/ic/uha.c	Wed Aug  4 20:14:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: uha.c,v 1.48 2021/04/24 23:36:55 thorpej Exp $	*/
+/*	$NetBSD: uha.c,v 1.48.8.1 2021/08/04 20:14:42 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include 

CVS commit: [thorpej-cfargs2] src/sys/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 18:53:26 UTC 2021

Modified Files:
src/sys/dev/i2c [thorpej-cfargs2]: as3722.c axp20x.c axppmic.c
gttwsi_core.c i2c.c i2cmux.c ihidev.c motoi2c.c rkpmic.c tcakp.c
tps65217pmic.c w83795g.c
src/sys/dev/i2o [thorpej-cfargs2]: iop.c iopsp.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/i2c/as3722.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/i2c/axp20x.c
cvs rdiff -u -r1.35 -r1.35.4.1 src/sys/dev/i2c/axppmic.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/i2c/gttwsi_core.c
cvs rdiff -u -r1.79 -r1.79.2.1 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/i2c/i2cmux.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/dev/i2c/ihidev.c \
src/sys/dev/i2c/tps65217pmic.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/dev/i2c/motoi2c.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/dev/i2c/rkpmic.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/i2c/tcakp.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/i2c/w83795g.c
cvs rdiff -u -r1.91 -r1.91.8.1 src/sys/dev/i2o/iop.c
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/dev/i2o/iopsp.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/i2c/as3722.c
diff -u src/sys/dev/i2c/as3722.c:1.23 src/sys/dev/i2c/as3722.c:1.23.8.1
--- src/sys/dev/i2c/as3722.c:1.23	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/as3722.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: as3722.c,v 1.23 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: as3722.c,v 1.23.8.1 2021/08/04 18:53:26 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -29,7 +29,7 @@
 #include "opt_fdt.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.23 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.23.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include 
 #include 
@@ -514,7 +514,7 @@ as3722_regulator_attach(struct as3722_so
 			continue;
 		raa.reg_def = regdef;
 		raa.reg_phandle = child;
-		config_found(sc->sc_dev, , NULL, CFARG_EOL);
+		config_found(sc->sc_dev, , NULL, CFARGS_NONE);
 	}
 }
 

Index: src/sys/dev/i2c/axp20x.c
diff -u src/sys/dev/i2c/axp20x.c:1.20 src/sys/dev/i2c/axp20x.c:1.20.8.1
--- src/sys/dev/i2c/axp20x.c:1.20	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/axp20x.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: axp20x.c,v 1.20 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: axp20x.c,v 1.20.8.1 2021/08/04 18:53:26 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2014-2017 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.20 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.20.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include 
 #include 
@@ -813,6 +813,6 @@ axp20x_fdt_attach(struct axp20x_softc *s
 
 	for (child = OF_child(regulators_phandle); child; child = OF_peer(child)) {
 		struct axp20xreg_attach_args reg = { .reg_phandle = child };
-		config_found(sc->sc_dev, , NULL, CFARG_EOL);
+		config_found(sc->sc_dev, , NULL, CFARGS_NONE);
 	}
 }

Index: src/sys/dev/i2c/axppmic.c
diff -u src/sys/dev/i2c/axppmic.c:1.35 src/sys/dev/i2c/axppmic.c:1.35.4.1
--- src/sys/dev/i2c/axppmic.c:1.35	Mon May 24 05:58:42 2021
+++ src/sys/dev/i2c/axppmic.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: axppmic.c,v 1.35 2021/05/24 05:58:42 skrll Exp $ */
+/* $NetBSD: axppmic.c,v 1.35.4.1 2021/08/04 18:53:26 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2014-2018 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 1.35 2021/05/24 05:58:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 1.35.4.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include 
 #include 
@@ -1052,7 +1052,7 @@ axppmic_attach(device_t parent, device_t
 continue;
 			aaa.reg_ctrl = ctrl;
 			aaa.reg_phandle = child;
-			config_found(sc->sc_dev, , NULL, CFARG_EOL);
+			config_found(sc->sc_dev, , NULL, CFARGS_NONE);
 		}
 	}
 

Index: src/sys/dev/i2c/gttwsi_core.c
diff -u src/sys/dev/i2c/gttwsi_core.c:1.17 src/sys/dev/i2c/gttwsi_core.c:1.17.8.1
--- src/sys/dev/i2c/gttwsi_core.c:1.17	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/gttwsi_core.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gttwsi_core.c,v 1.17 2021/04/24 23:36:54 thorpej Exp $	*/
+/*	$NetBSD: gttwsi_core.c,v 1.17.8.1 2021/08/04 18:53:26 thorpej Exp $	*/
 /*
  * Copyright (c) 2008 Eiji Kawauchi.
  * All rights reserved.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gttwsi_core.c,v 1.17 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gttwsi_core.c,v 1.17.8.1 2021/08/04 18:53:26 thorpej Exp $");
 #include "locators.h"
 
 #include 
@@ -164,8 +164,7 @@ gttwsi_config_children(device_t self)
 	iba.iba_tag = >sc_i2c;
 
 	config_found(sc->sc_dev, , iicbus_print,
-	CFARG_IATTR, "i2cbus",
-	CFARG_EOL);
+	CFARGS(.iattr = "i2cbus"));
 }
 
 

CVS commit: [thorpej-cfargs2] src/sys/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 18:38:19 UTC 2021

Modified Files:
src/sys/dev/hpc [thorpej-cfargs2]: bivideo.c btnmgr.c hpcapm.c hpcfb.c
hpcioman.c hpckbd.c hpf1275a_tty.c
src/sys/dev/hyperv [thorpej-cfargs2]: genfb_vmbus.c hvkbd.c hvs.c
vmbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/dev/hpc/bivideo.c
cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/dev/hpc/btnmgr.c \
src/sys/dev/hpc/hpf1275a_tty.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/hpc/hpcapm.c
cvs rdiff -u -r1.62 -r1.62.2.1 src/sys/dev/hpc/hpcfb.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/hpc/hpcioman.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/dev/hpc/hpckbd.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/dev/hyperv/genfb_vmbus.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/hyperv/hvkbd.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/dev/hyperv/hvs.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/dev/hyperv/vmbus.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/hpc/bivideo.c
diff -u src/sys/dev/hpc/bivideo.c:1.35 src/sys/dev/hpc/bivideo.c:1.35.8.1
--- src/sys/dev/hpc/bivideo.c:1.35	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hpc/bivideo.c	Wed Aug  4 18:38:19 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bivideo.c,v 1.35 2021/04/24 23:36:54 thorpej Exp $	*/
+/*	$NetBSD: bivideo.c,v 1.35.8.1 2021/08/04 18:38:19 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.35 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.35.8.1 2021/08/04 18:38:19 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_hpcfb.h"
@@ -195,7 +195,7 @@ bivideoattach(device_t parent, device_t 
 	ha.ha_ndspconf = 1;
 	ha.ha_dspconflist = >sc_dspconf;
 
-	config_found(self, , hpcfbprint, CFARG_EOL);
+	config_found(self, , hpcfbprint, CFARGS_NONE);
 }
 
 int

Index: src/sys/dev/hpc/btnmgr.c
diff -u src/sys/dev/hpc/btnmgr.c:1.30 src/sys/dev/hpc/btnmgr.c:1.30.8.1
--- src/sys/dev/hpc/btnmgr.c:1.30	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hpc/btnmgr.c	Wed Aug  4 18:38:19 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: btnmgr.c,v 1.30 2021/04/24 23:36:54 thorpej Exp $	*/
+/*	$NetBSD: btnmgr.c,v 1.30.8.1 2021/08/04 18:38:19 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.30 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.30.8.1 2021/08/04 18:38:19 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_btnmgr.h"
@@ -219,7 +219,7 @@ btnmgrattach(device_t parent,
 	wa.accessops = _wskbd_accessops;
 	wa.accesscookie = sc;
 
-	sc->sc_wskbddev = config_found(self, , wskbddevprint, CFARG_EOL);
+	sc->sc_wskbddev = config_found(self, , wskbddevprint, CFARGS_NONE);
 
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "unable to establish power handler\n");
Index: src/sys/dev/hpc/hpf1275a_tty.c
diff -u src/sys/dev/hpc/hpf1275a_tty.c:1.30 src/sys/dev/hpc/hpf1275a_tty.c:1.30.8.1
--- src/sys/dev/hpc/hpf1275a_tty.c:1.30	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hpc/hpf1275a_tty.c	Wed Aug  4 18:38:19 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpf1275a_tty.c,v 1.30 2021/04/24 23:36:54 thorpej Exp $ */
+/*	$NetBSD: hpf1275a_tty.c,v 1.30.8.1 2021/08/04 18:38:19 thorpej Exp $ */
 
 /*
  * Copyright (c) 2004 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hpf1275a_tty.c,v 1.30 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpf1275a_tty.c,v 1.30.8.1 2021/08/04 18:38:19 thorpej Exp $");
 
 #include "opt_wsdisplay_compat.h"
 
@@ -271,7 +271,7 @@ hpf1275a_attach(device_t parent, device_
 #ifdef WSDISPLAY_COMPAT_RAWKBD
 	sc->sc_rawkbd = 0;
 #endif
-	sc->sc_wskbd = config_found(self, , wskbddevprint, CFARG_EOL);
+	sc->sc_wskbd = config_found(self, , wskbddevprint, CFARGS_NONE);
 }
 
 

Index: src/sys/dev/hpc/hpcapm.c
diff -u src/sys/dev/hpc/hpcapm.c:1.23 src/sys/dev/hpc/hpcapm.c:1.23.8.1
--- src/sys/dev/hpc/hpcapm.c:1.23	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hpc/hpcapm.c	Wed Aug  4 18:38:19 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpcapm.c,v 1.23 2021/04/24 23:36:54 thorpej Exp $	*/
+/*	$NetBSD: hpcapm.c,v 1.23.8.1 2021/08/04 18:38:19 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Takemura Shin
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.23 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.23.8.1 2021/08/04 18:38:19 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_hpcapm.h"
@@ -149,7 +149,7 @@ hpcapm_attach(device_t parent, device_t 
 	aaa.accesscookie = sc;
 	aaa.apm_detail = 0x0102;
 
-	sc->sc_apmdev = config_found(self, , apmprint, CFARG_EOL);
+	sc->sc_apmdev = config_found(self, , apmprint, CFARGS_NONE);
 
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "unable to 

CVS commit: [thorpej-cfargs2] src/sys/dev/gpio

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 18:33:11 UTC 2021

Modified Files:
src/sys/dev/gpio [thorpej-cfargs2]: gpio.c gpioiic.c gpioow.c gpiosim.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.65.8.1 src/sys/dev/gpio/gpio.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/dev/gpio/gpioiic.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/dev/gpio/gpioow.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/gpio/gpiosim.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/gpio/gpio.c
diff -u src/sys/dev/gpio/gpio.c:1.65 src/sys/dev/gpio/gpio.c:1.65.8.1
--- src/sys/dev/gpio/gpio.c:1.65	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/gpio/gpio.c	Wed Aug  4 18:33:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.65 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: gpio.c,v 1.65.8.1 2021/08/04 18:33:11 thorpej Exp $ */
 /*	$OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $	*/
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.65 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.65.8.1 2021/08/04 18:33:11 thorpej Exp $");
 
 /*
  * General Purpose Input/Output framework.
@@ -191,8 +191,7 @@ gpio_rescan(device_t self, const char *i
 {
 
 	config_search(self, NULL,
-	CFARG_SEARCH, gpio_search,
-	CFARG_EOL);
+	CFARGS(.search = gpio_search));
 
 	return 0;
 }
@@ -278,7 +277,7 @@ gpio_search(device_t parent, cfdata_t cf
 	strcpy(ga.ga_dvname, cf->cf_name);
 
 	if (config_probe(parent, cf, ))
-		config_attach(parent, cf, , gpio_print, CFARG_EOL);
+		config_attach(parent, cf, , gpio_print, CFARGS_NONE);
 	kmem_free(ga.ga_dvname, namlen);
 	return 0;
 }
@@ -854,13 +853,11 @@ gpio_ioctl(struct gpio_softc *sc, u_long
 		locs[GPIOCF_FLAG] = ga.ga_flags;
 
 		cf = config_search(sc->sc_dev, ,
-		CFARG_LOCATORS, locs,
-		CFARG_EOL);
+		CFARGS(.locators = locs));
 		if (cf != NULL) {
 			dv = config_attach(sc->sc_dev, cf, ,
 			gpiobus_print,
-			CFARG_LOCATORS, locs,
-			CFARG_EOL);
+			CFARGS(.locators = locs));
 #ifdef COMPAT_50
 			if (dv != NULL) {
 gdev = kmem_alloc(sizeof(struct gpio_dev),

Index: src/sys/dev/gpio/gpioiic.c
diff -u src/sys/dev/gpio/gpioiic.c:1.10 src/sys/dev/gpio/gpioiic.c:1.10.8.1
--- src/sys/dev/gpio/gpioiic.c:1.10	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/gpio/gpioiic.c	Wed Aug  4 18:33:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpioiic.c,v 1.10 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: gpioiic.c,v 1.10.8.1 2021/08/04 18:33:11 thorpej Exp $ */
 /*	$OpenBSD: gpioiic.c,v 1.8 2008/11/24 12:12:12 mbalmer Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gpioiic.c,v 1.10 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpioiic.c,v 1.10.8.1 2021/08/04 18:33:11 thorpej Exp $");
 
 /*
  * I2C bus bit-banging through GPIO pins.
@@ -192,7 +192,7 @@ gpioiic_attach(device_t parent, device_t
 
 	memset(, 0, sizeof(iba));
 	iba.iba_tag = >sc_i2c_tag;
-	sc->sc_i2c_dev = config_found(self, , iicbus_print, CFARG_EOL);
+	sc->sc_i2c_dev = config_found(self, , iicbus_print, CFARGS_NONE);
 
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error("%s: could not establish power handler\n",

Index: src/sys/dev/gpio/gpioow.c
diff -u src/sys/dev/gpio/gpioow.c:1.18 src/sys/dev/gpio/gpioow.c:1.18.8.1
--- src/sys/dev/gpio/gpioow.c:1.18	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/gpio/gpioow.c	Wed Aug  4 18:33:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpioow.c,v 1.18 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: gpioow.c,v 1.18.8.1 2021/08/04 18:33:11 thorpej Exp $ */
 /*	$OpenBSD: gpioow.c,v 1.1 2006/03/04 16:27:03 grange Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.18 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.18.8.1 2021/08/04 18:33:11 thorpej Exp $");
 
 /*
  * 1-Wire bus bit-banging through GPIO pin.
@@ -149,7 +149,7 @@ gpioow_attach(device_t parent, device_t 
 
 	memset(, 0, sizeof(oba));
 	oba.oba_bus = >sc_ow_bus;
-	sc->sc_ow_dev = config_found(self, , onewirebus_print, CFARG_EOL);
+	sc->sc_ow_dev = config_found(self, , onewirebus_print, CFARGS_NONE);
 
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error("%s: could not establish power handler\n",

Index: src/sys/dev/gpio/gpiosim.c
diff -u src/sys/dev/gpio/gpiosim.c:1.22 src/sys/dev/gpio/gpiosim.c:1.22.8.1
--- src/sys/dev/gpio/gpiosim.c:1.22	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/gpio/gpiosim.c	Wed Aug  4 18:33:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiosim.c,v 1.22 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: gpiosim.c,v 1.22.8.1 2021/08/04 18:33:11 thorpej Exp $ */
 /*  $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $	*/
 
 /*
@@ -142,7 +142,7 @@ gpiosim_attach(device_t parent, device_t
 	CTL_CREATE, CTL_EOL);
 
 	aprint_normal(": simulating %d pins\n", 

CVS commit: [thorpej-cfargs2] src/sys/dev/fdt

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 18:24:14 UTC 2021

Modified Files:
src/sys/dev/fdt [thorpej-cfargs2]: dwc2_fdt.c dwc3_fdt.c ehci_fdt.c
fdt_i2c.c fdt_spi.c fdtbus.c gpiokeys.c ohci_fdt.c
virtio_mmio_fdt.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/dev/fdt/dwc2_fdt.c
cvs rdiff -u -r1.15 -r1.15.4.1 src/sys/dev/fdt/dwc3_fdt.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/dev/fdt/ehci_fdt.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/dev/fdt/fdt_i2c.c \
src/sys/dev/fdt/gpiokeys.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/dev/fdt/fdt_spi.c
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/dev/fdt/fdtbus.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/dev/fdt/ohci_fdt.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/fdt/virtio_mmio_fdt.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/fdt/dwc2_fdt.c
diff -u src/sys/dev/fdt/dwc2_fdt.c:1.11 src/sys/dev/fdt/dwc2_fdt.c:1.11.8.1
--- src/sys/dev/fdt/dwc2_fdt.c:1.11	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/dwc2_fdt.c	Wed Aug  4 18:24:13 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: dwc2_fdt.c,v 1.11 2021/04/24 23:36:53 thorpej Exp $	*/
+/*	$NetBSD: dwc2_fdt.c,v 1.11.8.1 2021/08/04 18:24:13 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dwc2_fdt.c,v 1.11 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_fdt.c,v 1.11.8.1 2021/08/04 18:24:13 thorpej Exp $");
 
 #include 
 #include 
@@ -204,7 +204,7 @@ dwc2_fdt_deferred(device_t self)
 		return;
 	}
 	sc->sc_dwc2.sc_child = config_found(sc->sc_dwc2.sc_dev,
-	>sc_dwc2.sc_bus, usbctlprint, CFARG_EOL);
+	>sc_dwc2.sc_bus, usbctlprint, CFARGS_NONE);
 }
 
 static void

Index: src/sys/dev/fdt/dwc3_fdt.c
diff -u src/sys/dev/fdt/dwc3_fdt.c:1.15 src/sys/dev/fdt/dwc3_fdt.c:1.15.4.1
--- src/sys/dev/fdt/dwc3_fdt.c:1.15	Tue May 18 11:13:31 2021
+++ src/sys/dev/fdt/dwc3_fdt.c	Wed Aug  4 18:24:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc3_fdt.c,v 1.15 2021/05/18 11:13:31 jmcneill Exp $ */
+/* $NetBSD: dwc3_fdt.c,v 1.15.4.1 2021/08/04 18:24:13 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.15 2021/05/18 11:13:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.15.4.1 2021/08/04 18:24:13 thorpej Exp $");
 
 #include 
 #include 
@@ -327,7 +327,7 @@ dwc3_fdt_attach(device_t parent, device_
 		return;
 	}
 
-	sc->sc_child = config_found(self, >sc_bus, usbctlprint, CFARG_EOL);
+	sc->sc_child = config_found(self, >sc_bus, usbctlprint, CFARGS_NONE);
 	sc->sc_child2 = config_found(self, >sc_bus2, usbctlprint,
-	CFARG_EOL);
+	CFARGS_NONE);
 }

Index: src/sys/dev/fdt/ehci_fdt.c
diff -u src/sys/dev/fdt/ehci_fdt.c:1.7 src/sys/dev/fdt/ehci_fdt.c:1.7.8.1
--- src/sys/dev/fdt/ehci_fdt.c:1.7	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/ehci_fdt.c	Wed Aug  4 18:24:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_fdt.c,v 1.7 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: ehci_fdt.c,v 1.7.8.1 2021/08/04 18:24:13 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ehci_fdt.c,v 1.7 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_fdt.c,v 1.7.8.1 2021/08/04 18:24:13 thorpej Exp $");
 
 #include 
 #include 
@@ -150,5 +150,5 @@ ehci_fdt_attach(device_t parent, device_
 
 	pmf_device_register1(self, NULL, NULL, ehci_shutdown);
 
-	sc->sc_child = config_found(self, >sc_bus, usbctlprint, CFARG_EOL);
+	sc->sc_child = config_found(self, >sc_bus, usbctlprint, CFARGS_NONE);
 }

Index: src/sys/dev/fdt/fdt_i2c.c
diff -u src/sys/dev/fdt/fdt_i2c.c:1.10 src/sys/dev/fdt/fdt_i2c.c:1.10.8.1
--- src/sys/dev/fdt/fdt_i2c.c:1.10	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/fdt_i2c.c	Wed Aug  4 18:24:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_i2c.c,v 1.10 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: fdt_i2c.c,v 1.10.8.1 2021/08/04 18:24:13 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.10 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.10.8.1 2021/08/04 18:24:13 thorpej Exp $");
 
 #include 
 #include 
@@ -123,8 +123,7 @@ fdtbus_attach_i2cbus(device_t dev, int p
 	prop_dictionary_set_bool(props, "i2c-no-indirect-config", true);
 
 	ret = config_found(dev, , print,
-	CFARG_IATTR, "i2cbus",
-	CFARG_EOL);
+	CFARGS(.iattr = "i2cbus"));
 	if (iba.iba_child_devices)
 		prop_object_release(iba.iba_child_devices);
 
Index: src/sys/dev/fdt/gpiokeys.c
diff -u src/sys/dev/fdt/gpiokeys.c:1.10 src/sys/dev/fdt/gpiokeys.c:1.10.8.1
--- src/sys/dev/fdt/gpiokeys.c:1.10	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/fdt/gpiokeys.c	Wed Aug  4 18:24:14 2021

CVS commit: [thorpej-cfargs2] src/sys/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 17:31:17 UTC 2021

Modified Files:
src/sys/dev/cardbus [thorpej-cfargs2]: cardbus.c cardslot.c
ehci_cardbus.c ohci_cardbus.c rbus_ppb.c uhci_cardbus.c
src/sys/dev/dec [thorpej-cfargs2]: dzkbd.c dzms.c
src/sys/dev/eisa [thorpej-cfargs2]: ahb.c eisa.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.111.8.1 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/dev/cardbus/cardslot.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/dev/cardbus/ohci_cardbus.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/cardbus/uhci_cardbus.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/dev/dec/dzkbd.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/dec/dzms.c
cvs rdiff -u -r1.69 -r1.69.2.1 src/sys/dev/eisa/ahb.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/eisa/eisa.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/cardbus/cardbus.c
diff -u src/sys/dev/cardbus/cardbus.c:1.111 src/sys/dev/cardbus/cardbus.c:1.111.8.1
--- src/sys/dev/cardbus/cardbus.c:1.111	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/cardbus/cardbus.c	Wed Aug  4 17:31:16 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: cardbus.c,v 1.111 2021/04/24 23:36:53 thorpej Exp $	*/
+/*	$NetBSD: cardbus.c,v 1.111.8.1 2021/08/04 17:31:16 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999 and 2000
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.111 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.111.8.1 2021/08/04 17:31:16 thorpej Exp $");
 
 #include "opt_cardbus.h"
 
@@ -605,9 +605,8 @@ cardbus_rescan(device_t self, const char
 		locs[CARDBUSCF_FUNCTION] = function;
 
 		if ((csc = config_found(sc->sc_dev, , cardbusprint,
-	CFARG_SUBMATCH, config_stdsubmatch,
-	CFARG_LOCATORS, locs,
-	CFARG_EOL)) == NULL) {
+	CFARGS(.submatch = config_stdsubmatch,
+	   .locators = locs))) == NULL) {
 			/* do not match */
 			disable_function(sc, function);
 			sc->sc_funcs[function] = NULL;

Index: src/sys/dev/cardbus/cardslot.c
diff -u src/sys/dev/cardbus/cardslot.c:1.59 src/sys/dev/cardbus/cardslot.c:1.59.8.1
--- src/sys/dev/cardbus/cardslot.c:1.59	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/cardbus/cardslot.c	Wed Aug  4 17:31:16 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: cardslot.c,v 1.59 2021/04/24 23:36:53 thorpej Exp $	*/
+/*	$NetBSD: cardslot.c,v 1.59.8.1 2021/08/04 17:31:16 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1999 and 2000
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.59 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.59.8.1 2021/08/04 17:31:16 thorpej Exp $");
 
 #include "opt_cardslot.h"
 
@@ -138,8 +138,7 @@ cardslotattach(device_t parent, device_t
 	DPRINTF(("%s attaching CardBus bus...\n", device_xname(self)));
 	if (cba != NULL) {
 		csc = device_private(config_found(self, cba, cardslot_cb_print,
-		CFARG_IATTR, "cbbus",
-		CFARG_EOL));
+		CFARGS(.iattr = "cbbus")));
 		if (csc) {
 			/* cardbus found */
 			DPRINTF(("%s: found cardbus on %s\n", __func__,
@@ -150,9 +149,8 @@ cardslotattach(device_t parent, device_t
 
 	if (pa != NULL) {
 		sc->sc_16_softc = config_found(self, pa, cardslot_16_print,
-		CFARG_SUBMATCH, cardslot_16_submatch,
-		CFARG_IATTR, "pcmciabus",
-		CFARG_EOL);
+		CFARGS(.submatch = cardslot_16_submatch,
+			   .iattr = "pcmciabus"));
 		if (sc->sc_16_softc) {
 			/* pcmcia 16-bit bus found */
 			DPRINTF(("%s: found 16-bit pcmcia bus\n", __func__));

Index: src/sys/dev/cardbus/ehci_cardbus.c
diff -u src/sys/dev/cardbus/ehci_cardbus.c:1.36 src/sys/dev/cardbus/ehci_cardbus.c:1.36.8.1
--- src/sys/dev/cardbus/ehci_cardbus.c:1.36	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/cardbus/ehci_cardbus.c	Wed Aug  4 17:31:16 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci_cardbus.c,v 1.36 2021/04/24 23:36:53 thorpej Exp $	*/
+/*	$NetBSD: ehci_cardbus.c,v 1.36.8.1 2021/08/04 17:31:16 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.36 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.36.8.1 2021/08/04 17:31:16 thorpej Exp $");
 
 #include 
 #include 
@@ -203,7 +203,7 @@ ehci_cardbus_attach(device_t parent, dev
 
 	/* Attach usb device. */
 	sc->sc.sc_child = config_found(self, >sc.sc_bus, usbctlprint,
-	CFARG_EOL);
+	CFARGS_NONE);
 }
 
 int

Index: src/sys/dev/cardbus/ohci_cardbus.c
diff -u src/sys/dev/cardbus/ohci_cardbus.c:1.45 src/sys/dev/cardbus/ohci_cardbus.c:1.45.8.1
--- src/sys/dev/cardbus/ohci_cardbus.c:1.45	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/cardbus/ohci_cardbus.c	Wed Aug  4 17:31:16 2021

CVS commit: [thorpej-cfargs2] src/sys/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 17:28:41 UTC 2021

Modified Files:
src/sys/dev/bi [thorpej-cfargs2]: bi.c kdb.c
src/sys/dev/bluetooth [thorpej-cfargs2]: bthidev.c bthub.c btkbd.c
btmagic.c btms.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/dev/bi/bi.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/dev/bi/kdb.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/bluetooth/bthidev.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/dev/bluetooth/bthub.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/bluetooth/btkbd.c \
src/sys/dev/bluetooth/btmagic.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/dev/bluetooth/btms.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/bi/bi.c
diff -u src/sys/dev/bi/bi.c:1.26 src/sys/dev/bi/bi.c:1.26.8.1
--- src/sys/dev/bi/bi.c:1.26	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/bi/bi.c	Wed Aug  4 17:28:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bi.c,v 1.26 2021/04/24 23:36:53 thorpej Exp $ */
+/*	$NetBSD: bi.c,v 1.26.8.1 2021/08/04 17:28:41 thorpej Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.26 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.26.8.1 2021/08/04 17:28:41 thorpej Exp $");
 
 #include 
 #include 
@@ -142,6 +142,6 @@ bi_attach(struct bi_softc *sc)
 		}
 		ba.ba_nodenr = nodenr;
 		ba.ba_ivec = sc->sc_lastiv + 64 + 4 * nodenr; /* all on spl5 */
-		config_found(sc->sc_dev, , bi_print, CFARG_EOL);
+		config_found(sc->sc_dev, , bi_print, CFARGS_NONE);
 	}
 }

Index: src/sys/dev/bi/kdb.c
diff -u src/sys/dev/bi/kdb.c:1.48 src/sys/dev/bi/kdb.c:1.48.8.1
--- src/sys/dev/bi/kdb.c:1.48	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/bi/kdb.c	Wed Aug  4 17:28:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: kdb.c,v 1.48 2021/04/24 23:36:53 thorpej Exp $ */
+/*	$NetBSD: kdb.c,v 1.48.8.1 2021/08/04 17:28:41 thorpej Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.48 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.48.8.1 2021/08/04 17:28:41 thorpej Exp $");
 
 #include 
 #include 
@@ -210,7 +210,7 @@ err2:		bus_dmamem_unmap(sc->sc_dmat, sc-
 	KDB_WL(BIREG_BCICSR, KDB_RL(BIREG_BCICSR) |
 	BCI_STOPEN | BCI_IDENTEN | BCI_UINTEN | BCI_INTEN);
 	KDB_WL(BIREG_UINTRCSR, ba->ba_ivec);
-	config_found(sc->sc_dev, , kdbprint, CFARG_EOL);
+	config_found(sc->sc_dev, , kdbprint, CFARGS_NONE);
 }
 
 void

Index: src/sys/dev/bluetooth/bthidev.c
diff -u src/sys/dev/bluetooth/bthidev.c:1.33 src/sys/dev/bluetooth/bthidev.c:1.33.8.1
--- src/sys/dev/bluetooth/bthidev.c:1.33	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/bluetooth/bthidev.c	Wed Aug  4 17:28:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bthidev.c,v 1.33 2021/04/24 23:36:53 thorpej Exp $	*/
+/*	$NetBSD: bthidev.c,v 1.33.8.1 2021/08/04 17:28:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.33 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.33.8.1 2021/08/04 17:28:41 thorpej Exp $");
 
 #include 
 #include 
@@ -320,10 +320,9 @@ bthidev_attach(device_t parent, device_t
 		locs[BTHIDBUSCF_REPORTID] = rep;
 
 		dev = config_found(self, , bthidev_print,
-		CFARG_SUBMATCH, config_stdsubmatch,
-		CFARG_IATTR, "bthidbus",
-		CFARG_LOCATORS, locs,
-		CFARG_EOL);
+		CFARGS(.submatch = config_stdsubmatch,
+			   .iattr = "bthidbus",
+			   .locators = locs));
 		if (dev != NULL) {
 			hidev = device_private(dev);
 			hidev->sc_dev = dev;

Index: src/sys/dev/bluetooth/bthub.c
diff -u src/sys/dev/bluetooth/bthub.c:1.25 src/sys/dev/bluetooth/bthub.c:1.25.8.1
--- src/sys/dev/bluetooth/bthub.c:1.25	Sat Apr 24 23:36:53 2021
+++ src/sys/dev/bluetooth/bthub.c	Wed Aug  4 17:28:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bthub.c,v 1.25 2021/04/24 23:36:53 thorpej Exp $	*/
+/*	$NetBSD: bthub.c,v 1.25.8.1 2021/08/04 17:28:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.25 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.25.8.1 2021/08/04 17:28:41 thorpej Exp $");
 
 #include 
 #include 
@@ -238,7 +238,7 @@ bthub_pioctl(dev_t devno, unsigned long 
 		if (dev != NULL)
 			return EADDRINUSE;
 
-		dev = config_found(self, dict, bthub_print, CFARG_EOL);
+		dev = config_found(self, dict, bthub_print, CFARGS_NONE);
 		if (dev == NULL)
 			return ENXIO;
 

Index: src/sys/dev/bluetooth/btkbd.c
diff -u src/sys/dev/bluetooth/btkbd.c:1.20 src/sys/dev/bluetooth/btkbd.c:1.20.8.1
--- src/sys/dev/bluetooth/btkbd.c:1.20	Sat Apr 24 23:36:53 2021
+++ 

CVS commit: [thorpej-cfargs2] src/sys/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 17:27:29 UTC 2021

Modified Files:
src/sys/dev/ata [thorpej-cfargs2]: ata.c ata_raid.c
src/sys/dev/audio [thorpej-cfargs2]: audio.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.161.8.1 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.44 -r1.44.8.1 src/sys/dev/ata/ata_raid.c
cvs rdiff -u -r1.105 -r1.105.2.1 src/sys/dev/audio/audio.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/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.161 src/sys/dev/ata/ata.c:1.161.8.1
--- src/sys/dev/ata/ata.c:1.161	Sat Apr 24 23:36:52 2021
+++ src/sys/dev/ata/ata.c	Wed Aug  4 17:27:29 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ata.c,v 1.161 2021/04/24 23:36:52 thorpej Exp $	*/
+/*	$NetBSD: ata.c,v 1.161.8.1 2021/08/04 17:27:29 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.161 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.161.8.1 2021/08/04 17:27:29 thorpej Exp $");
 
 #include "opt_ata.h"
 
@@ -206,8 +206,7 @@ ata_channel_attach(struct ata_channel *c
 	KASSERT(chp->ch_queue != NULL);
 
 	chp->atabus = config_found(chp->ch_atac->atac_dev, chp, atabusprint,
-		CFARG_IATTR, "ata",
-		CFARG_EOL);
+		CFARGS(.iattr = "ata"));
 }
 
 /*
@@ -375,8 +374,7 @@ atabusconfig_thread(void *arg)
 		adev.adev_drv_data = >ch_drive[i];
 		chp->ch_drive[i].drv_softc = config_found(atabus_sc->sc_dev,
 		, ataprint,
-		CFARG_IATTR, "ata_hl",
-		CFARG_EOL);
+		CFARGS(.iattr = "ata_hl"));
 		if (chp->ch_drive[i].drv_softc != NULL) {
 			ata_probe_caps(>ch_drive[i]);
 		} else {

Index: src/sys/dev/ata/ata_raid.c
diff -u src/sys/dev/ata/ata_raid.c:1.44 src/sys/dev/ata/ata_raid.c:1.44.8.1
--- src/sys/dev/ata/ata_raid.c:1.44	Sat Apr 24 23:36:52 2021
+++ src/sys/dev/ata/ata_raid.c	Wed Aug  4 17:27:29 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ata_raid.c,v 1.44 2021/04/24 23:36:52 thorpej Exp $	*/
+/*	$NetBSD: ata_raid.c,v 1.44.8.1 2021/08/04 17:27:29 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.44 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.44.8.1 2021/08/04 17:27:29 thorpej Exp $");
 
 #include 
 #include 
@@ -216,9 +216,8 @@ ataraid_attach(device_t parent, device_t
 		locs[ATARAIDCF_UNIT] = aai->aai_arrayno;
 
 		config_found(self, aai, ataraid_print,
-		CFARG_SUBMATCH, config_stdsubmatch,
-		CFARG_LOCATORS, locs,
-		CFARG_EOL);
+		CFARGS(.submatch = config_stdsubmatch,
+			   .locators = locs));
 	}
 }
 

Index: src/sys/dev/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.105 src/sys/dev/audio/audio.c:1.105.2.1
--- src/sys/dev/audio/audio.c:1.105	Wed Jul 21 06:14:58 2021
+++ src/sys/dev/audio/audio.c	Wed Aug  4 17:27:29 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.105 2021/07/21 06:14:58 isaki Exp $	*/
+/*	$NetBSD: audio.c,v 1.105.2.1 2021/08/04 17:27:29 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.105 2021/07/21 06:14:58 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.105.2.1 2021/08/04 17:27:29 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -1413,7 +1413,7 @@ audiosearch(device_t parent, cfdata_t cf
 
 	if (config_probe(parent, cf, aux))
 		config_attach(parent, cf, aux, NULL,
-		CFARG_EOL);
+		CFARGS_NONE);
 
 	return 0;
 }
@@ -1424,8 +1424,7 @@ audiorescan(device_t self, const char *i
 	struct audio_softc *sc = device_private(self);
 
 	config_search(sc->sc_dev, NULL,
-	CFARG_SEARCH, audiosearch,
-	CFARG_EOL);
+	CFARGS(.search = audiosearch));
 
 	return 0;
 }
@@ -1449,8 +1448,7 @@ audio_attach_mi(const struct audio_hw_if
 	arg.hwif = ahwp;
 	arg.hdl = hdlp;
 	return config_found(dev, , audioprint,
-	CFARG_IATTR, "audiobus",
-	CFARG_EOL);
+	CFARGS(.iattr = "audiobus"));
 }
 
 /*

CVS commit: [thorpej-cfargs2] src/sys/dev/adb

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 17:25:27 UTC 2021

Modified Files:
src/sys/dev/adb [thorpej-cfargs2]: adb_bus.c adb_kbd.c adb_ktm.c
adb_ms.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/dev/adb/adb_bus.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/dev/adb/adb_kbd.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/adb/adb_ktm.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/adb/adb_ms.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/adb/adb_bus.c
diff -u src/sys/dev/adb/adb_bus.c:1.11 src/sys/dev/adb/adb_bus.c:1.11.8.1
--- src/sys/dev/adb/adb_bus.c:1.11	Sat Apr 24 23:36:52 2021
+++ src/sys/dev/adb/adb_bus.c	Wed Aug  4 17:25:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: adb_bus.c,v 1.11 2021/04/24 23:36:52 thorpej Exp $ */
+/*	$NetBSD: adb_bus.c,v 1.11.8.1 2021/08/04 17:25:27 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: adb_bus.c,v 1.11 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_bus.c,v 1.11.8.1 2021/08/04 17:25:27 thorpej Exp $");
 
 #include 
 #include 
@@ -169,7 +169,7 @@ nadb_init(device_t dev)
 			sc->sc_devtable[i].handler_id);
 			aaa.dev = >sc_devtable[i];
 			if (config_found(sc->sc_dev, , nadb_devprint,
-	 CFARG_EOL)) {
+	 CFARGS_NONE)) {
 devmask |= (1 << i);
 			} else {
 aprint_normal(" not configured\n");

Index: src/sys/dev/adb/adb_kbd.c
diff -u src/sys/dev/adb/adb_kbd.c:1.31 src/sys/dev/adb/adb_kbd.c:1.31.8.1
--- src/sys/dev/adb/adb_kbd.c:1.31	Sat Apr 24 23:36:52 2021
+++ src/sys/dev/adb/adb_kbd.c	Wed Aug  4 17:25:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: adb_kbd.c,v 1.31 2021/04/24 23:36:52 thorpej Exp $	*/
+/*	$NetBSD: adb_kbd.c,v 1.31.8.1 2021/08/04 17:25:27 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1998	Colin Wood
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.31 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.31.8.1 2021/08/04 17:25:27 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -384,8 +384,7 @@ adbkbd_attach(device_t parent, device_t 
 	a.accesscookie = sc;
 
 	sc->sc_wskbddev = config_found(self, , wskbddevprint,
-	CFARG_IATTR, "wskbddev",
-	CFARG_EOL);
+	CFARGS(.iattr = "wskbddev"));
 #ifdef ADBKBD_EMUL_USB
 	sc->sc_emul_usb = TRUE;
 	wskbd_set_evtrans(sc->sc_wskbddev, adb_to_usb, 128);
@@ -396,9 +395,7 @@ adbkbd_attach(device_t parent, device_t 
 	am.accessops = _accessops;
 	am.accesscookie = sc;
 	sc->sc_wsmousedev = config_found(self, , wsmousedevprint,
-	CFARG_IATTR, "wsmousedev",
-	CFARG_EOL);
-
+	CFARGS(.iattr = "wsmousedev"));
 #endif
 	adbkbd_setup_sysctl(sc);
 

Index: src/sys/dev/adb/adb_ktm.c
diff -u src/sys/dev/adb/adb_ktm.c:1.3 src/sys/dev/adb/adb_ktm.c:1.3.8.1
--- src/sys/dev/adb/adb_ktm.c:1.3	Sat Apr 24 23:36:52 2021
+++ src/sys/dev/adb/adb_ktm.c	Wed Aug  4 17:25:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: adb_ktm.c,v 1.3 2021/04/24 23:36:52 thorpej Exp $	*/
+/*	$NetBSD: adb_ktm.c,v 1.3.8.1 2021/08/04 17:25:27 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2019 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: adb_ktm.c,v 1.3 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_ktm.c,v 1.3.8.1 2021/08/04 17:25:27 thorpej Exp $");
 
 #include 
 #include 
@@ -136,7 +136,7 @@ ktm_attach(device_t parent, device_t sel
 
 	a.accessops = _accessops;
 	a.accesscookie = sc;
-	sc->sc_wsmousedev = config_found(self, , wsmousedevprint, CFARG_EOL);
+	sc->sc_wsmousedev = config_found(self, , wsmousedevprint, CFARGS_NONE);
 }
 
 static int

Index: src/sys/dev/adb/adb_ms.c
diff -u src/sys/dev/adb/adb_ms.c:1.20 src/sys/dev/adb/adb_ms.c:1.20.8.1
--- src/sys/dev/adb/adb_ms.c:1.20	Sat Apr 24 23:36:52 2021
+++ src/sys/dev/adb/adb_ms.c	Wed Aug  4 17:25:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: adb_ms.c,v 1.20 2021/04/24 23:36:52 thorpej Exp $	*/
+/*	$NetBSD: adb_ms.c,v 1.20.8.1 2021/08/04 17:25:27 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1998	Colin Wood
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: adb_ms.c,v 1.20 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_ms.c,v 1.20.8.1 2021/08/04 17:25:27 thorpej Exp $");
 
 #include 
 #include 
@@ -247,7 +247,7 @@ adbms_attach(device_t parent, device_t s
 
 	a.accessops = _accessops;
 	a.accesscookie = sc;
-	sc->sc_wsmousedev = config_found(self, , wsmousedevprint, CFARG_EOL);
+	sc->sc_wsmousedev = config_found(self, , wsmousedevprint, CFARGS_NONE);
 }
 
 

CVS commit: [thorpej-cfargs2] src/sys/dev/acpi

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 17:24:17 UTC 2021

Modified Files:
src/sys/dev/acpi [thorpej-cfargs2]: acpi.c acpi_display.c dwiic_acpi.c
ehci_acpi.c ipmi_acpi.c smbus_acpi.c virtio_acpi.c wss_acpi.c
xhci_acpi.c
src/sys/dev/acpi/wmi [thorpej-cfargs2]: wmi_acpi.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.292.4.1 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/dev/acpi/acpi_display.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/dev/acpi/dwiic_acpi.c \
src/sys/dev/acpi/virtio_acpi.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/dev/acpi/ehci_acpi.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/acpi/ipmi_acpi.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/acpi/smbus_acpi.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/dev/acpi/wss_acpi.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/dev/acpi/xhci_acpi.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/dev/acpi/wmi/wmi_acpi.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/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.292 src/sys/dev/acpi/acpi.c:1.292.4.1
--- src/sys/dev/acpi/acpi.c:1.292	Wed May 12 23:22:33 2021
+++ src/sys/dev/acpi/acpi.c	Wed Aug  4 17:24:17 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi.c,v 1.292 2021/05/12 23:22:33 thorpej Exp $	*/
+/*	$NetBSD: acpi.c,v 1.292.4.1 2021/08/04 17:24:17 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.292 2021/05/12 23:22:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.292.4.1 2021/08/04 17:24:17 thorpej Exp $");
 
 #include "pci.h"
 #include "opt_acpi.h"
@@ -361,9 +361,8 @@ int
 acpi_check(device_t parent, const char *ifattr)
 {
 	return config_search(parent, NULL,
-			 CFARG_SUBMATCH, acpi_submatch,
-			 CFARG_IATTR, ifattr,
-			 CFARG_EOL) != NULL;
+			 CFARGS(.submatch = acpi_submatch,
+.iattr = ifattr)) != NULL;
 }
 
 int
@@ -492,8 +491,7 @@ acpi_attach(device_t parent, device_t se
 	 * Early initialization of acpiec(4) via ECDT.
 	 */
 	config_found(self, aa, NULL,
-	CFARG_IATTR, "acpiecdtbus",
-	CFARG_EOL);
+	CFARGS(.iattr = "acpiecdtbus"));
 
 	rv = AcpiInitializeObjects(ACPI_FULL_INITIALIZATION);
 
@@ -558,8 +556,7 @@ acpi_attach(device_t parent, device_t se
 			continue;
 		}
 		config_found(sc->sc_dev, hdr, NULL,
-		CFARG_IATTR, "acpisdtbus",
-		CFARG_EOL);
+		CFARGS(.iattr = "acpisdtbus"));
 		AcpiPutTable(hdr);
 	}
 
@@ -898,8 +895,7 @@ acpi_rescan(device_t self, const char *i
 
 	if (ifattr_match(ifattr, "acpihpetbus") && sc->sc_hpet == NULL) {
 		sc->sc_hpet = config_found(sc->sc_dev, , NULL,
-	   CFARG_IATTR, "acpihpetbus",
-	   CFARG_EOL);
+	   CFARGS(.iattr = "acpihpetbus"));
 	}
 
 	/*
@@ -915,14 +911,12 @@ acpi_rescan(device_t self, const char *i
 	 */
 	if (ifattr_match(ifattr, "acpiapmbus") && sc->sc_apmbus == NULL) {
 		sc->sc_apmbus = config_found(sc->sc_dev, NULL, NULL,
-	 CFARG_IATTR, "acpiapmbus",
-	 CFARG_EOL);
+	 CFARGS(.iattr = "acpiapmbus"));
 	}
 
 	if (ifattr_match(ifattr, "acpiwdrtbus") && sc->sc_wdrt == NULL) {
 		sc->sc_wdrt = config_found(sc->sc_dev, NULL, NULL,
-	   CFARG_IATTR, "acpiwdrtbus",
-	   CFARG_EOL);
+	   CFARGS(.iattr = "acpiwdrtbus"));
 	}
 
 	return 0;
@@ -965,9 +959,8 @@ acpi_rescan_early(struct acpi_softc *sc)
 		aa.aa_dmat64 = ad->ad_dmat64;
 
 		ad->ad_device = config_found(sc->sc_dev, , acpi_print,
-		CFARG_IATTR, "acpinodebus",
-		CFARG_DEVHANDLE, devhandle_from_acpi(ad->ad_handle),
-		CFARG_EOL);
+		CFARGS(.iattr = "acpinodebus",
+			   .devhandle = devhandle_from_acpi(ad->ad_handle)));
 	}
 }
 
@@ -1033,9 +1026,8 @@ acpi_rescan_nodes(struct acpi_softc *sc)
 		aa.aa_dmat64 = ad->ad_dmat64;
 
 		ad->ad_device = config_found(sc->sc_dev, , acpi_print,
-		CFARG_IATTR, "acpinodebus",
-		CFARG_DEVHANDLE, devhandle_from_acpi(ad->ad_handle),
-		CFARG_EOL);
+		CFARGS(.iattr = "acpinodebus",
+			   .devhandle = devhandle_from_acpi(ad->ad_handle)));
 	}
 }
 

Index: src/sys/dev/acpi/acpi_display.c
diff -u src/sys/dev/acpi/acpi_display.c:1.19 src/sys/dev/acpi/acpi_display.c:1.19.8.1
--- src/sys/dev/acpi/acpi_display.c:1.19	Sat Apr 24 23:36:52 2021
+++ src/sys/dev/acpi/acpi_display.c	Wed Aug  4 17:24:17 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_display.c,v 1.19 2021/04/24 23:36:52 thorpej Exp $	*/
+/*	$NetBSD: acpi_display.c,v 1.19.8.1 2021/08/04 17:24:17 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.19 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.19.8.1 2021/08/04 17:24:17 thorpej Exp $");
 
 #include 
 #include 
@@ -573,7 +573,7 @@ acpidisp_vga_scan_outdevs(struct acpidis
 		

CVS commit: [thorpej-cfargs2] src/sys/arch/evbarm

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 16:59:14 UTC 2021

Modified Files:
src/sys/arch/evbarm/adi_brh [thorpej-cfargs2]: obio.c
src/sys/arch/evbarm/armadillo [thorpej-cfargs2]: armadillo9_iic.c
src/sys/arch/evbarm/g42xxeb [thorpej-cfargs2]: g42xxeb_kmkbd.c
g42xxeb_lcd.c gb225.c gb225_pcic.c obio.c
src/sys/arch/evbarm/gumstix [thorpej-cfargs2]: gxiic.c gxio.c gxlcd.c
src/sys/arch/evbarm/hdl_g [thorpej-cfargs2]: obio.c
src/sys/arch/evbarm/ifpga [thorpej-cfargs2]: ifpga.c
src/sys/arch/evbarm/iq80310 [thorpej-cfargs2]: obio.c
src/sys/arch/evbarm/iq80321 [thorpej-cfargs2]: obio.c
src/sys/arch/evbarm/iyonix [thorpej-cfargs2]: obio.c
src/sys/arch/evbarm/lubbock [thorpej-cfargs2]: lubbock_lcd.c obio.c
sacc_obio.c
src/sys/arch/evbarm/mini2440 [thorpej-cfargs2]: mini2440_lcd.c
src/sys/arch/evbarm/mpcsa [thorpej-cfargs2]: mpcsa_leds.c
src/sys/arch/evbarm/netwalker [thorpej-cfargs2]: netwalker_btn.c
src/sys/arch/evbarm/nslu2 [thorpej-cfargs2]: nslu2_iic.c
src/sys/arch/evbarm/smdk2xx0 [thorpej-cfargs2]: smdk2410_kbd.c
smdk2410_lcd.c
src/sys/arch/evbarm/tsarm [thorpej-cfargs2]: tskp.c tslcd.c tspld.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/evbarm/adi_brh/obio.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbarm/armadillo/armadillo9_iic.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbarm/g42xxeb/gb225.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/evbarm/g42xxeb/obio.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbarm/gumstix/gxiic.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/evbarm/gumstix/gxio.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbarm/gumstix/gxlcd.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbarm/hdl_g/obio.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/evbarm/ifpga/ifpga.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/evbarm/iq80310/obio.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/evbarm/iq80321/obio.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/evbarm/iyonix/obio.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/evbarm/lubbock/lubbock_lcd.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbarm/lubbock/obio.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/evbarm/lubbock/sacc_obio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/evbarm/mini2440/mini2440_lcd.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbarm/mpcsa/mpcsa_leds.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbarm/netwalker/netwalker_btn.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbarm/nslu2/nslu2_iic.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbarm/tsarm/tskp.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/evbarm/tsarm/tslcd.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/evbarm/tsarm/tspld.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbarm/adi_brh/obio.c
diff -u src/sys/arch/evbarm/adi_brh/obio.c:1.12 src/sys/arch/evbarm/adi_brh/obio.c:1.12.8.1
--- src/sys/arch/evbarm/adi_brh/obio.c:1.12	Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/adi_brh/obio.c	Wed Aug  4 16:59:12 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.12 2021/04/24 23:36:32 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.12.8.1 2021/08/04 16:59:12 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.12 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.12.8.1 2021/08/04 16:59:12 thorpej Exp $");
 
 #include 
 #include 
@@ -105,8 +105,7 @@ obio_attach(device_t parent, device_t se
 	 * configuration file.
 	 */
 	config_search(self, NULL,
-	CFARG_SEARCH, obio_search,
-	CFARG_EOL);
+	CFARGS(.search = obio_search));
 }
 
 int
@@ -138,7 +137,7 @@ obio_search(device_t parent, cfdata_t cf
 	oba.oba_irq = cf->cf_loc[OBIOCF_IRQ];
 
 	if (config_probe(parent, cf, ))
-		config_attach(parent, cf, , obio_print, CFARG_EOL);
+		config_attach(parent, cf, , obio_print, CFARGS_NONE);
 
 	return (0);
 }

Index: src/sys/arch/evbarm/armadillo/armadillo9_iic.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_iic.c:1.10 src/sys/arch/evbarm/armadillo/armadillo9_iic.c:1.10.8.1
--- src/sys/arch/evbarm/armadillo/armadillo9_iic.c:1.10	Sat Apr 24 23:36:32 2021
+++ src/sys/arch/evbarm/armadillo/armadillo9_iic.c	Wed Aug  4 16:59:13 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: armadillo9_iic.c,v 1.10 2021/04/24 23:36:32 thorpej Exp $	*/
+/*	$NetBSD: armadillo9_iic.c,v 

CVS commit: [thorpej-cfargs2] src/sys/arch/evbmips

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 03:24:21 UTC 2021

Modified Files:
src/sys/arch/evbmips/adm5120 [thorpej-cfargs2]: mainbus.c
src/sys/arch/evbmips/alchemy [thorpej-cfargs2]: mainbus.c obio.c
src/sys/arch/evbmips/atheros [thorpej-cfargs2]: mainbus.c
src/sys/arch/evbmips/gdium [thorpej-cfargs2]: bonito_mainbus.c
mainbus.c
src/sys/arch/evbmips/ingenic [thorpej-cfargs2]: mainbus.c
src/sys/arch/evbmips/loongson [thorpej-cfargs2]: bonito_mainbus.c
mainbus.c
src/sys/arch/evbmips/loongson/dev [thorpej-cfargs2]: pcib.c
src/sys/arch/evbmips/malta/dev [thorpej-cfargs2]: gt.c mainbus.c
src/sys/arch/evbmips/malta/pci [thorpej-cfargs2]: pcib.c
src/sys/arch/evbmips/mipssim [thorpej-cfargs2]: mainbus.c
virtio_mainbus.c
src/sys/arch/evbmips/sbmips [thorpej-cfargs2]: zbbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbmips/adm5120/mainbus.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbmips/alchemy/mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/evbmips/alchemy/obio.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbmips/atheros/mainbus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbmips/gdium/bonito_mainbus.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/evbmips/gdium/mainbus.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/evbmips/ingenic/mainbus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbmips/loongson/bonito_mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/evbmips/loongson/mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbmips/loongson/dev/pcib.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/evbmips/malta/dev/gt.c \
src/sys/arch/evbmips/malta/dev/mainbus.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/evbmips/malta/pci/pcib.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbmips/mipssim/mainbus.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/evbmips/mipssim/virtio_mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbmips/sbmips/zbbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbmips/adm5120/mainbus.c
diff -u src/sys/arch/evbmips/adm5120/mainbus.c:1.4 src/sys/arch/evbmips/adm5120/mainbus.c:1.4.8.1
--- src/sys/arch/evbmips/adm5120/mainbus.c:1.4	Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbmips/adm5120/mainbus.c	Wed Aug  4 03:24:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 03:24:19 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 03:24:19 thorpej Exp $");
 
 #include 
 #include 
@@ -153,8 +153,7 @@ mainbus_attach(device_t parent, device_t
 	for (md = mainbusdevs; md->md_name != NULL; md++) {
 		ma.ma_name = md->md_name;
 		config_found(self, , mainbus_print,
-		CFARG_IATTR, "mainbus",
-		CFARG_EOL);
+		CFARGS(.iattr = "mainbus"));
 	}
 }
 

Index: src/sys/arch/evbmips/alchemy/mainbus.c
diff -u src/sys/arch/evbmips/alchemy/mainbus.c:1.11 src/sys/arch/evbmips/alchemy/mainbus.c:1.11.8.1
--- src/sys/arch/evbmips/alchemy/mainbus.c:1.11	Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbmips/alchemy/mainbus.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:24:20 thorpej Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include 
 #include 
@@ -87,7 +87,7 @@ mainbus_attach(device_t parent, device_t
 	printf("\n");
 
 	for (md = mainbusdevs; md->md_name != NULL; md++) {
-		config_found(self, NULL, mainbus_print, CFARG_EOL);
+		config_found(self, NULL, mainbus_print, CFARGS_NONE);
 	}
 }
 

Index: src/sys/arch/evbmips/alchemy/obio.c
diff -u src/sys/arch/evbmips/alchemy/obio.c:1.5 src/sys/arch/evbmips/alchemy/obio.c:1.5.8.1
--- src/sys/arch/evbmips/alchemy/obio.c:1.5	Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbmips/alchemy/obio.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.5 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.5.8.1 2021/08/04 03:24:20 thorpej Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.5 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.5.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include 
 #include 
@@ -89,8 +89,7 @@ obio_attach(device_t parent, device_t se
 		oa.oba_addr = od->od_addr;
 		oa.oba_irq = od->od_irq;
 		

CVS commit: [thorpej-cfargs2] src/sys/arch/evbppc

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 03:23:10 UTC 2021

Modified Files:
src/sys/arch/evbppc/ev64260 [thorpej-cfargs2]: mainbus.c
src/sys/arch/evbppc/explora/dev [thorpej-cfargs2]: elb.c fb_elb.c
src/sys/arch/evbppc/mpc85xx [thorpej-cfargs2]: autoconf.c
src/sys/arch/evbppc/pmppc [thorpej-cfargs2]: mainbus.c
src/sys/arch/evbppc/virtex [thorpej-cfargs2]: design_gsrd1.c
design_gsrd2.c
src/sys/arch/evbppc/virtex/dev [thorpej-cfargs2]: tft.c
src/sys/arch/evbppc/walnut/dev [thorpej-cfargs2]: pbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/evbppc/ev64260/mainbus.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbppc/explora/dev/elb.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/evbppc/explora/dev/fb_elb.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbppc/mpc85xx/autoconf.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/evbppc/pmppc/mainbus.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbppc/virtex/design_gsrd1.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/evbppc/virtex/design_gsrd2.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbppc/virtex/dev/tft.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/evbppc/walnut/dev/pbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbppc/ev64260/mainbus.c
diff -u src/sys/arch/evbppc/ev64260/mainbus.c:1.8 src/sys/arch/evbppc/ev64260/mainbus.c:1.8.8.1
--- src/sys/arch/evbppc/ev64260/mainbus.c:1.8	Sat Apr 24 23:36:36 2021
+++ src/sys/arch/evbppc/ev64260/mainbus.c	Wed Aug  4 03:23:10 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.8 2021/04/24 23:36:36 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.8.8.1 2021/08/04 03:23:10 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2021/04/24 23:36:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8.8.1 2021/08/04 03:23:10 thorpej Exp $");
 
 #include "mainbus.h"
 #include "opt_multiprocessor.h"
@@ -86,7 +86,7 @@ mainbus_attach(device_t parent, device_t
 	mba.mba_name = "cpu";
 	mba.mba_unit = 0;
 	mba.mba_addr = MAINBUSCF_ADDR_DEFAULT;
-	config_found(self, , mainbus_cfprint, CFARG_EOL);
+	config_found(self, , mainbus_cfprint, CFARGS_NONE);
 
 #ifdef MULTIPROCESSOR
 	/*
@@ -95,7 +95,7 @@ mainbus_attach(device_t parent, device_t
 	mba.mba_name = "cpu";
 	mba.mba_unit = 1;
 	mba.mba_addr = MAINBUSCF_ADDR_DEFAULT;
-	config_found(self, , mainbus_cfprint, CFARG_EOL);
+	config_found(self, , mainbus_cfprint, CFARGS_NONE);
 #endif
 
 	/*
@@ -104,7 +104,7 @@ mainbus_attach(device_t parent, device_t
 	mba.mba_name = "gt";
 	mba.mba_unit = -1;
 	mba.mba_addr = gt_base;
-	config_found(self, , mainbus_cfprint, CFARG_EOL);
+	config_found(self, , mainbus_cfprint, CFARGS_NONE);
 }
 
 int

Index: src/sys/arch/evbppc/explora/dev/elb.c
diff -u src/sys/arch/evbppc/explora/dev/elb.c:1.10 src/sys/arch/evbppc/explora/dev/elb.c:1.10.8.1
--- src/sys/arch/evbppc/explora/dev/elb.c:1.10	Sat Apr 24 23:36:36 2021
+++ src/sys/arch/evbppc/explora/dev/elb.c	Wed Aug  4 03:23:10 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: elb.c,v 1.10 2021/04/24 23:36:36 thorpej Exp $	*/
+/*	$NetBSD: elb.c,v 1.10.8.1 2021/08/04 03:23:10 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.10 2021/04/24 23:36:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.10.8.1 2021/08/04 03:23:10 thorpej Exp $");
 
 #include 
 #include 
@@ -141,7 +141,7 @@ elb_attach(device_t parent, device_t sel
 		eaa.elb_base2 = elb->elb_addr2;
 		eaa.elb_irq = elb->elb_irq;
 
-		(void) config_found(self, , elb_print, CFARG_EOL);
+		(void) config_found(self, , elb_print, CFARGS_NONE);
 	}
 }
 

Index: src/sys/arch/evbppc/explora/dev/fb_elb.c
diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.19 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.19.8.1
--- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.19	Sat Apr 24 23:36:36 2021
+++ src/sys/arch/evbppc/explora/dev/fb_elb.c	Wed Aug  4 03:23:10 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fb_elb.c,v 1.19 2021/04/24 23:36:36 thorpej Exp $	*/
+/*	$NetBSD: fb_elb.c,v 1.19.8.1 2021/08/04 03:23:10 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.19 2021/04/24 23:36:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.19.8.1 2021/08/04 03:23:10 thorpej Exp $");
 
 #include 
 #include 
@@ -214,7 +214,7 @@ fb_elb_attach(device_t parent, device_t 
 	waa.accessops = 
 	waa.accesscookie = sc;
 
-	config_found(self, , wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, , wsemuldisplaydevprint, CFARGS_NONE);
 }
 
 static void

Index: src/sys/arch/evbppc/mpc85xx/autoconf.c
diff -u 

CVS commit: [thorpej-cfargs2] src/sys/arch/evbsh3

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 03:08:49 UTC 2021

Modified Files:
src/sys/arch/evbsh3/ap_ms104_sh4 [thorpej-cfargs2]: shpcmcia.c
src/sys/arch/evbsh3/evbsh3 [thorpej-cfargs2]: mainbus.c
src/sys/arch/evbsh3/t_sh7706lan [thorpej-cfargs2]: scimci.c ssumci.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbsh3/evbsh3/mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbsh3/t_sh7706lan/scimci.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c
diff -u src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.6 src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.6.8.1
--- src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.6	Sat Apr 24 23:36:36 2021
+++ src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c	Wed Aug  4 03:08:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: shpcmcia.c,v 1.6 2021/04/24 23:36:36 thorpej Exp $	*/
+/*	$NetBSD: shpcmcia.c,v 1.6.8.1 2021/08/04 03:08:48 thorpej Exp $	*/
 
 /*-
  * Copyright (C) 2009 NONAKA Kimihiro 
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: shpcmcia.c,v 1.6 2021/04/24 23:36:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shpcmcia.c,v 1.6.8.1 2021/08/04 03:08:48 thorpej Exp $");
 
 #include 
 #include 
@@ -313,7 +313,7 @@ shpcmcia_attach_socket(struct shpcmcia_h
 	paa.pch = (pcmcia_chipset_handle_t)h;
 
 	h->pcmcia =
-	config_found(h->sc->sc_dev, , shpcmcia_print, CFARG_EOL);
+	config_found(h->sc->sc_dev, , shpcmcia_print, CFARGS_NONE);
 
 	/* if there's actually a pcmcia device attached, initialize the slot */
 	if (h->pcmcia)

Index: src/sys/arch/evbsh3/evbsh3/mainbus.c
diff -u src/sys/arch/evbsh3/evbsh3/mainbus.c:1.10 src/sys/arch/evbsh3/evbsh3/mainbus.c:1.10.8.1
--- src/sys/arch/evbsh3/evbsh3/mainbus.c:1.10	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/evbsh3/evbsh3/mainbus.c	Wed Aug  4 03:08:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.10 2021/04/24 23:36:37 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.10.8.1 2021/08/04 03:08:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10.8.1 2021/08/04 03:08:48 thorpej Exp $");
 
 #include 
 #include 
@@ -62,12 +62,11 @@ mainbus_attach(device_t parent, device_t
 	/* CPU  */
 	memset(, 0, sizeof(maa));
 	maa.ma_name = "cpu";
-	config_found(self, , mainbus_print, CFARG_EOL);
+	config_found(self, , mainbus_print, CFARGS_NONE);
 
 	/* Devices */
 	config_search(self, NULL,
-	CFARG_SEARCH, mainbus_search,
-	CFARG_EOL);
+	CFARGS(.search = mainbus_search));
 }
 
 static int
@@ -81,7 +80,7 @@ mainbus_search(device_t parent, cfdata_t
 	maa.ma_name = cf->cf_name;
 
 	if (config_probe(parent, cf, ))
-		config_attach(parent, cf, , mainbus_print, CFARG_EOL);
+		config_attach(parent, cf, , mainbus_print, CFARGS_NONE);
 
 	return 0;
 }

Index: src/sys/arch/evbsh3/t_sh7706lan/scimci.c
diff -u src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.3 src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.3.8.1
--- src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.3	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/evbsh3/t_sh7706lan/scimci.c	Wed Aug  4 03:08:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: scimci.c,v 1.3 2021/04/24 23:36:37 thorpej Exp $	*/
+/*	$NetBSD: scimci.c,v 1.3.8.1 2021/08/04 03:08:48 thorpej Exp $	*/
 
 /*-
  * Copyright (C) 2009 NONAKA Kimihiro 
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: scimci.c,v 1.3 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scimci.c,v 1.3.8.1 2021/08/04 03:08:48 thorpej Exp $");
 
 #include 
 #include 
@@ -235,7 +235,7 @@ scimci_attach(device_t parent, device_t 
 		 | SMC_CAPS_SINGLE_ONLY
 		 | SMC_CAPS_POLL_CARD_DET;
 
-	sc->sc_sdmmc = config_found(sc->sc_dev, , NULL, CFARG_EOL);
+	sc->sc_sdmmc = config_found(sc->sc_dev, , NULL, CFARGS_NONE);
 	if (sc->sc_sdmmc == NULL)
 		aprint_error_dev(sc->sc_dev, "couldn't attach bus\n");
 }

Index: src/sys/arch/evbsh3/t_sh7706lan/ssumci.c
diff -u src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.4 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.4.8.1
--- src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.4	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/evbsh3/t_sh7706lan/ssumci.c	Wed Aug  4 03:08:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssumci.c,v 1.4 2021/04/24 23:36:37 thorpej Exp $	*/
+/*	$NetBSD: ssumci.c,v 1.4.8.1 2021/08/04 03:08:48 thorpej Exp $	*/
 
 /*-
  * Copyright (C) 2010 NONAKA Kimihiro 
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.4 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.4.8.1 2021/08/04 03:08:48 thorpej Exp $");
 

CVS commit: [thorpej-cfargs2] src/sys/arch/zaurus/dev

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 03:07:41 UTC 2021

Modified Files:
src/sys/arch/zaurus/dev [thorpej-cfargs2]: w100lcd.c zapm.c ziic.c
zkbd.c zlcd.c zrc.c zssp.c ztp.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/zaurus/dev/w100lcd.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/zaurus/dev/zapm.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/zaurus/dev/ziic.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/zaurus/dev/zkbd.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/zaurus/dev/zrc.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/zaurus/dev/zssp.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/zaurus/dev/ztp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/zaurus/dev/w100lcd.c
diff -u src/sys/arch/zaurus/dev/w100lcd.c:1.4 src/sys/arch/zaurus/dev/w100lcd.c:1.4.8.1
--- src/sys/arch/zaurus/dev/w100lcd.c:1.4	Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/w100lcd.c	Wed Aug  4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: w100lcd.c,v 1.4 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: w100lcd.c,v 1.4.8.1 2021/08/04 03:07:41 thorpej Exp $ */
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
@@ -39,7 +39,7 @@
  * LCD on/off switch and backlight brightness are done in lcdctl.c.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.4 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.4.8.1 2021/08/04 03:07:41 thorpej Exp $");
 
 #include "lcdctl.h"
 
@@ -145,7 +145,7 @@ w100lcd_attach(device_t parent, device_t
 	aa.accessops = _accessops;
 	aa.accesscookie = sc;
 
-	(void)config_found(self, , wsemuldisplaydevprint, CFARG_EOL);
+	(void)config_found(self, , wsemuldisplaydevprint, CFARGS_NONE);
 
 	if (!pmf_device_register(self, w100lcd_suspend, w100lcd_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");

Index: src/sys/arch/zaurus/dev/zapm.c
diff -u src/sys/arch/zaurus/dev/zapm.c:1.13 src/sys/arch/zaurus/dev/zapm.c:1.13.8.1
--- src/sys/arch/zaurus/dev/zapm.c:1.13	Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/zapm.c	Wed Aug  4 03:07:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: zapm.c,v 1.13 2021/04/24 23:36:52 thorpej Exp $	*/
+/*	$NetBSD: zapm.c,v 1.13.8.1 2021/08/04 03:07:41 thorpej Exp $	*/
 /*	$OpenBSD: zaurus_apm.c,v 1.13 2006/12/12 23:14:28 dim Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zapm.c,v 1.13 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zapm.c,v 1.13.8.1 2021/08/04 03:07:41 thorpej Exp $");
 
 #include 
 #include 
@@ -195,7 +195,7 @@ zapm_attach(device_t parent, device_t se
 	aaa.accesscookie = sc;
 	aaa.apm_detail = 0x0102;
 
-	sc->sc_apmdev = config_found(self, , apmprint, CFARG_EOL);
+	sc->sc_apmdev = config_found(self, , apmprint, CFARGS_NONE);
 	if (sc->sc_apmdev != NULL) {
 		zapm_poll1(sc, 0);
 		callout_schedule(>sc_cyclic_poll, CYCLIC_TIME);

Index: src/sys/arch/zaurus/dev/ziic.c
diff -u src/sys/arch/zaurus/dev/ziic.c:1.5 src/sys/arch/zaurus/dev/ziic.c:1.5.8.1
--- src/sys/arch/zaurus/dev/ziic.c:1.5	Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/ziic.c	Wed Aug  4 03:07:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ziic.c,v 1.5 2021/04/24 23:36:52 thorpej Exp $	*/
+/*	$NetBSD: ziic.c,v 1.5.8.1 2021/08/04 03:07:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ziic.c,v 1.5 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ziic.c,v 1.5.8.1 2021/08/04 03:07:41 thorpej Exp $");
 
 #include 
 #include 
@@ -129,7 +129,7 @@ pxaiic_attach(device_t parent, device_t 
 
 	memset(, 0, sizeof(iba));
 	iba.iba_tag = >sc_i2c;
-	config_found(psc->sc_dev, , iicbus_print, CFARG_EOL);
+	config_found(psc->sc_dev, , iicbus_print, CFARGS_NONE);
 }
 
 static int

Index: src/sys/arch/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.21 src/sys/arch/zaurus/dev/zkbd.c:1.21.8.1
--- src/sys/arch/zaurus/dev/zkbd.c:1.21	Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/zkbd.c	Wed Aug  4 03:07:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: zkbd.c,v 1.21 2021/04/24 23:36:52 thorpej Exp $	*/
+/*	$NetBSD: zkbd.c,v 1.21.8.1 2021/08/04 03:07:41 thorpej Exp $	*/
 /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.21 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.21.8.1 2021/08/04 03:07:41 thorpej Exp $");
 
 #include "opt_wsdisplay_compat.h"
 #if 0	/* XXX */
@@ -336,7 +336,7 @@ zkbd_attach(device_t parent, device_t se
 
 	zkbd_hinge(sc);		/* to initialize sc_hinge */
 
-	sc->sc_wskbddev = config_found(self, , wskbddevprint, 

CVS commit: [thorpej-cfargs2] src/sys/arch

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 03:03:31 UTC 2021

Modified Files:
src/sys/arch/x68k/dev [thorpej-cfargs2]: fd.c grf_machdep.c intio.c
mfp.c mha.c neptune.c scsirom.c zs.c
src/sys/arch/x68k/x68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/x86/pci [thorpej-cfargs2]: amdnb_misc.c amdpcib.c amdsmn.c
dwiic_pci.c ichlpcib.c pchb.c pcib.c tcpcib.c
src/sys/arch/x86/pci/imcsmb [thorpej-cfargs2]: imc.c imcsmb.c
src/sys/arch/x86/x86 [thorpej-cfargs2]: cpu.c mainbus.c mp.c mpacpi.c
mpbios.c
src/sys/arch/xen/x86 [thorpej-cfargs2]: cpu.c xen_mainbus.c
src/sys/arch/xen/xen [thorpej-cfargs2]: hypervisor.c xpci_xenbus.c
src/sys/arch/xen/xenbus [thorpej-cfargs2]: xenbus_probe.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.124.8.1 src/sys/arch/x68k/dev/fd.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/x68k/dev/grf_machdep.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/arch/x68k/dev/intio.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/x68k/dev/mfp.c
cvs rdiff -u -r1.55 -r1.55.8.1 src/sys/arch/x68k/dev/mha.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/x68k/dev/neptune.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/x68k/dev/scsirom.c
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/arch/x68k/dev/zs.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/x68k/x68k/mainbus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/x86/pci/amdnb_misc.c \
src/sys/arch/x86/pci/amdpcib.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/x86/pci/amdsmn.c
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/arch/x86/pci/dwiic_pci.c
cvs rdiff -u -r1.53 -r1.53.8.1 src/sys/arch/x86/pci/ichlpcib.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/x86/pci/pchb.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/x86/pci/pcib.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/x86/pci/tcpcib.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/x86/pci/imcsmb/imc.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/x86/pci/imcsmb/imcsmb.c
cvs rdiff -u -r1.200 -r1.200.8.1 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/x86/x86/mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/x86/x86/mp.c
cvs rdiff -u -r1.106 -r1.106.4.1 src/sys/arch/x86/x86/mpacpi.c
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/arch/x86/x86/mpbios.c
cvs rdiff -u -r1.140 -r1.140.8.1 src/sys/arch/xen/x86/cpu.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/xen/x86/xen_mainbus.c
cvs rdiff -u -r1.91 -r1.91.8.1 src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/xen/xen/xpci_xenbus.c
cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/arch/xen/xenbus/xenbus_probe.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x68k/dev/fd.c
diff -u src/sys/arch/x68k/dev/fd.c:1.124 src/sys/arch/x68k/dev/fd.c:1.124.8.1
--- src/sys/arch/x68k/dev/fd.c:1.124	Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/fd.c	Wed Aug  4 03:03:30 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.124 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: fd.c,v 1.124.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.124 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.124.8.1 2021/08/04 03:03:30 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_m68k_arch.h"
@@ -514,7 +514,7 @@ fdcattach(device_t parent, device_t self
 
 	/* physical limit: four drives per controller. */
 	for (fa.fa_drive = 0; fa.fa_drive < 4; fa.fa_drive++) {
-		(void)config_found(self, (void *), fdprint, CFARG_EOL);
+		(void)config_found(self, (void *), fdprint, CFARGS_NONE);
 	}
 
 	intio_enable_intr(SICILIAN_INTR_FDC);

Index: src/sys/arch/x68k/dev/grf_machdep.c
diff -u src/sys/arch/x68k/dev/grf_machdep.c:1.33 src/sys/arch/x68k/dev/grf_machdep.c:1.33.8.1
--- src/sys/arch/x68k/dev/grf_machdep.c:1.33	Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/grf_machdep.c	Wed Aug  4 03:03:30 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_machdep.c,v 1.33 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: grf_machdep.c,v 1.33.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1991 University of Utah.
@@ -44,7 +44,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.33 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.33.8.1 2021/08/04 03:03:30 thorpej Exp $");
 
 #include "locators.h"
 
@@ -93,15 +93,14 @@ grfbusattach(device_t parent, device_t s
 
 	aprint_normal("\n");
 	config_search(self, NULL,
-	CFARG_SEARCH, grfbussearch,
-	CFARG_EOL);
+	CFARGS(.search = grfbussearch));
 }
 
 int
 grfbussearch(device_t self, cfdata_t match, const int *ldesc, void *aux)
 {
 
-	config_found(self, >cf_loc[GRFBCF_ADDR], grfbusprint, CFARG_EOL);
+	config_found(self, >cf_loc[GRFBCF_ADDR], grfbusprint, CFARGS_NONE);
 	return (0);
 }
 
@@ -157,7 +156,7 @@ 

CVS commit: [thorpej-cfargs2] src/sys/arch

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 03:00:08 UTC 2021

Modified Files:
src/sys/arch/usermode/dev [thorpej-cfargs2]: mainbus.c vatapi.c vncfb.c
src/sys/arch/vax/mba [thorpej-cfargs2]: mba.c
src/sys/arch/vax/uba [thorpej-cfargs2]: qv.c qvaux.c qvkbd.c qvms.c
src/sys/arch/vax/vax [thorpej-cfargs2]: autoconf.c cmi.c ka860.c
nmi_mainbus.c sbi.c ubi.c
src/sys/arch/vax/vsa [thorpej-cfargs2]: dz_vsbus.c hdc9224.c lcg.c
smg.c spx.c vsbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/usermode/dev/mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/usermode/dev/vatapi.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/usermode/dev/vncfb.c
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/arch/vax/mba/mba.c
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/arch/vax/uba/qv.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/vax/uba/qvaux.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/vax/uba/qvkbd.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/vax/uba/qvms.c
cvs rdiff -u -r1.98 -r1.98.8.1 src/sys/arch/vax/vax/autoconf.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/vax/vax/cmi.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/vax/vax/ka860.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/vax/vax/nmi_mainbus.c
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/arch/vax/vax/sbi.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/vax/vax/ubi.c
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/arch/vax/vsa/dz_vsbus.c
cvs rdiff -u -r1.61 -r1.61.8.1 src/sys/arch/vax/vsa/hdc9224.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/vax/vsa/lcg.c
cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/arch/vax/vsa/smg.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/vax/vsa/spx.c
cvs rdiff -u -r1.66 -r1.66.8.1 src/sys/arch/vax/vsa/vsbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/usermode/dev/mainbus.c
diff -u src/sys/arch/usermode/dev/mainbus.c:1.11 src/sys/arch/usermode/dev/mainbus.c:1.11.8.1
--- src/sys/arch/usermode/dev/mainbus.c:1.11	Sat Apr 24 23:36:50 2021
+++ src/sys/arch/usermode/dev/mainbus.c	Wed Aug  4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:00:08 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:00:08 thorpej Exp $");
 
 #include 
 #include 
@@ -80,45 +80,45 @@ mainbus_attach(device_t parent, device_t
 	sc->sc_dev = self;
 
 	taa.taa_type = THUNKBUS_TYPE_CPU;
-	config_found(self, , mainbus_print, CFARG_EOL);
+	config_found(self, , mainbus_print, CFARGS_NONE);
 
 	taa.taa_type = THUNKBUS_TYPE_TTYCONS;
-	config_found(self, , mainbus_print, CFARG_EOL);
+	config_found(self, , mainbus_print, CFARGS_NONE);
 
 	if (usermode_vnc_port > 0 && usermode_vnc_port < 65536) {
 		taa.taa_type = THUNKBUS_TYPE_VNCFB;
 		taa.u.vnc.width = usermode_vnc_width;
 		taa.u.vnc.height = usermode_vnc_height;
 		taa.u.vnc.port = usermode_vnc_port;
-		config_found(self, , mainbus_print, CFARG_EOL);
+		config_found(self, , mainbus_print, CFARGS_NONE);
 	}
 
 	taa.taa_type = THUNKBUS_TYPE_CLOCK;
-	config_found(self, , mainbus_print, CFARG_EOL);
+	config_found(self, , mainbus_print, CFARGS_NONE);
 
 	if (usermode_tap_device) {
 		taa.taa_type = THUNKBUS_TYPE_VETH;
 		taa.u.veth.device = usermode_tap_device;
 		taa.u.veth.eaddr = usermode_tap_eaddr;
-		config_found(self, , mainbus_print, CFARG_EOL);
+		config_found(self, , mainbus_print, CFARGS_NONE);
 	}
 
 	if (usermode_audio_device) {
 		taa.taa_type = THUNKBUS_TYPE_VAUDIO;
 		taa.u.vaudio.device = usermode_audio_device;
-		config_found(self, , mainbus_print, CFARG_EOL);
+		config_found(self, , mainbus_print, CFARGS_NONE);
 	}
 
 	for (i = 0; i < usermode_disk_image_path_count; i++) {
 		taa.taa_type = THUNKBUS_TYPE_DISKIMAGE;
 		taa.u.diskimage.path = usermode_disk_image_path[i];
-		config_found(self, , mainbus_print, CFARG_EOL);
+		config_found(self, , mainbus_print, CFARGS_NONE);
 	}
 
 	for (i = 0; i < usermode_vdev_count; i++) {
 		taa.taa_type = usermode_vdev_type[i];
 		taa.u.vdev.path = usermode_vdev_path[i];
-		config_found(self, , mainbus_print, CFARG_EOL);
+		config_found(self, , mainbus_print, CFARGS_NONE);
 	}
 }
 

Index: src/sys/arch/usermode/dev/vatapi.c
diff -u src/sys/arch/usermode/dev/vatapi.c:1.3 src/sys/arch/usermode/dev/vatapi.c:1.3.8.1
--- src/sys/arch/usermode/dev/vatapi.c:1.3	Sat Apr 24 23:36:50 2021
+++ src/sys/arch/usermode/dev/vatapi.c	Wed Aug  4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vatapi.c,v 1.3 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: vatapi.c,v 1.3.8.1 2021/08/04 03:00:08 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2018 Reinoud Zandijk 
@@ -27,7 +27,7 @@
  */
 
 #include 

CVS commit: [thorpej-cfargs2] src/sys/arch

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 02:58:24 UTC 2021

Modified Files:
src/sys/arch/sun2/dev [thorpej-cfargs2]: zs.c
src/sys/arch/sun2/sun2 [thorpej-cfargs2]: mbio.c mbmem.c obio.c obmem.c
src/sys/arch/sun3/dev [thorpej-cfargs2]: fd.c sebuf.c xd.c xy.c zs.c
src/sys/arch/sun3/sun3 [thorpej-cfargs2]: autoconf.c mainbus.c obio.c
obmem.c vme.c
src/sys/arch/sun3/sun3x [thorpej-cfargs2]: obio.c vme.c
src/sys/arch/sun68k/sun68k [thorpej-cfargs2]: autoconf.c vme_sun68k.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/sun2/dev/zs.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/sun2/sun2/mbio.c \
src/sys/arch/sun2/sun2/obio.c src/sys/arch/sun2/sun2/obmem.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/sun2/sun2/mbmem.c
cvs rdiff -u -r1.85 -r1.85.8.1 src/sys/arch/sun3/dev/fd.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sun3/dev/sebuf.c
cvs rdiff -u -r1.76 -r1.76.8.1 src/sys/arch/sun3/dev/xd.c
cvs rdiff -u -r1.81 -r1.81.8.1 src/sys/arch/sun3/dev/xy.c
cvs rdiff -u -r1.89 -r1.89.8.1 src/sys/arch/sun3/dev/zs.c
cvs rdiff -u -r1.80 -r1.80.8.1 src/sys/arch/sun3/sun3/autoconf.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/sun3/sun3/mainbus.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/arch/sun3/sun3/obio.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/sun3/sun3/obmem.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/sun3/sun3/vme.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/sun3/sun3x/obio.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sun3/sun3x/vme.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/sun68k/sun68k/autoconf.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sun68k/sun68k/vme_sun68k.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sun2/dev/zs.c
diff -u src/sys/arch/sun2/dev/zs.c:1.22 src/sys/arch/sun2/dev/zs.c:1.22.8.1
--- src/sys/arch/sun2/dev/zs.c:1.22	Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun2/dev/zs.c	Wed Aug  4 02:58:23 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.22 2021/04/24 23:36:49 thorpej Exp $	*/
+/*	$NetBSD: zs.c,v 1.22.8.1 2021/08/04 02:58:23 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22.8.1 2021/08/04 02:58:23 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -233,7 +233,7 @@ zs_attach(struct zsc_softc *zsc, struct 
 		 * The child attach will setup the hardware.
 		 */
 		if ((child = config_found(zsc->zsc_dev, (void *)_args,
-		zs_print, CFARG_EOL)) == NULL) {
+		zs_print, CFARGS_NONE)) == NULL) {
 			/* No sub-driver.  Just reset it. */
 			uint8_t reset = (channel == 0) ?
 ZSWR9_A_RESET : ZSWR9_B_RESET;
@@ -274,14 +274,14 @@ zs_attach(struct zsc_softc *zsc, struct 
 #if (NKBD > 0)
 	kma.kmta_name = "keyboard";
 	config_found(child, (void *), NULL,
-	CFARG_EOL);
+	CFARGS_NONE);
 #endif
 	break;
 case ZS_PERIPHERAL_SUNMS:
 #if (NMS > 0)
 	kma.kmta_name = "mouse";
 	config_found(child, (void *), NULL,
-	CFARG_EOL);
+	CFARGS_NONE);
 #endif
 	break;
 default:

Index: src/sys/arch/sun2/sun2/mbio.c
diff -u src/sys/arch/sun2/sun2/mbio.c:1.20 src/sys/arch/sun2/sun2/mbio.c:1.20.8.1
--- src/sys/arch/sun2/sun2/mbio.c:1.20	Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun2/sun2/mbio.c	Wed Aug  4 02:58:23 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbio.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $	*/
+/*	$NetBSD: mbio.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mbio.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mbio.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $");
 
 #include 
 #include 
@@ -130,15 +130,13 @@ mbio_attach(device_t parent, device_t se
 	for (cpp = special; *cpp != NULL; cpp++) {
 		mba.mba_name = *cpp;
 		config_search(self, ,
-		CFARG_SEARCH, sun68k_bus_search,
-		CFARG_EOL);
+		CFARGS(.search = sun68k_bus_search));
 	}
 
 	/* Find all other mbio devices */
 	mba.mba_name = NULL;
 	config_search(self, ,
-	CFARG_SEARCH, sun68k_bus_search,
-	CFARG_EOL);
+	CFARGS(.search = sun68k_bus_search));
 }
 
 int
Index: src/sys/arch/sun2/sun2/obio.c
diff -u src/sys/arch/sun2/sun2/obio.c:1.20 src/sys/arch/sun2/sun2/obio.c:1.20.8.1
--- src/sys/arch/sun2/sun2/obio.c:1.20	Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun2/sun2/obio.c	Wed Aug  4 02:58:23 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 

CVS commit: [thorpej-cfargs2] src/sys/arch

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 02:57:07 UTC 2021

Modified Files:
src/sys/arch/shark/ofw [thorpej-cfargs2]: ofisascr.c vlpci.c
src/sys/arch/shark/shark [thorpej-cfargs2]: sequoia.c shark_iic.c
src/sys/arch/sparc/dev [thorpej-cfargs2]: bootbus.c cgfourteen.c ebus.c
fd.c obio.c sbus.c ts102.c vme_machdep.c zs.c
src/sys/arch/sparc/sparc [thorpej-cfargs2]: autoconf.c cpuunit.c
iommu.c msiiep.c
src/sys/arch/sparc64/dev [thorpej-cfargs2]: cbus.c central.c com_ebus.c
ebus.c ebus_mainbus.c fdc.c ffb.c fhc.c gfb.c jbus-i2c.c psycho.c
pyro.c sab.c sbus.c schizo.c upa.c vbus.c vdsk.c vpci.c zs.c
src/sys/arch/sparc64/sparc64 [thorpej-cfargs2]: autoconf.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/shark/ofw/ofisascr.c \
src/sys/arch/shark/ofw/vlpci.c
cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/arch/shark/shark/sequoia.c
cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/arch/shark/shark/shark_iic.c
cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/arch/sparc/dev/bootbus.c
cvs rdiff -u -r1.89 -r1.89.8.1 src/sys/arch/sparc/dev/cgfourteen.c
cvs rdiff -u -r1.40 -r1.40.4.1 src/sys/arch/sparc/dev/ebus.c
cvs rdiff -u -r1.162 -r1.162.8.1 src/sys/arch/sparc/dev/fd.c
cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/arch/sparc/dev/obio.c
cvs rdiff -u -r1.82 -r1.82.4.1 src/sys/arch/sparc/dev/sbus.c
cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/arch/sparc/dev/ts102.c
cvs rdiff -u -r1.73 -r1.73.4.1 src/sys/arch/sparc/dev/vme_machdep.c
cvs rdiff -u -r1.122 -r1.122.8.1 src/sys/arch/sparc/dev/zs.c
cvs rdiff -u -r1.268 -r1.268.2.1 src/sys/arch/sparc/sparc/autoconf.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/sparc/sparc/cpuunit.c
cvs rdiff -u -r1.98 -r1.98.4.1 src/sys/arch/sparc/sparc/iommu.c
cvs rdiff -u -r1.51 -r1.51.4.1 src/sys/arch/sparc/sparc/msiiep.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/sparc64/dev/cbus.c
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/arch/sparc64/dev/central.c \
src/sys/arch/sparc64/dev/vbus.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/sparc64/dev/com_ebus.c
cvs rdiff -u -r1.67 -r1.67.4.1 src/sys/arch/sparc64/dev/ebus.c
cvs rdiff -u -r1.20 -r1.20.4.1 src/sys/arch/sparc64/dev/ebus_mainbus.c
cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/arch/sparc64/dev/fdc.c
cvs rdiff -u -r1.66 -r1.66.8.1 src/sys/arch/sparc64/dev/ffb.c
cvs rdiff -u -r1.9 -r1.9.4.1 src/sys/arch/sparc64/dev/fhc.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/sparc64/dev/gfb.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/sparc64/dev/jbus-i2c.c
cvs rdiff -u -r1.134 -r1.134.4.1 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.24 -r1.24.4.1 src/sys/arch/sparc64/dev/pyro.c
cvs rdiff -u -r1.56 -r1.56.8.1 src/sys/arch/sparc64/dev/sab.c
cvs rdiff -u -r1.102 -r1.102.4.1 src/sys/arch/sparc64/dev/sbus.c
cvs rdiff -u -r1.45 -r1.45.4.1 src/sys/arch/sparc64/dev/schizo.c
cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/arch/sparc64/dev/upa.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/arch/sparc64/dev/vdsk.c
cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/arch/sparc64/dev/vpci.c
cvs rdiff -u -r1.76 -r1.76.8.1 src/sys/arch/sparc64/dev/zs.c
cvs rdiff -u -r1.233 -r1.233.2.1 src/sys/arch/sparc64/sparc64/autoconf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/shark/ofw/ofisascr.c
diff -u src/sys/arch/shark/ofw/ofisascr.c:1.11 src/sys/arch/shark/ofw/ofisascr.c:1.11.8.1
--- src/sys/arch/shark/ofw/ofisascr.c:1.11	Sat Apr 24 23:36:48 2021
+++ src/sys/arch/shark/ofw/ofisascr.c	Wed Aug  4 02:57:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofisascr.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: ofisascr.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $	*/
 
 /*
  * Copyright 1997
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $");
 
 #include 
 #include 
@@ -105,6 +105,5 @@ ofisascrattach(device_t parent, device_t
 	ia.ia_aux = (void *)oba->oba_phandle;
 
 	config_found(dev, , NULL,
-	CFARG_DEVHANDLE, devhandle_from_of(oba->oba_phandle),
-	CFARG_EOL);
+	CFARGS(.devhandle = devhandle_from_of(oba->oba_phandle)));
 }
Index: src/sys/arch/shark/ofw/vlpci.c
diff -u src/sys/arch/shark/ofw/vlpci.c:1.11 src/sys/arch/shark/ofw/vlpci.c:1.11.8.1
--- src/sys/arch/shark/ofw/vlpci.c:1.11	Sat Apr 24 23:36:48 2021
+++ src/sys/arch/shark/ofw/vlpci.c	Wed Aug  4 02:57:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vlpci.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: vlpci.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2017 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $");
 
 #include "opt_pci.h"
 

CVS commit: [thorpej-cfargs2] src/sys/arch

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 02:53:01 UTC 2021

Modified Files:
src/sys/arch/riscv/htif [thorpej-cfargs2]: htif.c
src/sys/arch/riscv/riscv [thorpej-cfargs2]: mainbus.c
src/sys/arch/rs6000/mca [thorpej-cfargs2]: ioplanar.c
src/sys/arch/rs6000/rs6000 [thorpej-cfargs2]: mainbus.c
src/sys/arch/sandpoint/sandpoint [thorpej-cfargs2]: eumb.c mainbus.c
nhpow.c
src/sys/arch/sbmips/sbmips [thorpej-cfargs2]: zbbus.c
src/sys/arch/sgimips/dev [thorpej-cfargs2]: crmfb.c imc.c pic.c zs.c
zs_kbd.c zs_ms.c
src/sys/arch/sgimips/gio [thorpej-cfargs2]: gio.c grtwo.c light.c
newport.c pci_gio.c
src/sys/arch/sgimips/hpc [thorpej-cfargs2]: hpc.c pi1ppc.c
src/sys/arch/sgimips/ioc [thorpej-cfargs2]: ioc.c oioc.c
src/sys/arch/sgimips/mace [thorpej-cfargs2]: mace.c pci_mace.c
src/sys/arch/sgimips/sgimips [thorpej-cfargs2]: mainbus.c
src/sys/arch/sh3/dev [thorpej-cfargs2]: adc.c shb.c shpcic.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/riscv/htif/htif.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/riscv/riscv/mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/rs6000/mca/ioplanar.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/rs6000/rs6000/mainbus.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/sandpoint/sandpoint/eumb.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/sandpoint/sandpoint/mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/sandpoint/sandpoint/nhpow.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/sbmips/sbmips/zbbus.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/arch/sgimips/dev/crmfb.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/sgimips/dev/imc.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sgimips/dev/pic.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/arch/sgimips/dev/zs.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/sgimips/dev/zs_kbd.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/sgimips/dev/zs_ms.c
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/arch/sgimips/gio/gio.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/sgimips/gio/grtwo.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/sgimips/gio/light.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/sgimips/gio/newport.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sgimips/gio/pci_gio.c
cvs rdiff -u -r1.72 -r1.72.8.1 src/sys/arch/sgimips/hpc/hpc.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/sgimips/hpc/pi1ppc.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/sgimips/ioc/ioc.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/sgimips/ioc/oioc.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/sgimips/mace/mace.c \
src/sys/arch/sgimips/mace/pci_mace.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/sgimips/sgimips/mainbus.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/sh3/dev/adc.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/sh3/dev/shb.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/sh3/dev/shpcic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/riscv/htif/htif.c
diff -u src/sys/arch/riscv/htif/htif.c:1.3 src/sys/arch/riscv/htif/htif.c:1.3.8.1
--- src/sys/arch/riscv/htif/htif.c:1.3	Sat Apr 24 23:36:47 2021
+++ src/sys/arch/riscv/htif/htif.c	Wed Aug  4 02:52:59 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: htif.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $	*/
+/*	$NetBSD: htif.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 
-__RCSID("$NetBSD: htif.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $");
+__RCSID("$NetBSD: htif.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $");
 
 #include 
 #include 
@@ -68,7 +68,7 @@ htif_mainbus_attach(device_t parent, dev
 	struct htif_attach_args haa;
 
 	haa.haa_name = "htifcons";
-	config_found(self, , htif_mainbus_print, CFARG_EOL);
+	config_found(self, , htif_mainbus_print, CFARGS_NONE);
 	haa.haa_name = "htifdisk";
-	config_found(self, , htif_mainbus_print, CFARG_EOL);
+	config_found(self, , htif_mainbus_print, CFARGS_NONE);
 }

Index: src/sys/arch/riscv/riscv/mainbus.c
diff -u src/sys/arch/riscv/riscv/mainbus.c:1.3 src/sys/arch/riscv/riscv/mainbus.c:1.3.8.1
--- src/sys/arch/riscv/riscv/mainbus.c:1.3	Sat Apr 24 23:36:47 2021
+++ src/sys/arch/riscv/riscv/mainbus.c	Wed Aug  4 02:52:59 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 
 #include 
 
-__RCSID("$NetBSD: mainbus.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $");
+__RCSID("$NetBSD: mainbus.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $");
 
 #include 
 #include 
@@ -72,5 +72,5 @@ mainbus_attach(device_t parent, device_t
 	maa.maa_name = "cpu";
 	maa.maa_instance = 0;
 
-	config_found(self, , mainbus_print, CFARG_EOL);
+	config_found(self, , mainbus_print, 

CVS commit: [thorpej-cfargs2] src/sys/arch

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 02:49:41 UTC 2021

Modified Files:
src/sys/arch/news68k/dev [thorpej-cfargs2]: hb.c kb_hb.c kb_kbc.c kbc.c
ms_hb.c ms_kbc.c zs.c
src/sys/arch/news68k/news68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/newsmips/apbus [thorpej-cfargs2]: apbus.c kb_ap.c ms_ap.c
spifi.c xafb.c zs_ap.c
src/sys/arch/newsmips/dev [thorpej-cfargs2]: fb.c hb.c kb_hb.c ms_hb.c
sc_wrap.c zs_hb.c
src/sys/arch/newsmips/newsmips [thorpej-cfargs2]: mainbus.c
src/sys/arch/next68k/dev [thorpej-cfargs2]: intio.c nextdisplay.c
nextkbd.c zs.c
src/sys/arch/next68k/next68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/ofppc/ofppc [thorpej-cfargs2]: mainbus.c
src/sys/arch/ofppc/pci [thorpej-cfargs2]: ofwpci.c
src/sys/arch/playstation2/dev [thorpej-cfargs2]: ohci_sbus.c sbus.c
spd.c
src/sys/arch/playstation2/ee [thorpej-cfargs2]: gsfb.c
src/sys/arch/playstation2/playstation2 [thorpej-cfargs2]: mainbus.c
src/sys/arch/pmax/ibus [thorpej-cfargs2]: dz_ibus.c ibus.c pm.c sii.c
src/sys/arch/pmax/pmax [thorpej-cfargs2]: mainbus.c
src/sys/arch/pmax/tc [thorpej-cfargs2]: dt.c dtkbd.c dtms.c
src/sys/arch/powerpc/booke/dev [thorpej-cfargs2]: cpunode.c pq3duart.c
pq3ehci.c pq3etsec.c pq3gpio.c pq3obio.c
src/sys/arch/powerpc/booke/pci [thorpej-cfargs2]: pq3pci.c
src/sys/arch/powerpc/ibm4xx/dev [thorpej-cfargs2]: dwctwo_plb.c exb.c
gpiic_opb.c gpio_opb.c opb.c plb.c
src/sys/arch/powerpc/ibm4xx/pci [thorpej-cfargs2]: pchb.c
src/sys/arch/powerpc/pci [thorpej-cfargs2]: pchb.c pcib.c
src/sys/arch/prep/pci [thorpej-cfargs2]: gten.c pceb.c
src/sys/arch/prep/pnpbus [thorpej-cfargs2]: pnpbus.c
src/sys/arch/prep/prep [thorpej-cfargs2]: mainbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/news68k/dev/hb.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/news68k/dev/kb_hb.c \
src/sys/arch/news68k/dev/kbc.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/news68k/dev/kb_kbc.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/news68k/dev/ms_hb.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/news68k/dev/ms_kbc.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/news68k/dev/zs.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/news68k/news68k/mainbus.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/newsmips/apbus/apbus.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/newsmips/apbus/kb_ap.c \
src/sys/arch/newsmips/apbus/ms_ap.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/newsmips/apbus/spifi.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/newsmips/apbus/xafb.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/newsmips/apbus/zs_ap.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/newsmips/dev/fb.c \
src/sys/arch/newsmips/dev/zs_hb.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/newsmips/dev/hb.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/newsmips/dev/kb_hb.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/newsmips/dev/ms_hb.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/newsmips/dev/sc_wrap.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/newsmips/newsmips/mainbus.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/next68k/dev/intio.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/next68k/dev/nextdisplay.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/next68k/dev/nextkbd.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/next68k/dev/zs.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/next68k/next68k/mainbus.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/ofppc/ofppc/mainbus.c
cvs rdiff -u -r1.20 -r1.20.4.1 src/sys/arch/ofppc/pci/ofwpci.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/playstation2/dev/ohci_sbus.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/playstation2/dev/sbus.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/playstation2/dev/spd.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/playstation2/ee/gsfb.c
cvs rdiff -u -r1.17 -r1.17.8.1 \
src/sys/arch/playstation2/playstation2/mainbus.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/pmax/ibus/dz_ibus.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/pmax/ibus/ibus.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/pmax/ibus/pm.c
cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/arch/pmax/ibus/sii.c
cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/arch/pmax/pmax/mainbus.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/pmax/tc/dt.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/pmax/tc/dtkbd.c \
src/sys/arch/pmax/tc/dtms.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/powerpc/booke/dev/cpunode.c \
src/sys/arch/powerpc/booke/dev/pq3duart.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/powerpc/booke/dev/pq3ehci.c
cvs rdiff -u -r1.55 -r1.55.2.1 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/powerpc/booke/dev/pq3gpio.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/powerpc/booke/dev/pq3obio.c
cvs 

CVS commit: [thorpej-cfargs2] src/sys/arch

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 02:45:07 UTC 2021

Modified Files:
src/sys/arch/mipsco/isa [thorpej-cfargs2]: isa_machdep.c
src/sys/arch/mipsco/mipsco [thorpej-cfargs2]: mainbus.c
src/sys/arch/mipsco/obio [thorpej-cfargs2]: obio.c zs.c
src/sys/arch/mmeye/dev [thorpej-cfargs2]: mmeyepcmcia.c rtciic.c
src/sys/arch/mmeye/mmeye [thorpej-cfargs2]: mainbus.c
src/sys/arch/mvme68k/dev [thorpej-cfargs2]: mainbus.c pcc.c wdsc.c zs.c
src/sys/arch/mvmeppc/mvmeppc [thorpej-cfargs2]: mainbus.c
src/sys/arch/netwinder/pci [thorpej-cfargs2]: pcib.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/mipsco/isa/isa_machdep.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/mipsco/mipsco/mainbus.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/mipsco/obio/obio.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/arch/mipsco/obio/zs.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mmeye/dev/mmeyepcmcia.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/mmeye/dev/rtciic.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/mmeye/mmeye/mainbus.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/mvme68k/dev/mainbus.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/arch/mvme68k/dev/pcc.c \
src/sys/arch/mvme68k/dev/wdsc.c
cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/arch/mvme68k/dev/zs.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/mvmeppc/mvmeppc/mainbus.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/netwinder/pci/pcib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mipsco/isa/isa_machdep.c
diff -u src/sys/arch/mipsco/isa/isa_machdep.c:1.18 src/sys/arch/mipsco/isa/isa_machdep.c:1.18.8.1
--- src/sys/arch/mipsco/isa/isa_machdep.c:1.18	Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mipsco/isa/isa_machdep.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include 
 #include 
@@ -144,7 +144,7 @@ isabusattach(device_t parent, device_t s
 	(*platform.intr_establish)(SYS_INTR_ATBUS, isa_intr, ic);
 
 	printf("\n");
-	config_found(self, , mipscoisabusprint, CFARG_EOL);
+	config_found(self, , mipscoisabusprint, CFARGS_NONE);
 }
 
 int

Index: src/sys/arch/mipsco/mipsco/mainbus.c
diff -u src/sys/arch/mipsco/mipsco/mainbus.c:1.11 src/sys/arch/mipsco/mipsco/mainbus.c:1.11.8.1
--- src/sys/arch/mipsco/mipsco/mainbus.c:1.11	Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mipsco/mipsco/mainbus.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:43 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include 
 #include 
@@ -66,15 +66,15 @@ mbattach(device_t parent, device_t self,
 
 	nca.ca_name = "cpu";
 	nca.ca_addr = 0;
-	config_found(self, , mbprint, CFARG_EOL);
+	config_found(self, , mbprint, CFARGS_NONE);
 
 	nca.ca_name = "obio";
 	nca.ca_addr = 0;
-	config_found(self, , NULL, CFARG_EOL);
+	config_found(self, , NULL, CFARGS_NONE);
 
 	nca.ca_name = "isabus";		/* XXX */
 	nca.ca_addr = 0;
-	config_found(self, , NULL, CFARG_EOL);
+	config_found(self, , NULL, CFARGS_NONE);
 
 }
 

Index: src/sys/arch/mipsco/obio/obio.c
diff -u src/sys/arch/mipsco/obio/obio.c:1.18 src/sys/arch/mipsco/obio/obio.c:1.18.8.1
--- src/sys/arch/mipsco/obio/obio.c:1.18	Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mipsco/obio/obio.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include "locators.h"
 
@@ -87,8 +87,7 @@ obio_attach(device_t parent, device_t se
 
 	printf("\n");
 	config_search(self, ca,
-	CFARG_SEARCH, obio_search,
-	CFARG_EOL);
+	CFARGS(.search = obio_search));
 }
 
 static int
@@ -100,7 +99,7 @@ obio_search(device_t parent, cfdata_t cf
 	ca->ca_name = cf->cf_name;
 
 	if (config_probe(parent, cf, ca))
-		config_attach(parent, cf, ca, obio_print, CFARG_EOL);
+		config_attach(parent, cf, ca, obio_print, CFARGS_NONE);
 
 	

CVS commit: [thorpej-cfargs2] src/sys/arch/mips

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 02:44:16 UTC 2021

Modified Files:
src/sys/arch/mips/adm5120 [thorpej-cfargs2]: adm5120_extio.c
adm5120_obio.c
src/sys/arch/mips/adm5120/dev [thorpej-cfargs2]: admgpio.c admpci.c
ahci.c
src/sys/arch/mips/alchemy [thorpej-cfargs2]: aubus.c
src/sys/arch/mips/alchemy/dev [thorpej-cfargs2]: augpio.c aupci.c
aupcmcia.c aupsc.c ausmbus_psc.c auspi.c ohci_aubus.c
src/sys/arch/mips/atheros [thorpej-cfargs2]: arbus.c
src/sys/arch/mips/atheros/dev [thorpej-cfargs2]: argpio.c arpci.c
arspi.c ehci_arbus.c ohci_arbus.c
src/sys/arch/mips/cavium [thorpej-cfargs2]: mainbus.c octeon_bootbus.c
octeon_cpunode.c octeon_iobus.c
src/sys/arch/mips/cavium/dev [thorpej-cfargs2]: octeon_dwctwo.c
octeon_gmx.c octeon_mpi.c octeon_pip.c octeon_xhci.c
src/sys/arch/mips/ingenic [thorpej-cfargs2]: apbus.c ingenic_dwctwo.c
ingenic_ehci.c ingenic_ohci.c jziic.c
src/sys/arch/mips/ralink [thorpej-cfargs2]: ralink_ehci.c ralink_gpio.c
ralink_i2c.c ralink_mainbus.c ralink_ohci.c
src/sys/arch/mips/rmi [thorpej-cfargs2]: rmixl_cpucore.c
rmixl_cpunode.c rmixl_ehci.c rmixl_gpio.c rmixl_iobus.c
rmixl_mainbus.c rmixl_obio.c rmixl_ohci.c rmixl_pcie.c rmixl_pcix.c
rmixl_usbi.c
src/sys/arch/mips/sibyte/dev [thorpej-cfargs2]: sbgbus.c sbobio.c
sbscd.c sbsmbus.c
src/sys/arch/mips/sibyte/pci [thorpej-cfargs2]: sbbrz.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/mips/adm5120/adm5120_extio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/adm5120/adm5120_obio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/adm5120/dev/admgpio.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/mips/adm5120/dev/admpci.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mips/alchemy/aubus.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/mips/alchemy/dev/augpio.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/mips/alchemy/dev/aupci.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/mips/alchemy/dev/aupcmcia.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/mips/alchemy/dev/aupsc.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/alchemy/dev/ausmbus_psc.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/mips/alchemy/dev/auspi.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/mips/alchemy/dev/ohci_aubus.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/mips/atheros/arbus.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/mips/atheros/dev/argpio.c \
src/sys/arch/mips/atheros/dev/ehci_arbus.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/atheros/dev/arpci.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/atheros/dev/arspi.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/mips/atheros/dev/ohci_arbus.c
cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/arch/mips/cavium/mainbus.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/mips/cavium/octeon_bootbus.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/mips/cavium/octeon_cpunode.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/cavium/octeon_iobus.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/arch/mips/cavium/dev/octeon_gmx.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/cavium/dev/octeon_mpi.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/mips/cavium/dev/octeon_pip.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/cavium/dev/octeon_xhci.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/mips/ingenic/apbus.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/ingenic/ingenic_dwctwo.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/mips/ingenic/ingenic_ehci.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/ingenic/ingenic_ohci.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/mips/ingenic/jziic.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/mips/ralink/ralink_ehci.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/mips/ralink/ralink_gpio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/ralink/ralink_i2c.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/ralink/ralink_mainbus.c \
src/sys/arch/mips/ralink/ralink_ohci.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/rmi/rmixl_cpucore.c \
src/sys/arch/mips/rmi/rmixl_iobus.c src/sys/arch/mips/rmi/rmixl_obio.c \
src/sys/arch/mips/rmi/rmixl_ohci.c src/sys/arch/mips/rmi/rmixl_usbi.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/mips/rmi/rmixl_cpunode.c \
src/sys/arch/mips/rmi/rmixl_gpio.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/mips/rmi/rmixl_ehci.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/rmi/rmixl_mainbus.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/mips/rmi/rmixl_pcie.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/mips/rmi/rmixl_pcix.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/sibyte/dev/sbgbus.c
cvs rdiff -u -r1.24 -r1.24.8.1 

CVS commit: [thorpej-cfargs2] src/sys/arch/macppc

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 02:39:49 UTC 2021

Modified Files:
src/sys/arch/macppc/dev [thorpej-cfargs2]: adb.c akbd.c ams.c cuda.c
gpio.c ki2c.c mediabay.c mesh.c obio.c ofb.c pbms.c platinumfb.c
pmu.c smu.c smuiic.c snapper.c uni-n.c valkyriefb.c zs.c
src/sys/arch/macppc/macppc [thorpej-cfargs2]: mainbus.c memory.c
src/sys/arch/macppc/pci [thorpej-cfargs2]: bandit.c grackle.c u3.c
uninorth.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/macppc/dev/adb.c
cvs rdiff -u -r1.46 -r1.46.8.1 src/sys/arch/macppc/dev/akbd.c
cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/arch/macppc/dev/ams.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/macppc/dev/cuda.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/macppc/dev/gpio.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/macppc/dev/ki2c.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/macppc/dev/mediabay.c
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/arch/macppc/dev/mesh.c
cvs rdiff -u -r1.49 -r1.49.8.1 src/sys/arch/macppc/dev/obio.c
cvs rdiff -u -r1.71 -r1.71.8.1 src/sys/arch/macppc/dev/ofb.c
cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/arch/macppc/dev/pbms.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/macppc/dev/platinumfb.c
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/arch/macppc/dev/pmu.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/macppc/dev/smu.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/macppc/dev/smuiic.c
cvs rdiff -u -r1.60 -r1.60.2.1 src/sys/arch/macppc/dev/snapper.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/macppc/dev/uni-n.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/macppc/dev/valkyriefb.c
cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/arch/macppc/dev/zs.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/macppc/macppc/mainbus.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/macppc/macppc/memory.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/macppc/pci/bandit.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/macppc/pci/grackle.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/macppc/pci/u3.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/macppc/pci/uninorth.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/macppc/dev/adb.c
diff -u src/sys/arch/macppc/dev/adb.c:1.36 src/sys/arch/macppc/dev/adb.c:1.36.8.1
--- src/sys/arch/macppc/dev/adb.c:1.36	Sat Apr 24 23:36:41 2021
+++ src/sys/arch/macppc/dev/adb.c	Wed Aug  4 02:39:49 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: adb.c,v 1.36 2021/04/24 23:36:41 thorpej Exp $	*/
+/*	$NetBSD: adb.c,v 1.36.8.1 2021/08/04 02:39:49 thorpej Exp $	*/
 
 /*-
  * Copyright (C) 1994	Bradley A. Grantham
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.36 2021/04/24 23:36:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.36.8.1 2021/08/04 02:39:49 thorpej Exp $");
 
 #include 
 #include 
@@ -150,7 +150,7 @@ adbattach(device_t parent, device_t self
 	aa_args.adbaddr = ADBADDR_APM;
 	aa_args.handler_id = ADBADDR_APM;
 
-	(void)config_found(self, _args, NULL, CFARG_EOL);
+	(void)config_found(self, _args, NULL, CFARGS_NONE);
 #endif
 
 	/* 
@@ -174,7 +174,7 @@ adbattach(device_t parent, device_t self
 	aa_args.origaddr = 0;
 	aa_args.adbaddr = 0;
 	aa_args.handler_id = 0;
-	(void)config_found(self, _args, adbprint, CFARG_EOL);
+	(void)config_found(self, _args, adbprint, CFARGS_NONE);
 #endif
 
 	/* for each ADB device */
@@ -186,7 +186,7 @@ adbattach(device_t parent, device_t self
 		aa_args.adbaddr = adbaddr;
 		aa_args.handler_id = adbdata.devType;
 
-		(void)config_found(self, _args, adbprint, CFARG_EOL);
+		(void)config_found(self, _args, adbprint, CFARGS_NONE);
 	}
 
 	if (adbHardware == ADB_HW_CUDA)

Index: src/sys/arch/macppc/dev/akbd.c
diff -u src/sys/arch/macppc/dev/akbd.c:1.46 src/sys/arch/macppc/dev/akbd.c:1.46.8.1
--- src/sys/arch/macppc/dev/akbd.c:1.46	Sat Apr 24 23:36:41 2021
+++ src/sys/arch/macppc/dev/akbd.c	Wed Aug  4 02:39:49 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: akbd.c,v 1.46 2021/04/24 23:36:41 thorpej Exp $	*/
+/*	$NetBSD: akbd.c,v 1.46.8.1 2021/08/04 02:39:49 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1998	Colin Wood
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.46 2021/04/24 23:36:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.46.8.1 2021/08/04 02:39:49 thorpej Exp $");
 
 #include 
 #include 
@@ -250,7 +250,7 @@ akbdattach(device_t parent, device_t sel
 	a.accessops = _accessops;
 	a.accesscookie = sc;
 
-	sc->sc_wskbddev = config_found(self, , wskbddevprint, CFARG_EOL);
+	sc->sc_wskbddev = config_found(self, , wskbddevprint, CFARGS_NONE);
 }
 
 

Index: src/sys/arch/macppc/dev/ams.c
diff -u src/sys/arch/macppc/dev/ams.c:1.30 src/sys/arch/macppc/dev/ams.c:1.30.8.1
--- src/sys/arch/macppc/dev/ams.c:1.30	Sat Apr 24 23:36:41 2021
+++ src/sys/arch/macppc/dev/ams.c	Wed Aug  4 02:39:49 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ams.c,v 1.30 2021/04/24 23:36:41 thorpej 

CVS commit: [thorpej-cfargs2] src/sys/arch

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 02:37:21 UTC 2021

Modified Files:
src/sys/arch/landisk/dev [thorpej-cfargs2]: obio.c
src/sys/arch/landisk/landisk [thorpej-cfargs2]: mainbus.c
src/sys/arch/luna68k/dev [thorpej-cfargs2]: lunafb.c lunaws.c sio.c
src/sys/arch/luna68k/luna68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/mac68k/dev [thorpej-cfargs2]: adb.c akbd.c ams.c
grf_subr.c macfb.c ncr5380.c zs.c
src/sys/arch/mac68k/mac68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/mac68k/nubus [thorpej-cfargs2]: nubus.c
src/sys/arch/mac68k/obio [thorpej-cfargs2]: iwm_fd.c obio.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/landisk/dev/obio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/landisk/landisk/mainbus.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/luna68k/dev/lunafb.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/luna68k/dev/lunaws.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/luna68k/dev/sio.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/luna68k/luna68k/mainbus.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/arch/mac68k/dev/adb.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/mac68k/dev/akbd.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mac68k/dev/ams.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/mac68k/dev/grf_subr.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/mac68k/dev/macfb.c
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/arch/mac68k/dev/ncr5380.c
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/arch/mac68k/dev/zs.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/mac68k/mac68k/mainbus.c
cvs rdiff -u -r1.67 -r1.67.8.1 src/sys/arch/mac68k/nubus/nubus.c
cvs rdiff -u -r1.60 -r1.60.4.1 src/sys/arch/mac68k/obio/iwm_fd.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/arch/mac68k/obio/obio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/landisk/dev/obio.c
diff -u src/sys/arch/landisk/dev/obio.c:1.10 src/sys/arch/landisk/dev/obio.c:1.10.8.1
--- src/sys/arch/landisk/dev/obio.c:1.10	Sat Apr 24 23:36:40 2021
+++ src/sys/arch/landisk/dev/obio.c	Wed Aug  4 02:37:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.10 2021/04/24 23:36:40 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.10.8.1 2021/08/04 02:37:20 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10.8.1 2021/08/04 02:37:20 thorpej Exp $");
 
 #include "btn_obio.h"
 #include "pwrsw_obio.h"
@@ -106,8 +106,7 @@ obio_attach(device_t parent, device_t se
 #endif
 
 	config_search(self, NULL,
-	CFARG_SEARCH, obio_search,
-	CFARG_EOL);
+	CFARGS(.search = obio_search));
 }
 
 static int
@@ -143,7 +142,7 @@ obio_search(device_t parent, cfdata_t cf
 
 		tryagain = 0;
 		if (config_probe(parent, cf, )) {
-			config_attach(parent, cf, , obio_print, CFARG_EOL);
+			config_attach(parent, cf, , obio_print, CFARGS_NONE);
 			tryagain = (cf->cf_fstate == FSTATE_STAR);
 		}
 	} while (tryagain);

Index: src/sys/arch/landisk/landisk/mainbus.c
diff -u src/sys/arch/landisk/landisk/mainbus.c:1.5 src/sys/arch/landisk/landisk/mainbus.c:1.5.8.1
--- src/sys/arch/landisk/landisk/mainbus.c:1.5	Sat Apr 24 23:36:40 2021
+++ src/sys/arch/landisk/landisk/mainbus.c	Wed Aug  4 02:37:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:40 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.5.8.1 2021/08/04 02:37:20 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5.8.1 2021/08/04 02:37:20 thorpej Exp $");
 
 #include "obio.h"
 #include "pci.h"
@@ -80,19 +80,19 @@ mainbus_attach(device_t parent, device_t
 	memset(, 0, sizeof(mba));
 	mba.mba_ca.ca_name = "cpu";
 	mba.mba_ca.ca_node = 0;
-	config_found(self, , mainbus_print, CFARG_EOL);
+	config_found(self, , mainbus_print, CFARGS_NONE);
 
 #if NPCI > 0
 	/* SH PCIC */
 	memset(, 0, sizeof(mba));
 	mba.mba_mba.ma_name = "shpcic";
-	config_found(self, , mainbus_print, CFARG_EOL);
+	config_found(self, , mainbus_print, CFARGS_NONE);
 #endif
 
 	/* SH bus */
 	memset(, 0, sizeof(mba));
 	mba.mba_mba.ma_name = "shb";
-	config_found(self, , mainbus_print, CFARG_EOL);
+	config_found(self, , mainbus_print, CFARGS_NONE);
 
 #if NOBIO > 0
 	/* on-board I/O */
@@ -100,7 +100,7 @@ mainbus_attach(device_t parent, device_t
 	mba.mba_oba.oba_busname = "obio";
 	mba.mba_oba.oba_iot = _bus_io;
 	mba.mba_oba.oba_memt = _bus_mem;
-	config_found(self, , mainbus_print, CFARG_EOL);
+	config_found(self, , mainbus_print, CFARGS_NONE);
 #endif
 }
 

Index: src/sys/arch/luna68k/dev/lunafb.c
diff -u src/sys/arch/luna68k/dev/lunafb.c:1.42 

CVS commit: [thorpej-cfargs2] src/sys/arch

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 02:35:50 UTC 2021

Modified Files:
src/sys/arch/ia64/ia64 [thorpej-cfargs2]: mainbus.c
src/sys/arch/ibmnws/ibmnws [thorpej-cfargs2]: mainbus.c
src/sys/arch/iyonix/iyonix [thorpej-cfargs2]: obio.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/ia64/ia64/mainbus.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/ibmnws/ibmnws/mainbus.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/iyonix/iyonix/obio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/ia64/mainbus.c
diff -u src/sys/arch/ia64/ia64/mainbus.c:1.12 src/sys/arch/ia64/ia64/mainbus.c:1.12.8.1
--- src/sys/arch/ia64/ia64/mainbus.c:1.12	Sat Apr 24 23:36:40 2021
+++ src/sys/arch/ia64/ia64/mainbus.c	Wed Aug  4 02:35:50 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:40 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 02:35:50 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 02:35:50 thorpej Exp $");
 
 #include "acpica.h"
 
@@ -108,8 +108,7 @@ mainbus_attach(device_t parent, device_t
 
 			if (entry->Header.Type == ACPI_MADT_TYPE_LOCAL_SAPIC)
 config_found(self, entry, NULL,
-CFARG_IATTR, "cpubus",
-CFARG_EOL);
+CFARGS(.iattr = "cpubus"));
 
 			p += entry->Header.Length;
 		}
@@ -129,8 +128,7 @@ mainbus_attach(device_t parent, device_t
 	aaa.aa_dmat = NULL;	/* XXX */
 	aaa.aa_dmat64 = NULL;	/* XXX */
 	config_found(self, , NULL,
-	CFARG_IATTR, "acpibus",
-	CFARG_EOL);
+	CFARGS(.iattr = "acpibus"));
 #endif
 
 	return;

Index: src/sys/arch/ibmnws/ibmnws/mainbus.c
diff -u src/sys/arch/ibmnws/ibmnws/mainbus.c:1.16 src/sys/arch/ibmnws/ibmnws/mainbus.c:1.16.8.1
--- src/sys/arch/ibmnws/ibmnws/mainbus.c:1.16	Sat Apr 24 23:36:40 2021
+++ src/sys/arch/ibmnws/ibmnws/mainbus.c	Wed Aug  4 02:35:50 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.16 2021/04/24 23:36:40 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.16.8.1 2021/08/04 02:35:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -108,8 +108,7 @@ mainbus_attach(device_t parent, device_t
 	ca.ca_name = "cpu";
 	ca.ca_node = 0;
 	config_found(self, , mainbus_print,
-	CFARG_IATTR, "mainbus",
-	CFARG_EOL);
+	CFARGS(.iattr = "mainbus"));
 
 #if NOBIO > 0
 	obio_reserve_resource_map();
@@ -148,8 +147,7 @@ mainbus_attach(device_t parent, device_t
 	mba.mba_pba.pba_bridgetag = NULL;
 	mba.mba_pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 	config_found(self, _pba, pcibusprint,
-	CFARG_IATTR, "pcibus",
-	CFARG_EOL);
+	CFARGS(.iattr = "pcibus"));
 #endif
 
 #if NOBIO > 0
@@ -162,8 +160,7 @@ mainbus_attach(device_t parent, device_t
 		mba.mba_pba.pba_iot = _io_space_tag;
 		mba.mba_pba.pba_memt = _mem_space_tag;
 		config_found(self, _pba, mainbus_print,
-		CFARG_IATTR, "mainbus",
-		CFARG_EOL);
+		CFARGS(.iattr = "mainbus"));
 	}
 #endif
 #endif

Index: src/sys/arch/iyonix/iyonix/obio.c
diff -u src/sys/arch/iyonix/iyonix/obio.c:1.7 src/sys/arch/iyonix/iyonix/obio.c:1.7.8.1
--- src/sys/arch/iyonix/iyonix/obio.c:1.7	Sat Apr 24 23:36:40 2021
+++ src/sys/arch/iyonix/iyonix/obio.c	Wed Aug  4 02:35:50 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.7 2021/04/24 23:36:40 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.7.8.1 2021/08/04 02:35:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.7 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.7.8.1 2021/08/04 02:35:50 thorpej Exp $");
 
 #include 
 #include 
@@ -103,8 +103,7 @@ obio_attach(device_t parent, device_t se
 	 * configuration file.
 	 */
 	config_search(self, NULL,
-	CFARG_SEARCH, obio_search,
-	CFARG_EOL);
+	CFARGS(.search = obio_search));
 }
 
 int
@@ -140,7 +139,7 @@ obio_search(device_t parent, cfdata_t cf
 		oba.oba_irq = -1;
 
 	if (config_probe(parent, cf, ))
-		config_attach(parent, cf, , obio_print, CFARG_EOL);
+		config_attach(parent, cf, , obio_print, CFARGS_NONE);
 
 	return (0);
 }

CVS commit: [thorpej-cfargs2] src/sys/arch/i386

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 01:21:27 UTC 2021

Modified Files:
src/sys/arch/i386/i386 [thorpej-cfargs2]: i386_mainbus.c
src/sys/arch/i386/isa [thorpej-cfargs2]: lms.c mms.c
src/sys/arch/i386/pci [thorpej-cfargs2]: elan520.c gcscehci.c geode.c
gscpcib.c pceb.c pcmb.c viapcib.c
src/sys/arch/i386/pnpbios [thorpej-cfargs2]: pnpbios.c wss_pnpbios.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/i386/i386/i386_mainbus.c
cvs rdiff -u -r1.57 -r1.57.8.1 src/sys/arch/i386/isa/lms.c
cvs rdiff -u -r1.54 -r1.54.8.1 src/sys/arch/i386/isa/mms.c
cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/arch/i386/pci/elan520.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/i386/pci/gcscehci.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/i386/pci/geode.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/i386/pci/gscpcib.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/i386/pci/pceb.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/i386/pci/pcmb.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/i386/pci/viapcib.c
cvs rdiff -u -r1.76 -r1.76.8.1 src/sys/arch/i386/pnpbios/pnpbios.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/i386/pnpbios/wss_pnpbios.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/i386/i386/i386_mainbus.c
diff -u src/sys/arch/i386/i386/i386_mainbus.c:1.5 src/sys/arch/i386/i386/i386_mainbus.c:1.5.8.1
--- src/sys/arch/i386/i386/i386_mainbus.c:1.5	Sat Apr 24 23:36:39 2021
+++ src/sys/arch/i386/i386/i386_mainbus.c	Wed Aug  4 01:21:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i386_mainbus.c,v 1.5 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: i386_mainbus.c,v 1.5.8.1 2021/08/04 01:21:26 thorpej Exp $	*/
 /*	NetBSD: mainbus.c,v 1.104 2018/12/02 08:19:44 cherry Exp 	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: i386_mainbus.c,v 1.5 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i386_mainbus.c,v 1.5.8.1 2021/08/04 01:21:26 thorpej Exp $");
 
 #include 
 #include 
@@ -230,8 +230,7 @@ i386_mainbus_attach(device_t parent, dev
 		mba.mba_eba.eba_dmat = _bus_dma_tag;
 #endif
 		config_found(self, _eba, eisabusprint,
-		CFARG_IATTR, "eisabus",
-		CFARG_EOL);
+		CFARGS(.iattr = "eisabus"));
 	}
 
 #if NISA > 0
@@ -240,8 +239,7 @@ i386_mainbus_attach(device_t parent, dev
 		mba.mba_iba.iba_iot = x86_bus_space_io;
 		mba.mba_iba.iba_memt = x86_bus_space_mem;
 		config_found(self, _iba, isabusprint,
-		CFARG_IATTR, "isabus",
-		CFARG_EOL);
+		CFARGS(.iattr = "isabus"));
 	}
 #endif
 
@@ -272,8 +270,7 @@ i386_mainbus_rescan(device_t self, const
 		mba.mba_acpi.aa_dmat = _bus_dma_tag;
 		mba.mba_acpi.aa_dmat64 = NULL;
 		sc->sc_acpi = config_found(self, _acpi, NULL,
-		CFARG_IATTR, "acpibus",
-		CFARG_EOL);
+		CFARGS(.iattr = "acpibus"));
 #if 0 /* XXXJRT not yet */
 		if (acpi_active) {
 			/*
@@ -294,8 +291,7 @@ i386_mainbus_rescan(device_t self, const
 		if (pnpbios_probe()) {
 			mba.mba_paa.paa_ic = _isa_chipset;
 			sc->sc_pnpbios = config_found(self, _paa, NULL,
-			CFARG_IATTR, "pnpbiosbus",
-			CFARG_EOL);
+			CFARGS(.iattr = "pnpbiosbus"));
 		}
 #endif
 	}
@@ -307,8 +303,7 @@ i386_mainbus_rescan(device_t self, const
 		mba.mba_ipmi.iaa_memt = x86_bus_space_mem;
 		if (ipmi_probe(_ipmi)) {
 			sc->sc_ipmi = config_found(self, _ipmi, NULL,
-			CFARG_IATTR, "ipmibus",
-			CFARG_EOL);
+			CFARGS(.iattr = "ipmibus"));
 		}
 #endif
 	}
@@ -352,8 +347,7 @@ i386_mainbus_rescan(device_t self, const
 		if (npcibus == 0 && sc->sc_pci == NULL) {
 			sc->sc_pci =
 			config_found(self, _pba, pcibusprint,
-			CFARG_IATTR, "pcibus",
-			CFARG_EOL);
+	 CFARGS(.iattr = "pcibus"));
 		}
 #if NACPICA > 0
 		if (mp_verbose)
@@ -374,8 +368,7 @@ i386_mainbus_rescan(device_t self, const
 			mba.mba_mba.mba_bus = 0;
 			sc->sc_mca = config_found(self,
 			_mba, mcabusprint,
-			CFARG_IATTR, "mcabus",
-			CFARG_EOL);
+			CFARGS(.iattr = "mcabus"));
 		}
 #endif
 	}

Index: src/sys/arch/i386/isa/lms.c
diff -u src/sys/arch/i386/isa/lms.c:1.57 src/sys/arch/i386/isa/lms.c:1.57.8.1
--- src/sys/arch/i386/isa/lms.c:1.57	Sat Apr 24 23:36:39 2021
+++ src/sys/arch/i386/isa/lms.c	Wed Aug  4 01:21:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: lms.c,v 1.57 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: lms.c,v 1.57.8.1 2021/08/04 01:21:27 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -24,7 +24,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.57 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.57.8.1 2021/08/04 01:21:27 thorpej Exp $");
 
 #include 
 #include 
@@ -166,7 +166,7 @@ lmsattach(device_t parent, device_t self
 	 * here or in psmintr, because if this fails lms_enable() will
 	 * never be called, so lmsintr() will never be called.
 	 */
-	

CVS commit: [thorpej-cfargs2] src/sys/arch

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 01:08:48 UTC 2021

Modified Files:
src/sys/arch/hpcarm/dev [thorpej-cfargs2]: epsonlcd.c ipaq_atmelgpio.c
ipaq_lcd.c ipaq_pcic.c ipaq_saip.c j720kbd.c j720pwr.c j720ssp.c
j720tp.c nbpiic.c nbpkbd.c nbppcon.c sacc_hpcarm.c sed_saip.c
uda1341.c wzero3_kbd.c wzero3_keypad.c wzero3_lcd.c wzero3_tp.c
src/sys/arch/hpcmips/dev [thorpej-cfargs2]: it8368.c ite8181.c
m38813c.c mq200.c optpoint.c plum.c plumiobus.c plumohci.c
plumpcmcia.c plumvideo.c tc5165buf.c ucb1200.c ucbtp.c
src/sys/arch/hpcmips/hpcmips [thorpej-cfargs2]: mainbus.c
src/sys/arch/hpcmips/isa [thorpej-cfargs2]: isa_machdep.c
plumisa_machdep.c
src/sys/arch/hpcmips/tx [thorpej-cfargs2]: tx3912video.c tx39biu.c
tx39sib.c tx39spi.c tx39uart.c txcom.c txcsbus.c txioman.c txsim.c
src/sys/arch/hpcmips/vr [thorpej-cfargs2]: vr4181giu.c vrc4172gpio.c
vrc4172pci.c vrc4173bcu.c vrdsiu_mouse.c vrgiu.c vrip.c vrkiu.c
vrpciu.c vrpiu.c
src/sys/arch/hpcsh/dev [thorpej-cfargs2]: j6x0tp.c pfckbd.c psh3tp.c
src/sys/arch/hpcsh/dev/hd64461 [thorpej-cfargs2]: hd64461.c
hd64461pcmcia.c hd64461video.c
src/sys/arch/hpcsh/dev/hd64465 [thorpej-cfargs2]: hd64465.c
hd64465pcmcia.c
src/sys/arch/hpcsh/hpcsh [thorpej-cfargs2]: mainbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/hpcarm/dev/epsonlcd.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/hpcarm/dev/ipaq_lcd.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/hpcarm/dev/ipaq_pcic.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/hpcarm/dev/ipaq_saip.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/hpcarm/dev/j720kbd.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/hpcarm/dev/j720pwr.c \
src/sys/arch/hpcarm/dev/wzero3_lcd.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/hpcarm/dev/j720ssp.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/hpcarm/dev/j720tp.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/hpcarm/dev/nbpiic.c \
src/sys/arch/hpcarm/dev/nbppcon.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/hpcarm/dev/nbpkbd.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/hpcarm/dev/sacc_hpcarm.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/hpcarm/dev/sed_saip.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/hpcarm/dev/uda1341.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/hpcarm/dev/wzero3_kbd.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/hpcarm/dev/wzero3_keypad.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/hpcarm/dev/wzero3_tp.c
cvs rdiff -u -r1.26 -r1.26.6.1 src/sys/arch/hpcmips/dev/it8368.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/hpcmips/dev/ite8181.c \
src/sys/arch/hpcmips/dev/plumpcmcia.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/hpcmips/dev/m38813c.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/hpcmips/dev/mq200.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/hpcmips/dev/optpoint.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/hpcmips/dev/plum.c \
src/sys/arch/hpcmips/dev/tc5165buf.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/hpcmips/dev/plumiobus.c \
src/sys/arch/hpcmips/dev/plumohci.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/hpcmips/dev/plumvideo.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/hpcmips/dev/ucb1200.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/hpcmips/dev/ucbtp.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/hpcmips/hpcmips/mainbus.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/arch/hpcmips/isa/isa_machdep.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/hpcmips/isa/plumisa_machdep.c
cvs rdiff -u -r1.46 -r1.46.8.1 src/sys/arch/hpcmips/tx/tx3912video.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/hpcmips/tx/tx39biu.c \
src/sys/arch/hpcmips/tx/tx39uart.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/hpcmips/tx/tx39sib.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/hpcmips/tx/tx39spi.c
cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/arch/hpcmips/tx/txcom.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/hpcmips/tx/txcsbus.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/hpcmips/tx/txioman.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/hpcmips/tx/txsim.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/hpcmips/vr/vr4181giu.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/hpcmips/vr/vrc4172gpio.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/hpcmips/vr/vrc4172pci.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/hpcmips/vr/vrc4173bcu.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/hpcmips/vr/vrdsiu_mouse.c
cvs rdiff -u -r1.46 -r1.46.4.1 src/sys/arch/hpcmips/vr/vrgiu.c
cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/arch/hpcmips/vr/vrip.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/arch/hpcmips/vr/vrkiu.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/hpcmips/vr/vrpciu.c
cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/arch/hpcmips/vr/vrpiu.c
cvs rdiff -u -r1.24 -r1.24.8.1 

CVS commit: [thorpej-cfargs2] src/sys/arch/hppa

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 01:03:37 UTC 2021

Modified Files:
src/sys/arch/hppa/dev [thorpej-cfargs2]: asp.c astro.c dino.c elroy.c
gecko.c lasi.c mongoose.c phantomas.c ssio.c uturn.c wax.c
src/sys/arch/hppa/gsc [thorpej-cfargs2]: gscbus.c
src/sys/arch/hppa/hppa [thorpej-cfargs2]: mainbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/hppa/dev/asp.c \
src/sys/arch/hppa/dev/astro.c src/sys/arch/hppa/dev/elroy.c \
src/sys/arch/hppa/dev/wax.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/hppa/dev/dino.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/hppa/dev/gecko.c \
src/sys/arch/hppa/dev/phantomas.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/hppa/dev/lasi.c \
src/sys/arch/hppa/dev/uturn.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/hppa/dev/mongoose.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/hppa/dev/ssio.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/hppa/gsc/gscbus.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/hppa/hppa/mainbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hppa/dev/asp.c
diff -u src/sys/arch/hppa/dev/asp.c:1.3 src/sys/arch/hppa/dev/asp.c:1.3.8.1
--- src/sys/arch/hppa/dev/asp.c:1.3	Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/asp.c	Wed Aug  4 01:03:37 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: asp.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: asp.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $	*/
 
 /*	$OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $	*/
 
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $");
 
 #include 
 #include 
@@ -275,5 +275,5 @@ aspattach(device_t parent, device_t self
 	ga.ga_fix_args = asp_fix_args;
 	ga.ga_fix_args_cookie = sc;
 	ga.ga_scsi_target = sc->sc_trs->asp_scsi;
-	config_found(self, , gscprint, CFARG_EOL);
+	config_found(self, , gscprint, CFARGS_NONE);
 }
Index: src/sys/arch/hppa/dev/astro.c
diff -u src/sys/arch/hppa/dev/astro.c:1.3 src/sys/arch/hppa/dev/astro.c:1.3.8.1
--- src/sys/arch/hppa/dev/astro.c:1.3	Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/astro.c	Wed Aug  4 01:03:37 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: astro.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: astro.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $	*/
 
 /*	$OpenBSD: astro.c,v 1.8 2007/10/06 23:50:54 krw Exp $	*/
 
@@ -345,8 +345,7 @@ astro_callback(device_t self, struct con
 {
 
 	return config_found(self, ca, mbprint,
-	CFARG_SUBMATCH, mbsubmatch,
-	CFARG_EOL);
+	CFARGS(.submatch = mbsubmatch));
 }
 
 int
Index: src/sys/arch/hppa/dev/elroy.c
diff -u src/sys/arch/hppa/dev/elroy.c:1.3 src/sys/arch/hppa/dev/elroy.c:1.3.8.1
--- src/sys/arch/hppa/dev/elroy.c:1.3	Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/elroy.c	Wed Aug  4 01:03:37 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: elroy.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: elroy.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $	*/
 
 /*	$OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $	*/
 
@@ -1313,5 +1313,5 @@ le64toh(r->eio_base), le64toh(r->eio_mas
 	pba.pba_bus = 0; /* (le32toh(elroy_read32(>busnum)) & 0xff) >> 4; */
  	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 
-	config_found(self, , pcibusprint, CFARG_EOL);
+	config_found(self, , pcibusprint, CFARGS_NONE);
 }
Index: src/sys/arch/hppa/dev/wax.c
diff -u src/sys/arch/hppa/dev/wax.c:1.3 src/sys/arch/hppa/dev/wax.c:1.3.8.1
--- src/sys/arch/hppa/dev/wax.c:1.3	Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/wax.c	Wed Aug  4 01:03:37 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: wax.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: wax.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $	*/
 
 /*	$OpenBSD: wax.c,v 1.1 1998/11/23 03:04:10 mickey Exp $	*/
 
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $");
 
 #include 
 #include 
@@ -166,5 +166,5 @@ waxattach(device_t parent, device_t self
 	ga.ga_fix_args = wax_fix_args;
 	ga.ga_fix_args_cookie = sc;
 	ga.ga_scsi_target = 7; /* XXX */
-	config_found(self, , gscprint, CFARG_EOL);
+	config_found(self, , gscprint, CFARGS_NONE);
 }

Index: src/sys/arch/hppa/dev/dino.c
diff -u src/sys/arch/hppa/dev/dino.c:1.11 src/sys/arch/hppa/dev/dino.c:1.11.8.1
--- src/sys/arch/hppa/dev/dino.c:1.11	Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/dino.c	Wed Aug  4 01:03:37 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: dino.c,v 1.11 2021/04/24 23:36:39 thorpej Exp $ */
+/*	$NetBSD: dino.c,v 1.11.8.1 2021/08/04 01:03:37 thorpej Exp $ */
 
 /*	$OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $	*/
 
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: 

CVS commit: [thorpej-cfargs2] src/sys/arch/hp300

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 01:02:36 UTC 2021

Modified Files:
src/sys/arch/hp300/dev [thorpej-cfargs2]: dio.c diofb.c dnkbd.c fhpib.c
frodo.c hpib.c intio.c nhpib.c sgc.c sti_sgc.c
src/sys/arch/hp300/hp300 [thorpej-cfargs2]: autoconf.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/arch/hp300/dev/dio.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/hp300/dev/diofb.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/hp300/dev/dnkbd.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/hp300/dev/fhpib.c \
src/sys/arch/hp300/dev/nhpib.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/hp300/dev/frodo.c
cvs rdiff -u -r1.43 -r1.43.2.1 src/sys/arch/hp300/dev/hpib.c
cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/arch/hp300/dev/intio.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/hp300/dev/sgc.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/hp300/dev/sti_sgc.c
cvs rdiff -u -r1.109 -r1.109.8.1 src/sys/arch/hp300/hp300/autoconf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hp300/dev/dio.c
diff -u src/sys/arch/hp300/dev/dio.c:1.40 src/sys/arch/hp300/dev/dio.c:1.40.8.1
--- src/sys/arch/hp300/dev/dio.c:1.40	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/hp300/dev/dio.c	Wed Aug  4 01:02:36 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: dio.c,v 1.40 2021/04/24 23:36:37 thorpej Exp $	*/
+/*	$NetBSD: dio.c,v 1.40.8.1 2021/08/04 01:02:36 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.40 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.40.8.1 2021/08/04 01:02:36 thorpej Exp $");
 
 #define	_HP300_INTR_H_PRIVATE
 
@@ -155,8 +155,7 @@ dioattach(device_t parent, device_t self
 
 		/* Attach matching device. */
 		config_found(self, , dioprint,
-		CFARG_SUBMATCH, diosubmatch,
-		CFARG_EOL);
+		CFARGS(.submatch = diosubmatch));
 		scode += scodesize;
 	}
 }

Index: src/sys/arch/hp300/dev/diofb.c
diff -u src/sys/arch/hp300/dev/diofb.c:1.6 src/sys/arch/hp300/dev/diofb.c:1.6.8.1
--- src/sys/arch/hp300/dev/diofb.c:1.6	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/hp300/dev/diofb.c	Wed Aug  4 01:02:36 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: diofb.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $	*/
+/*	$NetBSD: diofb.c,v 1.6.8.1 2021/08/04 01:02:36 thorpej Exp $	*/
 /*	$OpenBSD: diofb.c,v 1.18 2010/12/26 15:40:59 miod Exp $	*/
 
 /*
@@ -334,7 +334,7 @@ diofb_end_attach(device_t self, struct w
 	waa.accessops = accessops;
 	waa.accesscookie = fb;
 
-	config_found(self, , wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, , wsemuldisplaydevprint, CFARGS_NONE);
 }
 
 /*

Index: src/sys/arch/hp300/dev/dnkbd.c
diff -u src/sys/arch/hp300/dev/dnkbd.c:1.12 src/sys/arch/hp300/dev/dnkbd.c:1.12.8.1
--- src/sys/arch/hp300/dev/dnkbd.c:1.12	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/hp300/dev/dnkbd.c	Wed Aug  4 01:02:36 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: dnkbd.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $	*/
+/*	$NetBSD: dnkbd.c,v 1.12.8.1 2021/08/04 01:02:36 thorpej Exp $	*/
 /*	$OpenBSD: dnkbd.c,v 1.17 2009/07/23 21:05:56 blambert Exp $	*/
 
 /*
@@ -391,16 +391,14 @@ dnkbd_attach_subdevices(struct dnkbd_sof
 	}
 
 	sc->sc_wskbddev = config_found(sc->sc_dev, , wskbddevprint,
-	CFARG_IATTR, "wskbddev",
-	CFARG_EOL);
+	CFARGS(.iattr = "wskbddev"));
 
 #if NWSMOUSE > 0
 	ma.accessops = _accessops;
 	ma.accesscookie = sc;
 
 	sc->sc_wsmousedev = config_found(sc->sc_dev, , wsmousedevprint,
-	CFARG_IATTR, "wsmousedev",
-	CFARG_EOL);
+	CFARGS(.iattr = "wsmousedev"));
 #endif
 
 	SET(sc->sc_flags, SF_ATTACHED);

Index: src/sys/arch/hp300/dev/fhpib.c
diff -u src/sys/arch/hp300/dev/fhpib.c:1.42 src/sys/arch/hp300/dev/fhpib.c:1.42.8.1
--- src/sys/arch/hp300/dev/fhpib.c:1.42	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/hp300/dev/fhpib.c	Wed Aug  4 01:02:36 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fhpib.c,v 1.42 2021/04/24 23:36:37 thorpej Exp $	*/
+/*	$NetBSD: fhpib.c,v 1.42.8.1 2021/08/04 01:02:36 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fhpib.c,v 1.42 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fhpib.c,v 1.42.8.1 2021/08/04 01:02:36 thorpej Exp $");
 
 #include 
 #include 
@@ -186,7 +186,7 @@ fhpibattach(device_t parent, device_t se
 	ha.ha_type = HPIBC;			/* XXX */
 	ha.ha_ba = HPIBC_BA;
 	ha.ha_softcpp = >sc_hpibbus;	/* XXX */
-	(void)config_found(self, , hpibdevprint, CFARG_EOL);
+	(void)config_found(self, , hpibdevprint, CFARGS_NONE);
 }
 
 static void
Index: src/sys/arch/hp300/dev/nhpib.c
diff -u src/sys/arch/hp300/dev/nhpib.c:1.42 src/sys/arch/hp300/dev/nhpib.c:1.42.8.1
--- src/sys/arch/hp300/dev/nhpib.c:1.42	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/hp300/dev/nhpib.c	Wed Aug  4 01:02:36 2021
@@ 

CVS commit: [thorpej-cfargs2] src/sys/arch/ews4800mips

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 01:01:42 UTC 2021

Modified Files:
src/sys/arch/ews4800mips/dev [thorpej-cfargs2]: ewskbd.c ewsms.c
src/sys/arch/ews4800mips/ews4800mips [thorpej-cfargs2]: mainbus.c
src/sys/arch/ews4800mips/sbd [thorpej-cfargs2]: fb_sbdio.c kbms_sbdio.c
sbdio.c zs_sbdio.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/ews4800mips/dev/ewskbd.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/ews4800mips/dev/ewsms.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/ews4800mips/ews4800mips/mainbus.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/ews4800mips/sbd/fb_sbdio.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/ews4800mips/sbd/kbms_sbdio.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/ews4800mips/sbd/sbdio.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/ews4800mips/sbd/zs_sbdio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ews4800mips/dev/ewskbd.c
diff -u src/sys/arch/ews4800mips/dev/ewskbd.c:1.12 src/sys/arch/ews4800mips/dev/ewskbd.c:1.12.8.1
--- src/sys/arch/ews4800mips/dev/ewskbd.c:1.12	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/ews4800mips/dev/ewskbd.c	Wed Aug  4 01:01:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ewskbd.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $	*/
+/*	$NetBSD: ewskbd.c,v 1.12.8.1 2021/08/04 01:01:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2005 Izumi Tsutsui.  All rights reserved.
@@ -59,7 +59,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ewskbd.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ewskbd.c,v 1.12.8.1 2021/08/04 01:01:41 thorpej Exp $");
 
 #include 
 #include 
@@ -251,7 +251,7 @@ ewskbd_zsc_attach(device_t parent, devic
 	wskaa.accessops = _wskbd_accessops;
 	wskaa.accesscookie = cs;
 	sc->sc_dc->wskbddev = config_found(self, , wskbddevprint,
-	CFARG_EOL);
+	CFARGS_NONE);
 }
 
 static int

Index: src/sys/arch/ews4800mips/dev/ewsms.c
diff -u src/sys/arch/ews4800mips/dev/ewsms.c:1.9 src/sys/arch/ews4800mips/dev/ewsms.c:1.9.8.1
--- src/sys/arch/ews4800mips/dev/ewsms.c:1.9	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/ews4800mips/dev/ewsms.c	Wed Aug  4 01:01:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ewsms.c,v 1.9 2021/04/24 23:36:37 thorpej Exp $	*/
+/*	$NetBSD: ewsms.c,v 1.9.8.1 2021/08/04 01:01:41 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2004 Steve Rumble
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ewsms.c,v 1.9 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ewsms.c,v 1.9.8.1 2021/08/04 01:01:41 thorpej Exp $");
 
 #include 
 #include 
@@ -184,7 +184,7 @@ ewsms_zsc_attach(device_t parent, device
 	wsmaa.accessops = _wsmouse_accessops;
 	wsmaa.accesscookie = sc;
 	sc->sc_wsmousedev = config_found(self, , wsmousedevprint,
-	CFARG_EOL);
+	CFARGS_NONE);
 }
 
 int

Index: src/sys/arch/ews4800mips/ews4800mips/mainbus.c
diff -u src/sys/arch/ews4800mips/ews4800mips/mainbus.c:1.6 src/sys/arch/ews4800mips/ews4800mips/mainbus.c:1.6.8.1
--- src/sys/arch/ews4800mips/ews4800mips/mainbus.c:1.6	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/ews4800mips/ews4800mips/mainbus.c	Wed Aug  4 01:01:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 01:01:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 01:01:41 thorpej Exp $");
 
 #include 
 #include 
@@ -66,13 +66,13 @@ mainbus_attach(device_t parent, device_t
 
 	/* CPU  */
 	ma.ma_name = "cpu";
-	config_found(self, , mainbus_print, CFARG_EOL);
+	config_found(self, , mainbus_print, CFARGS_NONE);
 
 	/* System Board dependent device busses */
 	if (platform.mainbusdevs != NULL) {
 		for (p = platform.mainbusdevs; *p != NULL; p++) {
 			ma.ma_name = *p;
-			config_found(self, , mainbus_print, CFARG_EOL);
+			config_found(self, , mainbus_print, CFARGS_NONE);
 		}
 	}
 }

Index: src/sys/arch/ews4800mips/sbd/fb_sbdio.c
diff -u src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.19 src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.19.8.1
--- src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.19	Sat Apr 24 23:36:37 2021
+++ src/sys/arch/ews4800mips/sbd/fb_sbdio.c	Wed Aug  4 01:01:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fb_sbdio.c,v 1.19 2021/04/24 23:36:37 thorpej Exp $	*/
+/*	$NetBSD: fb_sbdio.c,v 1.19.8.1 2021/08/04 01:01:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #define WIRED_FB_TLB
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.19 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.19.8.1 2021/08/04 01:01:41 thorpej Exp $");
 
 #include 
 #include 
@@ -163,7 +163,7 @@ 

CVS commit: [thorpej-cfargs2] src/sys/arch/epoc32

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 00:02:33 UTC 2021

Modified Files:
src/sys/arch/epoc32/dev [thorpej-cfargs2]: epockbd.c etna.c
src/sys/arch/epoc32/epoc32 [thorpej-cfargs2]: external.c internal.c
src/sys/arch/epoc32/windermere [thorpej-cfargs2]: windermere.c wmlcd.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/epoc32/dev/epockbd.c \
src/sys/arch/epoc32/dev/etna.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/epoc32/epoc32/external.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/epoc32/epoc32/internal.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/epoc32/windermere/windermere.c \
src/sys/arch/epoc32/windermere/wmlcd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/epoc32/dev/epockbd.c
diff -u src/sys/arch/epoc32/dev/epockbd.c:1.4 src/sys/arch/epoc32/dev/epockbd.c:1.4.8.1
--- src/sys/arch/epoc32/dev/epockbd.c:1.4	Sat Apr 24 23:36:32 2021
+++ src/sys/arch/epoc32/dev/epockbd.c	Wed Aug  4 00:02:33 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: epockbd.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $	*/
+/*	$NetBSD: epockbd.c,v 1.4.8.1 2021/08/04 00:02:33 thorpej Exp $	*/
 /*
  * Copyright (c) 2013 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: epockbd.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epockbd.c,v 1.4.8.1 2021/08/04 00:02:33 thorpej Exp $");
 
 #include 
 #include 
@@ -101,7 +101,7 @@ epockbd_attach(struct epockbd_softc *sc)
 	aa.accessops = _accessops;
 	aa.accesscookie = sc;
 	sc->sc_wskbddev = config_found(sc->sc_dev, , wskbddevprint,
-	CFARG_EOL);
+	CFARGS_NONE);
 }
 
 /*
Index: src/sys/arch/epoc32/dev/etna.c
diff -u src/sys/arch/epoc32/dev/etna.c:1.4 src/sys/arch/epoc32/dev/etna.c:1.4.8.1
--- src/sys/arch/epoc32/dev/etna.c:1.4	Sat Apr 24 23:36:32 2021
+++ src/sys/arch/epoc32/dev/etna.c	Wed Aug  4 00:02:33 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: etna.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $	*/
+/*	$NetBSD: etna.c,v 1.4.8.1 2021/08/04 00:02:33 thorpej Exp $	*/
 /*
  * Copyright (c) 2012 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: etna.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: etna.c,v 1.4.8.1 2021/08/04 00:02:33 thorpej Exp $");
 
 #include 
 #include 
@@ -201,7 +201,7 @@ etna_attach(device_t parent, device_t se
 	paa.paa_busname = "pcmcia";
 	paa.pct = _pcmcia_functions;
 	paa.pch = sc;
-	sc->sc_pcmcia = config_found(self, , NULL, CFARG_EOL);
+	sc->sc_pcmcia = config_found(self, , NULL, CFARGS_NONE);
 
 	config_interrupts(self, etna_doattach);
 }

Index: src/sys/arch/epoc32/epoc32/external.c
diff -u src/sys/arch/epoc32/epoc32/external.c:1.3 src/sys/arch/epoc32/epoc32/external.c:1.3.8.1
--- src/sys/arch/epoc32/epoc32/external.c:1.3	Sat Apr 24 23:36:32 2021
+++ src/sys/arch/epoc32/epoc32/external.c	Wed Aug  4 00:02:33 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: external.c,v 1.3 2021/04/24 23:36:32 thorpej Exp $	*/
+/*	$NetBSD: external.c,v 1.3.8.1 2021/08/04 00:02:33 thorpej Exp $	*/
 /*
  * Copyright (c) 2012, 2013 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: external.c,v 1.3 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: external.c,v 1.3.8.1 2021/08/04 00:02:33 thorpej Exp $");
 
 #include 
 #include 
@@ -65,8 +65,7 @@ external_attach(device_t parent, device_
 	aprint_normal("\n");
 
 	config_search(self, NULL,
-	CFARG_SEARCH, external_search,
-	CFARG_EOL);
+	CFARGS(.search = external_search));
 }
 
 /* ARGSUSED */
@@ -81,7 +80,7 @@ external_search(device_t parent, cfdata_
 	aa.addr2 = cf->cf_loc[EXTERNALCF_ADDR2];
 	aa.irq = cf->cf_loc[EXTERNALCF_IRQ];
 	if (config_probe(parent, cf, ))
-		config_attach(parent, cf, , external_print, CFARG_EOL);
+		config_attach(parent, cf, , external_print, CFARGS_NONE);
 
 	return 0;
 }

Index: src/sys/arch/epoc32/epoc32/internal.c
diff -u src/sys/arch/epoc32/epoc32/internal.c:1.2 src/sys/arch/epoc32/epoc32/internal.c:1.2.8.1
--- src/sys/arch/epoc32/epoc32/internal.c:1.2	Sat Apr 24 23:36:32 2021
+++ src/sys/arch/epoc32/epoc32/internal.c	Wed Aug  4 00:02:33 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: internal.c,v 1.2 2021/04/24 23:36:32 thorpej Exp $	*/
+/*	$NetBSD: internal.c,v 1.2.8.1 2021/08/04 00:02:33 thorpej Exp $	*/
 /*
  * Copyright (c) 2012 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: internal.c,v 1.2 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: internal.c,v 1.2.8.1 2021/08/04 00:02:33 thorpej Exp $");
 
 #include 
 #include 
@@ -56,8 +56,7 @@ internal_attach(device_t parent, device_
 	aprint_normal("\n");
 
 	config_search(self, aux,
-	CFARG_SEARCH, internal_search,
-	

CVS commit: [thorpej-cfargs2] src/sys/arch/emips

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 00:01:52 UTC 2021

Modified Files:
src/sys/arch/emips/ebus [thorpej-cfargs2]: ebus.c gpio_ebus.c
src/sys/arch/emips/emips [thorpej-cfargs2]: mainbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/emips/ebus/ebus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/emips/ebus/gpio_ebus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/emips/emips/mainbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/emips/ebus/ebus.c
diff -u src/sys/arch/emips/ebus/ebus.c:1.3 src/sys/arch/emips/ebus/ebus.c:1.3.8.1
--- src/sys/arch/emips/ebus/ebus.c:1.3	Sat Apr 24 23:36:31 2021
+++ src/sys/arch/emips/ebus/ebus.c	Wed Aug  4 00:01:51 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ebus.c,v 1.3 2021/04/24 23:36:31 thorpej Exp $	*/
+/*	$NetBSD: ebus.c,v 1.3.8.1 2021/08/04 00:01:51 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.3 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.3.8.1 2021/08/04 00:01:51 thorpej Exp $");
 
 #include 
 #include 
@@ -83,9 +83,8 @@ ebusattach(device_t parent, device_t sel
 		locs[EBUSCF_ADDR] = ia->ia_paddr;
 
 		if (config_found(self, ia, ebusprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL) == NULL) {
+ CFARGS(.submatch = config_stdsubmatch,
+	.locators = locs)) == NULL) {
 			/* do we need to say anything? */
 			if (ia->ia_basz != 0) {
 mips_unmap_physmem((vaddr_t)ia->ia_vaddr,

Index: src/sys/arch/emips/ebus/gpio_ebus.c
diff -u src/sys/arch/emips/ebus/gpio_ebus.c:1.4 src/sys/arch/emips/ebus/gpio_ebus.c:1.4.8.1
--- src/sys/arch/emips/ebus/gpio_ebus.c:1.4	Sat Apr 24 23:36:31 2021
+++ src/sys/arch/emips/ebus/gpio_ebus.c	Wed Aug  4 00:01:51 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gpio_ebus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $	*/
+/*	$NetBSD: gpio_ebus.c,v 1.4.8.1 2021/08/04 00:01:51 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gpio_ebus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio_ebus.c,v 1.4.8.1 2021/08/04 00:01:51 thorpej Exp $");
 
 #include 
 #include 
@@ -124,7 +124,7 @@ epio_ebus_attach(device_t parent, device
 	gba.gba_npins = GPIO_NPINS;
 
 	/* Attach GPIO framework */
-	(void)config_found(self, , gpiobus_print, CFARG_EOL);
+	(void)config_found(self, , gpiobus_print, CFARGS_NONE);
 }
 
 static int

Index: src/sys/arch/emips/emips/mainbus.c
diff -u src/sys/arch/emips/emips/mainbus.c:1.4 src/sys/arch/emips/emips/mainbus.c:1.4.8.1
--- src/sys/arch/emips/emips/mainbus.c:1.4	Sat Apr 24 23:36:31 2021
+++ src/sys/arch/emips/emips/mainbus.c	Wed Aug  4 00:01:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 00:01:52 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 00:01:52 thorpej Exp $");
 
 #include 
 #include 
@@ -71,11 +71,11 @@ mbattach(device_t parent, device_t self,
 
  	ma.ma_name = "cpu";
 	ma.ma_slot = 0;
-	config_found(self, , mbprint, CFARG_EOL);
+	config_found(self, , mbprint, CFARGS_NONE);
 
 	ma.ma_name = platform.iobus;
 	ma.ma_slot = 0;
-	config_found(self, , mbprint, CFARG_EOL);
+	config_found(self, , mbprint, CFARGS_NONE);
 }
 
 static int

CVS commit: [thorpej-cfargs2] src/sys/arch/dreamcast

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Wed Aug  4 00:00:00 UTC 2021

Modified Files:
src/sys/arch/dreamcast/dev [thorpej-cfargs2]: pvr.c
src/sys/arch/dreamcast/dev/g1 [thorpej-cfargs2]: g1bus.c
src/sys/arch/dreamcast/dev/g2 [thorpej-cfargs2]: g2bus.c gapspci.c
src/sys/arch/dreamcast/dev/maple [thorpej-cfargs2]: maple.c mkbd.c
mms.c
src/sys/arch/dreamcast/dreamcast [thorpej-cfargs2]: mainbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.2.1 src/sys/arch/dreamcast/dev/pvr.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/dreamcast/dev/g1/g1bus.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/dreamcast/dev/g2/g2bus.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/dreamcast/dev/g2/gapspci.c
cvs rdiff -u -r1.54 -r1.54.8.1 src/sys/arch/dreamcast/dev/maple/maple.c
cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/arch/dreamcast/dev/maple/mkbd.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/dreamcast/dev/maple/mms.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/dreamcast/dreamcast/mainbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/dreamcast/dev/pvr.c
diff -u src/sys/arch/dreamcast/dev/pvr.c:1.38 src/sys/arch/dreamcast/dev/pvr.c:1.38.2.1
--- src/sys/arch/dreamcast/dev/pvr.c:1.38	Sat Jul 31 14:36:33 2021
+++ src/sys/arch/dreamcast/dev/pvr.c	Tue Aug  3 23:59:59 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pvr.c,v 1.38 2021/07/31 14:36:33 andvar Exp $	*/
+/*	$NetBSD: pvr.c,v 1.38.2.1 2021/08/03 23:59:59 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.38 2021/07/31 14:36:33 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.38.2.1 2021/08/03 23:59:59 thorpej Exp $");
 
 #include 
 #include 
@@ -301,7 +301,7 @@ pvr_attach(device_t parent, device_t sel
 	waa.accessops = _accessops;
 	waa.accesscookie = sc;
 
-	(void) config_found(self, , wsemuldisplaydevprint, CFARG_EOL);
+	(void) config_found(self, , wsemuldisplaydevprint, CFARGS_NONE);
 }
 
 int

Index: src/sys/arch/dreamcast/dev/g1/g1bus.c
diff -u src/sys/arch/dreamcast/dev/g1/g1bus.c:1.2 src/sys/arch/dreamcast/dev/g1/g1bus.c:1.2.8.1
--- src/sys/arch/dreamcast/dev/g1/g1bus.c:1.2	Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/g1/g1bus.c	Wed Aug  4 00:00:00 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: g1bus.c,v 1.2 2021/04/24 23:36:31 thorpej Exp $	*/
+/*	$NetBSD: g1bus.c,v 1.2.8.1 2021/08/04 00:00:00 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -34,7 +34,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: g1bus.c,v 1.2 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g1bus.c,v 1.2.8.1 2021/08/04 00:00:00 thorpej Exp $");
 
 #include 
 #include 
@@ -76,8 +76,7 @@ g1busattach(device_t parent, device_t se
 	ga.ga_memt = >sc_memt;
 
 	config_search(self, ,
-	CFARG_SEARCH, g1bussearch,
-	CFARG_EOL);
+	CFARGS(.search = g1bussearch));
 }
 
 int
@@ -92,7 +91,7 @@ g1bussearch(device_t parent, cfdata_t cf
 {
 
 	if (config_probe(parent, cf, aux))
-		config_attach(parent, cf, aux, g1busprint, CFARG_EOL);
+		config_attach(parent, cf, aux, g1busprint, CFARGS_NONE);
 
 	return 0;
 }

Index: src/sys/arch/dreamcast/dev/g2/g2bus.c
diff -u src/sys/arch/dreamcast/dev/g2/g2bus.c:1.15 src/sys/arch/dreamcast/dev/g2/g2bus.c:1.15.8.1
--- src/sys/arch/dreamcast/dev/g2/g2bus.c:1.15	Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/g2/g2bus.c	Wed Aug  4 00:00:00 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: g2bus.c,v 1.15 2021/04/24 23:36:31 thorpej Exp $	*/
+/*	$NetBSD: g2bus.c,v 1.15.8.1 2021/08/04 00:00:00 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -34,7 +34,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: g2bus.c,v 1.15 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g2bus.c,v 1.15.8.1 2021/08/04 00:00:00 thorpej Exp $");
 
 #include 
 #include 
@@ -78,8 +78,7 @@ g2busattach(device_t parent, device_t se
 	ga.ga_memt = >sc_memt;
 
 	config_search(self, ,
-	CFARG_SEARCH, g2bussearch,
-	CFARG_EOL);
+	CFARGS(.search = g2bussearch));
 }
 
 int
@@ -94,7 +93,7 @@ g2bussearch(device_t parent, cfdata_t cf
 {
 
 	if (config_probe(parent, cf, aux))
-		config_attach(parent, cf, aux, g2busprint, CFARG_EOL);
+		config_attach(parent, cf, aux, g2busprint, CFARGS_NONE);
 
 	return 0;
 }

Index: src/sys/arch/dreamcast/dev/g2/gapspci.c
diff -u src/sys/arch/dreamcast/dev/g2/gapspci.c:1.20 src/sys/arch/dreamcast/dev/g2/gapspci.c:1.20.8.1
--- src/sys/arch/dreamcast/dev/g2/gapspci.c:1.20	Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/g2/gapspci.c	Wed Aug  4 00:00:00 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gapspci.c,v 1.20 2021/04/24 23:36:31 thorpej Exp $	*/
+/*	$NetBSD: gapspci.c,v 1.20.8.1 2021/08/04 00:00:00 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -33,7 +33,7 @@
  */
 
 

CVS commit: [thorpej-cfargs2] src/sys/arch/cobalt

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 23:57:22 UTC 2021

Modified Files:
src/sys/arch/cobalt/cobalt [thorpej-cfargs2]: mainbus.c
src/sys/arch/cobalt/dev [thorpej-cfargs2]: gt.c zs.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/cobalt/cobalt/mainbus.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/cobalt/dev/gt.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/cobalt/dev/zs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/cobalt/cobalt/mainbus.c
diff -u src/sys/arch/cobalt/cobalt/mainbus.c:1.21 src/sys/arch/cobalt/cobalt/mainbus.c:1.21.8.1
--- src/sys/arch/cobalt/cobalt/mainbus.c:1.21	Sat Apr 24 23:36:30 2021
+++ src/sys/arch/cobalt/cobalt/mainbus.c	Tue Aug  3 23:57:21 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:30 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.21.8.1 2021/08/03 23:57:21 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21.8.1 2021/08/03 23:57:21 thorpej Exp $");
 
 #include 
 #include 
@@ -64,8 +64,7 @@ mainbus_attach(device_t parent, device_t
 	aprint_normal("\n");
 
 	config_search(self, ,
-	CFARG_SEARCH, mainbus_search,
-	CFARG_EOL);
+	CFARGS(.search = mainbus_search));
 }
 
 static int
@@ -79,7 +78,7 @@ mainbus_search(device_t parent, cfdata_t
 		ma->ma_level = cf->cf_loc[MAINBUSCF_LEVEL];
 		ma->ma_irq = cf->cf_loc[MAINBUSCF_IRQ];
 		if (config_probe(parent, cf, ma))
-			config_attach(parent, cf, ma, mainbus_print, CFARG_EOL);
+			config_attach(parent, cf, ma, mainbus_print, CFARGS_NONE);
 	} while (cf->cf_fstate == FSTATE_STAR);
 
 	return 0;

Index: src/sys/arch/cobalt/dev/gt.c
diff -u src/sys/arch/cobalt/dev/gt.c:1.33 src/sys/arch/cobalt/dev/gt.c:1.33.8.1
--- src/sys/arch/cobalt/dev/gt.c:1.33	Sat Apr 24 23:36:31 2021
+++ src/sys/arch/cobalt/dev/gt.c	Tue Aug  3 23:57:21 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gt.c,v 1.33 2021/04/24 23:36:31 thorpej Exp $	*/
+/*	$NetBSD: gt.c,v 1.33.8.1 2021/08/03 23:57:21 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.33 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.33.8.1 2021/08/03 23:57:21 thorpej Exp $");
 
 #include "opt_pci.h"
 #include "pci.h"
@@ -157,7 +157,7 @@ gt_attach(device_t parent, device_t self
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
 		PCI_FLAGS_MRL_OKAY | /*PCI_FLAGS_MRM_OKAY|*/ PCI_FLAGS_MWI_OKAY;
 	pba.pba_pc = pc;
-	config_found(self, , gt_print, CFARG_EOL);
+	config_found(self, , gt_print, CFARGS_NONE);
 #endif
 }
 

Index: src/sys/arch/cobalt/dev/zs.c
diff -u src/sys/arch/cobalt/dev/zs.c:1.5 src/sys/arch/cobalt/dev/zs.c:1.5.8.1
--- src/sys/arch/cobalt/dev/zs.c:1.5	Sat Apr 24 23:36:31 2021
+++ src/sys/arch/cobalt/dev/zs.c	Tue Aug  3 23:57:21 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.5 2021/04/24 23:36:31 thorpej Exp $	*/
+/*	$NetBSD: zs.c,v 1.5.8.1 2021/08/03 23:57:21 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.5 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.5.8.1 2021/08/03 23:57:21 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -223,7 +223,7 @@ zs_attach(device_t parent, device_t self
 		 * The child attach will setup the hardware.
 		 */
 		if (!config_found(self, (void *)_args, zs_print,
-		CFARG_EOL)) {
+		CFARGS_NONE)) {
 			/* No sub-driver.  Just reset it. */
 			uint8_t reset = (channel == 0) ?
 			ZSWR9_A_RESET : ZSWR9_B_RESET;

CVS commit: [thorpej-cfargs2] src/sys/arch/cesfic

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 23:56:15 UTC 2021

Modified Files:
src/sys/arch/cesfic/cesfic [thorpej-cfargs2]: autoconf.c
src/sys/arch/cesfic/dev [thorpej-cfargs2]: zs.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/cesfic/cesfic/autoconf.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/cesfic/dev/zs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/cesfic/cesfic/autoconf.c
diff -u src/sys/arch/cesfic/cesfic/autoconf.c:1.28 src/sys/arch/cesfic/cesfic/autoconf.c:1.28.8.1
--- src/sys/arch/cesfic/cesfic/autoconf.c:1.28	Sat Apr 24 23:36:30 2021
+++ src/sys/arch/cesfic/cesfic/autoconf.c	Tue Aug  3 23:56:15 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.28 2021/04/24 23:36:30 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.28.8.1 2021/08/03 23:56:15 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997, 1999
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.28 2021/04/24 23:36:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.28.8.1 2021/08/03 23:56:15 thorpej Exp $");
 
 #include 
 #include 
@@ -90,8 +90,7 @@ mainbusattach(device_t parent, device_t 
 
 	/* Search for and attach children. */
 	config_search(self, NULL,
-	CFARG_SEARCH, mainbussearch,
-	CFARG_EOL);
+	CFARGS(.search = mainbussearch));
 }
 
 int
@@ -99,7 +98,7 @@ mainbussearch(device_t parent, cfdata_t 
 {
 
 	if (config_probe(parent, cf, NULL))
-		config_attach(parent, cf, NULL, NULL, CFARG_EOL);
+		config_attach(parent, cf, NULL, NULL, CFARGS_NONE);
 	return (0);
 }
 

Index: src/sys/arch/cesfic/dev/zs.c
diff -u src/sys/arch/cesfic/dev/zs.c:1.22 src/sys/arch/cesfic/dev/zs.c:1.22.8.1
--- src/sys/arch/cesfic/dev/zs.c:1.22	Sat Apr 24 23:36:30 2021
+++ src/sys/arch/cesfic/dev/zs.c	Tue Aug  3 23:56:15 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.22 2021/04/24 23:36:30 thorpej Exp $	*/
+/*	$NetBSD: zs.c,v 1.22.8.1 2021/08/03 23:56:15 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22 2021/04/24 23:36:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22.8.1 2021/08/03 23:56:15 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -165,7 +165,7 @@ zs_config(struct zsc_softc *zsc, char *b
 		 * The child attach will setup the hardware.
 		 */
 		if (!config_found(zsc->zsc_dev, (void *)_args,
-		zsc_print, CFARG_EOL)) {
+		zsc_print, CFARGS_NONE)) {
 			/* No sub-driver.  Just reset it. */
 			uint8_t reset = (channel == 0) ?
 ZSWR9_A_RESET : ZSWR9_B_RESET;

CVS commit: [thorpej-cfargs2] src/sys/arch/cats/pci

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 23:53:38 UTC 2021

Modified Files:
src/sys/arch/cats/pci [thorpej-cfargs2]: pcib.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/cats/pci/pcib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/cats/pci/pcib.c
diff -u src/sys/arch/cats/pci/pcib.c:1.17 src/sys/arch/cats/pci/pcib.c:1.17.8.1
--- src/sys/arch/cats/pci/pcib.c:1.17	Sat Apr 24 23:36:30 2021
+++ src/sys/arch/cats/pci/pcib.c	Tue Aug  3 23:53:38 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.17 2021/04/24 23:36:30 thorpej Exp $	*/
+/*	$NetBSD: pcib.c,v 1.17.8.1 2021/08/03 23:53:38 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.17 2021/04/24 23:36:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.17.8.1 2021/08/03 23:53:38 thorpej Exp $");
 
 #include 
 #include 
@@ -111,5 +111,5 @@ pcib_callback(device_t self)
 #if NISADMA > 0
 	iba.iba_dmat = _bus_dma_tag;
 #endif
-	config_found(self, , isabusprint, CFARG_EOL);
+	config_found(self, , isabusprint, CFARGS_NONE);
 }

CVS commit: [thorpej-cfargs2] src/sys/arch/bebox/bebox

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 23:44:31 UTC 2021

Modified Files:
src/sys/arch/bebox/bebox [thorpej-cfargs2]: mainbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/arch/bebox/bebox/mainbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/bebox/bebox/mainbus.c
diff -u src/sys/arch/bebox/bebox/mainbus.c:1.34 src/sys/arch/bebox/bebox/mainbus.c:1.34.8.1
--- src/sys/arch/bebox/bebox/mainbus.c:1.34	Sat Apr 24 23:36:30 2021
+++ src/sys/arch/bebox/bebox/mainbus.c	Tue Aug  3 23:44:31 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.34 2021/04/24 23:36:30 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.34.8.1 2021/08/03 23:44:31 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.34 2021/04/24 23:36:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.34.8.1 2021/08/03 23:44:31 thorpej Exp $");
 
 #include 
 #include 
@@ -111,13 +111,11 @@ mainbus_attach(device_t parent, device_t
 	ca.ca_name = "cpu";
 	ca.ca_node = 0;
 	config_found(self, , mainbus_print,
-	CFARG_IATTR, "mainbus",
-	CFARG_EOL);
+	CFARGS(.iattr = "mainbus"));
 	ca.ca_name = "cpu";
 	ca.ca_node = 1;
 	config_found(self, , mainbus_print,
-	CFARG_IATTR, "mainbus",
-	CFARG_EOL);
+	CFARGS(.iattr = "mainbus"));
 
 	/*
 	 * XXX Note also that the presence of a PCI bus should
@@ -162,8 +160,7 @@ mainbus_attach(device_t parent, device_t
 	mba.mba_pba.pba_bridgetag = NULL;
 	mba.mba_pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 	config_found(self, _pba, pcibusprint,
-	CFARG_IATTR, "pcibus",
-	CFARG_EOL);
+	CFARGS(.iattr = "pcibus"));
 #endif /* NPCI */
 
 #ifdef RESIDUAL_DATA_DUMP

CVS commit: [thorpej-cfargs2] src/sys/arch/atari

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 23:43:45 UTC 2021

Modified Files:
src/sys/arch/atari/atari [thorpej-cfargs2]: autoconf.c device.h
src/sys/arch/atari/dev [thorpej-cfargs2]: fd.c grf.c hdfd.c ite_cc.c
ite_et.c kbd.c ncr5380.c
src/sys/arch/atari/isa [thorpej-cfargs2]: isa_machdep.c
src/sys/arch/atari/pci [thorpej-cfargs2]: pci_machdep.c
src/sys/arch/atari/vme [thorpej-cfargs2]: vme.c vme_machdep.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.70.6.1 src/sys/arch/atari/atari/autoconf.c
cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/atari/atari/device.h
cvs rdiff -u -r1.88 -r1.88.8.1 src/sys/arch/atari/dev/fd.c \
src/sys/arch/atari/dev/hdfd.c
cvs rdiff -u -r1.52 -r1.52.6.1 src/sys/arch/atari/dev/grf.c
cvs rdiff -u -r1.42 -r1.42.6.1 src/sys/arch/atari/dev/ite_cc.c
cvs rdiff -u -r1.33 -r1.33.6.1 src/sys/arch/atari/dev/ite_et.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/arch/atari/dev/kbd.c
cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/arch/atari/dev/ncr5380.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/atari/isa/isa_machdep.c
cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/arch/atari/pci/pci_machdep.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/atari/vme/vme.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/atari/vme/vme_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/atari/atari/autoconf.c
diff -u src/sys/arch/atari/atari/autoconf.c:1.70 src/sys/arch/atari/atari/autoconf.c:1.70.6.1
--- src/sys/arch/atari/atari/autoconf.c:1.70	Tue Apr 27 14:48:29 2021
+++ src/sys/arch/atari/atari/autoconf.c	Tue Aug  3 23:43:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.70 2021/04/27 14:48:29 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.70.6.1 2021/08/03 23:43:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -30,10 +30,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define	__SUBR_AUTOCONF_PRIVATE		/* XXX atari_config_found() */
-
 #include 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.70 2021/04/27 14:48:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.70.6.1 2021/08/03 23:43:44 thorpej Exp $");
 
 #include "opt_md.h"
 
@@ -141,18 +139,15 @@ simple_devprint(void *aux, const char *p
  */
 int
 atari_config_found(cfdata_t pcfp, device_t parent, void *aux, cfprint_t pfn,
-cfarg_t tag, ...)
+const struct cfargs *cfargs)
 {
 	struct device temp;
 	cfdata_t cf;
 	const struct cfattach *ca;
 	int rv = 0;
-	va_list ap;
-
-	va_start(ap, tag);
 
 	if (atari_realconfig) {
-		rv = config_vfound(parent, aux, pfn, tag, ap) != NULL;
+		rv = config_found(parent, aux, pfn, cfargs) != NULL;
 		goto out;
 	}
 
@@ -164,7 +159,7 @@ atari_config_found(cfdata_t pcfp, device
 	parent->dv_cfdriver = config_cfdriver_lookup(pcfp->cf_name);
 	parent->dv_unit = pcfp->cf_unit;
 
-	if ((cf = config_vsearch(parent, aux, tag, ap)) != NULL) {
+	if ((cf = config_search(parent, aux, cfargs)) != NULL) {
 		ca = config_cfattach_lookup(cf->cf_name, cf->cf_atname);
 		if (ca != NULL) {
 			(*ca->ca_attach)(parent, NULL, aux);
@@ -174,7 +169,6 @@ atari_config_found(cfdata_t pcfp, device
 	}
 	parent->dv_cfdata = NULL;
  out:
-	va_end(ap);
 	return rv;
 }
 
@@ -203,9 +197,9 @@ config_console(void)
 	 * some setup for the 'grf-side'. This make it possible to use
 	 * a PCI card for both wscons and grfabs.
 	 */
-	atari_config_found(cf, NULL, __UNCONST("pcib")  , NULL, CFARG_EOL);
-	atari_config_found(cf, NULL, __UNCONST("isab")  , NULL, CFARG_EOL);
-	atari_config_found(cf, NULL, __UNCONST("grfbus"), NULL, CFARG_EOL);
+	atari_config_found(cf, NULL, __UNCONST("pcib")  , NULL, CFARGS_NONE);
+	atari_config_found(cf, NULL, __UNCONST("isab")  , NULL, CFARGS_NONE);
+	atari_config_found(cf, NULL, __UNCONST("grfbus"), NULL, CFARGS_NONE);
 }
 
 /*
@@ -325,20 +319,20 @@ mbattach(device_t parent, device_t self,
 	mb_attached = 1;
 
 	printf ("\n");
-	config_found(self, __UNCONST("clock")   , simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("grfbus")  , simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("kbd") , simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("fdc") , simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("ser") , simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("zs")  , simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("ncrscsi") , simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("nvr") , simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("lpt") , simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("wdc") , simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("ne")  , simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("isab"), simple_devprint, CFARG_EOL);
-	config_found(self, __UNCONST("pcib"), simple_devprint, CFARG_EOL);
-	

CVS commit: [thorpej-cfargs2] src/sys/arch/arc

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 23:41:24 UTC 2021

Modified Files:
src/sys/arch/arc/arc [thorpej-cfargs2]: mainbus.c
src/sys/arch/arc/dti [thorpej-cfargs2]: btl.c
src/sys/arch/arc/isa [thorpej-cfargs2]: isabus.c
src/sys/arch/arc/jazz [thorpej-cfargs2]: fd.c jazzio.c
src/sys/arch/arc/pci [thorpej-cfargs2]: necpb.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/arc/arc/mainbus.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/arc/dti/btl.c
cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/arch/arc/isa/isabus.c
cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/arch/arc/jazz/fd.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/arc/jazz/jazzio.c
cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/arch/arc/pci/necpb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arc/arc/mainbus.c
diff -u src/sys/arch/arc/arc/mainbus.c:1.24 src/sys/arch/arc/arc/mainbus.c:1.24.8.1
--- src/sys/arch/arc/arc/mainbus.c:1.24	Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/arc/mainbus.c	Tue Aug  3 23:41:24 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.24 2021/04/24 23:36:25 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.24.8.1 2021/08/03 23:41:24 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 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.24 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.24.8.1 2021/08/03 23:41:24 thorpej Exp $");
 
 #include 
 #include 
@@ -78,13 +78,13 @@ mbattach(device_t parent, device_t self,
 	nca.ca_name = "cpu";
 	nca.ca_slot = 0;
 	nca.ca_offset = 0;
-	config_found(self, , mbprint, CFARG_EOL);
+	config_found(self, , mbprint, CFARGS_NONE);
 
 	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, , mbprint, CFARG_EOL);
+		config_found(self, , mbprint, CFARGS_NONE);
 	}
 }
 

Index: src/sys/arch/arc/dti/btl.c
diff -u src/sys/arch/arc/dti/btl.c:1.29 src/sys/arch/arc/dti/btl.c:1.29.8.1
--- src/sys/arch/arc/dti/btl.c:1.29	Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/dti/btl.c	Tue Aug  3 23:41:24 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: btl.c,v 1.29 2021/04/24 23:36:25 thorpej Exp $	*/
+/*	$NetBSD: btl.c,v 1.29.8.1 2021/08/03 23:41:24 thorpej Exp $	*/
 /*	NetBSD: bt.c,v 1.10 1996/05/12 23:51:54 mycroft Exp 	*/
 
 #undef BTDIAG
@@ -51,7 +51,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: btl.c,v 1.29 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btl.c,v 1.29.8.1 2021/08/03 23:41:24 thorpej Exp $");
 
 #include 
 #include 
@@ -411,7 +411,7 @@ btattach(device_t parent, device_t self,
 	/*
 	 * ask the adapter what subunits are present
 	 */
-	config_found(self, >sc_link, scsiprint, CFARG_EOL);
+	config_found(self, >sc_link, scsiprint, CFARGS_NONE);
 }
 
 integrate void

Index: src/sys/arch/arc/isa/isabus.c
diff -u src/sys/arch/arc/isa/isabus.c:1.52 src/sys/arch/arc/isa/isabus.c:1.52.8.1
--- src/sys/arch/arc/isa/isabus.c:1.52	Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/isa/isabus.c	Tue Aug  3 23:41:24 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: isabus.c,v 1.52 2021/04/24 23:36:25 thorpej Exp $	*/
+/*	$NetBSD: isabus.c,v 1.52.8.1 2021/08/03 23:41:24 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 SOFT
 */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.52 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.52.8.1 2021/08/03 23:41:24 thorpej Exp $");
 
 #include 
 #include 
@@ -208,8 +208,7 @@ isabrattach(struct isabr_softc *sc)
 	iba.iba_dmat = >sc_dmat;
 	iba.iba_ic = >arc_isa_cs;
 	config_found(sc->sc_dev, , isabrprint,
-	CFARG_IATTR, "isabus",
-	CFARG_EOL);
+	CFARGS(.iattr = "isabus"));
 }
 
 static int

Index: src/sys/arch/arc/jazz/fd.c
diff -u src/sys/arch/arc/jazz/fd.c:1.50 src/sys/arch/arc/jazz/fd.c:1.50.8.1
--- src/sys/arch/arc/jazz/fd.c:1.50	Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/jazz/fd.c	Tue Aug  3 23:41:24 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.50 2021/04/24 23:36:25 thorpej Exp $	*/
+/*	$NetBSD: fd.c,v 1.50.8.1 2021/08/03 23:41:24 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 
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.50 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.50.8.1 2021/08/03 23:41:24 thorpej Exp $");
 
 #include 
 #include 
@@ -282,7 +282,7 @@ fdcattach(struct fdc_softc *fdc)
 	for (fa.fa_drive = 0; fa.fa_drive < 2; fa.fa_drive++) {
 		fa.fa_deftype = _types[type];
 		

CVS commit: [thorpej-cfargs2] src/sys/arch/amd64/amd64

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 23:24:35 UTC 2021

Modified Files:
src/sys/arch/amd64/amd64 [thorpej-cfargs2]: amd64_mainbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/amd64/amd64/amd64_mainbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/amd64/amd64_mainbus.c
diff -u src/sys/arch/amd64/amd64/amd64_mainbus.c:1.6 src/sys/arch/amd64/amd64/amd64_mainbus.c:1.6.8.1
--- src/sys/arch/amd64/amd64/amd64_mainbus.c:1.6	Sat Apr 24 23:36:24 2021
+++ src/sys/arch/amd64/amd64/amd64_mainbus.c	Tue Aug  3 23:24:35 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: amd64_mainbus.c,v 1.6 2021/04/24 23:36:24 thorpej Exp $	*/
+/*	$NetBSD: amd64_mainbus.c,v 1.6.8.1 2021/08/03 23:24:35 thorpej Exp $	*/
 /*	NetBSD: mainbus.c,v 1.39 2018/12/02 08:19:44 cherry Exp 	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: amd64_mainbus.c,v 1.6 2021/04/24 23:36:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amd64_mainbus.c,v 1.6.8.1 2021/08/03 23:24:35 thorpej Exp $");
 
 #include 
 #include 
@@ -180,8 +180,7 @@ amd64_mainbus_attach(device_t parent, de
 		mba.mba_acpi.aa_dmat = _bus_dma_tag;
 		mba.mba_acpi.aa_dmat64 = _bus_dma64_tag;
 		config_found(self, _acpi, NULL,
-		CFARG_IATTR, "acpibus",
-		CFARG_EOL);
+		CFARGS(.iattr = "acpibus"));
 	}
 #endif
 
@@ -191,8 +190,7 @@ amd64_mainbus_attach(device_t parent, de
 	mba.mba_ipmi.iaa_memt = x86_bus_space_mem;
 	if (ipmi_probe(_ipmi))
 		config_found(self, _ipmi, NULL,
-		CFARG_IATTR, "ipmibus",
-		CFARG_EOL);
+		CFARGS(.iattr = "ipmibus"));
 #endif
 
 #if NPCI > 0
@@ -220,8 +218,7 @@ amd64_mainbus_attach(device_t parent, de
 #endif
 		if (npcibus == 0)
 			config_found(self, _pba, pcibusprint,
-			CFARG_IATTR, "pcibus",
-			CFARG_EOL);
+			CFARGS(.iattr = "pcibus"));
 
 #if NACPICA > 0
 		if (mp_verbose)
@@ -236,8 +233,7 @@ amd64_mainbus_attach(device_t parent, de
 		mba.mba_iba.iba_iot = x86_bus_space_io;
 		mba.mba_iba.iba_memt = x86_bus_space_mem;
 		config_found(self, _iba, isabusprint,
-		CFARG_IATTR, "isabus",
-		CFARG_EOL);
+		CFARGS(.iattr = "isabus"));
 	}
 #endif
 

CVS commit: [thorpej-cfargs2] src/sys/arch/algor

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 23:20:34 UTC 2021

Modified Files:
src/sys/arch/algor/dev [thorpej-cfargs2]: bonito_mainbus.c mainbus.c
vtpbc_mainbus.c
src/sys/arch/algor/pci [thorpej-cfargs2]: pcib.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/algor/dev/bonito_mainbus.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/algor/dev/mainbus.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/algor/dev/vtpbc_mainbus.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/algor/pci/pcib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/algor/dev/bonito_mainbus.c
diff -u src/sys/arch/algor/dev/bonito_mainbus.c:1.18 src/sys/arch/algor/dev/bonito_mainbus.c:1.18.8.1
--- src/sys/arch/algor/dev/bonito_mainbus.c:1.18	Sat Apr 24 23:36:23 2021
+++ src/sys/arch/algor/dev/bonito_mainbus.c	Tue Aug  3 23:20:34 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bonito_mainbus.c,v 1.18 2021/04/24 23:36:23 thorpej Exp $	*/
+/*	$NetBSD: bonito_mainbus.c,v 1.18.8.1 2021/08/03 23:20:34 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.18 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.18.8.1 2021/08/03 23:20:34 thorpej Exp $");
 
 #include "opt_algor_p6032.h"
 
@@ -113,5 +113,5 @@ bonito_mainbus_attach(device_t parent, d
 	}
 #endif /* ALGOR_P6032 */
 
-	config_found(self, , pcibusprint, CFARG_EOL);
+	config_found(self, , pcibusprint, CFARGS_NONE);
 }

Index: src/sys/arch/algor/dev/mainbus.c
diff -u src/sys/arch/algor/dev/mainbus.c:1.29 src/sys/arch/algor/dev/mainbus.c:1.29.8.1
--- src/sys/arch/algor/dev/mainbus.c:1.29	Sat Apr 24 23:36:23 2021
+++ src/sys/arch/algor/dev/mainbus.c	Tue Aug  3 23:20:34 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.29 2021/04/24 23:36:23 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.29.8.1 2021/08/03 23:20:34 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29.8.1 2021/08/03 23:20:34 thorpej Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
@@ -221,8 +221,7 @@ mainbus_attach(device_t parent, device_t
 		ma.ma_addr = md->md_addr;
 		ma.ma_irq = md->md_irq;
 		config_found(self, , mainbus_print,
-		CFARG_SUBMATCH, mainbus_submatch,
-		CFARG_EOL);
+		CFARGS(.submatch = mainbus_submatch));
 	}
 }
 

Index: src/sys/arch/algor/dev/vtpbc_mainbus.c
diff -u src/sys/arch/algor/dev/vtpbc_mainbus.c:1.20 src/sys/arch/algor/dev/vtpbc_mainbus.c:1.20.8.1
--- src/sys/arch/algor/dev/vtpbc_mainbus.c:1.20	Sat Apr 24 23:36:23 2021
+++ src/sys/arch/algor/dev/vtpbc_mainbus.c	Tue Aug  3 23:20:34 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vtpbc_mainbus.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $	*/
+/*	$NetBSD: vtpbc_mainbus.c,v 1.20.8.1 2021/08/03 23:20:34 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.20.8.1 2021/08/03 23:20:34 thorpej Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
@@ -128,5 +128,5 @@ vtpbc_mainbus_attach(device_t parent, de
 	}
 #endif /* ALGOR_P4032 || ALGOR_P5064 */
 
-	config_found(self, , pcibusprint, CFARG_EOL);
+	config_found(self, , pcibusprint, CFARGS_NONE);
 }

Index: src/sys/arch/algor/pci/pcib.c
diff -u src/sys/arch/algor/pci/pcib.c:1.27 src/sys/arch/algor/pci/pcib.c:1.27.8.1
--- src/sys/arch/algor/pci/pcib.c:1.27	Sat Apr 24 23:36:23 2021
+++ src/sys/arch/algor/pci/pcib.c	Tue Aug  3 23:20:34 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.27 2021/04/24 23:36:23 thorpej Exp $	*/
+/*	$NetBSD: pcib.c,v 1.27.8.1 2021/08/03 23:20:34 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.27 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.27.8.1 2021/08/03 23:20:34 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;
 
-	config_found(sc->sc_dev, , isabusprint, CFARG_EOL);
+	config_found(sc->sc_dev, , isabusprint, CFARGS_NONE);
 }
 
 void

CVS commit: [thorpej-cfargs2] src/sys/arch/acorn32

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 23:19:53 UTC 2021

Modified Files:
src/sys/arch/acorn32/eb7500atx [thorpej-cfargs2]: rsbus.c
src/sys/arch/acorn32/mainbus [thorpej-cfargs2]: fd.c pioc.c
src/sys/arch/acorn32/podulebus [thorpej-cfargs2]: amps.c asc.c cosc.c
csc.c podulebus.c ptsc.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/acorn32/eb7500atx/rsbus.c
cvs rdiff -u -r1.63 -r1.63.8.1 src/sys/arch/acorn32/mainbus/fd.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/acorn32/mainbus/pioc.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/acorn32/podulebus/amps.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/acorn32/podulebus/asc.c \
src/sys/arch/acorn32/podulebus/cosc.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/acorn32/podulebus/csc.c \
src/sys/arch/acorn32/podulebus/ptsc.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/acorn32/podulebus/podulebus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn32/eb7500atx/rsbus.c
diff -u src/sys/arch/acorn32/eb7500atx/rsbus.c:1.11 src/sys/arch/acorn32/eb7500atx/rsbus.c:1.11.8.1
--- src/sys/arch/acorn32/eb7500atx/rsbus.c:1.11	Sat Apr 24 23:36:23 2021
+++ src/sys/arch/acorn32/eb7500atx/rsbus.c	Tue Aug  3 23:19:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus.c,v 1.11 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: rsbus.c,v 1.11.8.1 2021/08/03 23:19:52 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002
@@ -29,7 +29,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.11 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.11.8.1 2021/08/03 23:19:52 thorpej Exp $");
 
 #include 
 #include 
@@ -71,8 +71,7 @@ rsbus_attach(device_t parent, device_t s
 	 *  Attach each devices
 	 */
 	config_search(self, NULL,
-	CFARG_SEARCH, rsbus_search,
-	CFARG_EOL);
+	CFARGS(.search = rsbus_search));
 }
 
 static int
@@ -87,7 +86,7 @@ rsbus_search(device_t parent, cfdata_t c
 	sa.sa_intr = cf->cf_loc[RSBUSCF_IRQ];
 
 	if (config_probe(parent, cf, ))
-		config_attach(parent, cf, , rsbus_print, CFARG_EOL);
+		config_attach(parent, cf, , rsbus_print, CFARGS_NONE);
 
 	return (0);
 }

Index: src/sys/arch/acorn32/mainbus/fd.c
diff -u src/sys/arch/acorn32/mainbus/fd.c:1.63 src/sys/arch/acorn32/mainbus/fd.c:1.63.8.1
--- src/sys/arch/acorn32/mainbus/fd.c:1.63	Sat Apr 24 23:36:23 2021
+++ src/sys/arch/acorn32/mainbus/fd.c	Tue Aug  3 23:19:53 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.63 2021/04/24 23:36:23 thorpej Exp $	*/
+/*	$NetBSD: fd.c,v 1.63.8.1 2021/08/03 23:19:53 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.63 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.63.8.1 2021/08/03 23:19:53 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -431,7 +431,7 @@ fdcattach(device_t parent, device_t self
 			type, fa.fa_drive);
 		else
 			fa.fa_deftype = NULL;		/* unknown */
-		(void)config_found(self, (void *), fdprint, CFARG_EOL);
+		(void)config_found(self, (void *), fdprint, CFARGS_NONE);
 	}
 }
 

Index: src/sys/arch/acorn32/mainbus/pioc.c
diff -u src/sys/arch/acorn32/mainbus/pioc.c:1.19 src/sys/arch/acorn32/mainbus/pioc.c:1.19.8.1
--- src/sys/arch/acorn32/mainbus/pioc.c:1.19	Sat Apr 24 23:36:23 2021
+++ src/sys/arch/acorn32/mainbus/pioc.c	Tue Aug  3 23:19:53 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pioc.c,v 1.19 2021/04/24 23:36:23 thorpej Exp $	*/ 
+/*	$NetBSD: pioc.c,v 1.19.8.1 2021/08/03 23:19:53 thorpej Exp $	*/ 
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -41,7 +41,7 @@
 /*#define PIOC_DEBUG*/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.19 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.19.8.1 2021/08/03 23:19:53 thorpej Exp $");
 
 #include 
 #include 
@@ -234,7 +234,7 @@ piocsearch(device_t parent, cfdata_t cf,
 
 		tryagain = 0;
 		if (config_probe(parent, cf, )) {
-			config_attach(parent, cf, , piocprint, CFARG_EOL);
+			config_attach(parent, cf, , piocprint, CFARGS_NONE);
 /*			tryagain = (cf->cf_fstate == FSTATE_STAR);*/
 		}
 	} while (tryagain);
@@ -267,7 +267,7 @@ piocsubmatch(device_t parent, cfdata_t c
 			pa->pa_irq = cf->cf_loc[PIOCCF_IRQ];
 		tryagain = 0;
 		if (config_probe(parent, cf, pa)) {
-			config_attach(parent, cf, pa, piocprint, CFARG_EOL);
+			config_attach(parent, cf, pa, piocprint, CFARGS_NONE);
 /*			tryagain = (cf->cf_fstate == FSTATE_STAR);*/
 		}
 	} while (tryagain);
@@ -383,8 +383,7 @@ piocattach(device_t parent, device_t sel
 		pa.pa_drq = -1;
 		pa.pa_irq = -1;
 		config_found(self, , piocprint,
-		CFARG_SUBMATCH, piocsubmatch,
-		CFARG_EOL);
+		CFARGS(.submatch = piocsubmatch));
 	}
 
 	/*
@@ -403,8 +402,7 @@ piocattach(device_t parent, device_t sel
 		pa.pa_drq = -1;
 		pa.pa_irq = -1;
 		

CVS commit: [thorpej-cfargs2] src/sys/arch/alpha

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 23:14:59 UTC 2021

Modified Files:
src/sys/arch/alpha/alpha [thorpej-cfargs2]: mainbus.c
src/sys/arch/alpha/jensenio [thorpej-cfargs2]: jensenio.c
src/sys/arch/alpha/mcbus [thorpej-cfargs2]: mcbus.c
src/sys/arch/alpha/pci [thorpej-cfargs2]: apecs.c cia.c dwlpx.c
irongate.c lca.c mcpcia.c sio.c tsc.c tsciic.c ttwoga.c
src/sys/arch/alpha/sableio [thorpej-cfargs2]: sableio.c
src/sys/arch/alpha/tc [thorpej-cfargs2]: tcasic.c
src/sys/arch/alpha/tlsb [thorpej-cfargs2]: gbus.c kftxx.c tlsb.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/arch/alpha/alpha/mainbus.c
cvs rdiff -u -r1.21 -r1.21.6.1 src/sys/arch/alpha/jensenio/jensenio.c
cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/arch/alpha/mcbus/mcbus.c
cvs rdiff -u -r1.58 -r1.58.2.1 src/sys/arch/alpha/pci/apecs.c
cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/arch/alpha/pci/cia.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/arch/alpha/pci/dwlpx.c
cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/arch/alpha/pci/irongate.c
cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/arch/alpha/pci/lca.c
cvs rdiff -u -r1.34 -r1.34.2.1 src/sys/arch/alpha/pci/mcpcia.c
cvs rdiff -u -r1.56 -r1.56.6.1 src/sys/arch/alpha/pci/sio.c
cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/arch/alpha/pci/tsc.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/alpha/pci/tsciic.c
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/arch/alpha/pci/ttwoga.c
cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/arch/alpha/sableio/sableio.c
cvs rdiff -u -r1.51 -r1.51.6.1 src/sys/arch/alpha/tc/tcasic.c
cvs rdiff -u -r1.24 -r1.24.6.1 src/sys/arch/alpha/tlsb/gbus.c
cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/arch/alpha/tlsb/kftxx.c
cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/arch/alpha/tlsb/tlsb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/alpha/alpha/mainbus.c
diff -u src/sys/arch/alpha/alpha/mainbus.c:1.36 src/sys/arch/alpha/alpha/mainbus.c:1.36.2.1
--- src/sys/arch/alpha/alpha/mainbus.c:1.36	Wed Jul  7 03:24:26 2021
+++ src/sys/arch/alpha/alpha/mainbus.c	Tue Aug  3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.36 2021/07/07 03:24:26 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.36.2.1 2021/08/03 23:14:58 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.36 2021/07/07 03:24:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.36.2.1 2021/08/03 23:14:58 thorpej Exp $");
 
 #include 
 #include 
@@ -85,7 +85,7 @@ mbattach(device_t parent, device_t self,
 
 		ma.ma_name = "cpu";
 		ma.ma_slot = i;
-		if (config_found(self, , mbprint, CFARG_EOL) != NULL)
+		if (config_found(self, , mbprint, CFARGS_NONE) != NULL)
 			cpuattachcnt++;
 	}
 	if (ncpus != cpuattachcnt)
@@ -98,13 +98,13 @@ mbattach(device_t parent, device_t self,
 	if (alpha_is_qemu) {
 		ma.ma_name = "qemu";
 		ma.ma_slot = 0;			/* meaningless */
-		config_found(self, , mbprint, CFARG_EOL);
+		config_found(self, , mbprint, CFARGS_NONE);
 	}
 
 	if (platform.iobus != NULL) {
 		ma.ma_name = platform.iobus;
 		ma.ma_slot = 0;			/* meaningless */
-		config_found(self, , mbprint, CFARG_EOL);
+		config_found(self, , mbprint, CFARGS_NONE);
 	}
 }
 

Index: src/sys/arch/alpha/jensenio/jensenio.c
diff -u src/sys/arch/alpha/jensenio/jensenio.c:1.21 src/sys/arch/alpha/jensenio/jensenio.c:1.21.6.1
--- src/sys/arch/alpha/jensenio/jensenio.c:1.21	Fri May  7 16:58:34 2021
+++ src/sys/arch/alpha/jensenio/jensenio.c	Tue Aug  3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio.c,v 1.21 2021/05/07 16:58:34 thorpej Exp $ */
+/* $NetBSD: jensenio.c,v 1.21.6.1 2021/08/03 23:14:58 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.21 2021/05/07 16:58:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.21.6.1 2021/08/03 23:14:58 thorpej Exp $");
 
 #include 
 #include 
@@ -186,10 +186,9 @@ jensenio_attach(device_t parent, device_
 
 		locs[JENSENIOCF_PORT] = jensenio_devs[i].jd_ioaddr;
 		config_found(self, , jensenio_print,
-		CFARG_SUBMATCH, config_stdsubmatch,
-		CFARG_IATTR, "jensenio",
-		CFARG_LOCATORS, locs,
-		CFARG_EOL);
+		CFARGS(.submatch = config_stdsubmatch,
+			   .iattr = "jensenio",
+			   .locators = locs));
 	}
 
 	/*
@@ -203,8 +202,7 @@ jensenio_attach(device_t parent, device_
 	ja.ja_eisa.eba_dmat = >jc_dmat_eisa;
 	ja.ja_eisa.eba_ec = >jc_ec;
 	config_found(self, _eisa, eisabusprint,
-	CFARG_IATTR, "eisabus",
-	CFARG_EOL);
+	CFARGS(.iattr = "eisabus"));
 
 	/*
 	 * Attach the ISA bus.
@@ -217,8 +215,7 @@ jensenio_attach(device_t parent, device_
 	ja.ja_isa.iba_dmat = >jc_dmat_isa;
 	

CVS commit: [thorpej-cfargs2] src/sys/arch

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 23:05:52 UTC 2021

Modified Files:
src/sys/arch/amiga/amiga [thorpej-cfargs2]: autoconf.c device.h
src/sys/arch/amiga/clockport [thorpej-cfargs2]: a1k2cp.c clockport.c
gencp.c
src/sys/arch/amiga/dev [thorpej-cfargs2]: acafh.c afsc.c ahsc.c
amidisplaycc.c atzsc.c bppcsc.c cbiiisc.c drsc.c drsupio.c empsc.c
fd.c gayle_pcmcia.c grf.c grf_cc.c grf_cl.c grf_cv.c grf_cv3d.c
grf_et.c grf_rh.c grf_rt.c grf_ul.c gtsc.c gvpbus.c gvpio.c hyper.c
ioblix_zbus.c ivsc.c kbd.c mfc.c mgnsc.c mlhsc.c mntva.c ms.c
otgsc.c p5bus.c wesc.c wstsc.c xsh.c xsurf.c z3rambd.c zbus.c
zssc.c
src/sys/arch/amiga/pci [thorpej-cfargs2]: cv3dpb.c em4k.c empb.c mppb.c
p5pb.c
src/sys/arch/amigappc/amigappc [thorpej-cfargs2]: autoconf.c mainbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.119.6.1 src/sys/arch/amiga/amiga/autoconf.c
cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/arch/amiga/amiga/device.h
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/amiga/clockport/a1k2cp.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/amiga/clockport/clockport.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/amiga/clockport/gencp.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/amiga/dev/acafh.c \
src/sys/arch/amiga/dev/bppcsc.c src/sys/arch/amiga/dev/mntva.c \
src/sys/arch/amiga/dev/xsurf.c src/sys/arch/amiga/dev/z3rambd.c
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/arch/amiga/dev/afsc.c
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/arch/amiga/dev/ahsc.c
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/arch/amiga/dev/amidisplaycc.c
cvs rdiff -u -r1.44 -r1.44.8.1 src/sys/arch/amiga/dev/atzsc.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/amiga/dev/cbiiisc.c \
src/sys/arch/amiga/dev/drsupio.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/arch/amiga/dev/drsc.c \
src/sys/arch/amiga/dev/otgsc.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/amiga/dev/empsc.c
cvs rdiff -u -r1.98 -r1.98.8.1 src/sys/arch/amiga/dev/fd.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/amiga/dev/gayle_pcmcia.c \
src/sys/arch/amiga/dev/mlhsc.c
cvs rdiff -u -r1.66 -r1.66.6.1 src/sys/arch/amiga/dev/grf.c
cvs rdiff -u -r1.42 -r1.42.6.1 src/sys/arch/amiga/dev/grf_cc.c
cvs rdiff -u -r1.51 -r1.51.6.1 src/sys/arch/amiga/dev/grf_cl.c
cvs rdiff -u -r1.60 -r1.60.6.1 src/sys/arch/amiga/dev/grf_cv.c
cvs rdiff -u -r1.35 -r1.35.6.1 src/sys/arch/amiga/dev/grf_cv3d.c
cvs rdiff -u -r1.37 -r1.37.6.1 src/sys/arch/amiga/dev/grf_et.c
cvs rdiff -u -r1.58 -r1.58.6.1 src/sys/arch/amiga/dev/grf_rh.c
cvs rdiff -u -r1.59 -r1.59.6.1 src/sys/arch/amiga/dev/grf_rt.c
cvs rdiff -u -r1.52 -r1.52.6.1 src/sys/arch/amiga/dev/grf_ul.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/amiga/dev/gtsc.c
cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/amiga/dev/gvpbus.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/amiga/dev/gvpio.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/amiga/dev/hyper.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/amiga/dev/ioblix_zbus.c
cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/arch/amiga/dev/ivsc.c
cvs rdiff -u -r1.60 -r1.60.2.1 src/sys/arch/amiga/dev/kbd.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/arch/amiga/dev/mfc.c
cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/arch/amiga/dev/mgnsc.c \
src/sys/arch/amiga/dev/zssc.c
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/arch/amiga/dev/ms.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/amiga/dev/p5bus.c
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/arch/amiga/dev/wesc.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/amiga/dev/wstsc.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/amiga/dev/xsh.c
cvs rdiff -u -r1.76 -r1.76.6.1 src/sys/arch/amiga/dev/zbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/amiga/pci/cv3dpb.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/amiga/pci/em4k.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/amiga/pci/empb.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/amiga/pci/mppb.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/amiga/pci/p5pb.c
cvs rdiff -u -r1.8 -r1.8.6.1 src/sys/arch/amigappc/amigappc/autoconf.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/amigappc/amigappc/mainbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/amiga/autoconf.c
diff -u src/sys/arch/amiga/amiga/autoconf.c:1.119 src/sys/arch/amiga/amiga/autoconf.c:1.119.6.1
--- src/sys/arch/amiga/amiga/autoconf.c:1.119	Tue Apr 27 14:48:28 2021
+++ src/sys/arch/amiga/amiga/autoconf.c	Tue Aug  3 23:05:51 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.119 2021/04/27 14:48:28 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.119.6.1 2021/08/03 23:05:51 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -30,10 +30,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define	__SUBR_AUTOCONF_PRIVATE		/* XXX amiga_config_found() */
-
 #include 
-__KERNEL_RCSID(0, "$NetBSD: 

CVS commit: [thorpej-cfargs2] src/sys

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Tue Aug  3 15:00:15 UTC 2021

Modified Files:
src/sys/kern [thorpej-cfargs2]: subr_autoconf.c
src/sys/sys [thorpej-cfargs2]: device.h

Log Message:
Address concerns about limited compile-time type checking with the
tag-value mechanism of specifying arguments to config_search(),
config_found(), and config_attach() by replacing the tag-value scheme
with a "struct cfargs", a pointer to which is passed to the aforementioned
functions instead.

The structure has a version field to allow for future ABI versioning
flexibility.  The external structure is canononicalized internally
before use.

To ease the initialization of this structure, use a variadic preprocessor
macro, CFARGS(), to construct an anonymous "struct cfargs" inline, the
address of which is passed to the target function.  A CFARGS_NONE macro
provides a symbolic stand-in for when the caller doesn't want to pass
arguments (currently expands to NULL and is handled during canonicalization).


To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.288.2.1 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.171 -r1.171.2.1 src/sys/sys/device.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.288 src/sys/kern/subr_autoconf.c:1.288.2.1
--- src/sys/kern/subr_autoconf.c:1.288	Mon Jun 14 08:55:49 2021
+++ src/sys/kern/subr_autoconf.c	Tue Aug  3 15:00:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.288 2021/06/14 08:55:49 skrll Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.288.2.1 2021/08/03 15:00:15 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -76,10 +76,8 @@
  *	@(#)subr_autoconf.c	8.3 (Berkeley) 5/17/94
  */
 
-#define	__SUBR_AUTOCONF_PRIVATE	/* see  */
-
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.288 2021/06/14 08:55:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.288.2.1 2021/08/03 15:00:15 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -168,6 +166,20 @@ struct alldevs_foray {
 	struct devicelist	af_garbage;
 };
 
+/*
+ * Internal version of the cfargs structure; all versions are
+ * canonicalized to this.
+ */
+struct cfargs_internal {
+	union {
+		cfsubmatch_t	submatch;/* submatch function (direct config) */
+		cfsearch_t	search;	 /* search function (indirect config) */
+	};
+	const char *	iattr;		/* interface attribute */
+	const int *	locators;	/* locators array */
+	devhandle_t	devhandle;	/* devhandle_t (by value) */
+};
+
 static char *number(char *, int);
 static void mapply(struct matchinfo *, cfdata_t);
 static void config_devdelete(device_t);
@@ -177,6 +189,8 @@ static void config_devlink(device_t);
 static void config_alldevs_enter(struct alldevs_foray *);
 static void config_alldevs_exit(struct alldevs_foray *);
 static void config_add_attrib_dict(device_t);
+static device_t	config_attach_internal(device_t, cfdata_t, void *,
+		cfprint_t, const struct cfargs_internal *);
 
 static void config_collect_garbage(struct devicelist *);
 static void config_dump_garbage(struct devicelist *);
@@ -1068,65 +1082,37 @@ config_probe(device_t parent, cfdata_t c
 	return config_match(parent, cf, aux);
 }
 
-static void
-config_get_cfargs(cfarg_t tag,
-		  cfsubmatch_t *fnp,		/* output */
-		  const char **ifattrp,		/* output */
-		  const int **locsp,		/* output */
-		  devhandle_t *handlep,		/* output */
-		  va_list ap)
-{
-	cfsubmatch_t fn = NULL;
-	const char *ifattr = NULL;
-	const int *locs = NULL;
-	devhandle_t handle;
-
-	devhandle_invalidate();
-
-	while (tag != CFARG_EOL) {
-		switch (tag) {
-		/*
-		 * CFARG_SUBMATCH and CFARG_SEARCH are synonyms, but this
-		 * is merely an implementation detail.  They are distinct
-		 * from the caller's point of view.
-		 */
-		case CFARG_SUBMATCH:
-		case CFARG_SEARCH:
-			/* Only allow one function to be specified. */
-			if (fn != NULL) {
-panic("%s: caller specified both "
-"SUBMATCH and SEARCH", __func__);
-			}
-			fn = va_arg(ap, cfsubmatch_t);
-			break;
-
-		case CFARG_IATTR:
-			ifattr = va_arg(ap, const char *);
-			break;
+static struct cfargs_internal *
+cfargs_canonicalize(const struct cfargs * const cfargs,
+struct cfargs_internal * const store)
+{
+	struct cfargs_internal *args = store;
 
-		case CFARG_LOCATORS:
-			locs = va_arg(ap, const int *);
-			break;
+	memset(args, 0, sizeof(*args));
 
-		case CFARG_DEVHANDLE:
-			handle = va_arg(ap, devhandle_t);
-			break;
+	/* If none specified, are all-NULL pointers are good. */
+	if (cfargs == NULL) {
+		return args;
+	}
 
-		default:
-			panic("%s: unknown cfarg tag: %d\n",
-			__func__, tag);
-		}
-		tag = va_arg(ap, cfarg_t);
+	/*
+	 * submatch and search are mutually-exclusive.
+	 */
+	if (cfargs->submatch != NULL && cfargs->search != NULL) {
+		panic("cfargs_canonicalize: submatch and search are "
+