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 <sys/cdefs.h> -__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 <sys/param.h> #include <sys/systm.h> @@ -169,7 +169,7 @@ nadb_init(device_t dev) sc->sc_devtable[i].handler_id); aaa.dev = &sc->sc_devtable[i]; if (config_found(sc->sc_dev, &aaa, 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 <sys/cdefs.h> -__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, &a, 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 = &adbkms_accessops; am.accesscookie = sc; sc->sc_wsmousedev = config_found(self, &am, 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 <sys/cdefs.h> -__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 <sys/param.h> #include <sys/device.h> @@ -136,7 +136,7 @@ ktm_attach(device_t parent, device_t sel a.accessops = &ktm_accessops; a.accesscookie = sc; - sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL); + sc->sc_wsmousedev = config_found(self, &a, 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 <sys/cdefs.h> -__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 <sys/param.h> #include <sys/device.h> @@ -247,7 +247,7 @@ adbms_attach(device_t parent, device_t s a.accessops = &adbms_accessops; a.accesscookie = sc; - sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL); + sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE); }