Module Name: src Committed By: thorpej Date: Tue Aug 3 23:19:53 UTC 2021
Modified Files: src/sys/arch/acorn32/eb7500atx [thorpej-cfargs2]: rsbus.c src/sys/arch/acorn32/mainbus [thorpej-cfargs2]: fd.c pioc.c src/sys/arch/acorn32/podulebus [thorpej-cfargs2]: amps.c asc.c cosc.c csc.c podulebus.c ptsc.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/acorn32/eb7500atx/rsbus.c cvs rdiff -u -r1.63 -r1.63.8.1 src/sys/arch/acorn32/mainbus/fd.c cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/acorn32/mainbus/pioc.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/acorn32/podulebus/amps.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/acorn32/podulebus/asc.c \ src/sys/arch/acorn32/podulebus/cosc.c cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/acorn32/podulebus/csc.c \ src/sys/arch/acorn32/podulebus/ptsc.c cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/acorn32/podulebus/podulebus.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/acorn32/eb7500atx/rsbus.c diff -u src/sys/arch/acorn32/eb7500atx/rsbus.c:1.11 src/sys/arch/acorn32/eb7500atx/rsbus.c:1.11.8.1 --- src/sys/arch/acorn32/eb7500atx/rsbus.c:1.11 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/acorn32/eb7500atx/rsbus.c Tue Aug 3 23:19:52 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: rsbus.c,v 1.11 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: rsbus.c,v 1.11.8.1 2021/08/03 23:19:52 thorpej Exp $ */ /* * Copyright (c) 2002 @@ -29,7 +29,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.11 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.11.8.1 2021/08/03 23:19:52 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -71,8 +71,7 @@ rsbus_attach(device_t parent, device_t s * Attach each devices */ config_search(self, NULL, - CFARG_SEARCH, rsbus_search, - CFARG_EOL); + CFARGS(.search = rsbus_search)); } static int @@ -87,7 +86,7 @@ rsbus_search(device_t parent, cfdata_t c sa.sa_intr = cf->cf_loc[RSBUSCF_IRQ]; if (config_probe(parent, cf, &sa)) - config_attach(parent, cf, &sa, rsbus_print, CFARG_EOL); + config_attach(parent, cf, &sa, rsbus_print, CFARGS_NONE); return (0); } Index: src/sys/arch/acorn32/mainbus/fd.c diff -u src/sys/arch/acorn32/mainbus/fd.c:1.63 src/sys/arch/acorn32/mainbus/fd.c:1.63.8.1 --- src/sys/arch/acorn32/mainbus/fd.c:1.63 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/acorn32/mainbus/fd.c Tue Aug 3 23:19:53 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.63 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: fd.c,v 1.63.8.1 2021/08/03 23:19:53 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.63 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.63.8.1 2021/08/03 23:19:53 thorpej Exp $"); #include "opt_ddb.h" @@ -431,7 +431,7 @@ fdcattach(device_t parent, device_t self type, fa.fa_drive); else fa.fa_deftype = NULL; /* unknown */ - (void)config_found(self, (void *)&fa, fdprint, CFARG_EOL); + (void)config_found(self, (void *)&fa, fdprint, CFARGS_NONE); } } Index: src/sys/arch/acorn32/mainbus/pioc.c diff -u src/sys/arch/acorn32/mainbus/pioc.c:1.19 src/sys/arch/acorn32/mainbus/pioc.c:1.19.8.1 --- src/sys/arch/acorn32/mainbus/pioc.c:1.19 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/acorn32/mainbus/pioc.c Tue Aug 3 23:19:53 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pioc.c,v 1.19 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: pioc.c,v 1.19.8.1 2021/08/03 23:19:53 thorpej Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -41,7 +41,7 @@ /*#define PIOC_DEBUG*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.19 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.19.8.1 2021/08/03 23:19:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -234,7 +234,7 @@ piocsearch(device_t parent, cfdata_t cf, tryagain = 0; if (config_probe(parent, cf, &pa)) { - config_attach(parent, cf, &pa, piocprint, CFARG_EOL); + config_attach(parent, cf, &pa, piocprint, CFARGS_NONE); /* tryagain = (cf->cf_fstate == FSTATE_STAR);*/ } } while (tryagain); @@ -267,7 +267,7 @@ piocsubmatch(device_t parent, cfdata_t c pa->pa_irq = cf->cf_loc[PIOCCF_IRQ]; tryagain = 0; if (config_probe(parent, cf, pa)) { - config_attach(parent, cf, pa, piocprint, CFARG_EOL); + config_attach(parent, cf, pa, piocprint, CFARGS_NONE); /* tryagain = (cf->cf_fstate == FSTATE_STAR);*/ } } while (tryagain); @@ -383,8 +383,7 @@ piocattach(device_t parent, device_t sel pa.pa_drq = -1; pa.pa_irq = -1; config_found(self, &pa, piocprint, - CFARG_SUBMATCH, piocsubmatch, - CFARG_EOL); + CFARGS(.submatch = piocsubmatch)); } /* @@ -403,8 +402,7 @@ piocattach(device_t parent, device_t sel pa.pa_drq = -1; pa.pa_irq = -1; config_found(self, &pa, piocprint, - CFARG_SUBMATCH, piocsubmatch, - CFARG_EOL); + CFARGS(.submatch = piocsubmatch)); } /* @@ -440,8 +438,7 @@ piocattach(device_t parent, device_t sel pa.pa_drq = -1; pa.pa_irq = -1; config_found(self, &pa, piocprint, - CFARG_SUBMATCH, piocsubmatch, - CFARG_EOL); + CFARGS(.submatch = piocsubmatch)); } if (sc->sc_config[PIOC_CM_CR2] & PIOC_UART2_ENABLE) { @@ -466,8 +463,7 @@ piocattach(device_t parent, device_t sel pa.pa_drq = -1; pa.pa_irq = -1; config_found(self, &pa, piocprint, - CFARG_SUBMATCH, piocsubmatch, - CFARG_EOL); + CFARGS(.submatch = piocsubmatch)); } /* @@ -493,14 +489,12 @@ piocattach(device_t parent, device_t sel pa.pa_drq = -1; pa.pa_irq = -1; config_found(self, &pa, piocprint, - CFARG_SUBMATCH, piocsubmatch, - CFARG_EOL); + CFARGS(.submatch = piocsubmatch)); } #if 0 config_search(self, NULL, - CFARG_SEARCH, piocsearch, - CFARG_EOL); + CFARGS(.search = piocsearch)); #endif } Index: src/sys/arch/acorn32/podulebus/amps.c diff -u src/sys/arch/acorn32/podulebus/amps.c:1.22 src/sys/arch/acorn32/podulebus/amps.c:1.22.8.1 --- src/sys/arch/acorn32/podulebus/amps.c:1.22 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/acorn32/podulebus/amps.c Tue Aug 3 23:19:53 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: amps.c,v 1.22 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: amps.c,v 1.22.8.1 2021/08/03 23:19:53 thorpej Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amps.c,v 1.22 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amps.c,v 1.22.8.1 2021/08/03 23:19:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -182,7 +182,7 @@ amps_attach(device_t parent, device_t se aa.aa_irq = pa->pa_podule->interrupt; for (aa.aa_port = 0; aa.aa_port < MAX_AMPS_PORTS; ++aa.aa_port) { aa.aa_base -= AMPS_PORT_SPACING; - config_found(self, &aa, amps_print, CFARG_EOL); + config_found(self, &aa, amps_print, CFARGS_NONE); } } Index: src/sys/arch/acorn32/podulebus/asc.c diff -u src/sys/arch/acorn32/podulebus/asc.c:1.21 src/sys/arch/acorn32/podulebus/asc.c:1.21.8.1 --- src/sys/arch/acorn32/podulebus/asc.c:1.21 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/acorn32/podulebus/asc.c Tue Aug 3 23:19:53 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: asc.c,v 1.21 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: asc.c,v 1.21.8.1 2021/08/03 23:19:53 thorpej Exp $ */ /* * Copyright (c) 2001 Richard Earnshaw @@ -98,7 +98,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.21 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.21.8.1 2021/08/03 23:19:53 thorpej Exp $"); #include <sys/systm.h> #include <sys/kernel.h> @@ -277,7 +277,7 @@ ascattach(device_t parent, device_t self /* * attach all scsi units on us */ - config_found(self, &sbic->sc_channel, scsiprint, CFARG_EOL); + config_found(self, &sbic->sc_channel, scsiprint, CFARGS_NONE); } Index: src/sys/arch/acorn32/podulebus/cosc.c diff -u src/sys/arch/acorn32/podulebus/cosc.c:1.21 src/sys/arch/acorn32/podulebus/cosc.c:1.21.8.1 --- src/sys/arch/acorn32/podulebus/cosc.c:1.21 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/acorn32/podulebus/cosc.c Tue Aug 3 23:19:53 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cosc.c,v 1.21 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: cosc.c,v 1.21.8.1 2021/08/03 23:19:53 thorpej Exp $ */ /* * Copyright (c) 1996 Mark Brinicombe @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.21 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.21.8.1 2021/08/03 23:19:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -280,7 +280,7 @@ coscattach(device_t parent, device_t sel printf("\n"); /* attach all scsi units on us */ - config_found(self, &sc->sc_softc.sc_channel, scsiprint, CFARG_EOL); + config_found(self, &sc->sc_softc.sc_channel, scsiprint, CFARGS_NONE); } Index: src/sys/arch/acorn32/podulebus/csc.c diff -u src/sys/arch/acorn32/podulebus/csc.c:1.20 src/sys/arch/acorn32/podulebus/csc.c:1.20.8.1 --- src/sys/arch/acorn32/podulebus/csc.c:1.20 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/acorn32/podulebus/csc.c Tue Aug 3 23:19:53 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: csc.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: csc.c,v 1.20.8.1 2021/08/03 23:19:53 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: csc.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: csc.c,v 1.20.8.1 2021/08/03 23:19:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -197,7 +197,7 @@ cscattach(device_t parent, device_t self printf("\n"); /* attach all scsi units on us */ - config_found(self, &sc->sc_softc.sc_channel, scsiprint, CFARG_EOL); + config_found(self, &sc->sc_softc.sc_channel, scsiprint, CFARGS_NONE); } Index: src/sys/arch/acorn32/podulebus/ptsc.c diff -u src/sys/arch/acorn32/podulebus/ptsc.c:1.20 src/sys/arch/acorn32/podulebus/ptsc.c:1.20.8.1 --- src/sys/arch/acorn32/podulebus/ptsc.c:1.20 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/acorn32/podulebus/ptsc.c Tue Aug 3 23:19:53 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ptsc.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: ptsc.c,v 1.20.8.1 2021/08/03 23:19:53 thorpej Exp $ */ /* * Copyright (c) 1982, 1990 The Regents of the University of California. @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.20.8.1 2021/08/03 23:19:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -237,7 +237,7 @@ ptscattach(device_t parent, device_t sel printf("\n"); /* attach all scsi units on us */ - config_found(self, &sc->sc_softc.sc_channel, scsiprint, CFARG_EOL); + config_found(self, &sc->sc_softc.sc_channel, scsiprint, CFARGS_NONE); } Index: src/sys/arch/acorn32/podulebus/podulebus.c diff -u src/sys/arch/acorn32/podulebus/podulebus.c:1.31 src/sys/arch/acorn32/podulebus/podulebus.c:1.31.8.1 --- src/sys/arch/acorn32/podulebus/podulebus.c:1.31 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/acorn32/podulebus/podulebus.c Tue Aug 3 23:19:53 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: podulebus.c,v 1.31 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: podulebus.c,v 1.31.8.1 2021/08/03 23:19:53 thorpej Exp $ */ /* * Copyright (c) 1994-1996 Mark Brinicombe. @@ -43,7 +43,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.31 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.31.8.1 2021/08/03 23:19:53 thorpej Exp $"); #include <sys/systm.h> #include <sys/kernel.h> @@ -493,8 +493,7 @@ podulebusattach(device_t parent, device_ pa.pa_podule = &podules[loop]; pa.pa_iot = &podulebus_bs_tag; config_found(self, &pa, podulebusprint, - CFARG_SUBMATCH, podulebussubmatch, - CFARG_EOL); + CFARGS(.submatch = podulebussubmatch)); continue; } if (value == 0xffff) { @@ -509,8 +508,7 @@ podulebusattach(device_t parent, device_ pa.pa_podule = &podules[loop]; pa.pa_iot = &podulebus_bs_tag; config_found(self, &pa, podulebusprint, - CFARG_SUBMATCH, podulebussubmatch, - CFARG_EOL); + CFARGS(.submatch = podulebussubmatch)); } } }