Module Name: src
Committed By: thorpej
Date: Tue Aug 3 23:14:59 UTC 2021
Modified Files:
src/sys/arch/alpha/alpha [thorpej-cfargs2]: mainbus.c
src/sys/arch/alpha/jensenio [thorpej-cfargs2]: jensenio.c
src/sys/arch/alpha/mcbus [thorpej-cfargs2]: mcbus.c
src/sys/arch/alpha/pci [thorpej-cfargs2]: apecs.c cia.c dwlpx.c
irongate.c lca.c mcpcia.c sio.c tsc.c tsciic.c ttwoga.c
src/sys/arch/alpha/sableio [thorpej-cfargs2]: sableio.c
src/sys/arch/alpha/tc [thorpej-cfargs2]: tcasic.c
src/sys/arch/alpha/tlsb [thorpej-cfargs2]: gbus.c kftxx.c tlsb.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/arch/alpha/alpha/mainbus.c
cvs rdiff -u -r1.21 -r1.21.6.1 src/sys/arch/alpha/jensenio/jensenio.c
cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/arch/alpha/mcbus/mcbus.c
cvs rdiff -u -r1.58 -r1.58.2.1 src/sys/arch/alpha/pci/apecs.c
cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/arch/alpha/pci/cia.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/arch/alpha/pci/dwlpx.c
cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/arch/alpha/pci/irongate.c
cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/arch/alpha/pci/lca.c
cvs rdiff -u -r1.34 -r1.34.2.1 src/sys/arch/alpha/pci/mcpcia.c
cvs rdiff -u -r1.56 -r1.56.6.1 src/sys/arch/alpha/pci/sio.c
cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/arch/alpha/pci/tsc.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/alpha/pci/tsciic.c
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/arch/alpha/pci/ttwoga.c
cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/arch/alpha/sableio/sableio.c
cvs rdiff -u -r1.51 -r1.51.6.1 src/sys/arch/alpha/tc/tcasic.c
cvs rdiff -u -r1.24 -r1.24.6.1 src/sys/arch/alpha/tlsb/gbus.c
cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/arch/alpha/tlsb/kftxx.c
cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/arch/alpha/tlsb/tlsb.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/alpha/alpha/mainbus.c
diff -u src/sys/arch/alpha/alpha/mainbus.c:1.36 src/sys/arch/alpha/alpha/mainbus.c:1.36.2.1
--- src/sys/arch/alpha/alpha/mainbus.c:1.36 Wed Jul 7 03:24:26 2021
+++ src/sys/arch/alpha/alpha/mainbus.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.36 2021/07/07 03:24:26 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.36.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.36 2021/07/07 03:24:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.36.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,7 +85,7 @@ mbattach(device_t parent, device_t self,
ma.ma_name = "cpu";
ma.ma_slot = i;
- if (config_found(self, &ma, mbprint, CFARG_EOL) != NULL)
+ if (config_found(self, &ma, mbprint, CFARGS_NONE) != NULL)
cpuattachcnt++;
}
if (ncpus != cpuattachcnt)
@@ -98,13 +98,13 @@ mbattach(device_t parent, device_t self,
if (alpha_is_qemu) {
ma.ma_name = "qemu";
ma.ma_slot = 0; /* meaningless */
- config_found(self, &ma, mbprint, CFARG_EOL);
+ config_found(self, &ma, mbprint, CFARGS_NONE);
}
if (platform.iobus != NULL) {
ma.ma_name = platform.iobus;
ma.ma_slot = 0; /* meaningless */
- config_found(self, &ma, mbprint, CFARG_EOL);
+ config_found(self, &ma, mbprint, CFARGS_NONE);
}
}
Index: src/sys/arch/alpha/jensenio/jensenio.c
diff -u src/sys/arch/alpha/jensenio/jensenio.c:1.21 src/sys/arch/alpha/jensenio/jensenio.c:1.21.6.1
--- src/sys/arch/alpha/jensenio/jensenio.c:1.21 Fri May 7 16:58:34 2021
+++ src/sys/arch/alpha/jensenio/jensenio.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio.c,v 1.21 2021/05/07 16:58:34 thorpej Exp $ */
+/* $NetBSD: jensenio.c,v 1.21.6.1 2021/08/03 23:14:58 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.21 2021/05/07 16:58:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.21.6.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -186,10 +186,9 @@ jensenio_attach(device_t parent, device_
locs[JENSENIOCF_PORT] = jensenio_devs[i].jd_ioaddr;
config_found(self, &ja, jensenio_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "jensenio",
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "jensenio",
+ .locators = locs));
}
/*
@@ -203,8 +202,7 @@ jensenio_attach(device_t parent, device_
ja.ja_eisa.eba_dmat = &jcp->jc_dmat_eisa;
ja.ja_eisa.eba_ec = &jcp->jc_ec;
config_found(self, &ja.ja_eisa, eisabusprint,
- CFARG_IATTR, "eisabus",
- CFARG_EOL);
+ CFARGS(.iattr = "eisabus"));
/*
* Attach the ISA bus.
@@ -217,8 +215,7 @@ jensenio_attach(device_t parent, device_
ja.ja_isa.iba_dmat = &jcp->jc_dmat_isa;
ja.ja_isa.iba_ic = &jcp->jc_ic;
config_found(self, &ja.ja_isa, isabusprint,
- CFARG_IATTR, "isabus",
- CFARG_EOL);
+ CFARGS(.iattr = "eisabus"));
}
static int
Index: src/sys/arch/alpha/mcbus/mcbus.c
diff -u src/sys/arch/alpha/mcbus/mcbus.c:1.24 src/sys/arch/alpha/mcbus/mcbus.c:1.24.2.1
--- src/sys/arch/alpha/mcbus/mcbus.c:1.24 Sun Jul 4 22:42:35 2021
+++ src/sys/arch/alpha/mcbus/mcbus.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mcbus.c,v 1.24 2021/07/04 22:42:35 thorpej Exp $ */
+/* $NetBSD: mcbus.c,v 1.24.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -37,7 +37,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcbus.c,v 1.24 2021/07/04 22:42:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcbus.c,v 1.24.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,9 +146,8 @@ mcbusattach(device_t parent, device_t se
mbp->mcbus_types[1] = MCBUS_TYPE_MEM;
locs[MCBUSCF_MID] = 1;
config_found(self, &ta, mcbusprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
/*
* Now find PCI busses.
@@ -166,9 +165,8 @@ mcbusattach(device_t parent, device_t se
locs[MCBUSCF_MID] = mid;
if (MCPCIA_EXISTS(ta.ma_mid, ta.ma_gid))
config_found(self, &ta, mcbusprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
#if 0
@@ -196,9 +194,8 @@ mcbusattach(device_t parent, device_t se
mbp->mcbus_types[mid] = MCBUS_TYPE_CPU;
locs[MCBUSCF_MID] = mid;
config_found(self, &ta, mcbusprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
#endif
Index: src/sys/arch/alpha/pci/apecs.c
diff -u src/sys/arch/alpha/pci/apecs.c:1.58 src/sys/arch/alpha/pci/apecs.c:1.58.2.1
--- src/sys/arch/alpha/pci/apecs.c:1.58 Sun Jul 4 22:42:36 2021
+++ src/sys/arch/alpha/pci/apecs.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs.c,v 1.58 2021/07/04 22:42:36 thorpej Exp $ */
+/* $NetBSD: apecs.c,v 1.58.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.58 2021/07/04 22:42:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.58.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,7 +183,7 @@ apecsattach(device_t parent, device_t se
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
static int
Index: src/sys/arch/alpha/pci/cia.c
diff -u src/sys/arch/alpha/pci/cia.c:1.78 src/sys/arch/alpha/pci/cia.c:1.78.2.1
--- src/sys/arch/alpha/pci/cia.c:1.78 Sun Jul 4 22:42:36 2021
+++ src/sys/arch/alpha/pci/cia.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cia.c,v 1.78 2021/07/04 22:42:36 thorpej Exp $ */
+/* $NetBSD: cia.c,v 1.78.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.78 2021/07/04 22:42:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.78.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -346,7 +346,7 @@ ciaattach(device_t parent, device_t self
if ((ccp->cc_flags & CCF_PYXISBUG) == 0)
pba.pba_flags |= PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY |
PCI_FLAGS_MWI_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
static int
Index: src/sys/arch/alpha/pci/dwlpx.c
diff -u src/sys/arch/alpha/pci/dwlpx.c:1.42 src/sys/arch/alpha/pci/dwlpx.c:1.42.2.1
--- src/sys/arch/alpha/pci/dwlpx.c:1.42 Sat Jun 19 16:59:07 2021
+++ src/sys/arch/alpha/pci/dwlpx.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx.c,v 1.42 2021/06/19 16:59:07 thorpej Exp $ */
+/* $NetBSD: dwlpx.c,v 1.42.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dwlpx.c,v 1.42 2021/06/19 16:59:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx.c,v 1.42.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -175,7 +175,7 @@ dwlpxattach(device_t parent, device_t se
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
void
Index: src/sys/arch/alpha/pci/irongate.c
diff -u src/sys/arch/alpha/pci/irongate.c:1.20 src/sys/arch/alpha/pci/irongate.c:1.20.2.1
--- src/sys/arch/alpha/pci/irongate.c:1.20 Sun Jul 4 22:42:36 2021
+++ src/sys/arch/alpha/pci/irongate.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate.c,v 1.20 2021/07/04 22:42:36 thorpej Exp $ */
+/* $NetBSD: irongate.c,v 1.20.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irongate.c,v 1.20 2021/07/04 22:42:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irongate.c,v 1.20.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -182,13 +182,11 @@ irongate_attach(device_t parent, device_
apa.apa_pci_args.pa_flags = pba.pba_flags;
config_found(self, &apa, agpbusprint,
- CFARG_IATTR, "agpbus",
- CFARG_EOL);
+ CFARGS(.iattr = "agpbus"));
}
config_found(self, &pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
}
static int
Index: src/sys/arch/alpha/pci/lca.c
diff -u src/sys/arch/alpha/pci/lca.c:1.56 src/sys/arch/alpha/pci/lca.c:1.56.2.1
--- src/sys/arch/alpha/pci/lca.c:1.56 Fri Jul 16 18:50:19 2021
+++ src/sys/arch/alpha/pci/lca.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lca.c,v 1.56 2021/07/16 18:50:19 thorpej Exp $ */
+/* $NetBSD: lca.c,v 1.56.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.56 2021/07/16 18:50:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.56.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -246,7 +246,7 @@ lcaattach(device_t parent, device_t self
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
static int
Index: src/sys/arch/alpha/pci/mcpcia.c
diff -u src/sys/arch/alpha/pci/mcpcia.c:1.34 src/sys/arch/alpha/pci/mcpcia.c:1.34.2.1
--- src/sys/arch/alpha/pci/mcpcia.c:1.34 Sat Jun 19 16:59:07 2021
+++ src/sys/arch/alpha/pci/mcpcia.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia.c,v 1.34 2021/06/19 16:59:07 thorpej Exp $ */
+/* $NetBSD: mcpcia.c,v 1.34.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcpcia.c,v 1.34 2021/06/19 16:59:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia.c,v 1.34.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -187,7 +187,7 @@ mcpciaattach(device_t parent, device_t s
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
/*
* Clear any errors that may have occurred during the probe
Index: src/sys/arch/alpha/pci/sio.c
diff -u src/sys/arch/alpha/pci/sio.c:1.56 src/sys/arch/alpha/pci/sio.c:1.56.6.1
--- src/sys/arch/alpha/pci/sio.c:1.56 Fri May 7 16:58:34 2021
+++ src/sys/arch/alpha/pci/sio.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sio.c,v 1.56 2021/05/07 16:58:34 thorpej Exp $ */
+/* $NetBSD: sio.c,v 1.56.6.1 2021/08/03 23:14:58 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.56 2021/05/07 16:58:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.56.6.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -239,8 +239,7 @@ sio_bridge_callback(device_t self)
alphabus_dma_get_tag(sc->sc_parent_dmat, ALPHA_BUS_EISA);
sa.sa_eba.eba_ec = &ec;
config_found(sc->sc_dev, &sa.sa_eba, eisabusprint,
- CFARG_IATTR, "eisabus",
- CFARG_EOL);
+ CFARGS(.iattr = "eisabus"));
}
#endif /* NPCEB */
@@ -285,8 +284,7 @@ sio_bridge_callback(device_t self)
alphabus_dma_get_tag(sc->sc_parent_dmat, ALPHA_BUS_ISA);
sa.sa_iba.iba_ic = sc->sc_ic;
config_found(sc->sc_dev, &sa.sa_iba, isabusprint,
- CFARG_IATTR, "isabus",
- CFARG_EOL);
+ CFARGS(.iattr = "isabus"));
}
static void
Index: src/sys/arch/alpha/pci/tsc.c
diff -u src/sys/arch/alpha/pci/tsc.c:1.28 src/sys/arch/alpha/pci/tsc.c:1.28.2.1
--- src/sys/arch/alpha/pci/tsc.c:1.28 Sun Jul 4 22:42:36 2021
+++ src/sys/arch/alpha/pci/tsc.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tsc.c,v 1.28 2021/07/04 22:42:36 thorpej Exp $ */
+/* $NetBSD: tsc.c,v 1.28.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.28 2021/07/04 22:42:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.28.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -140,25 +140,25 @@ tscattach(device_t parent, device_t self
tsp.tsp_name = "tsp";
tsp.tsp_slot = 0;
- config_found(self, &tsp, tscprint, CFARG_EOL);
+ config_found(self, &tsp, tscprint, CFARGS_NONE);
if (titan) {
tsp.tsp_slot += 2;
- config_found(self, &tsp, tscprint, CFARG_EOL);
+ config_found(self, &tsp, tscprint, CFARGS_NONE);
}
if (csc & CSC_P1P) {
tsp.tsp_slot = 1;
- config_found(self, &tsp, tscprint, CFARG_EOL);
+ config_found(self, &tsp, tscprint, CFARGS_NONE);
if (titan) {
tsp.tsp_slot += 2;
- config_found(self, &tsp, tscprint, CFARG_EOL);
+ config_found(self, &tsp, tscprint, CFARGS_NONE);
}
}
memset(&tsciic, 0, sizeof tsciic);
tsciic.tsciic_name = "tsciic";
- config_found(self, &tsciic, tsciicprint, CFARG_EOL);
+ config_found(self, &tsciic, tsciicprint, CFARGS_NONE);
}
static int
@@ -230,7 +230,7 @@ tspattach(device_t parent, device_t self
pba.pba_bridgetag = NULL;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
struct tsp_config *
Index: src/sys/arch/alpha/pci/tsciic.c
diff -u src/sys/arch/alpha/pci/tsciic.c:1.3 src/sys/arch/alpha/pci/tsciic.c:1.3.8.1
--- src/sys/arch/alpha/pci/tsciic.c:1.3 Sat Apr 24 23:36:23 2021
+++ src/sys/arch/alpha/pci/tsciic.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tsciic.c,v 1.3 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: tsciic.c,v 1.3.8.1 2021/08/03 23:14:58 thorpej Exp $ */
/*
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsciic.c,v 1.3 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsciic.c,v 1.3.8.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,7 +87,7 @@ tsciic_init(device_t self)
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
- config_found(self, &iba, iicbus_print, CFARG_EOL);
+ config_found(self, &iba, iicbus_print, CFARGS_NONE);
}
/* I2C bitbanging */
Index: src/sys/arch/alpha/pci/ttwoga.c
diff -u src/sys/arch/alpha/pci/ttwoga.c:1.19 src/sys/arch/alpha/pci/ttwoga.c:1.19.2.1
--- src/sys/arch/alpha/pci/ttwoga.c:1.19 Sun Jul 4 22:42:36 2021
+++ src/sys/arch/alpha/pci/ttwoga.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga.c,v 1.19 2021/07/04 22:42:36 thorpej Exp $ */
+/* $NetBSD: ttwoga.c,v 1.19.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ttwoga.c,v 1.19 2021/07/04 22:42:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttwoga.c,v 1.19.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -144,7 +144,7 @@ ttwogaattach(device_t parent, device_t s
memset(&pba, 0, sizeof(pba));
pba.pba_bus = hose;
- config_found(self, &pba, ttwogaprint, CFARG_EOL);
+ config_found(self, &pba, ttwogaprint, CFARGS_NONE);
}
}
@@ -254,13 +254,11 @@ ttwopciattach(device_t parent, device_t
*/
if (pba->pba_bus == 0) {
config_found(self, &npba, ttwosableioprint,
- CFARG_IATTR, "sableiobus",
- CFARG_EOL);
+ CFARGS(.iattr = "sableiobus"));
}
config_found(self, &npba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
}
static int
Index: src/sys/arch/alpha/sableio/sableio.c
diff -u src/sys/arch/alpha/sableio/sableio.c:1.15 src/sys/arch/alpha/sableio/sableio.c:1.15.6.1
--- src/sys/arch/alpha/sableio/sableio.c:1.15 Fri May 7 16:58:34 2021
+++ src/sys/arch/alpha/sableio/sableio.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sableio.c,v 1.15 2021/05/07 16:58:34 thorpej Exp $ */
+/* $NetBSD: sableio.c,v 1.15.6.1 2021/08/03 23:14:58 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sableio.c,v 1.15 2021/05/07 16:58:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sableio.c,v 1.15.6.1 2021/08/03 23:14:58 thorpej Exp $");
#include "isadma.h"
@@ -170,9 +170,8 @@ sableio_attach(device_t parent, device_t
locs[SABLEIOCF_PORT] = sableio_devs[i].sd_ioaddr;
config_found(self, &sa, sableio_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
Index: src/sys/arch/alpha/tc/tcasic.c
diff -u src/sys/arch/alpha/tc/tcasic.c:1.51 src/sys/arch/alpha/tc/tcasic.c:1.51.6.1
--- src/sys/arch/alpha/tc/tcasic.c:1.51 Fri May 7 22:46:10 2021
+++ src/sys/arch/alpha/tc/tcasic.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcasic.c,v 1.51 2021/05/07 22:46:10 thorpej Exp $ */
+/* $NetBSD: tcasic.c,v 1.51.6.1 2021/08/03 23:14:58 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.51 2021/05/07 22:46:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.51.6.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -150,7 +150,7 @@ tcasicattach(device_t parent, device_t s
scb_set(0x800, iointr, NULL);
mutex_exit(&cpu_lock);
- config_found(self, &tba, tcasicprint, CFARG_EOL);
+ config_found(self, &tba, tcasicprint, CFARGS_NONE);
}
static int
Index: src/sys/arch/alpha/tlsb/gbus.c
diff -u src/sys/arch/alpha/tlsb/gbus.c:1.24 src/sys/arch/alpha/tlsb/gbus.c:1.24.6.1
--- src/sys/arch/alpha/tlsb/gbus.c:1.24 Fri May 7 22:46:10 2021
+++ src/sys/arch/alpha/tlsb/gbus.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gbus.c,v 1.24 2021/05/07 22:46:10 thorpej Exp $ */
+/* $NetBSD: gbus.c,v 1.24.6.1 2021/08/03 23:14:58 thorpej Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -37,7 +37,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gbus.c,v 1.24 2021/05/07 22:46:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gbus.c,v 1.24.6.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,8 +125,7 @@ gbusattach(device_t parent, device_t sel
struct gbus_attach_args gaa = *ga;
locs[GBUSCF_OFFSET] = gaa.ga_offset;
config_found(self, &gaa, gbusprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
Index: src/sys/arch/alpha/tlsb/kftxx.c
diff -u src/sys/arch/alpha/tlsb/kftxx.c:1.18 src/sys/arch/alpha/tlsb/kftxx.c:1.18.2.1
--- src/sys/arch/alpha/tlsb/kftxx.c:1.18 Sun Jul 4 22:42:36 2021
+++ src/sys/arch/alpha/tlsb/kftxx.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kftxx.c,v 1.18 2021/07/04 22:42:36 thorpej Exp $ */
+/* $NetBSD: kftxx.c,v 1.18.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: kftxx.c,v 1.18 2021/07/04 22:42:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kftxx.c,v 1.18.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,6 +128,6 @@ kftattach(device_t parent, device_t self
ka.ka_node = sc->sc_node;
ka.ka_dtype = sc->sc_dtype;
ka.ka_hosenum = hoseno;
- config_found(self, &ka, kftprint, CFARG_EOL);
+ config_found(self, &ka, kftprint, CFARGS_NONE);
}
}
Index: src/sys/arch/alpha/tlsb/tlsb.c
diff -u src/sys/arch/alpha/tlsb/tlsb.c:1.40 src/sys/arch/alpha/tlsb/tlsb.c:1.40.2.1
--- src/sys/arch/alpha/tlsb/tlsb.c:1.40 Sun Jul 4 22:42:36 2021
+++ src/sys/arch/alpha/tlsb/tlsb.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tlsb.c,v 1.40 2021/07/04 22:42:36 thorpej Exp $ */
+/* $NetBSD: tlsb.c,v 1.40.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
* NASA AMES Research Center.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tlsb.c,v 1.40 2021/07/04 22:42:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlsb.c,v 1.40.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include "opt_multiprocessor.h"
@@ -180,9 +180,8 @@ tlsbattach(device_t parent, device_t sel
locs[TLSBCF_OFFSET] = 0; /* XXX unused? */
config_found(self, &ta, tlsbprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
/*
* *Now* search for I/O nodes (in descending order)
@@ -228,9 +227,8 @@ tlsbattach(device_t parent, device_t sel
locs[TLSBCF_OFFSET] = 0; /* XXX unused? */
config_found(self, &ta, tlsbprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
}
