Module Name: src Committed By: thorpej Date: Wed Aug 4 01:02:36 UTC 2021
Modified Files: src/sys/arch/hp300/dev [thorpej-cfargs2]: dio.c diofb.c dnkbd.c fhpib.c frodo.c hpib.c intio.c nhpib.c sgc.c sti_sgc.c src/sys/arch/hp300/hp300 [thorpej-cfargs2]: autoconf.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/arch/hp300/dev/dio.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/hp300/dev/diofb.c cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/hp300/dev/dnkbd.c cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/hp300/dev/fhpib.c \ src/sys/arch/hp300/dev/nhpib.c cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/hp300/dev/frodo.c cvs rdiff -u -r1.43 -r1.43.2.1 src/sys/arch/hp300/dev/hpib.c cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/arch/hp300/dev/intio.c cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/hp300/dev/sgc.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/hp300/dev/sti_sgc.c cvs rdiff -u -r1.109 -r1.109.8.1 src/sys/arch/hp300/hp300/autoconf.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/hp300/dev/dio.c diff -u src/sys/arch/hp300/dev/dio.c:1.40 src/sys/arch/hp300/dev/dio.c:1.40.8.1 --- src/sys/arch/hp300/dev/dio.c:1.40 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hp300/dev/dio.c Wed Aug 4 01:02:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: dio.c,v 1.40 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: dio.c,v 1.40.8.1 2021/08/04 01:02:36 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.40 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.40.8.1 2021/08/04 01:02:36 thorpej Exp $"); #define _HP300_INTR_H_PRIVATE @@ -155,8 +155,7 @@ dioattach(device_t parent, device_t self /* Attach matching device. */ config_found(self, &da, dioprint, - CFARG_SUBMATCH, diosubmatch, - CFARG_EOL); + CFARGS(.submatch = diosubmatch)); scode += scodesize; } } Index: src/sys/arch/hp300/dev/diofb.c diff -u src/sys/arch/hp300/dev/diofb.c:1.6 src/sys/arch/hp300/dev/diofb.c:1.6.8.1 --- src/sys/arch/hp300/dev/diofb.c:1.6 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hp300/dev/diofb.c Wed Aug 4 01:02:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: diofb.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: diofb.c,v 1.6.8.1 2021/08/04 01:02:36 thorpej Exp $ */ /* $OpenBSD: diofb.c,v 1.18 2010/12/26 15:40:59 miod Exp $ */ /* @@ -334,7 +334,7 @@ diofb_end_attach(device_t self, struct w waa.accessops = accessops; waa.accesscookie = fb; - config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL); + config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE); } /* Index: src/sys/arch/hp300/dev/dnkbd.c diff -u src/sys/arch/hp300/dev/dnkbd.c:1.12 src/sys/arch/hp300/dev/dnkbd.c:1.12.8.1 --- src/sys/arch/hp300/dev/dnkbd.c:1.12 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hp300/dev/dnkbd.c Wed Aug 4 01:02:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: dnkbd.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: dnkbd.c,v 1.12.8.1 2021/08/04 01:02:36 thorpej Exp $ */ /* $OpenBSD: dnkbd.c,v 1.17 2009/07/23 21:05:56 blambert Exp $ */ /* @@ -391,16 +391,14 @@ dnkbd_attach_subdevices(struct dnkbd_sof } sc->sc_wskbddev = config_found(sc->sc_dev, &ka, wskbddevprint, - CFARG_IATTR, "wskbddev", - CFARG_EOL); + CFARGS(.iattr = "wskbddev")); #if NWSMOUSE > 0 ma.accessops = &dnmouse_accessops; ma.accesscookie = sc; sc->sc_wsmousedev = config_found(sc->sc_dev, &ma, wsmousedevprint, - CFARG_IATTR, "wsmousedev", - CFARG_EOL); + CFARGS(.iattr = "wsmousedev")); #endif SET(sc->sc_flags, SF_ATTACHED); Index: src/sys/arch/hp300/dev/fhpib.c diff -u src/sys/arch/hp300/dev/fhpib.c:1.42 src/sys/arch/hp300/dev/fhpib.c:1.42.8.1 --- src/sys/arch/hp300/dev/fhpib.c:1.42 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hp300/dev/fhpib.c Wed Aug 4 01:02:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: fhpib.c,v 1.42 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: fhpib.c,v 1.42.8.1 2021/08/04 01:02:36 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fhpib.c,v 1.42 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fhpib.c,v 1.42.8.1 2021/08/04 01:02:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -186,7 +186,7 @@ fhpibattach(device_t parent, device_t se ha.ha_type = HPIBC; /* XXX */ ha.ha_ba = HPIBC_BA; ha.ha_softcpp = &sc->sc_hpibbus; /* XXX */ - (void)config_found(self, &ha, hpibdevprint, CFARG_EOL); + (void)config_found(self, &ha, hpibdevprint, CFARGS_NONE); } static void Index: src/sys/arch/hp300/dev/nhpib.c diff -u src/sys/arch/hp300/dev/nhpib.c:1.42 src/sys/arch/hp300/dev/nhpib.c:1.42.8.1 --- src/sys/arch/hp300/dev/nhpib.c:1.42 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hp300/dev/nhpib.c Wed Aug 4 01:02:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: nhpib.c,v 1.42 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: nhpib.c,v 1.42.8.1 2021/08/04 01:02:36 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nhpib.c,v 1.42 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nhpib.c,v 1.42.8.1 2021/08/04 01:02:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -252,7 +252,7 @@ nhpib_common_attach(struct nhpib_softc * ha.ha_type = sc->sc_type; /* XXX */ ha.ha_ba = sc->sc_myaddr; ha.ha_softcpp = &sc->sc_hpibbus; /* XXX */ - (void)config_found(sc->sc_dev, &ha, hpibdevprint, CFARG_EOL); + (void)config_found(sc->sc_dev, &ha, hpibdevprint, CFARGS_NONE); } static void Index: src/sys/arch/hp300/dev/frodo.c diff -u src/sys/arch/hp300/dev/frodo.c:1.33 src/sys/arch/hp300/dev/frodo.c:1.33.8.1 --- src/sys/arch/hp300/dev/frodo.c:1.33 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hp300/dev/frodo.c Wed Aug 4 01:02:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: frodo.c,v 1.33 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: frodo.c,v 1.33.8.1 2021/08/04 01:02:36 thorpej Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: frodo.c,v 1.33 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: frodo.c,v 1.33.8.1 2021/08/04 01:02:36 thorpej Exp $"); #define _HP300_INTR_H_PRIVATE @@ -208,8 +208,7 @@ frodoattach(device_t parent, device_t se fa.fa_offset = fd->fd_offset; fa.fa_line = fd->fd_line; config_found(self, &fa, frodoprint, - CFARG_SUBMATCH, frodosubmatch, - CFARG_EOL); + CFARGS(.submatch = frodosubmatch)); } } Index: src/sys/arch/hp300/dev/hpib.c diff -u src/sys/arch/hp300/dev/hpib.c:1.43 src/sys/arch/hp300/dev/hpib.c:1.43.2.1 --- src/sys/arch/hp300/dev/hpib.c:1.43 Mon Jul 5 14:03:46 2021 +++ src/sys/arch/hp300/dev/hpib.c Wed Aug 4 01:02:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: hpib.c,v 1.43 2021/07/05 14:03:46 tsutsui Exp $ */ +/* $NetBSD: hpib.c,v 1.43.2.1 2021/08/04 01:02:36 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.43 2021/07/05 14:03:46 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.43.2.1 2021/08/04 01:02:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -190,8 +190,7 @@ hpibbus_attach_children(struct hpibbus_s ha.ha_slave = slave; ha.ha_punit = punit; config_found(sc->sc_dev, &ha, hpibbusprint, - CFARG_SUBMATCH, hpibbussubmatch, - CFARG_EOL); + CFARGS(.submatch = hpibbussubmatch)); } } } Index: src/sys/arch/hp300/dev/intio.c diff -u src/sys/arch/hp300/dev/intio.c:1.30 src/sys/arch/hp300/dev/intio.c:1.30.8.1 --- src/sys/arch/hp300/dev/intio.c:1.30 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hp300/dev/intio.c Wed Aug 4 01:02:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: intio.c,v 1.30 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: intio.c,v 1.30.8.1 2021/08/04 01:02:36 thorpej Exp $ */ /*- * Copyright (c) 1996, 1998, 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.30 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.30.8.1 2021/08/04 01:02:36 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -192,7 +192,7 @@ intioattach(device_t parent, device_t se ia.ia_iobase = ib[i].ib_offset; ia.ia_addr = (bus_addr_t)(intiobase + ib[i].ib_offset); ia.ia_ipl = ib[i].ib_ipl; - config_found(self, &ia, intioprint, CFARG_EOL); + config_found(self, &ia, intioprint, CFARGS_NONE); } } Index: src/sys/arch/hp300/dev/sgc.c diff -u src/sys/arch/hp300/dev/sgc.c:1.3 src/sys/arch/hp300/dev/sgc.c:1.3.8.1 --- src/sys/arch/hp300/dev/sgc.c:1.3 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hp300/dev/sgc.c Wed Aug 4 01:02:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sgc.c,v 1.3 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: sgc.c,v 1.3.8.1 2021/08/04 01:02:36 thorpej Exp $ */ /* $OpenBSD: sgc.c,v 1.6 2010/04/15 20:35:21 miod Exp $ */ /* @@ -131,7 +131,7 @@ sgcattach(device_t parent, device_t self saa.saa_slot = slot; /* Attach matching device. */ - config_found(self, &saa, sgcprint, CFARG_EOL); + config_found(self, &saa, sgcprint, CFARGS_NONE); } } Index: src/sys/arch/hp300/dev/sti_sgc.c diff -u src/sys/arch/hp300/dev/sti_sgc.c:1.5 src/sys/arch/hp300/dev/sti_sgc.c:1.5.8.1 --- src/sys/arch/hp300/dev/sti_sgc.c:1.5 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hp300/dev/sti_sgc.c Wed Aug 4 01:02:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sti_sgc.c,v 1.5 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: sti_sgc.c,v 1.5.8.1 2021/08/04 01:02:36 thorpej Exp $ */ /* $OpenBSD: sti_sgc.c,v 1.14 2007/05/26 00:36:03 krw Exp $ */ /* @@ -27,7 +27,7 @@ * */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.5 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.5.8.1 2021/08/04 01:02:36 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -212,7 +212,7 @@ sti_sgc_attach(device_t parent, device_t waa.accesscookie = scr; config_found(ssc->sc_dev, &waa, wsemuldisplaydevprint, - CFARG_EOL); + CFARGS_NONE); break; case STI_DD_CRX: @@ -231,7 +231,7 @@ sti_sgc_attach(device_t parent, device_t waa.accesscookie = scr; config_found(ssc->sc_dev, &waa, wsemuldisplaydevprint, - CFARG_EOL); + CFARGS_NONE); break; default: /* Index: src/sys/arch/hp300/hp300/autoconf.c diff -u src/sys/arch/hp300/hp300/autoconf.c:1.109 src/sys/arch/hp300/hp300/autoconf.c:1.109.8.1 --- src/sys/arch/hp300/hp300/autoconf.c:1.109 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/hp300/hp300/autoconf.c Wed Aug 4 01:02:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.109 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: autoconf.c,v 1.109.8.1 2021/08/04 01:02:36 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.109 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.109.8.1 2021/08/04 01:02:36 thorpej Exp $"); #include "dvbox.h" #include "gbox.h" @@ -261,8 +261,7 @@ mainbusattach(device_t parent, device_t /* Search for and attach children. */ config_search(self, NULL, - CFARG_SEARCH, mainbussearch, - CFARG_EOL); + CFARGS(.search = mainbussearch)); } static int @@ -270,7 +269,7 @@ mainbussearch(device_t parent, cfdata_t { if (config_probe(parent, cf, NULL)) - config_attach(parent, cf, NULL, NULL, CFARG_EOL); + config_attach(parent, cf, NULL, NULL, CFARGS_NONE); return 0; }