Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej-cfargs2]: src/sys/arch Adapt to CFARGS().
details: https://anonhg.NetBSD.org/src/rev/2e65fada0d6e
branches: thorpej-cfargs2
changeset: 985009:2e65fada0d6e
user: thorpej <thorpej%NetBSD.org@localhost>
date: Tue Aug 03 23:05:51 2021 +0000
description:
Adapt to CFARGS().
diffstat:
sys/arch/alpha/alpha/mainbus.c | 10 ++--
sys/arch/alpha/jensenio/jensenio.c | 17 +++-----
sys/arch/alpha/mcbus/mcbus.c | 19 ++++-----
sys/arch/alpha/pci/apecs.c | 6 +-
sys/arch/alpha/pci/cia.c | 6 +-
sys/arch/alpha/pci/dwlpx.c | 6 +-
sys/arch/alpha/pci/irongate.c | 10 ++---
sys/arch/alpha/pci/lca.c | 6 +-
sys/arch/alpha/pci/mcpcia.c | 6 +-
sys/arch/alpha/pci/sio.c | 10 ++---
sys/arch/alpha/pci/tsc.c | 16 ++++----
sys/arch/alpha/pci/tsciic.c | 6 +-
sys/arch/alpha/pci/ttwoga.c | 12 ++---
sys/arch/alpha/sableio/sableio.c | 9 ++--
sys/arch/alpha/tc/tcasic.c | 6 +-
sys/arch/alpha/tlsb/gbus.c | 9 ++--
sys/arch/alpha/tlsb/kftxx.c | 6 +-
sys/arch/alpha/tlsb/tlsb.c | 14 +++----
sys/arch/amiga/amiga/autoconf.c | 66 +++++++++++++++-------------------
sys/arch/amiga/amiga/device.h | 5 +-
sys/arch/amiga/clockport/a1k2cp.c | 4 +-
sys/arch/amiga/clockport/clockport.c | 7 +--
sys/arch/amiga/clockport/gencp.c | 4 +-
sys/arch/amiga/dev/acafh.c | 8 ++--
sys/arch/amiga/dev/afsc.c | 6 +-
sys/arch/amiga/dev/ahsc.c | 6 +-
sys/arch/amiga/dev/amidisplaycc.c | 6 +-
sys/arch/amiga/dev/atzsc.c | 6 +-
sys/arch/amiga/dev/bppcsc.c | 6 +-
sys/arch/amiga/dev/cbiiisc.c | 6 +-
sys/arch/amiga/dev/drsc.c | 6 +-
sys/arch/amiga/dev/drsupio.c | 6 +-
sys/arch/amiga/dev/empsc.c | 6 +-
sys/arch/amiga/dev/fd.c | 8 ++--
sys/arch/amiga/dev/gayle_pcmcia.c | 7 ++-
sys/arch/amiga/dev/grf.c | 10 ++---
sys/arch/amiga/dev/grf_cc.c | 6 +-
sys/arch/amiga/dev/grf_cl.c | 6 +-
sys/arch/amiga/dev/grf_cv.c | 6 +-
sys/arch/amiga/dev/grf_cv3d.c | 6 +-
sys/arch/amiga/dev/grf_et.c | 6 +-
sys/arch/amiga/dev/grf_rh.c | 6 +-
sys/arch/amiga/dev/grf_rt.c | 6 +-
sys/arch/amiga/dev/grf_ul.c | 6 +-
sys/arch/amiga/dev/gtsc.c | 6 +-
sys/arch/amiga/dev/gvpbus.c | 8 ++--
sys/arch/amiga/dev/gvpio.c | 6 +-
sys/arch/amiga/dev/hyper.c | 6 +-
sys/arch/amiga/dev/ioblix_zbus.c | 6 +-
sys/arch/amiga/dev/ivsc.c | 6 +-
sys/arch/amiga/dev/kbd.c | 7 +--
sys/arch/amiga/dev/mfc.c | 10 ++--
sys/arch/amiga/dev/mgnsc.c | 6 +-
sys/arch/amiga/dev/mlhsc.c | 6 +-
sys/arch/amiga/dev/mntva.c | 6 +-
sys/arch/amiga/dev/ms.c | 7 +--
sys/arch/amiga/dev/otgsc.c | 6 +-
sys/arch/amiga/dev/p5bus.c | 8 ++--
sys/arch/amiga/dev/wesc.c | 6 +-
sys/arch/amiga/dev/wstsc.c | 6 +-
sys/arch/amiga/dev/xsh.c | 6 +-
sys/arch/amiga/dev/xsurf.c | 12 +++---
sys/arch/amiga/dev/z3rambd.c | 6 +-
sys/arch/amiga/dev/zbus.c | 6 +-
sys/arch/amiga/dev/zssc.c | 6 +-
sys/arch/amiga/pci/cv3dpb.c | 4 +-
sys/arch/amiga/pci/em4k.c | 4 +-
sys/arch/amiga/pci/empb.c | 8 +--
sys/arch/amiga/pci/mppb.c | 4 +-
sys/arch/amiga/pci/p5pb.c | 4 +-
sys/arch/amigappc/amigappc/autoconf.c | 20 +++------
sys/arch/amigappc/amigappc/mainbus.c | 36 +++++++++---------
72 files changed, 292 insertions(+), 325 deletions(-)
diffs (truncated from 2346 to 300 lines):
diff -r 6d893947099b -r 2e65fada0d6e sys/arch/alpha/alpha/mainbus.c
--- a/sys/arch/alpha/alpha/mainbus.c Tue Aug 03 15:00:15 2021 +0000
+++ b/sys/arch/alpha/alpha/mainbus.c Tue Aug 03 23:05:51 2021 +0000
@@ -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 @@
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 @@
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);
}
}
diff -r 6d893947099b -r 2e65fada0d6e sys/arch/alpha/jensenio/jensenio.c
--- a/sys/arch/alpha/jensenio/jensenio.c Tue Aug 03 15:00:15 2021 +0000
+++ b/sys/arch/alpha/jensenio/jensenio.c Tue Aug 03 23:05:51 2021 +0000
@@ -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 @@
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 @@
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 @@
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
diff -r 6d893947099b -r 2e65fada0d6e sys/arch/alpha/mcbus/mcbus.c
--- a/sys/arch/alpha/mcbus/mcbus.c Tue Aug 03 15:00:15 2021 +0000
+++ b/sys/arch/alpha/mcbus/mcbus.c Tue Aug 03 23:05:51 2021 +0000
@@ -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 @@
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 @@
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 @@
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
diff -r 6d893947099b -r 2e65fada0d6e sys/arch/alpha/pci/apecs.c
--- a/sys/arch/alpha/pci/apecs.c Tue Aug 03 15:00:15 2021 +0000
+++ b/sys/arch/alpha/pci/apecs.c Tue Aug 03 23:05:51 2021 +0000
@@ -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 @@
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
diff -r 6d893947099b -r 2e65fada0d6e sys/arch/alpha/pci/cia.c
--- a/sys/arch/alpha/pci/cia.c Tue Aug 03 15:00:15 2021 +0000
+++ b/sys/arch/alpha/pci/cia.c Tue Aug 03 23:05:51 2021 +0000
@@ -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 @@
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
diff -r 6d893947099b -r 2e65fada0d6e sys/arch/alpha/pci/dwlpx.c
--- a/sys/arch/alpha/pci/dwlpx.c Tue Aug 03 15:00:15 2021 +0000
+++ b/sys/arch/alpha/pci/dwlpx.c Tue Aug 03 23:05:51 2021 +0000
@@ -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 @@
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
diff -r 6d893947099b -r 2e65fada0d6e sys/arch/alpha/pci/irongate.c
--- a/sys/arch/alpha/pci/irongate.c Tue Aug 03 15:00:15 2021 +0000
+++ b/sys/arch/alpha/pci/irongate.c Tue Aug 03 23:05:51 2021 +0000
@@ -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 @@
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
diff -r 6d893947099b -r 2e65fada0d6e sys/arch/alpha/pci/lca.c
--- a/sys/arch/alpha/pci/lca.c Tue Aug 03 15:00:15 2021 +0000
+++ b/sys/arch/alpha/pci/lca.c Tue Aug 03 23:05:51 2021 +0000
@@ -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 @@
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
diff -r 6d893947099b -r 2e65fada0d6e sys/arch/alpha/pci/mcpcia.c
--- a/sys/arch/alpha/pci/mcpcia.c Tue Aug 03 15:00:15 2021 +0000
+++ b/sys/arch/alpha/pci/mcpcia.c Tue Aug 03 23:05:51 2021 +0000
@@ -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.
Home |
Main Index |
Thread Index |
Old Index