Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/thorpej-cfargs2]: src/sys/rump/librump/rumpkern Adapt to CFARGS().



details:   https://anonhg.NetBSD.org/src/rev/3d8e070e6c5e
branches:  thorpej-cfargs2
changeset: 985031:3d8e070e6c5e
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Aug 05 00:39:16 2021 +0000

description:
Adapt to CFARGS().

diffstat:

 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c               |   7 +++----
 sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c                   |   7 +++----
 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c              |   7 +++----
 sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c                   |   7 +++----
 sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c |   6 +++---
 sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c  |   6 +++---
 sys/netbt/hci_unit.c                                                |   7 +++----
 sys/rump/dev/lib/libpci/pci_at_mainbus.c                            |   7 +++----
 sys/rump/dev/lib/libugenhc/ugenhc.c                                 |   6 +++---
 sys/rump/librump/rumpkern/rump_autoconf.c                           |  10 ++++------
 10 files changed, 31 insertions(+), 39 deletions(-)

diffs (279 lines):

diff -r 4f1a9dd78d51 -r 3d8e070e6c5e sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c     Tue Aug 03 23:53:38 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c     Thu Aug 05 00:39:16 2021 +0000
@@ -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 <sys/cdefs.h>
-__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 <linux/module.h>
 #include <linux/slab.h>
@@ -235,8 +235,7 @@
        afa.afa_fb_linebytes = mode_cmd.pitches[0];
 
        helper->fbdev = config_found(adev->ddev->dev, &afa, NULL,
-           CFARG_IATTR, "amdgpufbbus",
-           CFARG_EOL);
+           CFARGS(.iattr = "amdgpufbbus"));
        if (helper->fbdev == NULL) {
                DRM_ERROR("failed to attach amdgpufb\n");
                goto out_unref;
diff -r 4f1a9dd78d51 -r 3d8e070e6c5e sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Tue Aug 03 23:53:38 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Thu Aug 05 00:39:16 2021 +0000
@@ -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 <sys/cdefs.h>
-__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 <linux/async.h>
 #include <linux/module.h>
@@ -254,8 +254,7 @@
         * dev->struct_mutex.
         */
        helper->fbdev = config_found(dev->dev, &ifa, NULL,
-           CFARG_IATTR, "intelfbbus",
-           CFARG_EOL);
+           CFARGS(.iattr = "intelfbbus"));
        if (helper->fbdev == NULL) {
                DRM_ERROR("unable to attach intelfb\n");
                ret = -ENXIO;
diff -r 4f1a9dd78d51 -r 3d8e070e6c5e sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c    Tue Aug 03 23:53:38 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c    Thu Aug 05 00:39:16 2021 +0000
@@ -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 <sys/cdefs.h>
-__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 <linux/module.h>
 #include <linux/kernel.h>
@@ -443,8 +443,7 @@
        nfa.nfa_fb_linebytes = mode_cmd.pitches[0];
 
        helper->fbdev = config_found(dev->dev, &nfa, nouveau_fbcon_print,
-           CFARG_IATTR, "nouveaufbbus",
-           CFARG_EOL);
+           CFARGS(.iattr = "nouveaufbbus"));
        if (helper->fbdev == NULL) {
                goto out_unlock;
        }
