Module Name: src
Committed By: thorpej
Date: Wed Aug 4 00:02:33 UTC 2021
Modified Files:
src/sys/arch/epoc32/dev [thorpej-cfargs2]: epockbd.c etna.c
src/sys/arch/epoc32/epoc32 [thorpej-cfargs2]: external.c internal.c
src/sys/arch/epoc32/windermere [thorpej-cfargs2]: windermere.c wmlcd.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/epoc32/dev/epockbd.c \
src/sys/arch/epoc32/dev/etna.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/epoc32/epoc32/external.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/epoc32/epoc32/internal.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/epoc32/windermere/windermere.c \
src/sys/arch/epoc32/windermere/wmlcd.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/epoc32/dev/epockbd.c
diff -u src/sys/arch/epoc32/dev/epockbd.c:1.4 src/sys/arch/epoc32/dev/epockbd.c:1.4.8.1
--- src/sys/arch/epoc32/dev/epockbd.c:1.4 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/epoc32/dev/epockbd.c Wed Aug 4 00:02:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: epockbd.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: epockbd.c,v 1.4.8.1 2021/08/04 00:02:33 thorpej Exp $ */
/*
* Copyright (c) 2013 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epockbd.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epockbd.c,v 1.4.8.1 2021/08/04 00:02:33 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -101,7 +101,7 @@ epockbd_attach(struct epockbd_softc *sc)
aa.accessops = &epockbd_accessops;
aa.accesscookie = sc;
sc->sc_wskbddev = config_found(sc->sc_dev, &aa, wskbddevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
/*
Index: src/sys/arch/epoc32/dev/etna.c
diff -u src/sys/arch/epoc32/dev/etna.c:1.4 src/sys/arch/epoc32/dev/etna.c:1.4.8.1
--- src/sys/arch/epoc32/dev/etna.c:1.4 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/epoc32/dev/etna.c Wed Aug 4 00:02:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: etna.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: etna.c,v 1.4.8.1 2021/08/04 00:02:33 thorpej Exp $ */
/*
* Copyright (c) 2012 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: etna.c,v 1.4 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: etna.c,v 1.4.8.1 2021/08/04 00:02:33 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -201,7 +201,7 @@ etna_attach(device_t parent, device_t se
paa.paa_busname = "pcmcia";
paa.pct = &etna_pcmcia_functions;
paa.pch = sc;
- sc->sc_pcmcia = config_found(self, &paa, NULL, CFARG_EOL);
+ sc->sc_pcmcia = config_found(self, &paa, NULL, CFARGS_NONE);
config_interrupts(self, etna_doattach);
}
Index: src/sys/arch/epoc32/epoc32/external.c
diff -u src/sys/arch/epoc32/epoc32/external.c:1.3 src/sys/arch/epoc32/epoc32/external.c:1.3.8.1
--- src/sys/arch/epoc32/epoc32/external.c:1.3 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/epoc32/epoc32/external.c Wed Aug 4 00:02:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: external.c,v 1.3 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: external.c,v 1.3.8.1 2021/08/04 00:02:33 thorpej Exp $ */
/*
* Copyright (c) 2012, 2013 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: external.c,v 1.3 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: external.c,v 1.3.8.1 2021/08/04 00:02:33 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -65,8 +65,7 @@ external_attach(device_t parent, device_
aprint_normal("\n");
config_search(self, NULL,
- CFARG_SEARCH, external_search,
- CFARG_EOL);
+ CFARGS(.search = external_search));
}
/* ARGSUSED */
@@ -81,7 +80,7 @@ external_search(device_t parent, cfdata_
aa.addr2 = cf->cf_loc[EXTERNALCF_ADDR2];
aa.irq = cf->cf_loc[EXTERNALCF_IRQ];
if (config_probe(parent, cf, &aa))
- config_attach(parent, cf, &aa, external_print, CFARG_EOL);
+ config_attach(parent, cf, &aa, external_print, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/epoc32/epoc32/internal.c
diff -u src/sys/arch/epoc32/epoc32/internal.c:1.2 src/sys/arch/epoc32/epoc32/internal.c:1.2.8.1
--- src/sys/arch/epoc32/epoc32/internal.c:1.2 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/epoc32/epoc32/internal.c Wed Aug 4 00:02:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: internal.c,v 1.2 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: internal.c,v 1.2.8.1 2021/08/04 00:02:33 thorpej Exp $ */
/*
* Copyright (c) 2012 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: internal.c,v 1.2 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: internal.c,v 1.2.8.1 2021/08/04 00:02:33 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -56,8 +56,7 @@ internal_attach(device_t parent, device_
aprint_normal("\n");
config_search(self, aux,
- CFARG_SEARCH, internal_search,
- CFARG_EOL);
+ CFARGS(.search = internal_search));
}
static int
@@ -78,7 +77,7 @@ internal_search(device_t self, cfdata_t
return 0;
if (config_probe(self, cf, aux))
- config_attach(self, cf, aux, NULL, CFARG_EOL);
+ config_attach(self, cf, aux, NULL, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/epoc32/windermere/windermere.c
diff -u src/sys/arch/epoc32/windermere/windermere.c:1.2 src/sys/arch/epoc32/windermere/windermere.c:1.2.8.1
--- src/sys/arch/epoc32/windermere/windermere.c:1.2 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/epoc32/windermere/windermere.c Wed Aug 4 00:02:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: windermere.c,v 1.2 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: windermere.c,v 1.2.8.1 2021/08/04 00:02:33 thorpej Exp $ */
/*
* Copyright (c) 2012 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: windermere.c,v 1.2 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: windermere.c,v 1.2.8.1 2021/08/04 00:02:33 thorpej Exp $");
#include "opt_com.h"
@@ -144,8 +144,7 @@ windermere_attach(device_t parent, devic
aa.aa_irq = windermere_periphs[i].irq;
config_found(self, &aa, windermere_print,
- CFARG_SUBMATCH, windermere_submatch,
- CFARG_EOL);
+ CFARGS(.submatch = windermere_submatch));
}
}
Index: src/sys/arch/epoc32/windermere/wmlcd.c
diff -u src/sys/arch/epoc32/windermere/wmlcd.c:1.2 src/sys/arch/epoc32/windermere/wmlcd.c:1.2.8.1
--- src/sys/arch/epoc32/windermere/wmlcd.c:1.2 Sat Apr 24 23:36:32 2021
+++ src/sys/arch/epoc32/windermere/wmlcd.c Wed Aug 4 00:02:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wmlcd.c,v 1.2 2021/04/24 23:36:32 thorpej Exp $ */
+/* $NetBSD: wmlcd.c,v 1.2.8.1 2021/08/04 00:02:33 thorpej Exp $ */
/*
* Copyright (c) 2013 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmlcd.c,v 1.2 2021/04/24 23:36:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmlcd.c,v 1.2.8.1 2021/08/04 00:02:33 thorpej Exp $");
#include "rnd.h"
@@ -228,7 +228,7 @@ wmlcd_attach(device_t parent, device_t s
waa.accessops = &wmlcd_accessops;
waa.accesscookie = sc;
- config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
static int
