Module Name: src
Committed By: thorpej
Date: Wed Aug 4 03:08:49 UTC 2021
Modified Files:
src/sys/arch/evbsh3/ap_ms104_sh4 [thorpej-cfargs2]: shpcmcia.c
src/sys/arch/evbsh3/evbsh3 [thorpej-cfargs2]: mainbus.c
src/sys/arch/evbsh3/t_sh7706lan [thorpej-cfargs2]: scimci.c ssumci.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbsh3/evbsh3/mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbsh3/t_sh7706lan/scimci.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbsh3/t_sh7706lan/ssumci.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/evbsh3/ap_ms104_sh4/shpcmcia.c
diff -u src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.6 src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.6.8.1
--- src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.6 Sat Apr 24 23:36:36 2021
+++ src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c Wed Aug 4 03:08:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: shpcmcia.c,v 1.6 2021/04/24 23:36:36 thorpej Exp $ */
+/* $NetBSD: shpcmcia.c,v 1.6.8.1 2021/08/04 03:08:48 thorpej Exp $ */
/*-
* Copyright (C) 2009 NONAKA Kimihiro <non...@netbsd.org>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shpcmcia.c,v 1.6 2021/04/24 23:36:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shpcmcia.c,v 1.6.8.1 2021/08/04 03:08:48 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -313,7 +313,7 @@ shpcmcia_attach_socket(struct shpcmcia_h
paa.pch = (pcmcia_chipset_handle_t)h;
h->pcmcia =
- config_found(h->sc->sc_dev, &paa, shpcmcia_print, CFARG_EOL);
+ config_found(h->sc->sc_dev, &paa, shpcmcia_print, CFARGS_NONE);
/* if there's actually a pcmcia device attached, initialize the slot */
if (h->pcmcia)
Index: src/sys/arch/evbsh3/evbsh3/mainbus.c
diff -u src/sys/arch/evbsh3/evbsh3/mainbus.c:1.10 src/sys/arch/evbsh3/evbsh3/mainbus.c:1.10.8.1
--- src/sys/arch/evbsh3/evbsh3/mainbus.c:1.10 Sat Apr 24 23:36:37 2021
+++ src/sys/arch/evbsh3/evbsh3/mainbus.c Wed Aug 4 03:08:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.10 2021/04/24 23:36:37 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.10.8.1 2021/08/04 03:08:48 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10.8.1 2021/08/04 03:08:48 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,12 +62,11 @@ mainbus_attach(device_t parent, device_t
/* CPU */
memset(&maa, 0, sizeof(maa));
maa.ma_name = "cpu";
- config_found(self, &maa, mainbus_print, CFARG_EOL);
+ config_found(self, &maa, mainbus_print, CFARGS_NONE);
/* Devices */
config_search(self, NULL,
- CFARG_SEARCH, mainbus_search,
- CFARG_EOL);
+ CFARGS(.search = mainbus_search));
}
static int
@@ -81,7 +80,7 @@ mainbus_search(device_t parent, cfdata_t
maa.ma_name = cf->cf_name;
if (config_probe(parent, cf, &maa))
- config_attach(parent, cf, &maa, mainbus_print, CFARG_EOL);
+ config_attach(parent, cf, &maa, mainbus_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/evbsh3/t_sh7706lan/scimci.c
diff -u src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.3 src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.3.8.1
--- src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.3 Sat Apr 24 23:36:37 2021
+++ src/sys/arch/evbsh3/t_sh7706lan/scimci.c Wed Aug 4 03:08:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: scimci.c,v 1.3 2021/04/24 23:36:37 thorpej Exp $ */
+/* $NetBSD: scimci.c,v 1.3.8.1 2021/08/04 03:08:48 thorpej Exp $ */
/*-
* Copyright (C) 2009 NONAKA Kimihiro <non...@netbsd.org>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scimci.c,v 1.3 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scimci.c,v 1.3.8.1 2021/08/04 03:08:48 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -235,7 +235,7 @@ scimci_attach(device_t parent, device_t
| SMC_CAPS_SINGLE_ONLY
| SMC_CAPS_POLL_CARD_DET;
- sc->sc_sdmmc = config_found(sc->sc_dev, &saa, NULL, CFARG_EOL);
+ sc->sc_sdmmc = config_found(sc->sc_dev, &saa, NULL, CFARGS_NONE);
if (sc->sc_sdmmc == NULL)
aprint_error_dev(sc->sc_dev, "couldn't attach bus\n");
}
Index: src/sys/arch/evbsh3/t_sh7706lan/ssumci.c
diff -u src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.4 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.4.8.1
--- src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.4 Sat Apr 24 23:36:37 2021
+++ src/sys/arch/evbsh3/t_sh7706lan/ssumci.c Wed Aug 4 03:08:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ssumci.c,v 1.4 2021/04/24 23:36:37 thorpej Exp $ */
+/* $NetBSD: ssumci.c,v 1.4.8.1 2021/08/04 03:08:48 thorpej Exp $ */
/*-
* Copyright (C) 2010 NONAKA Kimihiro <non...@netbsd.org>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.4 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.4.8.1 2021/08/04 03:08:48 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -243,7 +243,7 @@ ssumci_attach(device_t parent, device_t
| SMC_CAPS_SINGLE_ONLY
| SMC_CAPS_POLL_CARD_DET;
- sc->sc_sdmmc = config_found(sc->sc_dev, &saa, NULL, CFARG_EOL);
+ sc->sc_sdmmc = config_found(sc->sc_dev, &saa, NULL, CFARGS_NONE);
if (sc->sc_sdmmc == NULL)
aprint_error_dev(sc->sc_dev, "couldn't attach bus\n");
}
