Module Name: src
Committed By: thorpej
Date: Tue Aug 3 23:57:22 UTC 2021
Modified Files:
src/sys/arch/cobalt/cobalt [thorpej-cfargs2]: mainbus.c
src/sys/arch/cobalt/dev [thorpej-cfargs2]: gt.c zs.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/cobalt/cobalt/mainbus.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/cobalt/dev/gt.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/cobalt/dev/zs.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/cobalt/cobalt/mainbus.c
diff -u src/sys/arch/cobalt/cobalt/mainbus.c:1.21 src/sys/arch/cobalt/cobalt/mainbus.c:1.21.8.1
--- src/sys/arch/cobalt/cobalt/mainbus.c:1.21 Sat Apr 24 23:36:30 2021
+++ src/sys/arch/cobalt/cobalt/mainbus.c Tue Aug 3 23:57:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:30 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.21.8.1 2021/08/03 23:57:21 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21.8.1 2021/08/03 23:57:21 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,8 +64,7 @@ mainbus_attach(device_t parent, device_t
aprint_normal("\n");
config_search(self, &ma,
- CFARG_SEARCH, mainbus_search,
- CFARG_EOL);
+ CFARGS(.search = mainbus_search));
}
static int
@@ -79,7 +78,7 @@ mainbus_search(device_t parent, cfdata_t
ma->ma_level = cf->cf_loc[MAINBUSCF_LEVEL];
ma->ma_irq = cf->cf_loc[MAINBUSCF_IRQ];
if (config_probe(parent, cf, ma))
- config_attach(parent, cf, ma, mainbus_print, CFARG_EOL);
+ config_attach(parent, cf, ma, mainbus_print, CFARGS_NONE);
} while (cf->cf_fstate == FSTATE_STAR);
return 0;
Index: src/sys/arch/cobalt/dev/gt.c
diff -u src/sys/arch/cobalt/dev/gt.c:1.33 src/sys/arch/cobalt/dev/gt.c:1.33.8.1
--- src/sys/arch/cobalt/dev/gt.c:1.33 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/cobalt/dev/gt.c Tue Aug 3 23:57:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gt.c,v 1.33 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: gt.c,v 1.33.8.1 2021/08/03 23:57:21 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.33 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.33.8.1 2021/08/03 23:57:21 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -157,7 +157,7 @@ gt_attach(device_t parent, device_t self
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | /*PCI_FLAGS_MRM_OKAY|*/ PCI_FLAGS_MWI_OKAY;
pba.pba_pc = pc;
- config_found(self, &pba, gt_print, CFARG_EOL);
+ config_found(self, &pba, gt_print, CFARGS_NONE);
#endif
}
Index: src/sys/arch/cobalt/dev/zs.c
diff -u src/sys/arch/cobalt/dev/zs.c:1.5 src/sys/arch/cobalt/dev/zs.c:1.5.8.1
--- src/sys/arch/cobalt/dev/zs.c:1.5 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/cobalt/dev/zs.c Tue Aug 3 23:57:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.5 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.5.8.1 2021/08/03 23:57:21 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.5 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.5.8.1 2021/08/03 23:57:21 thorpej Exp $");
#include "opt_ddb.h"
@@ -223,7 +223,7 @@ zs_attach(device_t parent, device_t self
* The child attach will setup the hardware.
*/
if (!config_found(self, (void *)&zsc_args, zs_print,
- CFARG_EOL)) {
+ CFARGS_NONE)) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
ZSWR9_A_RESET : ZSWR9_B_RESET;
