Module Name: src
Committed By: thorpej
Date: Tue Aug 3 23:41:24 UTC 2021
Modified Files:
src/sys/arch/arc/arc [thorpej-cfargs2]: mainbus.c
src/sys/arch/arc/dti [thorpej-cfargs2]: btl.c
src/sys/arch/arc/isa [thorpej-cfargs2]: isabus.c
src/sys/arch/arc/jazz [thorpej-cfargs2]: fd.c jazzio.c
src/sys/arch/arc/pci [thorpej-cfargs2]: necpb.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/arc/arc/mainbus.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/arc/dti/btl.c
cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/arch/arc/isa/isabus.c
cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/arch/arc/jazz/fd.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/arc/jazz/jazzio.c
cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/arch/arc/pci/necpb.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/arc/arc/mainbus.c
diff -u src/sys/arch/arc/arc/mainbus.c:1.24 src/sys/arch/arc/arc/mainbus.c:1.24.8.1
--- src/sys/arch/arc/arc/mainbus.c:1.24 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/arc/mainbus.c Tue Aug 3 23:41:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.24 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.24.8.1 2021/08/03 23:41:24 thorpej Exp $ */
/* $OpenBSD: mainbus.c,v 1.4 1998/10/15 21:30:15 imp Exp $ */
/* NetBSD: mainbus.c,v 1.3 1995/06/28 02:45:10 cgd Exp */
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.24 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.24.8.1 2021/08/03 23:41:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,13 +78,13 @@ mbattach(device_t parent, device_t self,
nca.ca_name = "cpu";
nca.ca_slot = 0;
nca.ca_offset = 0;
- config_found(self, &nca, mbprint, CFARG_EOL);
+ config_found(self, &nca, mbprint, CFARGS_NONE);
for (i = 0; platform->mainbusdevs[i] != NULL; i++) {
nca.ca_name = platform->mainbusdevs[i];
nca.ca_slot = 0;
nca.ca_offset = 0;
- config_found(self, &nca, mbprint, CFARG_EOL);
+ config_found(self, &nca, mbprint, CFARGS_NONE);
}
}
Index: src/sys/arch/arc/dti/btl.c
diff -u src/sys/arch/arc/dti/btl.c:1.29 src/sys/arch/arc/dti/btl.c:1.29.8.1
--- src/sys/arch/arc/dti/btl.c:1.29 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/dti/btl.c Tue Aug 3 23:41:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: btl.c,v 1.29 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: btl.c,v 1.29.8.1 2021/08/03 23:41:24 thorpej Exp $ */
/* NetBSD: bt.c,v 1.10 1996/05/12 23:51:54 mycroft Exp */
#undef BTDIAG
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btl.c,v 1.29 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btl.c,v 1.29.8.1 2021/08/03 23:41:24 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -411,7 +411,7 @@ btattach(device_t parent, device_t self,
/*
* ask the adapter what subunits are present
*/
- config_found(self, &sc->sc_link, scsiprint, CFARG_EOL);
+ config_found(self, &sc->sc_link, scsiprint, CFARGS_NONE);
}
integrate void
Index: src/sys/arch/arc/isa/isabus.c
diff -u src/sys/arch/arc/isa/isabus.c:1.52 src/sys/arch/arc/isa/isabus.c:1.52.8.1
--- src/sys/arch/arc/isa/isabus.c:1.52 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/isa/isabus.c Tue Aug 3 23:41:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isabus.c,v 1.52 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: isabus.c,v 1.52.8.1 2021/08/03 23:41:24 thorpej Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@@ -120,7 +120,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.52 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.52.8.1 2021/08/03 23:41:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -208,8 +208,7 @@ isabrattach(struct isabr_softc *sc)
iba.iba_dmat = &sc->sc_dmat;
iba.iba_ic = &sc->arc_isa_cs;
config_found(sc->sc_dev, &iba, isabrprint,
- CFARG_IATTR, "isabus",
- CFARG_EOL);
+ CFARGS(.iattr = "isabus"));
}
static int
Index: src/sys/arch/arc/jazz/fd.c
diff -u src/sys/arch/arc/jazz/fd.c:1.50 src/sys/arch/arc/jazz/fd.c:1.50.8.1
--- src/sys/arch/arc/jazz/fd.c:1.50 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/jazz/fd.c Tue Aug 3 23:41:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.50 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.50.8.1 2021/08/03 23:41:24 thorpej Exp $ */
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.50 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.50.8.1 2021/08/03 23:41:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -282,7 +282,7 @@ fdcattach(struct fdc_softc *fdc)
for (fa.fa_drive = 0; fa.fa_drive < 2; fa.fa_drive++) {
fa.fa_deftype = &fd_types[type];
(void)config_found(fdc->sc_dev, (void *)&fa, fdprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
}
Index: src/sys/arch/arc/jazz/jazzio.c
diff -u src/sys/arch/arc/jazz/jazzio.c:1.23 src/sys/arch/arc/jazz/jazzio.c:1.23.8.1
--- src/sys/arch/arc/jazz/jazzio.c:1.23 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/jazz/jazzio.c Tue Aug 3 23:41:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: jazzio.c,v 1.23 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: jazzio.c,v 1.23.8.1 2021/08/03 23:41:24 thorpej Exp $ */
/* $OpenBSD: picabus.c,v 1.11 1999/01/11 05:11:10 millert Exp $ */
/* NetBSD: tc.c,v 1.2 1995/03/08 00:39:05 cgd Exp */
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jazzio.c,v 1.23 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jazzio.c,v 1.23.8.1 2021/08/03 23:41:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -149,7 +149,7 @@ jazzioattach(device_t parent, device_t s
ja.ja_dma = 0;
/* Tell the autoconfig machinery we've found the hardware. */
- config_found(self, &ja, jazzioprint, CFARG_EOL);
+ config_found(self, &ja, jazzioprint, CFARGS_NONE);
}
}
Index: src/sys/arch/arc/pci/necpb.c
diff -u src/sys/arch/arc/pci/necpb.c:1.47 src/sys/arch/arc/pci/necpb.c:1.47.8.1
--- src/sys/arch/arc/pci/necpb.c:1.47 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/pci/necpb.c Tue Aug 3 23:41:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: necpb.c,v 1.47 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: necpb.c,v 1.47.8.1 2021/08/03 23:41:24 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.47 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.47.8.1 2021/08/03 23:41:24 thorpej Exp $");
#include "opt_pci.h"
@@ -276,7 +276,7 @@ necpbattach(device_t parent, device_t se
pba.pba_bus = 0;
pba.pba_bridgetag = NULL;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
static void