Module Name: src
Committed By: thorpej
Date: Wed Aug 4 00:01:52 UTC 2021
Modified Files:
src/sys/arch/emips/ebus [thorpej-cfargs2]: ebus.c gpio_ebus.c
src/sys/arch/emips/emips [thorpej-cfargs2]: mainbus.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/emips/ebus/ebus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/emips/ebus/gpio_ebus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/emips/emips/mainbus.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/emips/ebus/ebus.c
diff -u src/sys/arch/emips/ebus/ebus.c:1.3 src/sys/arch/emips/ebus/ebus.c:1.3.8.1
--- src/sys/arch/emips/ebus/ebus.c:1.3 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/emips/ebus/ebus.c Wed Aug 4 00:01:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus.c,v 1.3 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: ebus.c,v 1.3.8.1 2021/08/04 00:01:51 thorpej Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.3 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.3.8.1 2021/08/04 00:01:51 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,9 +83,8 @@ ebusattach(device_t parent, device_t sel
locs[EBUSCF_ADDR] = ia->ia_paddr;
if (config_found(self, ia, ebusprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL) == NULL) {
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs)) == NULL) {
/* do we need to say anything? */
if (ia->ia_basz != 0) {
mips_unmap_physmem((vaddr_t)ia->ia_vaddr,
Index: src/sys/arch/emips/ebus/gpio_ebus.c
diff -u src/sys/arch/emips/ebus/gpio_ebus.c:1.4 src/sys/arch/emips/ebus/gpio_ebus.c:1.4.8.1
--- src/sys/arch/emips/ebus/gpio_ebus.c:1.4 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/emips/ebus/gpio_ebus.c Wed Aug 4 00:01:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio_ebus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: gpio_ebus.c,v 1.4.8.1 2021/08/04 00:01:51 thorpej Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gpio_ebus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio_ebus.c,v 1.4.8.1 2021/08/04 00:01:51 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -124,7 +124,7 @@ epio_ebus_attach(device_t parent, device
gba.gba_npins = GPIO_NPINS;
/* Attach GPIO framework */
- (void)config_found(self, &gba, gpiobus_print, CFARG_EOL);
+ (void)config_found(self, &gba, gpiobus_print, CFARGS_NONE);
}
static int
Index: src/sys/arch/emips/emips/mainbus.c
diff -u src/sys/arch/emips/emips/mainbus.c:1.4 src/sys/arch/emips/emips/mainbus.c:1.4.8.1
--- src/sys/arch/emips/emips/mainbus.c:1.4 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/emips/emips/mainbus.c Wed Aug 4 00:01:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 00:01:52 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 00:01:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,11 +71,11 @@ mbattach(device_t parent, device_t self,
ma.ma_name = "cpu";
ma.ma_slot = 0;
- config_found(self, &ma, mbprint, CFARG_EOL);
+ config_found(self, &ma, mbprint, CFARGS_NONE);
ma.ma_name = platform.iobus;
ma.ma_slot = 0;
- config_found(self, &ma, mbprint, CFARG_EOL);
+ config_found(self, &ma, mbprint, CFARGS_NONE);
}
static int
