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 <sys/cdefs.h>
-__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->sc_dspconf;
- config_found(self, &ha, hpcfbprint, CFARG_EOL);
+ config_found(self, &ha, 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 <sys/cdefs.h>
-__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 = &btnmgr_wskbd_accessops;
wa.accesscookie = sc;
- sc->sc_wskbddev = config_found(self, &wa, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &wa, 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 <sys/cdefs.h>
-__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, &wska, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbd = config_found(self, &wska, 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 <sys/cdefs.h>
-__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, &aaa, apmprint, CFARG_EOL);
+ sc->sc_apmdev = config_found(self, &aaa, apmprint, CFARGS_NONE);
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "unable to establish power handler\n");
Index: src/sys/dev/hpc/hpcfb.c
diff -u src/sys/dev/hpc/hpcfb.c:1.62 src/sys/dev/hpc/hpcfb.c:1.62.2.1
--- src/sys/dev/hpc/hpcfb.c:1.62 Sat Jun 5 02:27:08 2021
+++ src/sys/dev/hpc/hpcfb.c Wed Aug 4 18:38:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.62 2021/06/05 02:27:08 rin Exp $ */
+/* $NetBSD: hpcfb.c,v 1.62.2.1 2021/08/04 18:38:19 thorpej Exp $ */
/*-
* Copyright (c) 1999
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.62 2021/06/05 02:27:08 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.62.2.1 2021/08/04 18:38:19 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcfb.h"
@@ -325,7 +325,7 @@ hpcfbattach(device_t parent, device_t se
wa.accesscookie = sc;
sc->sc_wsdisplay = config_found(self, &wa, wsemuldisplaydevprint,
- CFARG_EOL);
+ CFARGS_NONE);
#ifdef HPCFB_JUMP
/*
Index: src/sys/dev/hpc/hpcioman.c
diff -u src/sys/dev/hpc/hpcioman.c:1.20 src/sys/dev/hpc/hpcioman.c:1.20.8.1
--- src/sys/dev/hpc/hpcioman.c:1.20 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hpc/hpcioman.c Wed Aug 4 18:38:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcioman.c,v 1.20 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: hpcioman.c,v 1.20.8.1 2021/08/04 18:38:19 thorpej Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.20 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.20.8.1 2021/08/04 18:38:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,8 +74,7 @@ hpcioman_attach(device_t parent, device_
printf("\n");
config_search(self, aux,
- CFARG_SEARCH, hpcioman_search,
- CFARG_EOL);
+ CFARGS(.search = hpcioman_search));
}
int
@@ -155,7 +154,7 @@ hpcioman_search(device_t parent, cfdata_
}
hma.hma_connect = cf->cf_connect;
- config_attach(parent, cf, &hma, hpcioman_print, CFARG_EOL);
+ config_attach(parent, cf, &hma, hpcioman_print, CFARGS_NONE);
return (0);
}
Index: src/sys/dev/hpc/hpckbd.c
diff -u src/sys/dev/hpc/hpckbd.c:1.36 src/sys/dev/hpc/hpckbd.c:1.36.8.1
--- src/sys/dev/hpc/hpckbd.c:1.36 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hpc/hpckbd.c Wed Aug 4 18:38:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hpckbd.c,v 1.36 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: hpckbd.c,v 1.36.8.1 2021/08/04 18:38:19 thorpej Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.36 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.36.8.1 2021/08/04 18:38:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -184,7 +184,7 @@ hpckbd_attach(device_t parent, device_t
wa.accessops = &hpckbd_accessops;
wa.accesscookie = sc->sc_core;
sc->sc_core->hc_wskbddev = config_found(self, &wa, wskbddevprint,
- CFARG_EOL);
+ CFARGS_NONE);
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "unable to establish power handler\n");
Index: src/sys/dev/hyperv/genfb_vmbus.c
diff -u src/sys/dev/hyperv/genfb_vmbus.c:1.2 src/sys/dev/hyperv/genfb_vmbus.c:1.2.8.1
--- src/sys/dev/hyperv/genfb_vmbus.c:1.2 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hyperv/genfb_vmbus.c Wed Aug 4 18:38:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_vmbus.c,v 1.2 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: genfb_vmbus.c,v 1.2.8.1 2021/08/04 18:38:19 thorpej Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_vmbus.c,v 1.2 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_vmbus.c,v 1.2.8.1 2021/08/04 18:38:19 thorpej Exp $");
#include "opt_wsfb.h"
#include "opt_genfb.h"
@@ -115,8 +115,7 @@ genfb_vmbus_attach(device_t parent, devi
/* now try to attach a DRM */
config_found(self, aux, genfb_vmbus_drm_print,
- CFARG_IATTR, "drm",
- CFARG_EOL);
+ CFARGS(.iattr = "drm"));
}
static int
Index: src/sys/dev/hyperv/hvkbd.c
diff -u src/sys/dev/hyperv/hvkbd.c:1.8 src/sys/dev/hyperv/hvkbd.c:1.8.8.1
--- src/sys/dev/hyperv/hvkbd.c:1.8 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hyperv/hvkbd.c Wed Aug 4 18:38:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hvkbd.c,v 1.8 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: hvkbd.c,v 1.8.8.1 2021/08/04 18:38:19 thorpej Exp $ */
/*-
* Copyright (c) 2017 Microsoft Corp.
@@ -36,7 +36,7 @@
#endif /* _KERNEL_OPT */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.8 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.8.8.1 2021/08/04 18:38:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -237,7 +237,7 @@ hvkbd_attach(device_t parent, device_t s
a.keymap = &hvkbd_keymapdata;
a.accessops = &hvkbd_accessops;
a.accesscookie = sc;
- sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
return;
free_buf:
Index: src/sys/dev/hyperv/hvs.c
diff -u src/sys/dev/hyperv/hvs.c:1.6 src/sys/dev/hyperv/hvs.c:1.6.2.1
--- src/sys/dev/hyperv/hvs.c:1.6 Thu Jun 10 07:48:00 2021
+++ src/sys/dev/hyperv/hvs.c Wed Aug 4 18:38:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hvs.c,v 1.6 2021/06/10 07:48:00 nonaka Exp $ */
+/* $NetBSD: hvs.c,v 1.6.2.1 2021/08/04 18:38:19 thorpej Exp $ */
/* $OpenBSD: hvs.c,v 1.17 2017/08/10 17:22:48 mikeb Exp $ */
/*-
@@ -37,7 +37,7 @@
/* #define HVS_DEBUG_IO */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hvs.c,v 1.6 2021/06/10 07:48:00 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvs.c,v 1.6.2.1 2021/08/04 18:38:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -392,7 +392,7 @@ hvs_attach(device_t parent, device_t sel
chan->chan_defquirks |= PQUIRK_ONLYBIG;
sc->sc_scsibus = config_found(self, &sc->sc_channel, scsiprint,
- CFARG_EOL);
+ CFARGS_NONE);
/*
* If the driver has successfully attached to an IDE device,
Index: src/sys/dev/hyperv/vmbus.c
diff -u src/sys/dev/hyperv/vmbus.c:1.13 src/sys/dev/hyperv/vmbus.c:1.13.8.1
--- src/sys/dev/hyperv/vmbus.c:1.13 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/hyperv/vmbus.c Wed Aug 4 18:38:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vmbus.c,v 1.13 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: vmbus.c,v 1.13.8.1 2021/08/04 18:38:19 thorpej Exp $ */
/* $OpenBSD: hyperv.c,v 1.43 2017/06/27 13:56:15 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.13 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.13.8.1 2021/08/04 18:38:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2203,7 +2203,7 @@ vmbus_process_devq(void *arg)
vaa.aa_iot = sc->sc_iot;
vaa.aa_memt = sc->sc_memt;
ch->ch_dev = config_found(sc->sc_dev,
- &vaa, vmbus_attach_print, CFARG_EOL);
+ &vaa, vmbus_attach_print, CFARGS_NONE);
break;
case VMBUS_DEV_TYPE_DETACH:
