CVS commit: [thorpej-cfargs2] src/sys/dev/raidframe
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
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
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
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: src/sys/dev/ic
Module Name:src
Committed By: tnn
Date: Thu Aug 5 00:16:36 UTC 2021
Modified Files:
src/sys/dev/ic: ssdfb.c ssdfbvar.h
Log Message:
ssdfb: prepare for supporting rgb color displays
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/ssdfb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/ssdfbvar.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/ic/ssdfb.c
diff -u src/sys/dev/ic/ssdfb.c:1.16 src/sys/dev/ic/ssdfb.c:1.17
--- src/sys/dev/ic/ssdfb.c:1.16 Thu Aug 5 00:02:51 2021
+++ src/sys/dev/ic/ssdfb.c Thu Aug 5 00:16:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ssdfb.c,v 1.16 2021/08/05 00:02:51 tnn Exp $ */
+/* $NetBSD: ssdfb.c,v 1.17 2021/08/05 00:16:36 tnn Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.16 2021/08/05 00:02:51 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.17 2021/08/05 00:16:36 tnn Exp $");
#include "opt_ddb.h"
@@ -268,16 +268,35 @@ ssdfb_attach(struct ssdfb_softc *sc, int
goto out;
}
#ifdef SSDFB_USE_NATIVE_DEPTH
- ri->ri_depth = sc->sc_p->p_bits_per_pixel;
+ ri->ri_depth = sc->sc_p->p_bits_per_pixel;
#else
- ri->ri_depth = 8;
+ if (sc->sc_p->p_rgb && sc->sc_p->p_bits_per_pixel == 32) {
+ ri->ri_depth = sc->sc_p->p_bits_per_pixel;
+ ri->ri_rnum = 8;
+ ri->ri_gnum = 8;
+ ri->ri_bnum = 8;
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+ ri->ri_rpos = 0;
+ ri->ri_gpos = 8;
+ ri->ri_bpos = 16;
+#else
+ ri->ri_rpos = 24;
+ ri->ri_gpos = 16;
+ ri->ri_bpos = 8;
+#endif
+ } else {
+ ri->ri_depth = 8;
+ }
#endif
ri->ri_font = sc->sc_font;
ri->ri_width = sc->sc_p->p_width;
ri->ri_height = sc->sc_p->p_height;
ri->ri_stride = ri->ri_width * ri->ri_depth / 8;
ri->ri_hw = sc;
- ri->ri_flg = RI_FULLCLEAR | RI_FORCEMONO;
+ ri->ri_flg = RI_FULLCLEAR;
+ if (!sc->sc_p->p_rgb) {
+ ri->ri_flg |= RI_FORCEMONO;
+ }
sc->sc_ri_bits_len = round_page(ri->ri_stride * ri->ri_height);
ri->ri_bits = (u_char *)uvm_km_alloc(kernel_map, sc->sc_ri_bits_len,
0, UVM_KMF_WIRED);
@@ -290,7 +309,9 @@ ssdfb_attach(struct ssdfb_softc *sc, int
if (error)
goto out;
- ri->ri_caps &= ~WSSCREEN_WSCOLORS;
+ if (!sc->sc_p->p_rgb) {
+ ri->ri_caps &= ~WSSCREEN_WSCOLORS;
+ }
/*
* Save original emul ops & insert our damage notification hooks.
@@ -425,8 +446,10 @@ ssdfb_ioctl(void *v, void *vs, u_long cm
case WSDISPLAYIO_GET_FBINFO:
fbi = (struct wsdisplayio_fbinfo *)data;
error = wsdisplayio_get_fbinfo(>sc_ri, fbi);
- fbi->fbi_subtype.fbi_cmapinfo.cmap_entries = cmaplen;
- /* fbi->fbi_pixeltype = WSFB_GREYSCALE */;
+ if (!sc->sc_p->p_rgb) {
+ fbi->fbi_subtype.fbi_cmapinfo.cmap_entries = cmaplen;
+ /* fbi->fbi_pixeltype = WSFB_GREYSCALE */;
+ }
return error;
case WSDISPLAYIO_LINEBYTES:
*(u_int *)data = sc->sc_ri.ri_stride;
@@ -483,6 +506,8 @@ ssdfb_ioctl(void *v, void *vs, u_long cm
return 0;
#endif
case WSDISPLAYIO_GETCMAP:
+ if (sc->sc_p->p_rgb)
+ return ENOTSUP;
wc = (struct wsdisplay_cmap *)data;
if (wc->index >= cmaplen ||
wc->count > cmaplen - wc->index)
@@ -1117,9 +1142,9 @@ ssdfb_sync_ssd1322(struct ssdfb_softc *s
* Transfer rasops bitmap into gddram shadow buffer while keeping track
* of the bounding box of the dirty region we scribbled over.
*/
- x1 = sc->sc_p->p_width;
+ x1 = width;
x2 = -1;
- y1 = sc->sc_p->p_height;
+ y1 = height;
y2 = -1;
blockp = (uint16_t*)sc->sc_gddram;
for (y = 0; y < height; y++) {
Index: src/sys/dev/ic/ssdfbvar.h
diff -u src/sys/dev/ic/ssdfbvar.h:1.7 src/sys/dev/ic/ssdfbvar.h:1.8
--- src/sys/dev/ic/ssdfbvar.h:1.7 Mon Aug 2 14:00:48 2021
+++ src/sys/dev/ic/ssdfbvar.h Thu Aug 5 00:16:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ssdfbvar.h,v 1.7 2021/08/02 14:00:48 tnn Exp $ */
+/* $NetBSD: ssdfbvar.h,v 1.8 2021/08/05 00:16:36 tnn Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -235,6 +235,13 @@
#define SSD1353_CMD_SET_SECOND_PRECHARGE_SPEED 0x8a
#define SSD1353_DEFAULT_SECOND_PRECHARGE_SPEED 2
#define SSD1353_CMD_REMAP_COLOR_DEPTH 0xa0
+ #define SSD1353_REMAP_NO_INCREMENT __BIT(0)
+ #define SSD1353_REMAP_SEG_DIRECTION __BIT(1)
+ #define SSD1353_REMAP_RGB __BIT(2)
+ #define SSD1353_REMAP_LR __BIT(3)
+ #define SSD1353_REMAP_COM_DIRECTION __BIT(4)
+ #define SSD1353_REMAP_SPLIT_ODD_EVEN __BIT(5)
+ #define SSD1353_REMAP_PIXEL_FORMAT_MASK __BITS(7, 6)
#define SSD1353_CMD_SET_DISPLAY_START_LINE SSD1322_CMD_SET_DISPLAY_START_LINE
#define SSD1353_CMD_SET_DISPLAY_OFFSET SSD1322_CMD_SET_DISPLAY_OFFSET
#define SSD1353_CMD_SET_VERTICAL_SCROLL_AREA SSDFB_CMD_SET_VERTICAL_SCROLL_AREA
@@ -305,6 +312,7 @@ struct ssdfb_product {
intp_width;
intp_height;
intp_bits_per_pixel;
+ boolp_rgb;
intp_panel_shift;
uint8_tp_fosc;
uint8_tp_fosc_div;
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tnn
Date: Thu Aug 5 00:02:51 UTC 2021
Modified Files:
src/sys/dev/ic: ssdfb.c
Log Message:
ssdfb: make it work on big-endian
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/ssdfb.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/ssdfb.c
diff -u src/sys/dev/ic/ssdfb.c:1.15 src/sys/dev/ic/ssdfb.c:1.16
--- src/sys/dev/ic/ssdfb.c:1.15 Mon Aug 2 14:00:48 2021
+++ src/sys/dev/ic/ssdfb.c Thu Aug 5 00:02:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ssdfb.c,v 1.15 2021/08/02 14:00:48 tnn Exp $ */
+/* $NetBSD: ssdfb.c,v 1.16 2021/08/05 00:02:51 tnn Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.15 2021/08/02 14:00:48 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.16 2021/08/05 00:02:51 tnn Exp $");
#include "opt_ddb.h"
@@ -1126,24 +1126,27 @@ ssdfb_sync_ssd1322(struct ssdfb_softc *s
src = (uint16_t*)>ri_bits[y * ri->ri_stride];
src32 = (uint32_t*)src;
for (x = 0; x < width_in_blocks; x++) {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-# ifdef SSDFB_USE_NATIVE_DEPTH
+#ifdef SSDFB_USE_NATIVE_DEPTH
raw_block =
((*src << 12) & 0xf000) |
- ((*src << 4) & 0x0f00) |
- ((*src >> 4) & 0x00f0) |
+ ((*src << 4) & 0x0f00) |
+ ((*src >> 4) & 0x00f0) |
((*src >> 12) & 0x000f);
src++;
-# else
+#else
raw_block =
+# if _BYTE_ORDER == _LITTLE_ENDIAN
((*src32 << 8) & 0x0f00) |
((*src32 << 4) & 0xf000) |
((*src32 >> 16) & 0x000f) |
((*src32 >> 20) & 0x00f0);
+# else
+ ((*src32 >> 24) & 0x000f) |
+ ((*src32 >> 12) & 0x00f0) |
+ ((*src32 ) & 0x0f00) |
+ ((*src32 << 12) & 0xf000);
# endif
src32++;
-#else
-# error please add big endian host support here
#endif
if (raw_block != *blockp) {
*blockp = raw_block;
@@ -1159,7 +1162,6 @@ ssdfb_sync_ssd1322(struct ssdfb_softc *s
blockp++;
}
}
-
blockp = (uint16_t*)sc->sc_gddram;
if (x2 != -1)
return sc->sc_transfer_rect(sc->sc_cookie,
CVS commit: [thorpej-cfargs2] src/sys/dev
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
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
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
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: src/sys/dev/dkwedge
Module Name:src
Committed By: mlelstv
Date: Wed Aug 4 21:44:42 UTC 2021
Modified Files:
src/sys/dev/dkwedge: dk.c
Log Message:
Swap and Dump uses DEV_BSIZE units. Translate from device sectors like
regular I/O (strategy).
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/dkwedge/dk.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.105 src/sys/dev/dkwedge/dk.c:1.106
--- src/sys/dev/dkwedge/dk.c:1.105 Wed Jun 2 17:56:40 2021
+++ src/sys/dev/dkwedge/dk.c Wed Aug 4 21:44:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.105 2021/06/02 17:56:40 mlelstv Exp $ */
+/* $NetBSD: dk.c,v 1.106 2021/08/04 21:44:41 mlelstv Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.105 2021/06/02 17:56:40 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.106 2021/08/04 21:44:41 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_dkwedge.h"
@@ -1639,6 +1639,7 @@ static int
dksize(dev_t dev)
{
struct dkwedge_softc *sc = dkwedge_lookup(dev);
+ uint64_t p_size;
int rv = -1;
if (sc == NULL)
@@ -1651,12 +1652,13 @@ dksize(dev_t dev)
/* Our content type is static, no need to open the device. */
+ p_size = sc->sc_size << sc->sc_parent->dk_blkshift;
if (strcmp(sc->sc_ptype, DKW_PTYPE_SWAP) == 0) {
/* Saturate if we are larger than INT_MAX. */
- if (sc->sc_size > INT_MAX)
+ if (p_size > INT_MAX)
rv = INT_MAX;
else
- rv = (int) sc->sc_size;
+ rv = (int) p_size;
}
mutex_exit(>sc_parent->dk_rawlock);
@@ -1675,6 +1677,7 @@ dkdump(dev_t dev, daddr_t blkno, void *v
{
struct dkwedge_softc *sc = dkwedge_lookup(dev);
const struct bdevsw *bdev;
+ uint64_t p_size, p_offset;
int rv = 0;
if (sc == NULL)
@@ -1697,16 +1700,20 @@ dkdump(dev_t dev, daddr_t blkno, void *v
rv = EINVAL;
goto out;
}
- if (blkno < 0 || blkno + size / DEV_BSIZE > sc->sc_size) {
+
+ p_offset = sc->sc_offset << sc->sc_parent->dk_blkshift;
+ p_size = sc->sc_size << sc->sc_parent->dk_blkshift;
+
+ if (blkno < 0 || blkno + size / DEV_BSIZE > p_size) {
printf("%s: blkno (%" PRIu64 ") + size / DEV_BSIZE (%zu) > "
- "sc->sc_size (%" PRIu64 ")\n", __func__, blkno,
- size / DEV_BSIZE, sc->sc_size);
+ "p_size (%" PRIu64 ")\n", __func__, blkno,
+ size / DEV_BSIZE, p_size);
rv = EINVAL;
goto out;
}
bdev = bdevsw_lookup(sc->sc_pdev);
- rv = (*bdev->d_dump)(sc->sc_pdev, blkno + sc->sc_offset, va, size);
+ rv = (*bdev->d_dump)(sc->sc_pdev, blkno + p_offset, va, size);
out:
mutex_exit(>sc_parent->dk_rawlock);
CVS commit: [thorpej-cfargs2] src/sys/dev/sbus
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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: src/doc
Module Name:src Committed By: nia Date: Wed Aug 4 13:50:47 UTC 2021 Modified Files: src/doc: TODO.smpnet Log Message: doc: more MPSAFE interfaces To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/doc/TODO.smpnet Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.smpnet diff -u src/doc/TODO.smpnet:1.42 src/doc/TODO.smpnet:1.43 --- src/doc/TODO.smpnet:1.42 Tue Aug 3 01:44:10 2021 +++ src/doc/TODO.smpnet Wed Aug 4 13:50:47 2021 @@ -1,4 +1,4 @@ -$NetBSD: TODO.smpnet,v 1.42 2021/08/03 01:44:10 msaitoh Exp $ +$NetBSD: TODO.smpnet,v 1.43 2021/08/04 13:50:47 nia Exp $ MP-safe components == @@ -43,13 +43,16 @@ kernel option. Some components scale up - Layer 3 - All except for items in the below section - Interfaces + - canloop(4) - gif(4) - ipsecif(4) - l2tp(4) + - lagg(4) - pppoe(4) - if_spppsubr.c - tap(4) - tun(4) + - vether(4) - vlan(4) - Packet filters - npf(7)
CVS commit: src/lib/libpuffs
Module Name:src Committed By: andvar Date: Wed Aug 4 09:31:26 UTC 2021 Modified Files: src/lib/libpuffs: puffs_node.3 puffs_ops.3 Log Message: fix typos in puffs man pages. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libpuffs/puffs_node.3 cvs rdiff -u -r1.46 -r1.47 src/lib/libpuffs/puffs_ops.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpuffs/puffs_node.3 diff -u src/lib/libpuffs/puffs_node.3:1.5 src/lib/libpuffs/puffs_node.3:1.6 --- src/lib/libpuffs/puffs_node.3:1.5 Wed May 13 22:42:31 2009 +++ src/lib/libpuffs/puffs_node.3 Wed Aug 4 09:31:25 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: puffs_node.3,v 1.5 2009/05/13 22:42:31 wiz Exp $ +.\" $NetBSD: puffs_node.3,v 1.6 2021/08/04 09:31:25 andvar Exp $ .\" .\" Copyright (c) 2007 Antti Kantee. All rights reserved. .\" @@ -66,7 +66,7 @@ and the argument is the argument given to .Fn puffs_nodewalk . .It Fn puffs_nodewalk pu nwfn arg -Walk all nodes associted with the mountpoint +Walk all nodes associated with the mountpoint .Ar pu and call .Fn nwfn Index: src/lib/libpuffs/puffs_ops.3 diff -u src/lib/libpuffs/puffs_ops.3:1.46 src/lib/libpuffs/puffs_ops.3:1.47 --- src/lib/libpuffs/puffs_ops.3:1.46 Mon Jul 3 21:32:51 2017 +++ src/lib/libpuffs/puffs_ops.3 Wed Aug 4 09:31:25 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: puffs_ops.3,v 1.46 2017/07/03 21:32:51 wiz Exp $ +.\" $NetBSD: puffs_ops.3,v 1.47 2021/08/04 09:31:25 andvar Exp $ .\" .\" Copyright (c) 2007 Antti Kantee. All rights reserved. .\" @@ -324,7 +324,7 @@ Wait for all I/O for complete until retu .It Dv MNT_NOWAIT Initiate I/O, but do not wait for completion. .It Dv MNT_LAZY -Synchorize data not synchoronized by the file system syncer, +Synchronize data not synchronized by the file system syncer, i.e., data not written when .Fn node_fsync is called with @@ -631,12 +631,12 @@ Called when a regular file is being memo .Fa flags is currently always 0. .It Fn puffs_node_fsync "pu" "opc" "pcr" "flags" "offlo" "offhi" -Sychronize a node's contents onto stable storage. +Synchronize a node's contents onto stable storage. This is necessary only if the file server caches some information before committing it. The parameter .Fa flags -specifies the minimum level of sychronization required (XXX: they are +specifies the minimum level of synchronization required (XXX: they are not yet available). The parameters .Fa offlo @@ -735,7 +735,7 @@ in the buffer. The argument .Fa offset is used to specify the offset to the directory. -Its intepretation is up to the file system and it should be set to +Its interpretation is up to the file system and it should be set to signal the continuation point when there is no more room for the next entry in .Fa dent . @@ -870,7 +870,7 @@ has a link count of zero, it may be safe .It Fn puffs_node_reclaim2 "pu" "opc" "nlookup" Same as .Fn puffs_node_reclaim -with an addditional argument for the number of lookups that have been done +with an additional argument for the number of lookups that have been done on the node (Node creation is counted as a lookup). This can be used by the file system to avoid a race condition, where the kernel sends a reclaim while it does not have received the reply for a lookup. @@ -882,7 +882,7 @@ If the file system maps cookies to .Vt struct puffs_node then the framework will do that work, and .Fn puffs_node_reclaim -can be reliabily used without the race condition. +can be reliably used without the race condition. .It Fn puffs_node_abortop "pu" "opc" "pcn" In case the operation following lookup (e.g., mkdir or remove) is not executed for some reason, abortop will be issued.
CVS commit: src/sys/netinet
Module Name:src Committed By: christos Date: Wed Aug 4 08:47:10 UTC 2021 Modified Files: src/sys/netinet: tcp_usrreq.c Log Message: Get the value of the right variable (from RVP) To generate a diff of this commit: cvs rdiff -u -r1.229 -r1.230 src/sys/netinet/tcp_usrreq.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/netinet/tcp_usrreq.c diff -u src/sys/netinet/tcp_usrreq.c:1.229 src/sys/netinet/tcp_usrreq.c:1.230 --- src/sys/netinet/tcp_usrreq.c:1.229 Mon Mar 8 13:17:27 2021 +++ src/sys/netinet/tcp_usrreq.c Wed Aug 4 04:47:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_usrreq.c,v 1.229 2021/03/08 18:17:27 christos Exp $ */ +/* $NetBSD: tcp_usrreq.c,v 1.230 2021/08/04 08:47:10 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -99,7 +99,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.229 2021/03/08 18:17:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.230 2021/08/04 08:47:10 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -480,7 +480,7 @@ tcp_ctloutput(int op, struct socket *so, optval = tp->t_keepcnt; goto setval; case TCP_KEEPINIT: - optval = tp->t_keepcnt; + optval = tp->t_keepinit; setval: error = sockopt_set(sopt, , sizeof(optval)); break; default:
