Module Name: src
Committed By: thorpej
Date: Wed Aug 4 01:03:37 UTC 2021
Modified Files:
src/sys/arch/hppa/dev [thorpej-cfargs2]: asp.c astro.c dino.c elroy.c
gecko.c lasi.c mongoose.c phantomas.c ssio.c uturn.c wax.c
src/sys/arch/hppa/gsc [thorpej-cfargs2]: gscbus.c
src/sys/arch/hppa/hppa [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/hppa/dev/asp.c \
src/sys/arch/hppa/dev/astro.c src/sys/arch/hppa/dev/elroy.c \
src/sys/arch/hppa/dev/wax.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/hppa/dev/dino.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/hppa/dev/gecko.c \
src/sys/arch/hppa/dev/phantomas.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/hppa/dev/lasi.c \
src/sys/arch/hppa/dev/uturn.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/hppa/dev/mongoose.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/hppa/dev/ssio.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/hppa/gsc/gscbus.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/hppa/hppa/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/hppa/dev/asp.c
diff -u src/sys/arch/hppa/dev/asp.c:1.3 src/sys/arch/hppa/dev/asp.c:1.3.8.1
--- src/sys/arch/hppa/dev/asp.c:1.3 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/asp.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: asp.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: asp.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $ */
/* $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $ */
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -275,5 +275,5 @@ aspattach(device_t parent, device_t self
ga.ga_fix_args = asp_fix_args;
ga.ga_fix_args_cookie = sc;
ga.ga_scsi_target = sc->sc_trs->asp_scsi;
- config_found(self, &ga, gscprint, CFARG_EOL);
+ config_found(self, &ga, gscprint, CFARGS_NONE);
}
Index: src/sys/arch/hppa/dev/astro.c
diff -u src/sys/arch/hppa/dev/astro.c:1.3 src/sys/arch/hppa/dev/astro.c:1.3.8.1
--- src/sys/arch/hppa/dev/astro.c:1.3 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/astro.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: astro.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: astro.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $ */
/* $OpenBSD: astro.c,v 1.8 2007/10/06 23:50:54 krw Exp $ */
@@ -345,8 +345,7 @@ astro_callback(device_t self, struct con
{
return config_found(self, ca, mbprint,
- CFARG_SUBMATCH, mbsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = mbsubmatch));
}
int
Index: src/sys/arch/hppa/dev/elroy.c
diff -u src/sys/arch/hppa/dev/elroy.c:1.3 src/sys/arch/hppa/dev/elroy.c:1.3.8.1
--- src/sys/arch/hppa/dev/elroy.c:1.3 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/elroy.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: elroy.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: elroy.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $ */
/* $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $ */
@@ -1313,5 +1313,5 @@ le64toh(r->eio_base), le64toh(r->eio_mas
pba.pba_bus = 0; /* (le32toh(elroy_read32(&r->busnum)) & 0xff) >> 4; */
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint, CFARGS_NONE);
}
Index: src/sys/arch/hppa/dev/wax.c
diff -u src/sys/arch/hppa/dev/wax.c:1.3 src/sys/arch/hppa/dev/wax.c:1.3.8.1
--- src/sys/arch/hppa/dev/wax.c:1.3 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/wax.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wax.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: wax.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $ */
/* $OpenBSD: wax.c,v 1.1 1998/11/23 03:04:10 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.3 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.3.8.1 2021/08/04 01:03:37 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -166,5 +166,5 @@ waxattach(device_t parent, device_t self
ga.ga_fix_args = wax_fix_args;
ga.ga_fix_args_cookie = sc;
ga.ga_scsi_target = 7; /* XXX */
- config_found(self, &ga, gscprint, CFARG_EOL);
+ config_found(self, &ga, gscprint, CFARGS_NONE);
}
Index: src/sys/arch/hppa/dev/dino.c
diff -u src/sys/arch/hppa/dev/dino.c:1.11 src/sys/arch/hppa/dev/dino.c:1.11.8.1
--- src/sys/arch/hppa/dev/dino.c:1.11 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/dino.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.11 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: dino.c,v 1.11.8.1 2021/08/04 01:03:37 thorpej Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.11 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.11.8.1 2021/08/04 01:03:37 thorpej Exp $");
/* #include "cardbus.h" */
@@ -1744,15 +1744,13 @@ dinoattach(device_t parent, device_t sel
pba.pba_bus = 0;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
config_found(self, &pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
}
static device_t
dino_callback(device_t self, struct confargs *ca)
{
return config_found(self, ca, mbprint,
- CFARG_SUBMATCH, mbsubmatch,
- CFARG_IATTR, "gedoens",
- CFARG_EOL);
+ CFARGS(.submatch = mbsubmatch,
+ .iattr = "gedoens"));
}
Index: src/sys/arch/hppa/dev/gecko.c
diff -u src/sys/arch/hppa/dev/gecko.c:1.2 src/sys/arch/hppa/dev/gecko.c:1.2.8.1
--- src/sys/arch/hppa/dev/gecko.c:1.2 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/gecko.c Wed Aug 4 01:03:37 2021
@@ -91,7 +91,6 @@ gecko_callback(device_t self, struct con
{
return config_round(self, ca, mbprint,
- CFARG_SUBMATCH, mbsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = mbsubmatch));
}
Index: src/sys/arch/hppa/dev/phantomas.c
diff -u src/sys/arch/hppa/dev/phantomas.c:1.2 src/sys/arch/hppa/dev/phantomas.c:1.2.8.1
--- src/sys/arch/hppa/dev/phantomas.c:1.2 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/phantomas.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: phantomas.c,v 1.2 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: phantomas.c,v 1.2.8.1 2021/08/04 01:03:37 thorpej Exp $ */
/* $OpenBSD: phantomas.c,v 1.1 2002/12/18 23:52:45 mickey Exp $ */
/*
@@ -79,6 +79,5 @@ phantomas_callback(device_t self, struct
{
return config_found(self, ca, mbprint,
- CFARG_SUBMATCH, mbsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = mbsubmatch));
}
Index: src/sys/arch/hppa/dev/lasi.c
diff -u src/sys/arch/hppa/dev/lasi.c:1.4 src/sys/arch/hppa/dev/lasi.c:1.4.8.1
--- src/sys/arch/hppa/dev/lasi.c:1.4 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/lasi.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lasi.c,v 1.4 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: lasi.c,v 1.4.8.1 2021/08/04 01:03:37 thorpej Exp $ */
/* $OpenBSD: lasi.c,v 1.4 2001/06/09 03:57:19 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.4 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.4.8.1 2021/08/04 01:03:37 thorpej Exp $");
#undef LASIDEBUG
@@ -214,7 +214,7 @@ lasiattach(device_t parent, device_t sel
ga.ga_fix_args = lasi_fix_args;
ga.ga_fix_args_cookie = sc;
ga.ga_scsi_target = 7; /* XXX */
- config_found(self, &ga, gscprint, CFARG_EOL);
+ config_found(self, &ga, gscprint, CFARGS_NONE);
/* could be already set by power(4) */
if (!cold_hook)
Index: src/sys/arch/hppa/dev/uturn.c
diff -u src/sys/arch/hppa/dev/uturn.c:1.4 src/sys/arch/hppa/dev/uturn.c:1.4.8.1
--- src/sys/arch/hppa/dev/uturn.c:1.4 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/uturn.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uturn.c,v 1.4 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: uturn.c,v 1.4.8.1 2021/08/04 01:03:37 thorpej Exp $ */
/* $OpenBSD: uturn.c,v 1.6 2007/12/29 01:26:14 kettenis Exp $ */
@@ -380,8 +380,7 @@ uturn_callback(device_t self, struct con
{
return config_found(self, ca, mbprint,
- CFARG_SUBMATCH, mbsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = mbsubmatch));
}
/*
Index: src/sys/arch/hppa/dev/mongoose.c
diff -u src/sys/arch/hppa/dev/mongoose.c:1.6 src/sys/arch/hppa/dev/mongoose.c:1.6.8.1
--- src/sys/arch/hppa/dev/mongoose.c:1.6 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/dev/mongoose.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mongoose.c,v 1.6 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: mongoose.c,v 1.6.8.1 2021/08/04 01:03:37 thorpej Exp $ */
/* $OpenBSD: mongoose.c,v 1.19 2010/01/01 20:28:42 kettenis Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.6 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.6.8.1 2021/08/04 01:03:37 thorpej Exp $");
#define MONGOOSE_DEBUG 9
@@ -689,8 +689,7 @@ mgattach(device_t parent, device_t self,
ea.mongoose_eisa.eba_dmat = NULL /* &sc->sc_edmat */;
ea.mongoose_eisa.eba_ec = &sc->sc_ec;
config_found(self, &ea.mongoose_eisa, eisabusprint,
- CFARG_IATTR, "eisabus",
- CFARG_EOL);
+ CFARGS(.iattr = "eisabus"));
sc->sc_ic.ic_v = sc;
sc->sc_ic.ic_attach_hook = mg_isa_attach_hook;
@@ -715,8 +714,7 @@ mgattach(device_t parent, device_t self,
#endif
ea.mongoose_isa.iba_ic = &sc->sc_ic;
config_found(self, &ea.mongoose_isa, isabusprint,
- CFARG_IATTR, "isabus",
- CFARG_EOL);
+ CFARGS(.iattr = "isabus"));
#undef R
/* attach interrupt */
Index: src/sys/arch/hppa/dev/ssio.c
diff -u src/sys/arch/hppa/dev/ssio.c:1.4 src/sys/arch/hppa/dev/ssio.c:1.4.2.1
--- src/sys/arch/hppa/dev/ssio.c:1.4 Sat Jul 24 21:31:33 2021
+++ src/sys/arch/hppa/dev/ssio.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ssio.c,v 1.4 2021/07/24 21:31:33 andvar Exp $ */
+/* $NetBSD: ssio.c,v 1.4.2.1 2021/08/04 01:03:37 thorpej Exp $ */
/* $OpenBSD: ssio.c,v 1.7 2009/03/08 22:19:04 miod Exp $ */
@@ -265,7 +265,7 @@ ssio_attach(device_t parent, device_t se
saa.saa_iobase = pci_conf_read(pa->pa_pc, pa->pa_tag, SSIO_PCI_SP1BAR);
saa.saa_iobase &= 0xfffffffe;
saa.saa_irq = 4;
- config_found(self, &saa, ssio_print, CFARG_EOL);
+ config_found(self, &saa, ssio_print, CFARGS_NONE);
/* Serial Port 2. */
saa.saa_name = "com";
@@ -273,7 +273,7 @@ ssio_attach(device_t parent, device_t se
saa.saa_iobase = pci_conf_read(pa->pa_pc, pa->pa_tag, SSIO_PCI_SP2BAR);
saa.saa_iobase &= 0xfffffffe;
saa.saa_irq = 3;
- config_found(self, &saa, ssio_print, CFARG_EOL);
+ config_found(self, &saa, ssio_print, CFARGS_NONE);
/* Parallel Port. */
saa.saa_name = "lpt";
@@ -281,7 +281,7 @@ ssio_attach(device_t parent, device_t se
saa.saa_iobase = pci_conf_read(pa->pa_pc, pa->pa_tag, SSIO_PCI_PPBAR);
saa.saa_iobase &= 0xfffffffe;
saa.saa_irq = 7;
- config_found(self, &saa, ssio_print, CFARG_EOL);
+ config_found(self, &saa, ssio_print, CFARGS_NONE);
#if NUKBD > 0
/*
Index: src/sys/arch/hppa/gsc/gscbus.c
diff -u src/sys/arch/hppa/gsc/gscbus.c:1.2 src/sys/arch/hppa/gsc/gscbus.c:1.2.8.1
--- src/sys/arch/hppa/gsc/gscbus.c:1.2 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/gsc/gscbus.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gscbus.c,v 1.2 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: gscbus.c,v 1.2.8.1 2021/08/04 01:03:37 thorpej Exp $ */
/* $OpenBSD: gscbus.c,v 1.13 2001/08/01 20:32:04 miod Exp $ */
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.2 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.2.8.1 2021/08/04 01:03:37 thorpej Exp $");
#define GSCDEBUG
@@ -121,8 +121,7 @@ gsc_module_callback(device_t self, struc
(*sc->sc_ga.ga_fix_args)(sc->sc_ga.ga_fix_args_cookie, &ga);
return config_found(self, &ga, mbprint,
- CFARG_SUBMATCH, mbsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = mbsubmatch));
}
int
Index: src/sys/arch/hppa/hppa/mainbus.c
diff -u src/sys/arch/hppa/hppa/mainbus.c:1.7 src/sys/arch/hppa/hppa/mainbus.c:1.7.8.1
--- src/sys/arch/hppa/hppa/mainbus.c:1.7 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/hppa/hppa/mainbus.c Wed Aug 4 01:03:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.7 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.7.8.1 2021/08/04 01:03:37 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.7 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.7.8.1 2021/08/04 01:03:37 thorpej Exp $");
#include "locators.h"
#include "power.h"
@@ -1342,8 +1342,7 @@ mb_module_callback(device_t self, struct
return NULL;
return config_found(self, ca, mbprint,
- CFARG_SUBMATCH, mbsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = mbsubmatch));
}
static device_t
@@ -1354,8 +1353,7 @@ mb_cpu_mem_callback(device_t self, struc
return NULL;
return config_found(self, ca, mbprint,
- CFARG_SUBMATCH, mbsubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = mbsubmatch));
}
void
@@ -1400,7 +1398,7 @@ mbattach(device_t parent, device_t self,
nca.ca_hpa = 0;
nca.ca_iot = &hppa_bustag;
nca.ca_dmatag = &hppa_dmatag;
- config_found(self, &nca, mbprint, CFARG_EOL);
+ config_found(self, &nca, mbprint, CFARGS_NONE);
#if NPOWER > 0
/* get some power */
@@ -1408,7 +1406,7 @@ mbattach(device_t parent, device_t self,
nca.ca_name = "power";
nca.ca_irq = HPPACF_IRQ_UNDEF;
nca.ca_iot = &hppa_bustag;
- config_found(self, &nca, mbprint, CFARG_EOL);
+ config_found(self, &nca, mbprint, CFARGS_NONE);
#endif
#if NLCD > 0
@@ -1423,7 +1421,7 @@ mbattach(device_t parent, device_t self,
nca.ca_iot = &hppa_bustag;
nca.ca_hpa = nca.ca_pcl.cmd_addr;
- config_found(self, &nca, mbprint, CFARG_EOL);
+ config_found(self, &nca, mbprint, CFARGS_NONE);
}
#endif
