Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej-cfargs2]: src/sys/arch Adapt to CFARGS().
details: https://anonhg.NetBSD.org/src/rev/fdd52a233255
branches: thorpej-cfargs2
changeset: 985010:fdd52a233255
user: thorpej <thorpej%NetBSD.org@localhost>
date: Tue Aug 03 23:19:52 2021 +0000
description:
Adapt to CFARGS().
diffstat:
sys/arch/acorn32/eb7500atx/rsbus.c | 9 ++++-----
sys/arch/acorn32/mainbus/fd.c | 6 +++---
sys/arch/acorn32/mainbus/pioc.c | 26 ++++++++++----------------
sys/arch/acorn32/podulebus/amps.c | 6 +++---
sys/arch/acorn32/podulebus/asc.c | 6 +++---
sys/arch/acorn32/podulebus/cosc.c | 6 +++---
sys/arch/acorn32/podulebus/csc.c | 6 +++---
sys/arch/acorn32/podulebus/podulebus.c | 10 ++++------
sys/arch/acorn32/podulebus/ptsc.c | 6 +++---
sys/arch/algor/dev/bonito_mainbus.c | 6 +++---
sys/arch/algor/dev/mainbus.c | 7 +++----
sys/arch/algor/dev/vtpbc_mainbus.c | 6 +++---
sys/arch/algor/pci/pcib.c | 6 +++---
sys/arch/amd64/amd64/amd64_mainbus.c | 16 ++++++----------
14 files changed, 54 insertions(+), 68 deletions(-)
diffs (truncated from 493 to 300 lines):
diff -r 2e65fada0d6e -r fdd52a233255 sys/arch/acorn32/eb7500atx/rsbus.c
--- a/sys/arch/acorn32/eb7500atx/rsbus.c Tue Aug 03 23:05:51 2021 +0000
+++ b/sys/arch/acorn32/eb7500atx/rsbus.c Tue Aug 03 23:19:52 2021 +0000
@@ -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 @@
* Attach each devices
*/
config_search(self, NULL,
- CFARG_SEARCH, rsbus_search,
- CFARG_EOL);
+ CFARGS(.search = rsbus_search));
}
static int
@@ -87,7 +86,7 @@
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);
}
diff -r 2e65fada0d6e -r fdd52a233255 sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c Tue Aug 03 23:05:51 2021 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c Tue Aug 03 23:19:52 2021 +0000
@@ -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 @@
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);
}
}
diff -r 2e65fada0d6e -r fdd52a233255 sys/arch/acorn32/mainbus/pioc.c
--- a/sys/arch/acorn32/mainbus/pioc.c Tue Aug 03 23:05:51 2021 +0000
+++ b/sys/arch/acorn32/mainbus/pioc.c Tue Aug 03 23:19:52 2021 +0000
@@ -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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
}
diff -r 2e65fada0d6e -r fdd52a233255 sys/arch/acorn32/podulebus/amps.c
--- a/sys/arch/acorn32/podulebus/amps.c Tue Aug 03 23:05:51 2021 +0000
+++ b/sys/arch/acorn32/podulebus/amps.c Tue Aug 03 23:19:52 2021 +0000
@@ -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 @@
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);
}
}
diff -r 2e65fada0d6e -r fdd52a233255 sys/arch/acorn32/podulebus/asc.c
--- a/sys/arch/acorn32/podulebus/asc.c Tue Aug 03 23:05:51 2021 +0000
+++ b/sys/arch/acorn32/podulebus/asc.c Tue Aug 03 23:19:52 2021 +0000
@@ -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 @@
/*
* attach all scsi units on us
*/
- config_found(self, &sbic->sc_channel, scsiprint, CFARG_EOL);
+ config_found(self, &sbic->sc_channel, scsiprint, CFARGS_NONE);
}
diff -r 2e65fada0d6e -r fdd52a233255 sys/arch/acorn32/podulebus/cosc.c
--- a/sys/arch/acorn32/podulebus/cosc.c Tue Aug 03 23:05:51 2021 +0000
+++ b/sys/arch/acorn32/podulebus/cosc.c Tue Aug 03 23:19:52 2021 +0000
@@ -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 @@
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);
}
diff -r 2e65fada0d6e -r fdd52a233255 sys/arch/acorn32/podulebus/csc.c
--- a/sys/arch/acorn32/podulebus/csc.c Tue Aug 03 23:05:51 2021 +0000
+++ b/sys/arch/acorn32/podulebus/csc.c Tue Aug 03 23:19:52 2021 +0000
@@ -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 @@
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);
}
diff -r 2e65fada0d6e -r fdd52a233255 sys/arch/acorn32/podulebus/podulebus.c
--- a/sys/arch/acorn32/podulebus/podulebus.c Tue Aug 03 23:05:51 2021 +0000
+++ b/sys/arch/acorn32/podulebus/podulebus.c Tue Aug 03 23:19:52 2021 +0000
@@ -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 @@
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 @@
pa.pa_podule = &podules[loop];
pa.pa_iot = &podulebus_bs_tag;
config_found(self, &pa, podulebusprint,
- CFARG_SUBMATCH, podulebussubmatch,
- CFARG_EOL);
+ CFARGS(.submatch = podulebussubmatch));
Home |
Main Index |
Thread Index |
Old Index