diff -r 4f1a9dd78d51 -r 3d8e070e6c5e sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c Tue Aug 03 23:53:38 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c Thu Aug 05 00:39:16 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_fb.c,v 1.9 2021/04/24 23:37:00 thorpej Exp $    */
+/*     $NetBSD: radeon_fb.c,v 1.9.8.1 2021/08/05 00:39:17 thorpej Exp $        */
 
 /*
  * Copyright © 2007 David Airlie
@@ -26,7 +26,7 @@
  *     David Airlie
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.9 2021/04/24 23:37:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.9.8.1 2021/08/05 00:39:17 thorpej Exp $");
 
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -254,8 +254,7 @@
        rfa.rfa_fb_linebytes = mode_cmd.pitches[0];
 
        helper->fbdev = config_found(rdev->ddev->dev, &rfa, NULL,
-           CFARG_IATTR, "radeonfbbus",
-           CFARG_EOL);
+           CFARGS(.iattr = "radeonfbbus"));
        if (helper->fbdev == NULL) {
                DRM_ERROR("failed to attach genfb\n");
                goto out_unref;
diff -r 4f1a9dd78d51 -r 3d8e070e6c5e sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c
--- a/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c       Tue Aug 03 23:53:38 2021 +0000
+++ b/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c       Thu Aug 05 00:39:16 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vchiq_netbsd_acpi.c,v 1.4 2021/04/24 23:37:00 thorpej Exp $ */
+/* $NetBSD: vchiq_netbsd_acpi.c,v 1.4.8.1 2021/08/05 00:39:17 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_acpi.c,v 1.4 2021/04/24 23:37:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_acpi.c,v 1.4.8.1 2021/08/05 00:39:17 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -143,5 +143,5 @@
        vchiq_init();
 
        vaa.vaa_name = "AUDS";
-       config_found(self, &vaa, vchiq_print, CFARG_EOL);
+       config_found(self, &vaa, vchiq_print, CFARGS_NONE);
 }
diff -r 4f1a9dd78d51 -r 3d8e070e6c5e sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c
--- a/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c        Tue Aug 03 23:53:38 2021 +0000
+++ b/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c        Thu Aug 05 00:39:16 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vchiq_netbsd_fdt.c,v 1.6 2021/04/24 23:37:00 thorpej Exp $ */
+/* $NetBSD: vchiq_netbsd_fdt.c,v 1.6.8.1 2021/08/05 00:39:17 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_fdt.c,v 1.6 2021/04/24 23:37:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_fdt.c,v 1.6.8.1 2021/08/05 00:39:17 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -146,5 +146,5 @@
        vchiq_init();
 
        vaa.vaa_name = "AUDS";
-       config_found(self, &vaa, vchiq_print, CFARG_EOL);
+       config_found(self, &vaa, vchiq_print, CFARGS_NONE);
 }
diff -r 4f1a9dd78d51 -r 3d8e070e6c5e sys/netbt/hci_unit.c
--- a/sys/netbt/hci_unit.c      Tue Aug 03 23:53:38 2021 +0000
+++ b/sys/netbt/hci_unit.c      Thu Aug 05 00:39:16 2021 +0000
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
 #include <sys/conf.h>
@@ -194,8 +194,7 @@
         * Attach Bluetooth Device Hub
         */
        unit->hci_bthub = config_found(unit->hci_dev, &unit->hci_bdaddr, NULL,
-           CFARG_IATTR, "btbus",
-           CFARG_EOL);
+           CFARGS(.iattr = "btbus"));
 
        return 0;
 
diff -r 4f1a9dd78d51 -r 3d8e070e6c5e sys/rump/dev/lib/libpci/pci_at_mainbus.c
--- a/sys/rump/dev/lib/libpci/pci_at_mainbus.c  Tue Aug 03 23:53:38 2021 +0000
+++ b/sys/rump/dev/lib/libpci/pci_at_mainbus.c  Thu Aug 05 00:39:16 2021 +0000
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
 #include <sys/conf.h>
@@ -99,6 +99,5 @@
        if (!mainbus)
                panic("no mainbus.  use maintaxi instead?");
        config_found(mainbus, &pba, pcibusprint,
-           CFARG_IATTR, "pcibus",
-           CFARG_EOL);
+           CFARGS(.iattr = "pcibus"));
 }
diff -r 4f1a9dd78d51 -r 3d8e070e6c5e sys/rump/dev/lib/libugenhc/ugenhc.c
--- a/sys/rump/dev/lib/libugenhc/ugenhc.c       Tue Aug 03 23:53:38 2021 +0000
+++ b/sys/rump/dev/lib/libugenhc/ugenhc.c       Thu Aug 05 00:39:16 2021 +0000
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
 #include <sys/bus.h>
@@ -959,5 +959,5 @@
 
        mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 
-       config_found(self, &sc->sc_bus, usbctlprint, CFARG_EOL);
+       config_found(self, &sc->sc_bus, usbctlprint, CFARGS_NONE);
 }
diff -r 4f1a9dd78d51 -r 3d8e070e6c5e sys/rump/librump/rumpkern/rump_autoconf.c
--- a/sys/rump/librump/rumpkern/rump_autoconf.c Tue Aug 03 23:53:38 2021 +0000
+++ b/sys/rump/librump/rumpkern/rump_autoconf.c Thu Aug 05 00:39:16 2021 +0000
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
 #include <sys/device.h>
@@ -107,9 +107,7 @@
 
        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 @@
 
        maa.maa_unit = cf->cf_unit;
        if (config_probe(parent, cf, &maa))
-               config_attach(parent, cf, &maa, NULL, CFARG_EOL);
+               config_attach(parent, cf, &maa, NULL, CFARGS_NONE);
 
        return 0;
 }



Home | Main Index | Thread Index | Old Index