Module Name: src
Committed By: thorpej
Date: Wed Aug 4 03:07:41 UTC 2021
Modified Files:
src/sys/arch/zaurus/dev [thorpej-cfargs2]: w100lcd.c zapm.c ziic.c
zkbd.c zlcd.c zrc.c zssp.c ztp.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/zaurus/dev/w100lcd.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/zaurus/dev/zapm.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/zaurus/dev/ziic.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/zaurus/dev/zkbd.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/zaurus/dev/zrc.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/zaurus/dev/zssp.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/zaurus/dev/ztp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/zaurus/dev/w100lcd.c
diff -u src/sys/arch/zaurus/dev/w100lcd.c:1.4 src/sys/arch/zaurus/dev/w100lcd.c:1.4.8.1
--- src/sys/arch/zaurus/dev/w100lcd.c:1.4 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/w100lcd.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: w100lcd.c,v 1.4 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: w100lcd.c,v 1.4.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
* Written by Hiroyuki Bessho for Genetec Corporation.
@@ -39,7 +39,7 @@
* LCD on/off switch and backlight brightness are done in lcdctl.c.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.4 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.4.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include "lcdctl.h"
@@ -145,7 +145,7 @@ w100lcd_attach(device_t parent, device_t
aa.accessops = &w100lcd_accessops;
aa.accesscookie = sc;
- (void)config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ (void)config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
if (!pmf_device_register(self, w100lcd_suspend, w100lcd_resume))
aprint_error_dev(self, "couldn't establish power handler\n");
Index: src/sys/arch/zaurus/dev/zapm.c
diff -u src/sys/arch/zaurus/dev/zapm.c:1.13 src/sys/arch/zaurus/dev/zapm.c:1.13.8.1
--- src/sys/arch/zaurus/dev/zapm.c:1.13 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/zapm.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zapm.c,v 1.13 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: zapm.c,v 1.13.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/* $OpenBSD: zaurus_apm.c,v 1.13 2006/12/12 23:14:28 dim Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zapm.c,v 1.13 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zapm.c,v 1.13.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -195,7 +195,7 @@ zapm_attach(device_t parent, device_t se
aaa.accesscookie = sc;
aaa.apm_detail = 0x0102;
- sc->sc_apmdev = config_found(self, &aaa, apmprint, CFARG_EOL);
+ sc->sc_apmdev = config_found(self, &aaa, apmprint, CFARGS_NONE);
if (sc->sc_apmdev != NULL) {
zapm_poll1(sc, 0);
callout_schedule(&sc->sc_cyclic_poll, CYCLIC_TIME);
Index: src/sys/arch/zaurus/dev/ziic.c
diff -u src/sys/arch/zaurus/dev/ziic.c:1.5 src/sys/arch/zaurus/dev/ziic.c:1.5.8.1
--- src/sys/arch/zaurus/dev/ziic.c:1.5 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/ziic.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ziic.c,v 1.5 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: ziic.c,v 1.5.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ziic.c,v 1.5 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ziic.c,v 1.5.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -129,7 +129,7 @@ pxaiic_attach(device_t parent, device_t
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
- config_found(psc->sc_dev, &iba, iicbus_print, CFARG_EOL);
+ config_found(psc->sc_dev, &iba, iicbus_print, CFARGS_NONE);
}
static int
Index: src/sys/arch/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.21 src/sys/arch/zaurus/dev/zkbd.c:1.21.8.1
--- src/sys/arch/zaurus/dev/zkbd.c:1.21 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/zkbd.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zkbd.c,v 1.21 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: zkbd.c,v 1.21.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.21 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.21.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include "opt_wsdisplay_compat.h"
#if 0 /* XXX */
@@ -336,7 +336,7 @@ zkbd_attach(device_t parent, device_t se
zkbd_hinge(sc); /* to initialize sc_hinge */
- sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
}
#ifdef WSDISPLAY_COMPAT_RAWKBD
Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.19 src/sys/arch/zaurus/dev/zlcd.c:1.19.8.1
--- src/sys/arch/zaurus/dev/zlcd.c:1.19 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/zlcd.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zlcd.c,v 1.19 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: zlcd.c,v 1.19.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/* $OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $ */
/* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.19 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.19.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include "lcdctl.h"
@@ -158,7 +158,7 @@ lcd_attach(device_t parent, device_t sel
aa.accessops = &lcd_accessops;
aa.accesscookie = sc;
- (void) config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ (void) config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
if (!pmf_device_register(self, lcd_suspend, lcd_resume))
aprint_error_dev(self, "couldn't establish power handler\n");
Index: src/sys/arch/zaurus/dev/zrc.c
diff -u src/sys/arch/zaurus/dev/zrc.c:1.11 src/sys/arch/zaurus/dev/zrc.c:1.11.8.1
--- src/sys/arch/zaurus/dev/zrc.c:1.11 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/zrc.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zrc.c,v 1.11 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: zrc.c,v 1.11.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/* $OpenBSD: zaurus_remote.c,v 1.1 2005/11/17 05:26:31 uwe Exp $ */
/*
@@ -20,7 +20,7 @@
#include "opt_wsdisplay_compat.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.11 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.11.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -208,7 +208,7 @@ zrc_attach(device_t parent, device_t sel
a.accessops = &zrc_accessops;
a.accesscookie = sc;
- sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
}
static int
Index: src/sys/arch/zaurus/dev/zssp.c
diff -u src/sys/arch/zaurus/dev/zssp.c:1.14 src/sys/arch/zaurus/dev/zssp.c:1.14.8.1
--- src/sys/arch/zaurus/dev/zssp.c:1.14 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/zssp.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zssp.c,v 1.14 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: zssp.c,v 1.14.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/* $OpenBSD: zaurus_ssp.c,v 1.6 2005/04/08 21:58:49 uwe Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.14 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.14.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -145,8 +145,7 @@ zssp_attach(device_t parent, device_t se
/* Attach all devices */
config_search(self, NULL,
- CFARG_SEARCH, zssp_search,
- CFARG_EOL);
+ CFARGS(.search = zssp_search));
}
static int
@@ -157,7 +156,7 @@ zssp_search(device_t parent, cfdata_t cf
aa.zaa_name = cf->cf_name;
if (config_probe(parent, cf, &aa))
- config_attach(parent, cf, &aa, zssp_print, CFARG_EOL);
+ config_attach(parent, cf, &aa, zssp_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/zaurus/dev/ztp.c
diff -u src/sys/arch/zaurus/dev/ztp.c:1.15 src/sys/arch/zaurus/dev/ztp.c:1.15.8.1
--- src/sys/arch/zaurus/dev/ztp.c:1.15 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/ztp.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ztp.c,v 1.15 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: ztp.c,v 1.15.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/* $OpenBSD: zts.c,v 1.9 2005/04/24 18:55:49 uwe Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ztp.c,v 1.15 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ztp.c,v 1.15.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include "lcd.h"
#include "w100lcd.h"
@@ -206,7 +206,7 @@ ztp_attach(device_t parent, device_t sel
sc->sc_ccnt_hs = CCNT_HS_400_VGA_C860;
}
- sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+ sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
/* Initialize calibration, set default parameters. */
tpcalib_init(&sc->sc_tpcalib);
