Module Name: src Committed By: thorpej Date: Wed Aug 4 01:01:42 UTC 2021
Modified Files: src/sys/arch/ews4800mips/dev [thorpej-cfargs2]: ewskbd.c ewsms.c src/sys/arch/ews4800mips/ews4800mips [thorpej-cfargs2]: mainbus.c src/sys/arch/ews4800mips/sbd [thorpej-cfargs2]: fb_sbdio.c kbms_sbdio.c sbdio.c zs_sbdio.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/ews4800mips/dev/ewskbd.c cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/ews4800mips/dev/ewsms.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/ews4800mips/ews4800mips/mainbus.c cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/ews4800mips/sbd/fb_sbdio.c cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/ews4800mips/sbd/kbms_sbdio.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/ews4800mips/sbd/sbdio.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/ews4800mips/sbd/zs_sbdio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/ews4800mips/dev/ewskbd.c diff -u src/sys/arch/ews4800mips/dev/ewskbd.c:1.12 src/sys/arch/ews4800mips/dev/ewskbd.c:1.12.8.1 --- src/sys/arch/ews4800mips/dev/ewskbd.c:1.12 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/ews4800mips/dev/ewskbd.c Wed Aug 4 01:01:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ewskbd.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: ewskbd.c,v 1.12.8.1 2021/08/04 01:01:41 thorpej Exp $ */ /*- * Copyright (c) 2005 Izumi Tsutsui. All rights reserved. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ewskbd.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ewskbd.c,v 1.12.8.1 2021/08/04 01:01:41 thorpej Exp $"); #include <sys/param.h> #include <sys/kmem.h> @@ -251,7 +251,7 @@ ewskbd_zsc_attach(device_t parent, devic wskaa.accessops = &ewskbd_wskbd_accessops; wskaa.accesscookie = cs; sc->sc_dc->wskbddev = config_found(self, &wskaa, wskbddevprint, - CFARG_EOL); + CFARGS_NONE); } static int Index: src/sys/arch/ews4800mips/dev/ewsms.c diff -u src/sys/arch/ews4800mips/dev/ewsms.c:1.9 src/sys/arch/ews4800mips/dev/ewsms.c:1.9.8.1 --- src/sys/arch/ews4800mips/dev/ewsms.c:1.9 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/ews4800mips/dev/ewsms.c Wed Aug 4 01:01:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ewsms.c,v 1.9 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: ewsms.c,v 1.9.8.1 2021/08/04 01:01:41 thorpej Exp $ */ /* * Copyright (c) 2004 Steve Rumble @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ewsms.c,v 1.9 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ewsms.c,v 1.9.8.1 2021/08/04 01:01:41 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -184,7 +184,7 @@ ewsms_zsc_attach(device_t parent, device wsmaa.accessops = &ewsms_wsmouse_accessops; wsmaa.accesscookie = sc; sc->sc_wsmousedev = config_found(self, &wsmaa, wsmousedevprint, - CFARG_EOL); + CFARGS_NONE); } int Index: src/sys/arch/ews4800mips/ews4800mips/mainbus.c diff -u src/sys/arch/ews4800mips/ews4800mips/mainbus.c:1.6 src/sys/arch/ews4800mips/ews4800mips/mainbus.c:1.6.8.1 --- src/sys/arch/ews4800mips/ews4800mips/mainbus.c:1.6 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/ews4800mips/ews4800mips/mainbus.c Wed Aug 4 01:01:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 01:01:41 thorpej Exp $ */ /*- * Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 01:01:41 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,13 +66,13 @@ mainbus_attach(device_t parent, device_t /* CPU */ ma.ma_name = "cpu"; - config_found(self, &ma, mainbus_print, CFARG_EOL); + config_found(self, &ma, mainbus_print, CFARGS_NONE); /* System Board dependent device busses */ if (platform.mainbusdevs != NULL) { for (p = platform.mainbusdevs; *p != NULL; p++) { ma.ma_name = *p; - config_found(self, &ma, mainbus_print, CFARG_EOL); + config_found(self, &ma, mainbus_print, CFARGS_NONE); } } } Index: src/sys/arch/ews4800mips/sbd/fb_sbdio.c diff -u src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.19 src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.19.8.1 --- src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.19 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/ews4800mips/sbd/fb_sbdio.c Wed Aug 4 01:01:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: fb_sbdio.c,v 1.19 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: fb_sbdio.c,v 1.19.8.1 2021/08/04 01:01:41 thorpej Exp $ */ /*- * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #define WIRED_FB_TLB #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.19 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.19.8.1 2021/08/04 01:01:41 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -163,7 +163,7 @@ fb_sbdio_attach(device_t parent, device_ wa.accessops = &_fb_accessops; wa.accesscookie = (void *)sc; - config_found(self, &wa, wsdisplaydevprint, CFARG_EOL); + config_found(self, &wa, wsdisplaydevprint, CFARGS_NONE); } void Index: src/sys/arch/ews4800mips/sbd/kbms_sbdio.c diff -u src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.12 src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.12.8.1 --- src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.12 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/ews4800mips/sbd/kbms_sbdio.c Wed Aug 4 01:01:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: kbms_sbdio.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: kbms_sbdio.c,v 1.12.8.1 2021/08/04 01:01:41 thorpej Exp $ */ /*- * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbms_sbdio.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbms_sbdio.c,v 1.12.8.1 2021/08/04 01:01:41 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -167,7 +167,7 @@ kbms_sbdio_attach(device_t parent, devic return; } - sc->sc_wskbd = config_found(self, &ka, wskbddevprint, CFARG_EOL); + sc->sc_wskbd = config_found(self, &ka, wskbddevprint, CFARGS_NONE); ma.accessops = &mouse_accessops; ma.accesscookie = self; @@ -179,7 +179,7 @@ kbms_sbdio_attach(device_t parent, devic sc->sc_mouse_sig = 0x88; mouse_init(sc); - sc->sc_wsmouse = config_found(self, &ma, wsmousedevprint, CFARG_EOL); + sc->sc_wsmouse = config_found(self, &ma, wsmousedevprint, CFARGS_NONE); intr_establish(sa->sa_irq, kbms_sbdio_intr, self); } Index: src/sys/arch/ews4800mips/sbd/sbdio.c diff -u src/sys/arch/ews4800mips/sbd/sbdio.c:1.6 src/sys/arch/ews4800mips/sbd/sbdio.c:1.6.8.1 --- src/sys/arch/ews4800mips/sbd/sbdio.c:1.6 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/ews4800mips/sbd/sbdio.c Wed Aug 4 01:01:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sbdio.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: sbdio.c,v 1.6.8.1 2021/08/04 01:01:41 thorpej Exp $ */ /*- * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbdio.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbdio.c,v 1.6.8.1 2021/08/04 01:01:41 thorpej Exp $"); #define _EWS4800MIPS_BUS_DMA_PRIVATE @@ -105,7 +105,7 @@ sbdio_attach(device_t parent, device_t s sa.sa_addr2 = sd->sd_addr2; sa.sa_irq = sd->sd_irq; sa.sa_flags = sd->sd_flags; - config_found(self, &sa, sbdio_print, CFARG_EOL); + config_found(self, &sa, sbdio_print, CFARGS_NONE); } } Index: src/sys/arch/ews4800mips/sbd/zs_sbdio.c diff -u src/sys/arch/ews4800mips/sbd/zs_sbdio.c:1.13 src/sys/arch/ews4800mips/sbd/zs_sbdio.c:1.13.8.1 --- src/sys/arch/ews4800mips/sbd/zs_sbdio.c:1.13 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/ews4800mips/sbd/zs_sbdio.c Wed Aug 4 01:01:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs_sbdio.c,v 1.13 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: zs_sbdio.c,v 1.13.8.1 2021/08/04 01:01:41 thorpej Exp $ */ /*- * Copyright (c) 1996, 2005 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs_sbdio.c,v 1.13 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs_sbdio.c,v 1.13.8.1 2021/08/04 01:01:41 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -176,7 +176,7 @@ zs_sbdio_attach(device_t parent, device_ * The child attach will setup the hardware. */ if (!config_found(self, (void *)&zsc_args, zs_print, - CFARG_EOL)) { + CFARGS_NONE)) { /* No sub-driver. Just reset it. */ uint8_t reset = (channel == 0) ? ZSWR9_A_RESET : ZSWR9_B_RESET;