CVS commit: [thorpej-cfargs2] src/sys/arch/evbmips
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 03:24:21 UTC 2021
Modified Files:
src/sys/arch/evbmips/adm5120 [thorpej-cfargs2]: mainbus.c
src/sys/arch/evbmips/alchemy [thorpej-cfargs2]: mainbus.c obio.c
src/sys/arch/evbmips/atheros [thorpej-cfargs2]: mainbus.c
src/sys/arch/evbmips/gdium [thorpej-cfargs2]: bonito_mainbus.c
mainbus.c
src/sys/arch/evbmips/ingenic [thorpej-cfargs2]: mainbus.c
src/sys/arch/evbmips/loongson [thorpej-cfargs2]: bonito_mainbus.c
mainbus.c
src/sys/arch/evbmips/loongson/dev [thorpej-cfargs2]: pcib.c
src/sys/arch/evbmips/malta/dev [thorpej-cfargs2]: gt.c mainbus.c
src/sys/arch/evbmips/malta/pci [thorpej-cfargs2]: pcib.c
src/sys/arch/evbmips/mipssim [thorpej-cfargs2]: mainbus.c
virtio_mainbus.c
src/sys/arch/evbmips/sbmips [thorpej-cfargs2]: zbbus.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/evbmips/adm5120/mainbus.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbmips/alchemy/mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/evbmips/alchemy/obio.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbmips/atheros/mainbus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbmips/gdium/bonito_mainbus.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/evbmips/gdium/mainbus.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/evbmips/ingenic/mainbus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbmips/loongson/bonito_mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/evbmips/loongson/mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbmips/loongson/dev/pcib.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/evbmips/malta/dev/gt.c \
src/sys/arch/evbmips/malta/dev/mainbus.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/evbmips/malta/pci/pcib.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbmips/mipssim/mainbus.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/evbmips/mipssim/virtio_mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbmips/sbmips/zbbus.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/evbmips/adm5120/mainbus.c
diff -u src/sys/arch/evbmips/adm5120/mainbus.c:1.4 src/sys/arch/evbmips/adm5120/mainbus.c:1.4.8.1
--- src/sys/arch/evbmips/adm5120/mainbus.c:1.4 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbmips/adm5120/mainbus.c Wed Aug 4 03:24:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 03:24:19 thorpej Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 03:24:19 thorpej Exp $");
#include
#include
@@ -153,8 +153,7 @@ mainbus_attach(device_t parent, device_t
for (md = mainbusdevs; md->md_name != NULL; md++) {
ma.ma_name = md->md_name;
config_found(self, &ma, mainbus_print,
- CFARG_IATTR, "mainbus",
- CFARG_EOL);
+ CFARGS(.iattr = "mainbus"));
}
}
Index: src/sys/arch/evbmips/alchemy/mainbus.c
diff -u src/sys/arch/evbmips/alchemy/mainbus.c:1.11 src/sys/arch/evbmips/alchemy/mainbus.c:1.11.8.1
--- src/sys/arch/evbmips/alchemy/mainbus.c:1.11 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbmips/alchemy/mainbus.c Wed Aug 4 03:24:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:24:20 thorpej Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:24:20 thorpej Exp $");
#include
#include
@@ -87,7 +87,7 @@ mainbus_attach(device_t parent, device_t
printf("\n");
for (md = mainbusdevs; md->md_name != NULL; md++) {
- config_found(self, NULL, mainbus_print, CFARG_EOL);
+ config_found(self, NULL, mainbus_print, CFARGS_NONE);
}
}
Index: src/sys/arch/evbmips/alchemy/obio.c
diff -u src/sys/arch/evbmips/alchemy/obio.c:1.5 src/sys/arch/evbmips/alchemy/obio.c:1.5.8.1
--- src/sys/arch/evbmips/alchemy/obio.c:1.5 Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbmips/alchemy/obio.c Wed Aug 4 03:24:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.5 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.5.8.1 2021/08/04 03:24:20 thorpej Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.5 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.5.8.1 2021/08/04 03:24:20 thorpej Exp $");
#include
#include
@@ -89,8 +89,7 @@ obio_attach(device_t parent, device_t se
oa.oba_addr = od->od_addr;
oa.oba_irq = od->od_irq;
c
CVS commit: [thorpej-cfargs2] src/sys/arch/evbppc
Module Name:src Committed By: thorpej Date: Wed Aug 4 03:23:10 UTC 2021 Modified Files: src/sys/arch/evbppc/ev64260 [thorpej-cfargs2]: mainbus.c src/sys/arch/evbppc/explora/dev [thorpej-cfargs2]: elb.c fb_elb.c src/sys/arch/evbppc/mpc85xx [thorpej-cfargs2]: autoconf.c src/sys/arch/evbppc/pmppc [thorpej-cfargs2]: mainbus.c src/sys/arch/evbppc/virtex [thorpej-cfargs2]: design_gsrd1.c design_gsrd2.c src/sys/arch/evbppc/virtex/dev [thorpej-cfargs2]: tft.c src/sys/arch/evbppc/walnut/dev [thorpej-cfargs2]: pbus.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/evbppc/ev64260/mainbus.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbppc/explora/dev/elb.c cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/evbppc/explora/dev/fb_elb.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbppc/mpc85xx/autoconf.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/evbppc/pmppc/mainbus.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbppc/virtex/design_gsrd1.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/evbppc/virtex/design_gsrd2.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbppc/virtex/dev/tft.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/evbppc/walnut/dev/pbus.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/evbppc/ev64260/mainbus.c diff -u src/sys/arch/evbppc/ev64260/mainbus.c:1.8 src/sys/arch/evbppc/ev64260/mainbus.c:1.8.8.1 --- src/sys/arch/evbppc/ev64260/mainbus.c:1.8 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/ev64260/mainbus.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.8 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.8.8.1 2021/08/04 03:23:10 thorpej Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8.8.1 2021/08/04 03:23:10 thorpej Exp $"); #include "mainbus.h" #include "opt_multiprocessor.h" @@ -86,7 +86,7 @@ mainbus_attach(device_t parent, device_t mba.mba_name = "cpu"; mba.mba_unit = 0; mba.mba_addr = MAINBUSCF_ADDR_DEFAULT; - config_found(self, &mba, mainbus_cfprint, CFARG_EOL); + config_found(self, &mba, mainbus_cfprint, CFARGS_NONE); #ifdef MULTIPROCESSOR /* @@ -95,7 +95,7 @@ mainbus_attach(device_t parent, device_t mba.mba_name = "cpu"; mba.mba_unit = 1; mba.mba_addr = MAINBUSCF_ADDR_DEFAULT; - config_found(self, &mba, mainbus_cfprint, CFARG_EOL); + config_found(self, &mba, mainbus_cfprint, CFARGS_NONE); #endif /* @@ -104,7 +104,7 @@ mainbus_attach(device_t parent, device_t mba.mba_name = "gt"; mba.mba_unit = -1; mba.mba_addr = gt_base; - config_found(self, &mba, mainbus_cfprint, CFARG_EOL); + config_found(self, &mba, mainbus_cfprint, CFARGS_NONE); } int Index: src/sys/arch/evbppc/explora/dev/elb.c diff -u src/sys/arch/evbppc/explora/dev/elb.c:1.10 src/sys/arch/evbppc/explora/dev/elb.c:1.10.8.1 --- src/sys/arch/evbppc/explora/dev/elb.c:1.10 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/explora/dev/elb.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: elb.c,v 1.10 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: elb.c,v 1.10.8.1 2021/08/04 03:23:10 thorpej Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.10 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.10.8.1 2021/08/04 03:23:10 thorpej Exp $"); #include #include @@ -141,7 +141,7 @@ elb_attach(device_t parent, device_t sel eaa.elb_base2 = elb->elb_addr2; eaa.elb_irq = elb->elb_irq; - (void) config_found(self, &eaa, elb_print, CFARG_EOL); + (void) config_found(self, &eaa, elb_print, CFARGS_NONE); } } Index: src/sys/arch/evbppc/explora/dev/fb_elb.c diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.19 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.19.8.1 --- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.19 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbppc/explora/dev/fb_elb.c Wed Aug 4 03:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: fb_elb.c,v 1.19 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: fb_elb.c,v 1.19.8.1 2021/08/04 03:23:10 thorpej Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.19 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.19.8.1 2021/08/04 03:23:10 thorpej Exp $"); #include #include @@ -214,7 +214,7 @@ fb_elb_attach(device_t parent, device_t waa.accessops = &accessops; waa.accesscookie = sc; - config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL); + config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE); } static void Index: src/sys/arch/evbppc/mpc8
CVS commit: [thorpej-cfargs2] src/sys/arch/evbsh3
Module Name:src Committed By: thorpej Date: Wed Aug 4 03:08:49 UTC 2021 Modified Files: src/sys/arch/evbsh3/ap_ms104_sh4 [thorpej-cfargs2]: shpcmcia.c src/sys/arch/evbsh3/evbsh3 [thorpej-cfargs2]: mainbus.c src/sys/arch/evbsh3/t_sh7706lan [thorpej-cfargs2]: scimci.c ssumci.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/evbsh3/evbsh3/mainbus.c cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbsh3/t_sh7706lan/scimci.c cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbsh3/t_sh7706lan/ssumci.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/evbsh3/ap_ms104_sh4/shpcmcia.c diff -u src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.6 src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.6.8.1 --- src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.6 Sat Apr 24 23:36:36 2021 +++ src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c Wed Aug 4 03:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: shpcmcia.c,v 1.6 2021/04/24 23:36:36 thorpej Exp $ */ +/* $NetBSD: shpcmcia.c,v 1.6.8.1 2021/08/04 03:08:48 thorpej Exp $ */ /*- * Copyright (C) 2009 NONAKA Kimihiro @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: shpcmcia.c,v 1.6 2021/04/24 23:36:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: shpcmcia.c,v 1.6.8.1 2021/08/04 03:08:48 thorpej Exp $"); #include #include @@ -313,7 +313,7 @@ shpcmcia_attach_socket(struct shpcmcia_h paa.pch = (pcmcia_chipset_handle_t)h; h->pcmcia = - config_found(h->sc->sc_dev, &paa, shpcmcia_print, CFARG_EOL); + config_found(h->sc->sc_dev, &paa, shpcmcia_print, CFARGS_NONE); /* if there's actually a pcmcia device attached, initialize the slot */ if (h->pcmcia) Index: src/sys/arch/evbsh3/evbsh3/mainbus.c diff -u src/sys/arch/evbsh3/evbsh3/mainbus.c:1.10 src/sys/arch/evbsh3/evbsh3/mainbus.c:1.10.8.1 --- src/sys/arch/evbsh3/evbsh3/mainbus.c:1.10 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/evbsh3/evbsh3/mainbus.c Wed Aug 4 03:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.10 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.10.8.1 2021/08/04 03:08:48 thorpej Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10.8.1 2021/08/04 03:08:48 thorpej Exp $"); #include #include @@ -62,12 +62,11 @@ mainbus_attach(device_t parent, device_t /* CPU */ memset(&maa, 0, sizeof(maa)); maa.ma_name = "cpu"; - config_found(self, &maa, mainbus_print, CFARG_EOL); + config_found(self, &maa, mainbus_print, CFARGS_NONE); /* Devices */ config_search(self, NULL, - CFARG_SEARCH, mainbus_search, - CFARG_EOL); + CFARGS(.search = mainbus_search)); } static int @@ -81,7 +80,7 @@ mainbus_search(device_t parent, cfdata_t maa.ma_name = cf->cf_name; if (config_probe(parent, cf, &maa)) - config_attach(parent, cf, &maa, mainbus_print, CFARG_EOL); + config_attach(parent, cf, &maa, mainbus_print, CFARGS_NONE); return 0; } Index: src/sys/arch/evbsh3/t_sh7706lan/scimci.c diff -u src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.3 src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.3.8.1 --- src/sys/arch/evbsh3/t_sh7706lan/scimci.c:1.3 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/evbsh3/t_sh7706lan/scimci.c Wed Aug 4 03:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: scimci.c,v 1.3 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: scimci.c,v 1.3.8.1 2021/08/04 03:08:48 thorpej Exp $ */ /*- * Copyright (C) 2009 NONAKA Kimihiro @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: scimci.c,v 1.3 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scimci.c,v 1.3.8.1 2021/08/04 03:08:48 thorpej Exp $"); #include #include @@ -235,7 +235,7 @@ scimci_attach(device_t parent, device_t | SMC_CAPS_SINGLE_ONLY | SMC_CAPS_POLL_CARD_DET; - sc->sc_sdmmc = config_found(sc->sc_dev, &saa, NULL, CFARG_EOL); + sc->sc_sdmmc = config_found(sc->sc_dev, &saa, NULL, CFARGS_NONE); if (sc->sc_sdmmc == NULL) aprint_error_dev(sc->sc_dev, "couldn't attach bus\n"); } Index: src/sys/arch/evbsh3/t_sh7706lan/ssumci.c diff -u src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.4 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.4.8.1 --- src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.4 Sat Apr 24 23:36:37 2021 +++ src/sys/arch/evbsh3/t_sh7706lan/ssumci.c Wed Aug 4 03:08:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ssumci.c,v 1.4 2021/04/24 23:36:37 thorpej Exp $ */ +/* $NetBSD: ssumci.c,v 1.4.8.1 2021/08/04 03:08:48 thorpej Exp $ */ /*- * Copyright (C) 2010 NONAKA Kimihiro @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.4 2021/04/24 23:36:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.4.8.
CVS commit: [thorpej-cfargs2] src/sys/arch/zaurus/dev
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 03:07:41 UTC 2021
Modified Files:
src/sys/arch/zaurus/dev [thorpej-cfargs2]: w100lcd.c zapm.c ziic.c
zkbd.c zlcd.c zrc.c zssp.c ztp.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/zaurus/dev/w100lcd.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/zaurus/dev/zapm.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/zaurus/dev/ziic.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/zaurus/dev/zkbd.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/zaurus/dev/zrc.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/zaurus/dev/zssp.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/zaurus/dev/ztp.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/zaurus/dev/w100lcd.c
diff -u src/sys/arch/zaurus/dev/w100lcd.c:1.4 src/sys/arch/zaurus/dev/w100lcd.c:1.4.8.1
--- src/sys/arch/zaurus/dev/w100lcd.c:1.4 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/w100lcd.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: w100lcd.c,v 1.4 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: w100lcd.c,v 1.4.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
* Written by Hiroyuki Bessho for Genetec Corporation.
@@ -39,7 +39,7 @@
* LCD on/off switch and backlight brightness are done in lcdctl.c.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.4 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.4.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include "lcdctl.h"
@@ -145,7 +145,7 @@ w100lcd_attach(device_t parent, device_t
aa.accessops = &w100lcd_accessops;
aa.accesscookie = sc;
- (void)config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+ (void)config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
if (!pmf_device_register(self, w100lcd_suspend, w100lcd_resume))
aprint_error_dev(self, "couldn't establish power handler\n");
Index: src/sys/arch/zaurus/dev/zapm.c
diff -u src/sys/arch/zaurus/dev/zapm.c:1.13 src/sys/arch/zaurus/dev/zapm.c:1.13.8.1
--- src/sys/arch/zaurus/dev/zapm.c:1.13 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/zapm.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zapm.c,v 1.13 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: zapm.c,v 1.13.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/* $OpenBSD: zaurus_apm.c,v 1.13 2006/12/12 23:14:28 dim Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zapm.c,v 1.13 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zapm.c,v 1.13.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include
#include
@@ -195,7 +195,7 @@ zapm_attach(device_t parent, device_t se
aaa.accesscookie = sc;
aaa.apm_detail = 0x0102;
- sc->sc_apmdev = config_found(self, &aaa, apmprint, CFARG_EOL);
+ sc->sc_apmdev = config_found(self, &aaa, apmprint, CFARGS_NONE);
if (sc->sc_apmdev != NULL) {
zapm_poll1(sc, 0);
callout_schedule(&sc->sc_cyclic_poll, CYCLIC_TIME);
Index: src/sys/arch/zaurus/dev/ziic.c
diff -u src/sys/arch/zaurus/dev/ziic.c:1.5 src/sys/arch/zaurus/dev/ziic.c:1.5.8.1
--- src/sys/arch/zaurus/dev/ziic.c:1.5 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/ziic.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ziic.c,v 1.5 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: ziic.c,v 1.5.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ziic.c,v 1.5 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ziic.c,v 1.5.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include
#include
@@ -129,7 +129,7 @@ pxaiic_attach(device_t parent, device_t
memset(&iba, 0, sizeof(iba));
iba.iba_tag = &sc->sc_i2c;
- config_found(psc->sc_dev, &iba, iicbus_print, CFARG_EOL);
+ config_found(psc->sc_dev, &iba, iicbus_print, CFARGS_NONE);
}
static int
Index: src/sys/arch/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.21 src/sys/arch/zaurus/dev/zkbd.c:1.21.8.1
--- src/sys/arch/zaurus/dev/zkbd.c:1.21 Sat Apr 24 23:36:52 2021
+++ src/sys/arch/zaurus/dev/zkbd.c Wed Aug 4 03:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zkbd.c,v 1.21 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: zkbd.c,v 1.21.8.1 2021/08/04 03:07:41 thorpej Exp $ */
/* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.21 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.21.8.1 2021/08/04 03:07:41 thorpej Exp $");
#include "opt_wsdisplay_compat.h"
#if 0 /* XXX */
@@ -336,7 +336,7 @@ zkbd_attach(device_t parent, device_t se
zkbd_hinge(sc); /* to initialize sc_hinge */
- sc->sc_wskbddev = conf
CVS commit: [thorpej-cfargs2] src/sys/arch
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 03:03:31 UTC 2021
Modified Files:
src/sys/arch/x68k/dev [thorpej-cfargs2]: fd.c grf_machdep.c intio.c
mfp.c mha.c neptune.c scsirom.c zs.c
src/sys/arch/x68k/x68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/x86/pci [thorpej-cfargs2]: amdnb_misc.c amdpcib.c amdsmn.c
dwiic_pci.c ichlpcib.c pchb.c pcib.c tcpcib.c
src/sys/arch/x86/pci/imcsmb [thorpej-cfargs2]: imc.c imcsmb.c
src/sys/arch/x86/x86 [thorpej-cfargs2]: cpu.c mainbus.c mp.c mpacpi.c
mpbios.c
src/sys/arch/xen/x86 [thorpej-cfargs2]: cpu.c xen_mainbus.c
src/sys/arch/xen/xen [thorpej-cfargs2]: hypervisor.c xpci_xenbus.c
src/sys/arch/xen/xenbus [thorpej-cfargs2]: xenbus_probe.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.124.8.1 src/sys/arch/x68k/dev/fd.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/x68k/dev/grf_machdep.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/arch/x68k/dev/intio.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/x68k/dev/mfp.c
cvs rdiff -u -r1.55 -r1.55.8.1 src/sys/arch/x68k/dev/mha.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/x68k/dev/neptune.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/x68k/dev/scsirom.c
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/arch/x68k/dev/zs.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/x68k/x68k/mainbus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/x86/pci/amdnb_misc.c \
src/sys/arch/x86/pci/amdpcib.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/x86/pci/amdsmn.c
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/arch/x86/pci/dwiic_pci.c
cvs rdiff -u -r1.53 -r1.53.8.1 src/sys/arch/x86/pci/ichlpcib.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/x86/pci/pchb.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/x86/pci/pcib.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/x86/pci/tcpcib.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/x86/pci/imcsmb/imc.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/x86/pci/imcsmb/imcsmb.c
cvs rdiff -u -r1.200 -r1.200.8.1 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/x86/x86/mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/x86/x86/mp.c
cvs rdiff -u -r1.106 -r1.106.4.1 src/sys/arch/x86/x86/mpacpi.c
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/arch/x86/x86/mpbios.c
cvs rdiff -u -r1.140 -r1.140.8.1 src/sys/arch/xen/x86/cpu.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/xen/x86/xen_mainbus.c
cvs rdiff -u -r1.91 -r1.91.8.1 src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/xen/xen/xpci_xenbus.c
cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/arch/xen/xenbus/xenbus_probe.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/x68k/dev/fd.c
diff -u src/sys/arch/x68k/dev/fd.c:1.124 src/sys/arch/x68k/dev/fd.c:1.124.8.1
--- src/sys/arch/x68k/dev/fd.c:1.124 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/fd.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.124 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.124.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.124 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.124.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_m68k_arch.h"
@@ -514,7 +514,7 @@ fdcattach(device_t parent, device_t self
/* physical limit: four drives per controller. */
for (fa.fa_drive = 0; fa.fa_drive < 4; fa.fa_drive++) {
- (void)config_found(self, (void *)&fa, fdprint, CFARG_EOL);
+ (void)config_found(self, (void *)&fa, fdprint, CFARGS_NONE);
}
intio_enable_intr(SICILIAN_INTR_FDC);
Index: src/sys/arch/x68k/dev/grf_machdep.c
diff -u src/sys/arch/x68k/dev/grf_machdep.c:1.33 src/sys/arch/x68k/dev/grf_machdep.c:1.33.8.1
--- src/sys/arch/x68k/dev/grf_machdep.c:1.33 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x68k/dev/grf_machdep.c Wed Aug 4 03:03:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_machdep.c,v 1.33 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: grf_machdep.c,v 1.33.8.1 2021/08/04 03:03:30 thorpej Exp $ */
/*
* Copyright (c) 1991 University of Utah.
@@ -44,7 +44,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.33 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.33.8.1 2021/08/04 03:03:30 thorpej Exp $");
#include "locators.h"
@@ -93,15 +93,14 @@ grfbusattach(device_t parent, device_t s
aprint_normal("\n");
config_search(self, NULL,
- CFARG_SEARCH, grfbussearch,
- CFARG_EOL);
+ CFARGS(.search = grfbussearch));
}
int
grfbussearch(device_t self, cfdata_t match, const int *ldesc, void *aux)
{
- config_found(self, &match->cf_loc[GRFBCF_ADDR], grfbusprint, CFARG_EOL);
+ config_found(self, &match->cf_loc[GRFBCF_ADDR], grfbusprint, CFARGS_NONE);
return (0);
}
@@ -1
CVS commit: [thorpej-cfargs2] src/sys/arch
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 03:00:08 UTC 2021
Modified Files:
src/sys/arch/usermode/dev [thorpej-cfargs2]: mainbus.c vatapi.c vncfb.c
src/sys/arch/vax/mba [thorpej-cfargs2]: mba.c
src/sys/arch/vax/uba [thorpej-cfargs2]: qv.c qvaux.c qvkbd.c qvms.c
src/sys/arch/vax/vax [thorpej-cfargs2]: autoconf.c cmi.c ka860.c
nmi_mainbus.c sbi.c ubi.c
src/sys/arch/vax/vsa [thorpej-cfargs2]: dz_vsbus.c hdc9224.c lcg.c
smg.c spx.c vsbus.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/usermode/dev/mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/usermode/dev/vatapi.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/usermode/dev/vncfb.c
cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/arch/vax/mba/mba.c
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/arch/vax/uba/qv.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/vax/uba/qvaux.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/vax/uba/qvkbd.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/vax/uba/qvms.c
cvs rdiff -u -r1.98 -r1.98.8.1 src/sys/arch/vax/vax/autoconf.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/vax/vax/cmi.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/vax/vax/ka860.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/vax/vax/nmi_mainbus.c
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/arch/vax/vax/sbi.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/vax/vax/ubi.c
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/arch/vax/vsa/dz_vsbus.c
cvs rdiff -u -r1.61 -r1.61.8.1 src/sys/arch/vax/vsa/hdc9224.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/vax/vsa/lcg.c
cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/arch/vax/vsa/smg.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/vax/vsa/spx.c
cvs rdiff -u -r1.66 -r1.66.8.1 src/sys/arch/vax/vsa/vsbus.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/usermode/dev/mainbus.c
diff -u src/sys/arch/usermode/dev/mainbus.c:1.11 src/sys/arch/usermode/dev/mainbus.c:1.11.8.1
--- src/sys/arch/usermode/dev/mainbus.c:1.11 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/usermode/dev/mainbus.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:00:08 thorpej Exp $");
#include
#include
@@ -80,45 +80,45 @@ mainbus_attach(device_t parent, device_t
sc->sc_dev = self;
taa.taa_type = THUNKBUS_TYPE_CPU;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
taa.taa_type = THUNKBUS_TYPE_TTYCONS;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
if (usermode_vnc_port > 0 && usermode_vnc_port < 65536) {
taa.taa_type = THUNKBUS_TYPE_VNCFB;
taa.u.vnc.width = usermode_vnc_width;
taa.u.vnc.height = usermode_vnc_height;
taa.u.vnc.port = usermode_vnc_port;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
}
taa.taa_type = THUNKBUS_TYPE_CLOCK;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
if (usermode_tap_device) {
taa.taa_type = THUNKBUS_TYPE_VETH;
taa.u.veth.device = usermode_tap_device;
taa.u.veth.eaddr = usermode_tap_eaddr;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
}
if (usermode_audio_device) {
taa.taa_type = THUNKBUS_TYPE_VAUDIO;
taa.u.vaudio.device = usermode_audio_device;
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
}
for (i = 0; i < usermode_disk_image_path_count; i++) {
taa.taa_type = THUNKBUS_TYPE_DISKIMAGE;
taa.u.diskimage.path = usermode_disk_image_path[i];
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
}
for (i = 0; i < usermode_vdev_count; i++) {
taa.taa_type = usermode_vdev_type[i];
taa.u.vdev.path = usermode_vdev_path[i];
- config_found(self, &taa, mainbus_print, CFARG_EOL);
+ config_found(self, &taa, mainbus_print, CFARGS_NONE);
}
}
Index: src/sys/arch/usermode/dev/vatapi.c
diff -u src/sys/arch/usermode/dev/vatapi.c:1.3 src/sys/arch/usermode/dev/vatapi.c:1.3.8.1
--- src/sys/arch/usermode/dev/vatapi.c:1.3 Sat Apr 24 23:36:50 2021
+++ src/sys/arch/usermode/dev/vatapi.c Wed Aug 4 03:00:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vatapi.c,v 1.3 2021/04/24 23:36:50 thorpej Exp $ */
+/* $NetBSD: vatapi.c,v 1.3.8.1 2021/08/04 03:00:08 thorpej Exp $ */
/*-
* Copyright (c) 2018 Reinoud
CVS commit: [thorpej-cfargs2] src/sys/arch
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 02:58:24 UTC 2021
Modified Files:
src/sys/arch/sun2/dev [thorpej-cfargs2]: zs.c
src/sys/arch/sun2/sun2 [thorpej-cfargs2]: mbio.c mbmem.c obio.c obmem.c
src/sys/arch/sun3/dev [thorpej-cfargs2]: fd.c sebuf.c xd.c xy.c zs.c
src/sys/arch/sun3/sun3 [thorpej-cfargs2]: autoconf.c mainbus.c obio.c
obmem.c vme.c
src/sys/arch/sun3/sun3x [thorpej-cfargs2]: obio.c vme.c
src/sys/arch/sun68k/sun68k [thorpej-cfargs2]: autoconf.c vme_sun68k.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/sun2/dev/zs.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/sun2/sun2/mbio.c \
src/sys/arch/sun2/sun2/obio.c src/sys/arch/sun2/sun2/obmem.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/sun2/sun2/mbmem.c
cvs rdiff -u -r1.85 -r1.85.8.1 src/sys/arch/sun3/dev/fd.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sun3/dev/sebuf.c
cvs rdiff -u -r1.76 -r1.76.8.1 src/sys/arch/sun3/dev/xd.c
cvs rdiff -u -r1.81 -r1.81.8.1 src/sys/arch/sun3/dev/xy.c
cvs rdiff -u -r1.89 -r1.89.8.1 src/sys/arch/sun3/dev/zs.c
cvs rdiff -u -r1.80 -r1.80.8.1 src/sys/arch/sun3/sun3/autoconf.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/sun3/sun3/mainbus.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/arch/sun3/sun3/obio.c
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/sun3/sun3/obmem.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/sun3/sun3/vme.c
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/sun3/sun3x/obio.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sun3/sun3x/vme.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/sun68k/sun68k/autoconf.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sun68k/sun68k/vme_sun68k.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/sun2/dev/zs.c
diff -u src/sys/arch/sun2/dev/zs.c:1.22 src/sys/arch/sun2/dev/zs.c:1.22.8.1
--- src/sys/arch/sun2/dev/zs.c:1.22 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun2/dev/zs.c Wed Aug 4 02:58:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.22 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.22.8.1 2021/08/04 02:58:23 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22.8.1 2021/08/04 02:58:23 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -233,7 +233,7 @@ zs_attach(struct zsc_softc *zsc, struct
* The child attach will setup the hardware.
*/
if ((child = config_found(zsc->zsc_dev, (void *)&zsc_args,
- zs_print, CFARG_EOL)) == NULL) {
+ zs_print, CFARGS_NONE)) == NULL) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
ZSWR9_A_RESET : ZSWR9_B_RESET;
@@ -274,14 +274,14 @@ zs_attach(struct zsc_softc *zsc, struct
#if (NKBD > 0)
kma.kmta_name = "keyboard";
config_found(child, (void *)&kma, NULL,
- CFARG_EOL);
+ CFARGS_NONE);
#endif
break;
case ZS_PERIPHERAL_SUNMS:
#if (NMS > 0)
kma.kmta_name = "mouse";
config_found(child, (void *)&kma, NULL,
- CFARG_EOL);
+ CFARGS_NONE);
#endif
break;
default:
Index: src/sys/arch/sun2/sun2/mbio.c
diff -u src/sys/arch/sun2/sun2/mbio.c:1.20 src/sys/arch/sun2/sun2/mbio.c:1.20.8.1
--- src/sys/arch/sun2/sun2/mbio.c:1.20 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun2/sun2/mbio.c Wed Aug 4 02:58:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mbio.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: mbio.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mbio.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mbio.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $");
#include
#include
@@ -130,15 +130,13 @@ mbio_attach(device_t parent, device_t se
for (cpp = special; *cpp != NULL; cpp++) {
mba.mba_name = *cpp;
config_search(self, &mba,
- CFARG_SEARCH, sun68k_bus_search,
- CFARG_EOL);
+ CFARGS(.search = sun68k_bus_search));
}
/* Find all other mbio devices */
mba.mba_name = NULL;
config_search(self, &mba,
- CFARG_SEARCH, sun68k_bus_search,
- CFARG_EOL);
+ CFARGS(.search = sun68k_bus_search));
}
int
Index: src/sys/arch/sun2/sun2/obio.c
diff -u src/sys/arch/sun2/sun2/obio.c:1.20 src/sys/arch/sun2/sun2/obio.c:1.20.8.1
--- src/sys/arch/sun2/sun2/obio.c:1.20 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sun2/sun2/obio.c Wed Aug 4 02:58:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.20 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.20.8.1 2021/08/04 02:58:23 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0,
CVS commit: [thorpej-cfargs2] src/sys/arch
Module Name:src Committed By: thorpej Date: Wed Aug 4 02:57:07 UTC 2021 Modified Files: src/sys/arch/shark/ofw [thorpej-cfargs2]: ofisascr.c vlpci.c src/sys/arch/shark/shark [thorpej-cfargs2]: sequoia.c shark_iic.c src/sys/arch/sparc/dev [thorpej-cfargs2]: bootbus.c cgfourteen.c ebus.c fd.c obio.c sbus.c ts102.c vme_machdep.c zs.c src/sys/arch/sparc/sparc [thorpej-cfargs2]: autoconf.c cpuunit.c iommu.c msiiep.c src/sys/arch/sparc64/dev [thorpej-cfargs2]: cbus.c central.c com_ebus.c ebus.c ebus_mainbus.c fdc.c ffb.c fhc.c gfb.c jbus-i2c.c psycho.c pyro.c sab.c sbus.c schizo.c upa.c vbus.c vdsk.c vpci.c zs.c src/sys/arch/sparc64/sparc64 [thorpej-cfargs2]: autoconf.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/shark/ofw/ofisascr.c \ src/sys/arch/shark/ofw/vlpci.c cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/arch/shark/shark/sequoia.c cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/arch/shark/shark/shark_iic.c cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/arch/sparc/dev/bootbus.c cvs rdiff -u -r1.89 -r1.89.8.1 src/sys/arch/sparc/dev/cgfourteen.c cvs rdiff -u -r1.40 -r1.40.4.1 src/sys/arch/sparc/dev/ebus.c cvs rdiff -u -r1.162 -r1.162.8.1 src/sys/arch/sparc/dev/fd.c cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/arch/sparc/dev/obio.c cvs rdiff -u -r1.82 -r1.82.4.1 src/sys/arch/sparc/dev/sbus.c cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/arch/sparc/dev/ts102.c cvs rdiff -u -r1.73 -r1.73.4.1 src/sys/arch/sparc/dev/vme_machdep.c cvs rdiff -u -r1.122 -r1.122.8.1 src/sys/arch/sparc/dev/zs.c cvs rdiff -u -r1.268 -r1.268.2.1 src/sys/arch/sparc/sparc/autoconf.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/sparc/sparc/cpuunit.c cvs rdiff -u -r1.98 -r1.98.4.1 src/sys/arch/sparc/sparc/iommu.c cvs rdiff -u -r1.51 -r1.51.4.1 src/sys/arch/sparc/sparc/msiiep.c cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/sparc64/dev/cbus.c cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/arch/sparc64/dev/central.c \ src/sys/arch/sparc64/dev/vbus.c cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/sparc64/dev/com_ebus.c cvs rdiff -u -r1.67 -r1.67.4.1 src/sys/arch/sparc64/dev/ebus.c cvs rdiff -u -r1.20 -r1.20.4.1 src/sys/arch/sparc64/dev/ebus_mainbus.c cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/arch/sparc64/dev/fdc.c cvs rdiff -u -r1.66 -r1.66.8.1 src/sys/arch/sparc64/dev/ffb.c cvs rdiff -u -r1.9 -r1.9.4.1 src/sys/arch/sparc64/dev/fhc.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/sparc64/dev/gfb.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/sparc64/dev/jbus-i2c.c cvs rdiff -u -r1.134 -r1.134.4.1 src/sys/arch/sparc64/dev/psycho.c cvs rdiff -u -r1.24 -r1.24.4.1 src/sys/arch/sparc64/dev/pyro.c cvs rdiff -u -r1.56 -r1.56.8.1 src/sys/arch/sparc64/dev/sab.c cvs rdiff -u -r1.102 -r1.102.4.1 src/sys/arch/sparc64/dev/sbus.c cvs rdiff -u -r1.45 -r1.45.4.1 src/sys/arch/sparc64/dev/schizo.c cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/arch/sparc64/dev/upa.c cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/arch/sparc64/dev/vdsk.c cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/arch/sparc64/dev/vpci.c cvs rdiff -u -r1.76 -r1.76.8.1 src/sys/arch/sparc64/dev/zs.c cvs rdiff -u -r1.233 -r1.233.2.1 src/sys/arch/sparc64/sparc64/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/shark/ofw/ofisascr.c diff -u src/sys/arch/shark/ofw/ofisascr.c:1.11 src/sys/arch/shark/ofw/ofisascr.c:1.11.8.1 --- src/sys/arch/shark/ofw/ofisascr.c:1.11 Sat Apr 24 23:36:48 2021 +++ src/sys/arch/shark/ofw/ofisascr.c Wed Aug 4 02:57:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ofisascr.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $ */ +/* $NetBSD: ofisascr.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $ */ /* * Copyright 1997 @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $"); #include #include @@ -105,6 +105,5 @@ ofisascrattach(device_t parent, device_t ia.ia_aux = (void *)oba->oba_phandle; config_found(dev, &ia, NULL, - CFARG_DEVHANDLE, devhandle_from_of(oba->oba_phandle), - CFARG_EOL); + CFARGS(.devhandle = devhandle_from_of(oba->oba_phandle))); } Index: src/sys/arch/shark/ofw/vlpci.c diff -u src/sys/arch/shark/ofw/vlpci.c:1.11 src/sys/arch/shark/ofw/vlpci.c:1.11.8.1 --- src/sys/arch/shark/ofw/vlpci.c:1.11 Sat Apr 24 23:36:48 2021 +++ src/sys/arch/shark/ofw/vlpci.c Wed Aug 4 02:57:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vlpci.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $ */ +/* $NetBSD: vlpci.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $ */ /* * Copyright (c) 2017 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.11 2021/04/24 23:36:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.11.8.1 2021/08/04 02:57:06 thorpej Exp $"); #include "opt_pci.h"
CVS commit: [thorpej-cfargs2] src/sys/arch
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 02:53:01 UTC 2021
Modified Files:
src/sys/arch/riscv/htif [thorpej-cfargs2]: htif.c
src/sys/arch/riscv/riscv [thorpej-cfargs2]: mainbus.c
src/sys/arch/rs6000/mca [thorpej-cfargs2]: ioplanar.c
src/sys/arch/rs6000/rs6000 [thorpej-cfargs2]: mainbus.c
src/sys/arch/sandpoint/sandpoint [thorpej-cfargs2]: eumb.c mainbus.c
nhpow.c
src/sys/arch/sbmips/sbmips [thorpej-cfargs2]: zbbus.c
src/sys/arch/sgimips/dev [thorpej-cfargs2]: crmfb.c imc.c pic.c zs.c
zs_kbd.c zs_ms.c
src/sys/arch/sgimips/gio [thorpej-cfargs2]: gio.c grtwo.c light.c
newport.c pci_gio.c
src/sys/arch/sgimips/hpc [thorpej-cfargs2]: hpc.c pi1ppc.c
src/sys/arch/sgimips/ioc [thorpej-cfargs2]: ioc.c oioc.c
src/sys/arch/sgimips/mace [thorpej-cfargs2]: mace.c pci_mace.c
src/sys/arch/sgimips/sgimips [thorpej-cfargs2]: mainbus.c
src/sys/arch/sh3/dev [thorpej-cfargs2]: adc.c shb.c shpcic.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/riscv/htif/htif.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/riscv/riscv/mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/rs6000/mca/ioplanar.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/rs6000/rs6000/mainbus.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/sandpoint/sandpoint/eumb.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/sandpoint/sandpoint/mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/sandpoint/sandpoint/nhpow.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/sbmips/sbmips/zbbus.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/arch/sgimips/dev/crmfb.c
cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/sgimips/dev/imc.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sgimips/dev/pic.c
cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/arch/sgimips/dev/zs.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/sgimips/dev/zs_kbd.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/sgimips/dev/zs_ms.c
cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/arch/sgimips/gio/gio.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/sgimips/gio/grtwo.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/sgimips/gio/light.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/sgimips/gio/newport.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/sgimips/gio/pci_gio.c
cvs rdiff -u -r1.72 -r1.72.8.1 src/sys/arch/sgimips/hpc/hpc.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/sgimips/hpc/pi1ppc.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/sgimips/ioc/ioc.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/sgimips/ioc/oioc.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/sgimips/mace/mace.c \
src/sys/arch/sgimips/mace/pci_mace.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/sgimips/sgimips/mainbus.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/sh3/dev/adc.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/sh3/dev/shb.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/sh3/dev/shpcic.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/riscv/htif/htif.c
diff -u src/sys/arch/riscv/htif/htif.c:1.3 src/sys/arch/riscv/htif/htif.c:1.3.8.1
--- src/sys/arch/riscv/htif/htif.c:1.3 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/riscv/htif/htif.c Wed Aug 4 02:52:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: htif.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: htif.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-__RCSID("$NetBSD: htif.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $");
+__RCSID("$NetBSD: htif.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $");
#include
#include
@@ -68,7 +68,7 @@ htif_mainbus_attach(device_t parent, dev
struct htif_attach_args haa;
haa.haa_name = "htifcons";
- config_found(self, &haa, htif_mainbus_print, CFARG_EOL);
+ config_found(self, &haa, htif_mainbus_print, CFARGS_NONE);
haa.haa_name = "htifdisk";
- config_found(self, &haa, htif_mainbus_print, CFARG_EOL);
+ config_found(self, &haa, htif_mainbus_print, CFARGS_NONE);
}
Index: src/sys/arch/riscv/riscv/mainbus.c
diff -u src/sys/arch/riscv/riscv/mainbus.c:1.3 src/sys/arch/riscv/riscv/mainbus.c:1.3.8.1
--- src/sys/arch/riscv/riscv/mainbus.c:1.3 Sat Apr 24 23:36:47 2021
+++ src/sys/arch/riscv/riscv/mainbus.c Wed Aug 4 02:52:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include
-__RCSID("$NetBSD: mainbus.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $");
+__RCSID("$NetBSD: mainbus.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $");
#include
#include
@@ -72,5 +72,5 @@ mainbus_attach(device_t parent, device_t
maa.maa_name = "cpu";
maa.maa_instance = 0;
- config_found(self, &maa, mainbus_print, CFARG_EOL);
+ config_found(self, &
CVS commit: [thorpej-cfargs2] src/sys/arch
Module Name:src Committed By: thorpej Date: Wed Aug 4 02:49:41 UTC 2021 Modified Files: src/sys/arch/news68k/dev [thorpej-cfargs2]: hb.c kb_hb.c kb_kbc.c kbc.c ms_hb.c ms_kbc.c zs.c src/sys/arch/news68k/news68k [thorpej-cfargs2]: mainbus.c src/sys/arch/newsmips/apbus [thorpej-cfargs2]: apbus.c kb_ap.c ms_ap.c spifi.c xafb.c zs_ap.c src/sys/arch/newsmips/dev [thorpej-cfargs2]: fb.c hb.c kb_hb.c ms_hb.c sc_wrap.c zs_hb.c src/sys/arch/newsmips/newsmips [thorpej-cfargs2]: mainbus.c src/sys/arch/next68k/dev [thorpej-cfargs2]: intio.c nextdisplay.c nextkbd.c zs.c src/sys/arch/next68k/next68k [thorpej-cfargs2]: mainbus.c src/sys/arch/ofppc/ofppc [thorpej-cfargs2]: mainbus.c src/sys/arch/ofppc/pci [thorpej-cfargs2]: ofwpci.c src/sys/arch/playstation2/dev [thorpej-cfargs2]: ohci_sbus.c sbus.c spd.c src/sys/arch/playstation2/ee [thorpej-cfargs2]: gsfb.c src/sys/arch/playstation2/playstation2 [thorpej-cfargs2]: mainbus.c src/sys/arch/pmax/ibus [thorpej-cfargs2]: dz_ibus.c ibus.c pm.c sii.c src/sys/arch/pmax/pmax [thorpej-cfargs2]: mainbus.c src/sys/arch/pmax/tc [thorpej-cfargs2]: dt.c dtkbd.c dtms.c src/sys/arch/powerpc/booke/dev [thorpej-cfargs2]: cpunode.c pq3duart.c pq3ehci.c pq3etsec.c pq3gpio.c pq3obio.c src/sys/arch/powerpc/booke/pci [thorpej-cfargs2]: pq3pci.c src/sys/arch/powerpc/ibm4xx/dev [thorpej-cfargs2]: dwctwo_plb.c exb.c gpiic_opb.c gpio_opb.c opb.c plb.c src/sys/arch/powerpc/ibm4xx/pci [thorpej-cfargs2]: pchb.c src/sys/arch/powerpc/pci [thorpej-cfargs2]: pchb.c pcib.c src/sys/arch/prep/pci [thorpej-cfargs2]: gten.c pceb.c src/sys/arch/prep/pnpbus [thorpej-cfargs2]: pnpbus.c src/sys/arch/prep/prep [thorpej-cfargs2]: mainbus.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/news68k/dev/hb.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/news68k/dev/kb_hb.c \ src/sys/arch/news68k/dev/kbc.c cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/news68k/dev/kb_kbc.c cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/news68k/dev/ms_hb.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/news68k/dev/ms_kbc.c cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/news68k/dev/zs.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/news68k/news68k/mainbus.c cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/newsmips/apbus/apbus.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/newsmips/apbus/kb_ap.c \ src/sys/arch/newsmips/apbus/ms_ap.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/newsmips/apbus/spifi.c cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/newsmips/apbus/xafb.c cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/newsmips/apbus/zs_ap.c cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/newsmips/dev/fb.c \ src/sys/arch/newsmips/dev/zs_hb.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/newsmips/dev/hb.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/newsmips/dev/kb_hb.c cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/newsmips/dev/ms_hb.c cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/newsmips/dev/sc_wrap.c cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/newsmips/newsmips/mainbus.c cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/next68k/dev/intio.c cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/next68k/dev/nextdisplay.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/next68k/dev/nextkbd.c cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/next68k/dev/zs.c cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/next68k/next68k/mainbus.c cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/ofppc/ofppc/mainbus.c cvs rdiff -u -r1.20 -r1.20.4.1 src/sys/arch/ofppc/pci/ofwpci.c cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/playstation2/dev/ohci_sbus.c cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/playstation2/dev/sbus.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/playstation2/dev/spd.c cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/playstation2/ee/gsfb.c cvs rdiff -u -r1.17 -r1.17.8.1 \ src/sys/arch/playstation2/playstation2/mainbus.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/pmax/ibus/dz_ibus.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/pmax/ibus/ibus.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/pmax/ibus/pm.c cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/arch/pmax/ibus/sii.c cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/arch/pmax/pmax/mainbus.c cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/pmax/tc/dt.c cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/pmax/tc/dtkbd.c \ src/sys/arch/pmax/tc/dtms.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/powerpc/booke/dev/cpunode.c \ src/sys/arch/powerpc/booke/dev/pq3duart.c cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/powerpc/booke/dev/pq3ehci.c cvs rdiff -u -r1.55 -r1.55.2.1 src/sys/arch/powerpc/booke/dev/pq3etsec.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/powerpc/booke/dev/pq3gpio.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/powerpc/booke/dev/pq3obio.c cvs
CVS commit: [thorpej-cfargs2] src/sys/arch
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 02:45:07 UTC 2021
Modified Files:
src/sys/arch/mipsco/isa [thorpej-cfargs2]: isa_machdep.c
src/sys/arch/mipsco/mipsco [thorpej-cfargs2]: mainbus.c
src/sys/arch/mipsco/obio [thorpej-cfargs2]: obio.c zs.c
src/sys/arch/mmeye/dev [thorpej-cfargs2]: mmeyepcmcia.c rtciic.c
src/sys/arch/mmeye/mmeye [thorpej-cfargs2]: mainbus.c
src/sys/arch/mvme68k/dev [thorpej-cfargs2]: mainbus.c pcc.c wdsc.c zs.c
src/sys/arch/mvmeppc/mvmeppc [thorpej-cfargs2]: mainbus.c
src/sys/arch/netwinder/pci [thorpej-cfargs2]: pcib.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/mipsco/isa/isa_machdep.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/mipsco/mipsco/mainbus.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/mipsco/obio/obio.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/arch/mipsco/obio/zs.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mmeye/dev/mmeyepcmcia.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/mmeye/dev/rtciic.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/mmeye/mmeye/mainbus.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/mvme68k/dev/mainbus.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/arch/mvme68k/dev/pcc.c \
src/sys/arch/mvme68k/dev/wdsc.c
cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/arch/mvme68k/dev/zs.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/mvmeppc/mvmeppc/mainbus.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/netwinder/pci/pcib.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/mipsco/isa/isa_machdep.c
diff -u src/sys/arch/mipsco/isa/isa_machdep.c:1.18 src/sys/arch/mipsco/isa/isa_machdep.c:1.18.8.1
--- src/sys/arch/mipsco/isa/isa_machdep.c:1.18 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mipsco/isa/isa_machdep.c Wed Aug 4 02:45:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $");
#include
#include
@@ -144,7 +144,7 @@ isabusattach(device_t parent, device_t s
(*platform.intr_establish)(SYS_INTR_ATBUS, isa_intr, ic);
printf("\n");
- config_found(self, &iba, mipscoisabusprint, CFARG_EOL);
+ config_found(self, &iba, mipscoisabusprint, CFARGS_NONE);
}
int
Index: src/sys/arch/mipsco/mipsco/mainbus.c
diff -u src/sys/arch/mipsco/mipsco/mainbus.c:1.11 src/sys/arch/mipsco/mipsco/mainbus.c:1.11.8.1
--- src/sys/arch/mipsco/mipsco/mainbus.c:1.11 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mipsco/mipsco/mainbus.c Wed Aug 4 02:45:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 02:45:06 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 02:45:06 thorpej Exp $");
#include
#include
@@ -66,15 +66,15 @@ mbattach(device_t parent, device_t self,
nca.ca_name = "cpu";
nca.ca_addr = 0;
- config_found(self, &nca, mbprint, CFARG_EOL);
+ config_found(self, &nca, mbprint, CFARGS_NONE);
nca.ca_name = "obio";
nca.ca_addr = 0;
- config_found(self, &nca, NULL, CFARG_EOL);
+ config_found(self, &nca, NULL, CFARGS_NONE);
nca.ca_name = "isabus"; /* XXX */
nca.ca_addr = 0;
- config_found(self, &nca, NULL, CFARG_EOL);
+ config_found(self, &nca, NULL, CFARGS_NONE);
}
Index: src/sys/arch/mipsco/obio/obio.c
diff -u src/sys/arch/mipsco/obio/obio.c:1.18 src/sys/arch/mipsco/obio/obio.c:1.18.8.1
--- src/sys/arch/mipsco/obio/obio.c:1.18 Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mipsco/obio/obio.c Wed Aug 4 02:45:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $");
#include "locators.h"
@@ -87,8 +87,7 @@ obio_attach(device_t parent, device_t se
printf("\n");
config_search(self, ca,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
+ CFARGS(.search = obio_search));
}
static int
@@ -100,7 +99,7 @@ obio_search(device_t parent, cfdata_t cf
ca->ca_name = cf->cf_name;
if (config_probe(parent, cf, ca))
- config_attach(parent, cf, ca, obio_print, CFARG_EOL);
+ config_attach(parent, cf, ca,
CVS commit: [thorpej-cfargs2] src/sys/arch/mips
Module Name:src Committed By: thorpej Date: Wed Aug 4 02:44:16 UTC 2021 Modified Files: src/sys/arch/mips/adm5120 [thorpej-cfargs2]: adm5120_extio.c adm5120_obio.c src/sys/arch/mips/adm5120/dev [thorpej-cfargs2]: admgpio.c admpci.c ahci.c src/sys/arch/mips/alchemy [thorpej-cfargs2]: aubus.c src/sys/arch/mips/alchemy/dev [thorpej-cfargs2]: augpio.c aupci.c aupcmcia.c aupsc.c ausmbus_psc.c auspi.c ohci_aubus.c src/sys/arch/mips/atheros [thorpej-cfargs2]: arbus.c src/sys/arch/mips/atheros/dev [thorpej-cfargs2]: argpio.c arpci.c arspi.c ehci_arbus.c ohci_arbus.c src/sys/arch/mips/cavium [thorpej-cfargs2]: mainbus.c octeon_bootbus.c octeon_cpunode.c octeon_iobus.c src/sys/arch/mips/cavium/dev [thorpej-cfargs2]: octeon_dwctwo.c octeon_gmx.c octeon_mpi.c octeon_pip.c octeon_xhci.c src/sys/arch/mips/ingenic [thorpej-cfargs2]: apbus.c ingenic_dwctwo.c ingenic_ehci.c ingenic_ohci.c jziic.c src/sys/arch/mips/ralink [thorpej-cfargs2]: ralink_ehci.c ralink_gpio.c ralink_i2c.c ralink_mainbus.c ralink_ohci.c src/sys/arch/mips/rmi [thorpej-cfargs2]: rmixl_cpucore.c rmixl_cpunode.c rmixl_ehci.c rmixl_gpio.c rmixl_iobus.c rmixl_mainbus.c rmixl_obio.c rmixl_ohci.c rmixl_pcie.c rmixl_pcix.c rmixl_usbi.c src/sys/arch/mips/sibyte/dev [thorpej-cfargs2]: sbgbus.c sbobio.c sbscd.c sbsmbus.c src/sys/arch/mips/sibyte/pci [thorpej-cfargs2]: sbbrz.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/mips/adm5120/adm5120_extio.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/adm5120/adm5120_obio.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/adm5120/dev/admgpio.c cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/mips/adm5120/dev/admpci.c cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mips/adm5120/dev/ahci.c cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mips/alchemy/aubus.c cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/mips/alchemy/dev/augpio.c cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/mips/alchemy/dev/aupci.c cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/mips/alchemy/dev/aupcmcia.c cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/mips/alchemy/dev/aupsc.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/alchemy/dev/ausmbus_psc.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/mips/alchemy/dev/auspi.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/mips/alchemy/dev/ohci_aubus.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/mips/atheros/arbus.c cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/mips/atheros/dev/argpio.c \ src/sys/arch/mips/atheros/dev/ehci_arbus.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/atheros/dev/arpci.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/atheros/dev/arspi.c cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/mips/atheros/dev/ohci_arbus.c cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/arch/mips/cavium/mainbus.c cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/mips/cavium/octeon_bootbus.c cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/mips/cavium/octeon_cpunode.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/cavium/octeon_iobus.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/arch/mips/cavium/dev/octeon_gmx.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/cavium/dev/octeon_mpi.c cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/mips/cavium/dev/octeon_pip.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/cavium/dev/octeon_xhci.c cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/mips/ingenic/apbus.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/ingenic/ingenic_dwctwo.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/mips/ingenic/ingenic_ehci.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/ingenic/ingenic_ohci.c cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/mips/ingenic/jziic.c cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/mips/ralink/ralink_ehci.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/mips/ralink/ralink_gpio.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/ralink/ralink_i2c.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/ralink/ralink_mainbus.c \ src/sys/arch/mips/ralink/ralink_ohci.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/mips/rmi/rmixl_cpucore.c \ src/sys/arch/mips/rmi/rmixl_iobus.c src/sys/arch/mips/rmi/rmixl_obio.c \ src/sys/arch/mips/rmi/rmixl_ohci.c src/sys/arch/mips/rmi/rmixl_usbi.c cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/mips/rmi/rmixl_cpunode.c \ src/sys/arch/mips/rmi/rmixl_gpio.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/mips/rmi/rmixl_ehci.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/rmi/rmixl_mainbus.c cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/mips/rmi/rmixl_pcie.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/mips/rmi/rmixl_pcix.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/mips/sibyte/dev/sbgbus.c cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mips/sibyte/de
CVS commit: [thorpej-cfargs2] src/sys/arch/macppc
Module Name:src Committed By: thorpej Date: Wed Aug 4 02:39:49 UTC 2021 Modified Files: src/sys/arch/macppc/dev [thorpej-cfargs2]: adb.c akbd.c ams.c cuda.c gpio.c ki2c.c mediabay.c mesh.c obio.c ofb.c pbms.c platinumfb.c pmu.c smu.c smuiic.c snapper.c uni-n.c valkyriefb.c zs.c src/sys/arch/macppc/macppc [thorpej-cfargs2]: mainbus.c memory.c src/sys/arch/macppc/pci [thorpej-cfargs2]: bandit.c grackle.c u3.c uninorth.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/macppc/dev/adb.c cvs rdiff -u -r1.46 -r1.46.8.1 src/sys/arch/macppc/dev/akbd.c cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/arch/macppc/dev/ams.c cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/macppc/dev/cuda.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/macppc/dev/gpio.c cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/arch/macppc/dev/ki2c.c cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/macppc/dev/mediabay.c cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/arch/macppc/dev/mesh.c cvs rdiff -u -r1.49 -r1.49.8.1 src/sys/arch/macppc/dev/obio.c cvs rdiff -u -r1.71 -r1.71.8.1 src/sys/arch/macppc/dev/ofb.c cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/arch/macppc/dev/pbms.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/macppc/dev/platinumfb.c cvs rdiff -u -r1.37 -r1.37.8.1 src/sys/arch/macppc/dev/pmu.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/macppc/dev/smu.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/macppc/dev/smuiic.c cvs rdiff -u -r1.60 -r1.60.2.1 src/sys/arch/macppc/dev/snapper.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/macppc/dev/uni-n.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/macppc/dev/valkyriefb.c cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/arch/macppc/dev/zs.c cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/macppc/macppc/mainbus.c cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/macppc/macppc/memory.c cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/macppc/pci/bandit.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/macppc/pci/grackle.c cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/macppc/pci/u3.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/macppc/pci/uninorth.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/macppc/dev/adb.c diff -u src/sys/arch/macppc/dev/adb.c:1.36 src/sys/arch/macppc/dev/adb.c:1.36.8.1 --- src/sys/arch/macppc/dev/adb.c:1.36 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/adb.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: adb.c,v 1.36 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: adb.c,v 1.36.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /*- * Copyright (C) 1994 Bradley A. Grantham @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.36 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.36.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include #include @@ -150,7 +150,7 @@ adbattach(device_t parent, device_t self aa_args.adbaddr = ADBADDR_APM; aa_args.handler_id = ADBADDR_APM; - (void)config_found(self, &aa_args, NULL, CFARG_EOL); + (void)config_found(self, &aa_args, NULL, CFARGS_NONE); #endif /* @@ -174,7 +174,7 @@ adbattach(device_t parent, device_t self aa_args.origaddr = 0; aa_args.adbaddr = 0; aa_args.handler_id = 0; - (void)config_found(self, &aa_args, adbprint, CFARG_EOL); + (void)config_found(self, &aa_args, adbprint, CFARGS_NONE); #endif /* for each ADB device */ @@ -186,7 +186,7 @@ adbattach(device_t parent, device_t self aa_args.adbaddr = adbaddr; aa_args.handler_id = adbdata.devType; - (void)config_found(self, &aa_args, adbprint, CFARG_EOL); + (void)config_found(self, &aa_args, adbprint, CFARGS_NONE); } if (adbHardware == ADB_HW_CUDA) Index: src/sys/arch/macppc/dev/akbd.c diff -u src/sys/arch/macppc/dev/akbd.c:1.46 src/sys/arch/macppc/dev/akbd.c:1.46.8.1 --- src/sys/arch/macppc/dev/akbd.c:1.46 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/akbd.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: akbd.c,v 1.46 2021/04/24 23:36:41 thorpej Exp $ */ +/* $NetBSD: akbd.c,v 1.46.8.1 2021/08/04 02:39:49 thorpej Exp $ */ /* * Copyright (C) 1998 Colin Wood @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.46 2021/04/24 23:36:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.46.8.1 2021/08/04 02:39:49 thorpej Exp $"); #include #include @@ -250,7 +250,7 @@ akbdattach(device_t parent, device_t sel a.accessops = &akbd_accessops; a.accesscookie = sc; - sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL); + sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE); } Index: src/sys/arch/macppc/dev/ams.c diff -u src/sys/arch/macppc/dev/ams.c:1.30 src/sys/arch/macppc/dev/ams.c:1.30.8.1 --- src/sys/arch/macppc/dev/ams.c:1.30 Sat Apr 24 23:36:41 2021 +++ src/sys/arch/macppc/dev/ams.c Wed Aug 4 02:39:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ams.c,v 1.30 202
CVS commit: [thorpej-cfargs2] src/sys/arch
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 02:37:21 UTC 2021
Modified Files:
src/sys/arch/landisk/dev [thorpej-cfargs2]: obio.c
src/sys/arch/landisk/landisk [thorpej-cfargs2]: mainbus.c
src/sys/arch/luna68k/dev [thorpej-cfargs2]: lunafb.c lunaws.c sio.c
src/sys/arch/luna68k/luna68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/mac68k/dev [thorpej-cfargs2]: adb.c akbd.c ams.c
grf_subr.c macfb.c ncr5380.c zs.c
src/sys/arch/mac68k/mac68k [thorpej-cfargs2]: mainbus.c
src/sys/arch/mac68k/nubus [thorpej-cfargs2]: nubus.c
src/sys/arch/mac68k/obio [thorpej-cfargs2]: iwm_fd.c obio.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/landisk/dev/obio.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/landisk/landisk/mainbus.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/luna68k/dev/lunafb.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/luna68k/dev/lunaws.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/luna68k/dev/sio.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/luna68k/luna68k/mainbus.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/arch/mac68k/dev/adb.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/mac68k/dev/akbd.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mac68k/dev/ams.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/mac68k/dev/grf_subr.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/mac68k/dev/macfb.c
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/arch/mac68k/dev/ncr5380.c
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/arch/mac68k/dev/zs.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/mac68k/mac68k/mainbus.c
cvs rdiff -u -r1.67 -r1.67.8.1 src/sys/arch/mac68k/nubus/nubus.c
cvs rdiff -u -r1.60 -r1.60.4.1 src/sys/arch/mac68k/obio/iwm_fd.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/arch/mac68k/obio/obio.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/landisk/dev/obio.c
diff -u src/sys/arch/landisk/dev/obio.c:1.10 src/sys/arch/landisk/dev/obio.c:1.10.8.1
--- src/sys/arch/landisk/dev/obio.c:1.10 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/landisk/dev/obio.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.10 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.10.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include "btn_obio.h"
#include "pwrsw_obio.h"
@@ -106,8 +106,7 @@ obio_attach(device_t parent, device_t se
#endif
config_search(self, NULL,
- CFARG_SEARCH, obio_search,
- CFARG_EOL);
+ CFARGS(.search = obio_search));
}
static int
@@ -143,7 +142,7 @@ obio_search(device_t parent, cfdata_t cf
tryagain = 0;
if (config_probe(parent, cf, &oa)) {
- config_attach(parent, cf, &oa, obio_print, CFARG_EOL);
+ config_attach(parent, cf, &oa, obio_print, CFARGS_NONE);
tryagain = (cf->cf_fstate == FSTATE_STAR);
}
} while (tryagain);
Index: src/sys/arch/landisk/landisk/mainbus.c
diff -u src/sys/arch/landisk/landisk/mainbus.c:1.5 src/sys/arch/landisk/landisk/mainbus.c:1.5.8.1
--- src/sys/arch/landisk/landisk/mainbus.c:1.5 Sat Apr 24 23:36:40 2021
+++ src/sys/arch/landisk/landisk/mainbus.c Wed Aug 4 02:37:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:40 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.5.8.1 2021/08/04 02:37:20 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5.8.1 2021/08/04 02:37:20 thorpej Exp $");
#include "obio.h"
#include "pci.h"
@@ -80,19 +80,19 @@ mainbus_attach(device_t parent, device_t
memset(&mba, 0, sizeof(mba));
mba.mba_ca.ca_name = "cpu";
mba.mba_ca.ca_node = 0;
- config_found(self, &mba, mainbus_print, CFARG_EOL);
+ config_found(self, &mba, mainbus_print, CFARGS_NONE);
#if NPCI > 0
/* SH PCIC */
memset(&mba, 0, sizeof(mba));
mba.mba_mba.ma_name = "shpcic";
- config_found(self, &mba, mainbus_print, CFARG_EOL);
+ config_found(self, &mba, mainbus_print, CFARGS_NONE);
#endif
/* SH bus */
memset(&mba, 0, sizeof(mba));
mba.mba_mba.ma_name = "shb";
- config_found(self, &mba, mainbus_print, CFARG_EOL);
+ config_found(self, &mba, mainbus_print, CFARGS_NONE);
#if NOBIO > 0
/* on-board I/O */
@@ -100,7 +100,7 @@ mainbus_attach(device_t parent, device_t
mba.mba_oba.oba_busname = "obio";
mba.mba_oba.oba_iot = &obio_bus_io;
mba.mba_oba.oba_memt = &obio_bus_mem;
- config_found(self, &mba, mainbus_print, CFARG_EOL);
+ config_found(self, &mba, mainbus_print, CFARGS_NONE);
#endif
}
Index: src/sys/arch/luna68k/dev/lunafb.c
diff -u src/sys/a
CVS commit: [thorpej-cfargs2] src/sys/arch
Module Name:src Committed By: thorpej Date: Wed Aug 4 02:35:50 UTC 2021 Modified Files: src/sys/arch/ia64/ia64 [thorpej-cfargs2]: mainbus.c src/sys/arch/ibmnws/ibmnws [thorpej-cfargs2]: mainbus.c src/sys/arch/iyonix/iyonix [thorpej-cfargs2]: obio.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/ia64/ia64/mainbus.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/ibmnws/ibmnws/mainbus.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/iyonix/iyonix/obio.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/ia64/ia64/mainbus.c diff -u src/sys/arch/ia64/ia64/mainbus.c:1.12 src/sys/arch/ia64/ia64/mainbus.c:1.12.8.1 --- src/sys/arch/ia64/ia64/mainbus.c:1.12 Sat Apr 24 23:36:40 2021 +++ src/sys/arch/ia64/ia64/mainbus.c Wed Aug 4 02:35:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:40 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 02:35:50 thorpej Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2021/04/24 23:36:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12.8.1 2021/08/04 02:35:50 thorpej Exp $"); #include "acpica.h" @@ -108,8 +108,7 @@ mainbus_attach(device_t parent, device_t if (entry->Header.Type == ACPI_MADT_TYPE_LOCAL_SAPIC) config_found(self, entry, NULL, -CFARG_IATTR, "cpubus", -CFARG_EOL); +CFARGS(.iattr = "cpubus")); p += entry->Header.Length; } @@ -129,8 +128,7 @@ mainbus_attach(device_t parent, device_t aaa.aa_dmat = NULL; /* XXX */ aaa.aa_dmat64 = NULL; /* XXX */ config_found(self, &aaa, NULL, - CFARG_IATTR, "acpibus", - CFARG_EOL); + CFARGS(.iattr = "acpibus")); #endif return; Index: src/sys/arch/ibmnws/ibmnws/mainbus.c diff -u src/sys/arch/ibmnws/ibmnws/mainbus.c:1.16 src/sys/arch/ibmnws/ibmnws/mainbus.c:1.16.8.1 --- src/sys/arch/ibmnws/ibmnws/mainbus.c:1.16 Sat Apr 24 23:36:40 2021 +++ src/sys/arch/ibmnws/ibmnws/mainbus.c Wed Aug 4 02:35:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.16 2021/04/24 23:36:40 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.16.8.1 2021/08/04 02:35:50 thorpej Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -108,8 +108,7 @@ mainbus_attach(device_t parent, device_t ca.ca_name = "cpu"; ca.ca_node = 0; config_found(self, &ca, mainbus_print, - CFARG_IATTR, "mainbus", - CFARG_EOL); + CFARGS(.iattr = "mainbus")); #if NOBIO > 0 obio_reserve_resource_map(); @@ -148,8 +147,7 @@ mainbus_attach(device_t parent, device_t mba.mba_pba.pba_bridgetag = NULL; mba.mba_pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY; config_found(self, &mba.mba_pba, pcibusprint, - CFARG_IATTR, "pcibus", - CFARG_EOL); + CFARGS(.iattr = "pcibus")); #endif #if NOBIO > 0 @@ -162,8 +160,7 @@ mainbus_attach(device_t parent, device_t mba.mba_pba.pba_iot = &isa_io_space_tag; mba.mba_pba.pba_memt = &isa_mem_space_tag; config_found(self, &mba.mba_pba, mainbus_print, - CFARG_IATTR, "mainbus", - CFARG_EOL); + CFARGS(.iattr = "mainbus")); } #endif #endif Index: src/sys/arch/iyonix/iyonix/obio.c diff -u src/sys/arch/iyonix/iyonix/obio.c:1.7 src/sys/arch/iyonix/iyonix/obio.c:1.7.8.1 --- src/sys/arch/iyonix/iyonix/obio.c:1.7 Sat Apr 24 23:36:40 2021 +++ src/sys/arch/iyonix/iyonix/obio.c Wed Aug 4 02:35:50 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.7 2021/04/24 23:36:40 thorpej Exp $ */ +/* $NetBSD: obio.c,v 1.7.8.1 2021/08/04 02:35:50 thorpej Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.7 2021/04/24 23:36:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.7.8.1 2021/08/04 02:35:50 thorpej Exp $"); #include #include @@ -103,8 +103,7 @@ obio_attach(device_t parent, device_t se * configuration file. */ config_search(self, NULL, - CFARG_SEARCH, obio_search, - CFARG_EOL); + CFARGS(.search = obio_search)); } int @@ -140,7 +139,7 @@ obio_search(device_t parent, cfdata_t cf oba.oba_irq = -1; if (config_probe(parent, cf, &oba)) - config_attach(parent, cf, &oba, obio_print, CFARG_EOL); + config_attach(parent, cf, &oba, obio_print, CFARGS_NONE); return (0); }
CVS commit: [thorpej-cfargs2] src/sys/arch/i386
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 01:21:27 UTC 2021
Modified Files:
src/sys/arch/i386/i386 [thorpej-cfargs2]: i386_mainbus.c
src/sys/arch/i386/isa [thorpej-cfargs2]: lms.c mms.c
src/sys/arch/i386/pci [thorpej-cfargs2]: elan520.c gcscehci.c geode.c
gscpcib.c pceb.c pcmb.c viapcib.c
src/sys/arch/i386/pnpbios [thorpej-cfargs2]: pnpbios.c wss_pnpbios.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/i386/i386/i386_mainbus.c
cvs rdiff -u -r1.57 -r1.57.8.1 src/sys/arch/i386/isa/lms.c
cvs rdiff -u -r1.54 -r1.54.8.1 src/sys/arch/i386/isa/mms.c
cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/arch/i386/pci/elan520.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/i386/pci/gcscehci.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/i386/pci/geode.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/i386/pci/gscpcib.c
cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/i386/pci/pceb.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/i386/pci/pcmb.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/i386/pci/viapcib.c
cvs rdiff -u -r1.76 -r1.76.8.1 src/sys/arch/i386/pnpbios/pnpbios.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/i386/pnpbios/wss_pnpbios.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/i386/i386/i386_mainbus.c
diff -u src/sys/arch/i386/i386/i386_mainbus.c:1.5 src/sys/arch/i386/i386/i386_mainbus.c:1.5.8.1
--- src/sys/arch/i386/i386/i386_mainbus.c:1.5 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/i386/i386/i386_mainbus.c Wed Aug 4 01:21:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i386_mainbus.c,v 1.5 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: i386_mainbus.c,v 1.5.8.1 2021/08/04 01:21:26 thorpej Exp $ */
/* NetBSD: mainbus.c,v 1.104 2018/12/02 08:19:44 cherry Exp */
/*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i386_mainbus.c,v 1.5 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i386_mainbus.c,v 1.5.8.1 2021/08/04 01:21:26 thorpej Exp $");
#include
#include
@@ -230,8 +230,7 @@ i386_mainbus_attach(device_t parent, dev
mba.mba_eba.eba_dmat = &eisa_bus_dma_tag;
#endif
config_found(self, &mba.mba_eba, eisabusprint,
- CFARG_IATTR, "eisabus",
- CFARG_EOL);
+ CFARGS(.iattr = "eisabus"));
}
#if NISA > 0
@@ -240,8 +239,7 @@ i386_mainbus_attach(device_t parent, dev
mba.mba_iba.iba_iot = x86_bus_space_io;
mba.mba_iba.iba_memt = x86_bus_space_mem;
config_found(self, &mba.mba_iba, isabusprint,
- CFARG_IATTR, "isabus",
- CFARG_EOL);
+ CFARGS(.iattr = "isabus"));
}
#endif
@@ -272,8 +270,7 @@ i386_mainbus_rescan(device_t self, const
mba.mba_acpi.aa_dmat = &pci_bus_dma_tag;
mba.mba_acpi.aa_dmat64 = NULL;
sc->sc_acpi = config_found(self, &mba.mba_acpi, NULL,
- CFARG_IATTR, "acpibus",
- CFARG_EOL);
+ CFARGS(.iattr = "acpibus"));
#if 0 /* XXXJRT not yet */
if (acpi_active) {
/*
@@ -294,8 +291,7 @@ i386_mainbus_rescan(device_t self, const
if (pnpbios_probe()) {
mba.mba_paa.paa_ic = &x86_isa_chipset;
sc->sc_pnpbios = config_found(self, &mba.mba_paa, NULL,
- CFARG_IATTR, "pnpbiosbus",
- CFARG_EOL);
+ CFARGS(.iattr = "pnpbiosbus"));
}
#endif
}
@@ -307,8 +303,7 @@ i386_mainbus_rescan(device_t self, const
mba.mba_ipmi.iaa_memt = x86_bus_space_mem;
if (ipmi_probe(&mba.mba_ipmi)) {
sc->sc_ipmi = config_found(self, &mba.mba_ipmi, NULL,
- CFARG_IATTR, "ipmibus",
- CFARG_EOL);
+ CFARGS(.iattr = "ipmibus"));
}
#endif
}
@@ -352,8 +347,7 @@ i386_mainbus_rescan(device_t self, const
if (npcibus == 0 && sc->sc_pci == NULL) {
sc->sc_pci =
config_found(self, &mba.mba_pba, pcibusprint,
- CFARG_IATTR, "pcibus",
- CFARG_EOL);
+ CFARGS(.iattr = "pcibus"));
}
#if NACPICA > 0
if (mp_verbose)
@@ -374,8 +368,7 @@ i386_mainbus_rescan(device_t self, const
mba.mba_mba.mba_bus = 0;
sc->sc_mca = config_found(self,
&mba.mba_mba, mcabusprint,
- CFARG_IATTR, "mcabus",
- CFARG_EOL);
+ CFARGS(.iattr = "mcabus"));
}
#endif
}
Index: src/sys/arch/i386/isa/lms.c
diff -u src/sys/arch/i386/isa/lms.c:1.57 src/sys/arch/i386/isa/lms.c:1.57.8.1
--- src/sys/arch/i386/isa/lms.c:1.57 Sat Apr 24 23:36:39 2021
+++ src/sys/arch/i386/isa/lms.c Wed Aug 4 01:21:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lms.c,v 1.57 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: lms.c,v 1.57.8.1 2021/08/04 01:21:27 thorpej Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -24,7 +24,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.57 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.57.8.1 2021/08/04 01:21:27 thorpej Exp $");
#include
#include
@@ -166,7 +166,7 @@ lmsattach(device_t parent, device_t self
* here or in psmintr, because if this fails lms_enable()
CVS commit: [thorpej-cfargs2] src/sys/arch
Module Name:src Committed By: thorpej Date: Wed Aug 4 01:08:48 UTC 2021 Modified Files: src/sys/arch/hpcarm/dev [thorpej-cfargs2]: epsonlcd.c ipaq_atmelgpio.c ipaq_lcd.c ipaq_pcic.c ipaq_saip.c j720kbd.c j720pwr.c j720ssp.c j720tp.c nbpiic.c nbpkbd.c nbppcon.c sacc_hpcarm.c sed_saip.c uda1341.c wzero3_kbd.c wzero3_keypad.c wzero3_lcd.c wzero3_tp.c src/sys/arch/hpcmips/dev [thorpej-cfargs2]: it8368.c ite8181.c m38813c.c mq200.c optpoint.c plum.c plumiobus.c plumohci.c plumpcmcia.c plumvideo.c tc5165buf.c ucb1200.c ucbtp.c src/sys/arch/hpcmips/hpcmips [thorpej-cfargs2]: mainbus.c src/sys/arch/hpcmips/isa [thorpej-cfargs2]: isa_machdep.c plumisa_machdep.c src/sys/arch/hpcmips/tx [thorpej-cfargs2]: tx3912video.c tx39biu.c tx39sib.c tx39spi.c tx39uart.c txcom.c txcsbus.c txioman.c txsim.c src/sys/arch/hpcmips/vr [thorpej-cfargs2]: vr4181giu.c vrc4172gpio.c vrc4172pci.c vrc4173bcu.c vrdsiu_mouse.c vrgiu.c vrip.c vrkiu.c vrpciu.c vrpiu.c src/sys/arch/hpcsh/dev [thorpej-cfargs2]: j6x0tp.c pfckbd.c psh3tp.c src/sys/arch/hpcsh/dev/hd64461 [thorpej-cfargs2]: hd64461.c hd64461pcmcia.c hd64461video.c src/sys/arch/hpcsh/dev/hd64465 [thorpej-cfargs2]: hd64465.c hd64465pcmcia.c src/sys/arch/hpcsh/hpcsh [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/hpcarm/dev/epsonlcd.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/hpcarm/dev/ipaq_lcd.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/hpcarm/dev/ipaq_pcic.c cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/hpcarm/dev/ipaq_saip.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/hpcarm/dev/j720kbd.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/hpcarm/dev/j720pwr.c \ src/sys/arch/hpcarm/dev/wzero3_lcd.c cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/hpcarm/dev/j720ssp.c cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/hpcarm/dev/j720tp.c cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/hpcarm/dev/nbpiic.c \ src/sys/arch/hpcarm/dev/nbppcon.c cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/hpcarm/dev/nbpkbd.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/hpcarm/dev/sacc_hpcarm.c cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/hpcarm/dev/sed_saip.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/hpcarm/dev/uda1341.c cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/hpcarm/dev/wzero3_kbd.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/hpcarm/dev/wzero3_keypad.c cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/hpcarm/dev/wzero3_tp.c cvs rdiff -u -r1.26 -r1.26.6.1 src/sys/arch/hpcmips/dev/it8368.c cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/hpcmips/dev/ite8181.c \ src/sys/arch/hpcmips/dev/plumpcmcia.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/hpcmips/dev/m38813c.c cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/hpcmips/dev/mq200.c cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/hpcmips/dev/optpoint.c cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/hpcmips/dev/plum.c \ src/sys/arch/hpcmips/dev/tc5165buf.c cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/hpcmips/dev/plumiobus.c \ src/sys/arch/hpcmips/dev/plumohci.c cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/hpcmips/dev/plumvideo.c cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/hpcmips/dev/ucb1200.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/hpcmips/dev/ucbtp.c cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/arch/hpcmips/hpcmips/mainbus.c cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/arch/hpcmips/isa/isa_machdep.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/hpcmips/isa/plumisa_machdep.c cvs rdiff -u -r1.46 -r1.46.8.1 src/sys/arch/hpcmips/tx/tx3912video.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/hpcmips/tx/tx39biu.c \ src/sys/arch/hpcmips/tx/tx39uart.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/hpcmips/tx/tx39sib.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/hpcmips/tx/tx39spi.c cvs rdiff -u -r1.51 -r1.51.8.1 src/sys/arch/hpcmips/tx/txcom.c cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/hpcmips/tx/txcsbus.c cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/hpcmips/tx/txioman.c cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/hpcmips/tx/txsim.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/hpcmips/vr/vr4181giu.c cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/hpcmips/vr/vrc4172gpio.c cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/hpcmips/vr/vrc4172pci.c cvs rdiff -u -r1.25 -r1.25.8.1 src/sys/arch/hpcmips/vr/vrc4173bcu.c cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/hpcmips/vr/vrdsiu_mouse.c cvs rdiff -u -r1.46 -r1.46.4.1 src/sys/arch/hpcmips/vr/vrgiu.c cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/arch/hpcmips/vr/vrip.c cvs rdiff -u -r1.40 -r1.40.8.1 src/sys/arch/hpcmips/vr/vrkiu.c cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/hpcmips/vr/vrpciu.c cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/arch/hpcmips/vr/vrpiu.c cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/hpcsh/de
CVS commit: [thorpej-cfargs2] src/sys/arch/hppa
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
-__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
#include
@@ -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
-__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
#include
@@ -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
-__KERNEL_RCSI
CVS commit: [thorpej-cfargs2] src/sys/arch/hp300
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 -__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 -__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 #include @@ -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/n
CVS commit: [thorpej-cfargs2] src/sys/arch/ews4800mips
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 01:01:42 UTC 2021
Modified Files:
src/sys/arch/ews4800mips/dev [thorpej-cfargs2]: ewskbd.c ewsms.c
src/sys/arch/ews4800mips/ews4800mips [thorpej-cfargs2]: mainbus.c
src/sys/arch/ews4800mips/sbd [thorpej-cfargs2]: fb_sbdio.c kbms_sbdio.c
sbdio.c zs_sbdio.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/ews4800mips/dev/ewskbd.c
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/ews4800mips/dev/ewsms.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/ews4800mips/ews4800mips/mainbus.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/arch/ews4800mips/sbd/fb_sbdio.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/ews4800mips/sbd/kbms_sbdio.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/ews4800mips/sbd/sbdio.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/arch/ews4800mips/sbd/zs_sbdio.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/ews4800mips/dev/ewskbd.c
diff -u src/sys/arch/ews4800mips/dev/ewskbd.c:1.12 src/sys/arch/ews4800mips/dev/ewskbd.c:1.12.8.1
--- src/sys/arch/ews4800mips/dev/ewskbd.c:1.12 Sat Apr 24 23:36:37 2021
+++ src/sys/arch/ews4800mips/dev/ewskbd.c Wed Aug 4 01:01:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ewskbd.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $ */
+/* $NetBSD: ewskbd.c,v 1.12.8.1 2021/08/04 01:01:41 thorpej Exp $ */
/*-
* Copyright (c) 2005 Izumi Tsutsui. All rights reserved.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ewskbd.c,v 1.12 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ewskbd.c,v 1.12.8.1 2021/08/04 01:01:41 thorpej Exp $");
#include
#include
@@ -251,7 +251,7 @@ ewskbd_zsc_attach(device_t parent, devic
wskaa.accessops = &ewskbd_wskbd_accessops;
wskaa.accesscookie = cs;
sc->sc_dc->wskbddev = config_found(self, &wskaa, wskbddevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
static int
Index: src/sys/arch/ews4800mips/dev/ewsms.c
diff -u src/sys/arch/ews4800mips/dev/ewsms.c:1.9 src/sys/arch/ews4800mips/dev/ewsms.c:1.9.8.1
--- src/sys/arch/ews4800mips/dev/ewsms.c:1.9 Sat Apr 24 23:36:37 2021
+++ src/sys/arch/ews4800mips/dev/ewsms.c Wed Aug 4 01:01:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ewsms.c,v 1.9 2021/04/24 23:36:37 thorpej Exp $ */
+/* $NetBSD: ewsms.c,v 1.9.8.1 2021/08/04 01:01:41 thorpej Exp $ */
/*
* Copyright (c) 2004 Steve Rumble
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ewsms.c,v 1.9 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ewsms.c,v 1.9.8.1 2021/08/04 01:01:41 thorpej Exp $");
#include
#include
@@ -184,7 +184,7 @@ ewsms_zsc_attach(device_t parent, device
wsmaa.accessops = &ewsms_wsmouse_accessops;
wsmaa.accesscookie = sc;
sc->sc_wsmousedev = config_found(self, &wsmaa, wsmousedevprint,
- CFARG_EOL);
+ CFARGS_NONE);
}
int
Index: src/sys/arch/ews4800mips/ews4800mips/mainbus.c
diff -u src/sys/arch/ews4800mips/ews4800mips/mainbus.c:1.6 src/sys/arch/ews4800mips/ews4800mips/mainbus.c:1.6.8.1
--- src/sys/arch/ews4800mips/ews4800mips/mainbus.c:1.6 Sat Apr 24 23:36:37 2021
+++ src/sys/arch/ews4800mips/ews4800mips/mainbus.c Wed Aug 4 01:01:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 01:01:41 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 01:01:41 thorpej Exp $");
#include
#include
@@ -66,13 +66,13 @@ mainbus_attach(device_t parent, device_t
/* CPU */
ma.ma_name = "cpu";
- config_found(self, &ma, mainbus_print, CFARG_EOL);
+ config_found(self, &ma, mainbus_print, CFARGS_NONE);
/* System Board dependent device busses */
if (platform.mainbusdevs != NULL) {
for (p = platform.mainbusdevs; *p != NULL; p++) {
ma.ma_name = *p;
- config_found(self, &ma, mainbus_print, CFARG_EOL);
+ config_found(self, &ma, mainbus_print, CFARGS_NONE);
}
}
}
Index: src/sys/arch/ews4800mips/sbd/fb_sbdio.c
diff -u src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.19 src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.19.8.1
--- src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.19 Sat Apr 24 23:36:37 2021
+++ src/sys/arch/ews4800mips/sbd/fb_sbdio.c Wed Aug 4 01:01:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_sbdio.c,v 1.19 2021/04/24 23:36:37 thorpej Exp $ */
+/* $NetBSD: fb_sbdio.c,v 1.19.8.1 2021/08/04 01:01:41 thorpej Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#define WIRED_FB_TLB
#include
-__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.19 2021/04/24 23:36:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.19.8.1 2021/08/04 01:01:41 thorpej Exp $");
#include
#includ
CVS commit: [thorpej-cfargs2] src/sys/arch/epoc32
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
-__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
#include
@@ -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
-__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
#include
@@ -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
-__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
#include
@@ -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
-__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
#include
@@ -56,8 +56,7 @@ internal_attach(device_t parent, device_
aprint_normal("\n");
config_search(self, aux,
- CFARG_SEARC
CVS commit: [thorpej-cfargs2] src/sys/arch/emips
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 00:01:52 UTC 2021
Modified Files:
src/sys/arch/emips/ebus [thorpej-cfargs2]: ebus.c gpio_ebus.c
src/sys/arch/emips/emips [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/emips/ebus/ebus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/emips/ebus/gpio_ebus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/emips/emips/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/emips/ebus/ebus.c
diff -u src/sys/arch/emips/ebus/ebus.c:1.3 src/sys/arch/emips/ebus/ebus.c:1.3.8.1
--- src/sys/arch/emips/ebus/ebus.c:1.3 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/emips/ebus/ebus.c Wed Aug 4 00:01:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus.c,v 1.3 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: ebus.c,v 1.3.8.1 2021/08/04 00:01:51 thorpej Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.3 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.3.8.1 2021/08/04 00:01:51 thorpej Exp $");
#include
#include
@@ -83,9 +83,8 @@ ebusattach(device_t parent, device_t sel
locs[EBUSCF_ADDR] = ia->ia_paddr;
if (config_found(self, ia, ebusprint,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL) == NULL) {
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs)) == NULL) {
/* do we need to say anything? */
if (ia->ia_basz != 0) {
mips_unmap_physmem((vaddr_t)ia->ia_vaddr,
Index: src/sys/arch/emips/ebus/gpio_ebus.c
diff -u src/sys/arch/emips/ebus/gpio_ebus.c:1.4 src/sys/arch/emips/ebus/gpio_ebus.c:1.4.8.1
--- src/sys/arch/emips/ebus/gpio_ebus.c:1.4 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/emips/ebus/gpio_ebus.c Wed Aug 4 00:01:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio_ebus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: gpio_ebus.c,v 1.4.8.1 2021/08/04 00:01:51 thorpej Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gpio_ebus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio_ebus.c,v 1.4.8.1 2021/08/04 00:01:51 thorpej Exp $");
#include
#include
@@ -124,7 +124,7 @@ epio_ebus_attach(device_t parent, device
gba.gba_npins = GPIO_NPINS;
/* Attach GPIO framework */
- (void)config_found(self, &gba, gpiobus_print, CFARG_EOL);
+ (void)config_found(self, &gba, gpiobus_print, CFARGS_NONE);
}
static int
Index: src/sys/arch/emips/emips/mainbus.c
diff -u src/sys/arch/emips/emips/mainbus.c:1.4 src/sys/arch/emips/emips/mainbus.c:1.4.8.1
--- src/sys/arch/emips/emips/mainbus.c:1.4 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/emips/emips/mainbus.c Wed Aug 4 00:01:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 00:01:52 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 00:01:52 thorpej Exp $");
#include
#include
@@ -71,11 +71,11 @@ mbattach(device_t parent, device_t self,
ma.ma_name = "cpu";
ma.ma_slot = 0;
- config_found(self, &ma, mbprint, CFARG_EOL);
+ config_found(self, &ma, mbprint, CFARGS_NONE);
ma.ma_name = platform.iobus;
ma.ma_slot = 0;
- config_found(self, &ma, mbprint, CFARG_EOL);
+ config_found(self, &ma, mbprint, CFARGS_NONE);
}
static int
CVS commit: [thorpej-cfargs2] src/sys/arch/dreamcast
Module Name:src
Committed By: thorpej
Date: Wed Aug 4 00:00:00 UTC 2021
Modified Files:
src/sys/arch/dreamcast/dev [thorpej-cfargs2]: pvr.c
src/sys/arch/dreamcast/dev/g1 [thorpej-cfargs2]: g1bus.c
src/sys/arch/dreamcast/dev/g2 [thorpej-cfargs2]: g2bus.c gapspci.c
src/sys/arch/dreamcast/dev/maple [thorpej-cfargs2]: maple.c mkbd.c
mms.c
src/sys/arch/dreamcast/dreamcast [thorpej-cfargs2]: mainbus.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.2.1 src/sys/arch/dreamcast/dev/pvr.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/dreamcast/dev/g1/g1bus.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/arch/dreamcast/dev/g2/g2bus.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/dreamcast/dev/g2/gapspci.c
cvs rdiff -u -r1.54 -r1.54.8.1 src/sys/arch/dreamcast/dev/maple/maple.c
cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/arch/dreamcast/dev/maple/mkbd.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/dreamcast/dev/maple/mms.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/dreamcast/dreamcast/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/dreamcast/dev/pvr.c
diff -u src/sys/arch/dreamcast/dev/pvr.c:1.38 src/sys/arch/dreamcast/dev/pvr.c:1.38.2.1
--- src/sys/arch/dreamcast/dev/pvr.c:1.38 Sat Jul 31 14:36:33 2021
+++ src/sys/arch/dreamcast/dev/pvr.c Tue Aug 3 23:59:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pvr.c,v 1.38 2021/07/31 14:36:33 andvar Exp $ */
+/* $NetBSD: pvr.c,v 1.38.2.1 2021/08/03 23:59:59 thorpej Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.38 2021/07/31 14:36:33 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.38.2.1 2021/08/03 23:59:59 thorpej Exp $");
#include
#include
@@ -301,7 +301,7 @@ pvr_attach(device_t parent, device_t sel
waa.accessops = &pvr_accessops;
waa.accesscookie = sc;
- (void) config_found(self, &waa, wsemuldisplaydevprint, CFARG_EOL);
+ (void) config_found(self, &waa, wsemuldisplaydevprint, CFARGS_NONE);
}
int
Index: src/sys/arch/dreamcast/dev/g1/g1bus.c
diff -u src/sys/arch/dreamcast/dev/g1/g1bus.c:1.2 src/sys/arch/dreamcast/dev/g1/g1bus.c:1.2.8.1
--- src/sys/arch/dreamcast/dev/g1/g1bus.c:1.2 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/g1/g1bus.c Wed Aug 4 00:00:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: g1bus.c,v 1.2 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: g1bus.c,v 1.2.8.1 2021/08/04 00:00:00 thorpej Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -34,7 +34,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: g1bus.c,v 1.2 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g1bus.c,v 1.2.8.1 2021/08/04 00:00:00 thorpej Exp $");
#include
#include
@@ -76,8 +76,7 @@ g1busattach(device_t parent, device_t se
ga.ga_memt = &sc->sc_memt;
config_search(self, &ga,
- CFARG_SEARCH, g1bussearch,
- CFARG_EOL);
+ CFARGS(.search = g1bussearch));
}
int
@@ -92,7 +91,7 @@ g1bussearch(device_t parent, cfdata_t cf
{
if (config_probe(parent, cf, aux))
- config_attach(parent, cf, aux, g1busprint, CFARG_EOL);
+ config_attach(parent, cf, aux, g1busprint, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/dreamcast/dev/g2/g2bus.c
diff -u src/sys/arch/dreamcast/dev/g2/g2bus.c:1.15 src/sys/arch/dreamcast/dev/g2/g2bus.c:1.15.8.1
--- src/sys/arch/dreamcast/dev/g2/g2bus.c:1.15 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/g2/g2bus.c Wed Aug 4 00:00:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: g2bus.c,v 1.15 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: g2bus.c,v 1.15.8.1 2021/08/04 00:00:00 thorpej Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -34,7 +34,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: g2bus.c,v 1.15 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g2bus.c,v 1.15.8.1 2021/08/04 00:00:00 thorpej Exp $");
#include
#include
@@ -78,8 +78,7 @@ g2busattach(device_t parent, device_t se
ga.ga_memt = &sc->sc_memt;
config_search(self, &ga,
- CFARG_SEARCH, g2bussearch,
- CFARG_EOL);
+ CFARGS(.search = g2bussearch));
}
int
@@ -94,7 +93,7 @@ g2bussearch(device_t parent, cfdata_t cf
{
if (config_probe(parent, cf, aux))
- config_attach(parent, cf, aux, g2busprint, CFARG_EOL);
+ config_attach(parent, cf, aux, g2busprint, CFARGS_NONE);
return 0;
}
Index: src/sys/arch/dreamcast/dev/g2/gapspci.c
diff -u src/sys/arch/dreamcast/dev/g2/gapspci.c:1.20 src/sys/arch/dreamcast/dev/g2/gapspci.c:1.20.8.1
--- src/sys/arch/dreamcast/dev/g2/gapspci.c:1.20 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/dreamcast/dev/g2/gapspci.c Wed Aug 4 00:00:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gapspci.c,v 1.20 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: gapspci.c,v 1.20.8.1 2021/08/04 00:00:00 thorpej Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
CVS commit: [thorpej-cfargs2] src/sys/arch/cobalt
Module Name:src
Committed By: thorpej
Date: Tue Aug 3 23:57:22 UTC 2021
Modified Files:
src/sys/arch/cobalt/cobalt [thorpej-cfargs2]: mainbus.c
src/sys/arch/cobalt/dev [thorpej-cfargs2]: gt.c zs.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/cobalt/cobalt/mainbus.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/cobalt/dev/gt.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/cobalt/dev/zs.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/cobalt/cobalt/mainbus.c
diff -u src/sys/arch/cobalt/cobalt/mainbus.c:1.21 src/sys/arch/cobalt/cobalt/mainbus.c:1.21.8.1
--- src/sys/arch/cobalt/cobalt/mainbus.c:1.21 Sat Apr 24 23:36:30 2021
+++ src/sys/arch/cobalt/cobalt/mainbus.c Tue Aug 3 23:57:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:30 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.21.8.1 2021/08/03 23:57:21 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21.8.1 2021/08/03 23:57:21 thorpej Exp $");
#include
#include
@@ -64,8 +64,7 @@ mainbus_attach(device_t parent, device_t
aprint_normal("\n");
config_search(self, &ma,
- CFARG_SEARCH, mainbus_search,
- CFARG_EOL);
+ CFARGS(.search = mainbus_search));
}
static int
@@ -79,7 +78,7 @@ mainbus_search(device_t parent, cfdata_t
ma->ma_level = cf->cf_loc[MAINBUSCF_LEVEL];
ma->ma_irq = cf->cf_loc[MAINBUSCF_IRQ];
if (config_probe(parent, cf, ma))
- config_attach(parent, cf, ma, mainbus_print, CFARG_EOL);
+ config_attach(parent, cf, ma, mainbus_print, CFARGS_NONE);
} while (cf->cf_fstate == FSTATE_STAR);
return 0;
Index: src/sys/arch/cobalt/dev/gt.c
diff -u src/sys/arch/cobalt/dev/gt.c:1.33 src/sys/arch/cobalt/dev/gt.c:1.33.8.1
--- src/sys/arch/cobalt/dev/gt.c:1.33 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/cobalt/dev/gt.c Tue Aug 3 23:57:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gt.c,v 1.33 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: gt.c,v 1.33.8.1 2021/08/03 23:57:21 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.33 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.33.8.1 2021/08/03 23:57:21 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -157,7 +157,7 @@ gt_attach(device_t parent, device_t self
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | /*PCI_FLAGS_MRM_OKAY|*/ PCI_FLAGS_MWI_OKAY;
pba.pba_pc = pc;
- config_found(self, &pba, gt_print, CFARG_EOL);
+ config_found(self, &pba, gt_print, CFARGS_NONE);
#endif
}
Index: src/sys/arch/cobalt/dev/zs.c
diff -u src/sys/arch/cobalt/dev/zs.c:1.5 src/sys/arch/cobalt/dev/zs.c:1.5.8.1
--- src/sys/arch/cobalt/dev/zs.c:1.5 Sat Apr 24 23:36:31 2021
+++ src/sys/arch/cobalt/dev/zs.c Tue Aug 3 23:57:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.5 2021/04/24 23:36:31 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.5.8.1 2021/08/03 23:57:21 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.5 2021/04/24 23:36:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.5.8.1 2021/08/03 23:57:21 thorpej Exp $");
#include "opt_ddb.h"
@@ -223,7 +223,7 @@ zs_attach(device_t parent, device_t self
* The child attach will setup the hardware.
*/
if (!config_found(self, (void *)&zsc_args, zs_print,
- CFARG_EOL)) {
+ CFARGS_NONE)) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
ZSWR9_A_RESET : ZSWR9_B_RESET;
CVS commit: [thorpej-cfargs2] src/sys/arch/cesfic
Module Name:src
Committed By: thorpej
Date: Tue Aug 3 23:56:15 UTC 2021
Modified Files:
src/sys/arch/cesfic/cesfic [thorpej-cfargs2]: autoconf.c
src/sys/arch/cesfic/dev [thorpej-cfargs2]: zs.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/cesfic/cesfic/autoconf.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/cesfic/dev/zs.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/cesfic/cesfic/autoconf.c
diff -u src/sys/arch/cesfic/cesfic/autoconf.c:1.28 src/sys/arch/cesfic/cesfic/autoconf.c:1.28.8.1
--- src/sys/arch/cesfic/cesfic/autoconf.c:1.28 Sat Apr 24 23:36:30 2021
+++ src/sys/arch/cesfic/cesfic/autoconf.c Tue Aug 3 23:56:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.28 2021/04/24 23:36:30 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.28.8.1 2021/08/03 23:56:15 thorpej Exp $ */
/*
* Copyright (c) 1997, 1999
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.28 2021/04/24 23:36:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.28.8.1 2021/08/03 23:56:15 thorpej Exp $");
#include
#include
@@ -90,8 +90,7 @@ mainbusattach(device_t parent, device_t
/* Search for and attach children. */
config_search(self, NULL,
- CFARG_SEARCH, mainbussearch,
- CFARG_EOL);
+ CFARGS(.search = mainbussearch));
}
int
@@ -99,7 +98,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);
}
Index: src/sys/arch/cesfic/dev/zs.c
diff -u src/sys/arch/cesfic/dev/zs.c:1.22 src/sys/arch/cesfic/dev/zs.c:1.22.8.1
--- src/sys/arch/cesfic/dev/zs.c:1.22 Sat Apr 24 23:36:30 2021
+++ src/sys/arch/cesfic/dev/zs.c Tue Aug 3 23:56:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.22 2021/04/24 23:36:30 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.22.8.1 2021/08/03 23:56:15 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22 2021/04/24 23:36:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22.8.1 2021/08/03 23:56:15 thorpej Exp $");
#include "opt_ddb.h"
@@ -165,7 +165,7 @@ zs_config(struct zsc_softc *zsc, char *b
* The child attach will setup the hardware.
*/
if (!config_found(zsc->zsc_dev, (void *)&zsc_args,
- zsc_print, CFARG_EOL)) {
+ zsc_print, CFARGS_NONE)) {
/* No sub-driver. Just reset it. */
uint8_t reset = (channel == 0) ?
ZSWR9_A_RESET : ZSWR9_B_RESET;
CVS commit: [thorpej-cfargs2] src/sys/arch/cats/pci
Module Name:src Committed By: thorpej Date: Tue Aug 3 23:53:38 UTC 2021 Modified Files: src/sys/arch/cats/pci [thorpej-cfargs2]: pcib.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/cats/pci/pcib.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/cats/pci/pcib.c diff -u src/sys/arch/cats/pci/pcib.c:1.17 src/sys/arch/cats/pci/pcib.c:1.17.8.1 --- src/sys/arch/cats/pci/pcib.c:1.17 Sat Apr 24 23:36:30 2021 +++ src/sys/arch/cats/pci/pcib.c Tue Aug 3 23:53:38 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pcib.c,v 1.17 2021/04/24 23:36:30 thorpej Exp $ */ +/* $NetBSD: pcib.c,v 1.17.8.1 2021/08/03 23:53:38 thorpej Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.17 2021/04/24 23:36:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.17.8.1 2021/08/03 23:53:38 thorpej Exp $"); #include #include @@ -111,5 +111,5 @@ pcib_callback(device_t self) #if NISADMA > 0 iba.iba_dmat = &isa_bus_dma_tag; #endif - config_found(self, &iba, isabusprint, CFARG_EOL); + config_found(self, &iba, isabusprint, CFARGS_NONE); }
CVS commit: [thorpej-cfargs2] src/sys/arch/bebox/bebox
Module Name:src Committed By: thorpej Date: Tue Aug 3 23:44:31 UTC 2021 Modified Files: src/sys/arch/bebox/bebox [thorpej-cfargs2]: mainbus.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/arch/bebox/bebox/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/bebox/bebox/mainbus.c diff -u src/sys/arch/bebox/bebox/mainbus.c:1.34 src/sys/arch/bebox/bebox/mainbus.c:1.34.8.1 --- src/sys/arch/bebox/bebox/mainbus.c:1.34 Sat Apr 24 23:36:30 2021 +++ src/sys/arch/bebox/bebox/mainbus.c Tue Aug 3 23:44:31 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.34 2021/04/24 23:36:30 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.34.8.1 2021/08/03 23:44:31 thorpej Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.34 2021/04/24 23:36:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.34.8.1 2021/08/03 23:44:31 thorpej Exp $"); #include #include @@ -111,13 +111,11 @@ mainbus_attach(device_t parent, device_t ca.ca_name = "cpu"; ca.ca_node = 0; config_found(self, &ca, mainbus_print, - CFARG_IATTR, "mainbus", - CFARG_EOL); + CFARGS(.iattr = "mainbus")); ca.ca_name = "cpu"; ca.ca_node = 1; config_found(self, &ca, mainbus_print, - CFARG_IATTR, "mainbus", - CFARG_EOL); + CFARGS(.iattr = "mainbus")); /* * XXX Note also that the presence of a PCI bus should @@ -162,8 +160,7 @@ mainbus_attach(device_t parent, device_t mba.mba_pba.pba_bridgetag = NULL; mba.mba_pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY; config_found(self, &mba.mba_pba, pcibusprint, - CFARG_IATTR, "pcibus", - CFARG_EOL); + CFARGS(.iattr = "pcibus")); #endif /* NPCI */ #ifdef RESIDUAL_DATA_DUMP
CVS commit: [thorpej-cfargs2] src/sys/arch/atari
Module Name:src
Committed By: thorpej
Date: Tue Aug 3 23:43:45 UTC 2021
Modified Files:
src/sys/arch/atari/atari [thorpej-cfargs2]: autoconf.c device.h
src/sys/arch/atari/dev [thorpej-cfargs2]: fd.c grf.c hdfd.c ite_cc.c
ite_et.c kbd.c ncr5380.c
src/sys/arch/atari/isa [thorpej-cfargs2]: isa_machdep.c
src/sys/arch/atari/pci [thorpej-cfargs2]: pci_machdep.c
src/sys/arch/atari/vme [thorpej-cfargs2]: vme.c vme_machdep.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.70.6.1 src/sys/arch/atari/atari/autoconf.c
cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/atari/atari/device.h
cvs rdiff -u -r1.88 -r1.88.8.1 src/sys/arch/atari/dev/fd.c \
src/sys/arch/atari/dev/hdfd.c
cvs rdiff -u -r1.52 -r1.52.6.1 src/sys/arch/atari/dev/grf.c
cvs rdiff -u -r1.42 -r1.42.6.1 src/sys/arch/atari/dev/ite_cc.c
cvs rdiff -u -r1.33 -r1.33.6.1 src/sys/arch/atari/dev/ite_et.c
cvs rdiff -u -r1.48 -r1.48.8.1 src/sys/arch/atari/dev/kbd.c
cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/arch/atari/dev/ncr5380.c
cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/atari/isa/isa_machdep.c
cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/arch/atari/pci/pci_machdep.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/atari/vme/vme.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/atari/vme/vme_machdep.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/atari/atari/autoconf.c
diff -u src/sys/arch/atari/atari/autoconf.c:1.70 src/sys/arch/atari/atari/autoconf.c:1.70.6.1
--- src/sys/arch/atari/atari/autoconf.c:1.70 Tue Apr 27 14:48:29 2021
+++ src/sys/arch/atari/atari/autoconf.c Tue Aug 3 23:43:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.70 2021/04/27 14:48:29 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.70.6.1 2021/08/03 23:43:44 thorpej Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -30,10 +30,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define __SUBR_AUTOCONF_PRIVATE /* XXX atari_config_found() */
-
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.70 2021/04/27 14:48:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.70.6.1 2021/08/03 23:43:44 thorpej Exp $");
#include "opt_md.h"
@@ -141,18 +139,15 @@ simple_devprint(void *aux, const char *p
*/
int
atari_config_found(cfdata_t pcfp, device_t parent, void *aux, cfprint_t pfn,
-cfarg_t tag, ...)
+const struct cfargs *cfargs)
{
struct device temp;
cfdata_t cf;
const struct cfattach *ca;
int rv = 0;
- va_list ap;
-
- va_start(ap, tag);
if (atari_realconfig) {
- rv = config_vfound(parent, aux, pfn, tag, ap) != NULL;
+ rv = config_found(parent, aux, pfn, cfargs) != NULL;
goto out;
}
@@ -164,7 +159,7 @@ atari_config_found(cfdata_t pcfp, device
parent->dv_cfdriver = config_cfdriver_lookup(pcfp->cf_name);
parent->dv_unit = pcfp->cf_unit;
- if ((cf = config_vsearch(parent, aux, tag, ap)) != NULL) {
+ if ((cf = config_search(parent, aux, cfargs)) != NULL) {
ca = config_cfattach_lookup(cf->cf_name, cf->cf_atname);
if (ca != NULL) {
(*ca->ca_attach)(parent, NULL, aux);
@@ -174,7 +169,6 @@ atari_config_found(cfdata_t pcfp, device
}
parent->dv_cfdata = NULL;
out:
- va_end(ap);
return rv;
}
@@ -203,9 +197,9 @@ config_console(void)
* some setup for the 'grf-side'. This make it possible to use
* a PCI card for both wscons and grfabs.
*/
- atari_config_found(cf, NULL, __UNCONST("pcib") , NULL, CFARG_EOL);
- atari_config_found(cf, NULL, __UNCONST("isab") , NULL, CFARG_EOL);
- atari_config_found(cf, NULL, __UNCONST("grfbus"), NULL, CFARG_EOL);
+ atari_config_found(cf, NULL, __UNCONST("pcib") , NULL, CFARGS_NONE);
+ atari_config_found(cf, NULL, __UNCONST("isab") , NULL, CFARGS_NONE);
+ atari_config_found(cf, NULL, __UNCONST("grfbus"), NULL, CFARGS_NONE);
}
/*
@@ -325,20 +319,20 @@ mbattach(device_t parent, device_t self,
mb_attached = 1;
printf ("\n");
- config_found(self, __UNCONST("clock") , simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("grfbus") , simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("kbd") , simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("fdc") , simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("ser") , simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("zs") , simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("ncrscsi") , simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("nvr") , simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("lpt") , simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("wdc") , simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("ne") , simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("isab"), simple_devprint, CFARG_EOL);
- config_found(self, __UNCONST("pcib"), simple_devprint, CFARG_EOL);
- c
CVS commit: [thorpej-cfargs2] src/sys/arch/arc
Module Name:src
Committed By: thorpej
Date: Tue Aug 3 23:41:24 UTC 2021
Modified Files:
src/sys/arch/arc/arc [thorpej-cfargs2]: mainbus.c
src/sys/arch/arc/dti [thorpej-cfargs2]: btl.c
src/sys/arch/arc/isa [thorpej-cfargs2]: isabus.c
src/sys/arch/arc/jazz [thorpej-cfargs2]: fd.c jazzio.c
src/sys/arch/arc/pci [thorpej-cfargs2]: necpb.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/arc/arc/mainbus.c
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/arc/dti/btl.c
cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/arch/arc/isa/isabus.c
cvs rdiff -u -r1.50 -r1.50.8.1 src/sys/arch/arc/jazz/fd.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/arc/jazz/jazzio.c
cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/arch/arc/pci/necpb.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/arc/arc/mainbus.c
diff -u src/sys/arch/arc/arc/mainbus.c:1.24 src/sys/arch/arc/arc/mainbus.c:1.24.8.1
--- src/sys/arch/arc/arc/mainbus.c:1.24 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/arc/mainbus.c Tue Aug 3 23:41:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.24 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.24.8.1 2021/08/03 23:41:24 thorpej Exp $ */
/* $OpenBSD: mainbus.c,v 1.4 1998/10/15 21:30:15 imp Exp $ */
/* NetBSD: mainbus.c,v 1.3 1995/06/28 02:45:10 cgd Exp */
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.24 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.24.8.1 2021/08/03 23:41:24 thorpej Exp $");
#include
#include
@@ -78,13 +78,13 @@ mbattach(device_t parent, device_t self,
nca.ca_name = "cpu";
nca.ca_slot = 0;
nca.ca_offset = 0;
- config_found(self, &nca, mbprint, CFARG_EOL);
+ config_found(self, &nca, mbprint, CFARGS_NONE);
for (i = 0; platform->mainbusdevs[i] != NULL; i++) {
nca.ca_name = platform->mainbusdevs[i];
nca.ca_slot = 0;
nca.ca_offset = 0;
- config_found(self, &nca, mbprint, CFARG_EOL);
+ config_found(self, &nca, mbprint, CFARGS_NONE);
}
}
Index: src/sys/arch/arc/dti/btl.c
diff -u src/sys/arch/arc/dti/btl.c:1.29 src/sys/arch/arc/dti/btl.c:1.29.8.1
--- src/sys/arch/arc/dti/btl.c:1.29 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/dti/btl.c Tue Aug 3 23:41:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: btl.c,v 1.29 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: btl.c,v 1.29.8.1 2021/08/03 23:41:24 thorpej Exp $ */
/* NetBSD: bt.c,v 1.10 1996/05/12 23:51:54 mycroft Exp */
#undef BTDIAG
@@ -51,7 +51,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: btl.c,v 1.29 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btl.c,v 1.29.8.1 2021/08/03 23:41:24 thorpej Exp $");
#include
#include
@@ -411,7 +411,7 @@ btattach(device_t parent, device_t self,
/*
* ask the adapter what subunits are present
*/
- config_found(self, &sc->sc_link, scsiprint, CFARG_EOL);
+ config_found(self, &sc->sc_link, scsiprint, CFARGS_NONE);
}
integrate void
Index: src/sys/arch/arc/isa/isabus.c
diff -u src/sys/arch/arc/isa/isabus.c:1.52 src/sys/arch/arc/isa/isabus.c:1.52.8.1
--- src/sys/arch/arc/isa/isabus.c:1.52 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/isa/isabus.c Tue Aug 3 23:41:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isabus.c,v 1.52 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: isabus.c,v 1.52.8.1 2021/08/03 23:41:24 thorpej Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@@ -120,7 +120,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.52 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.52.8.1 2021/08/03 23:41:24 thorpej Exp $");
#include
#include
@@ -208,8 +208,7 @@ isabrattach(struct isabr_softc *sc)
iba.iba_dmat = &sc->sc_dmat;
iba.iba_ic = &sc->arc_isa_cs;
config_found(sc->sc_dev, &iba, isabrprint,
- CFARG_IATTR, "isabus",
- CFARG_EOL);
+ CFARGS(.iattr = "isabus"));
}
static int
Index: src/sys/arch/arc/jazz/fd.c
diff -u src/sys/arch/arc/jazz/fd.c:1.50 src/sys/arch/arc/jazz/fd.c:1.50.8.1
--- src/sys/arch/arc/jazz/fd.c:1.50 Sat Apr 24 23:36:25 2021
+++ src/sys/arch/arc/jazz/fd.c Tue Aug 3 23:41:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.50 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.50.8.1 2021/08/03 23:41:24 thorpej Exp $ */
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.50 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.50.8.1 2021/08/03 23:41:24 thorpej Exp $");
#include
#include
@@ -282,7 +282,7 @@ fdcattach(struct fdc_softc *fdc)
for (fa.fa_drive = 0; fa.fa_drive < 2; fa.fa_drive++) {
fa.f
CVS commit: [thorpej-cfargs2] src/sys/arch/amd64/amd64
Module Name:src Committed By: thorpej Date: Tue Aug 3 23:24:35 UTC 2021 Modified Files: src/sys/arch/amd64/amd64 [thorpej-cfargs2]: amd64_mainbus.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/amd64/amd64/amd64_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/amd64/amd64/amd64_mainbus.c diff -u src/sys/arch/amd64/amd64/amd64_mainbus.c:1.6 src/sys/arch/amd64/amd64/amd64_mainbus.c:1.6.8.1 --- src/sys/arch/amd64/amd64/amd64_mainbus.c:1.6 Sat Apr 24 23:36:24 2021 +++ src/sys/arch/amd64/amd64/amd64_mainbus.c Tue Aug 3 23:24:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: amd64_mainbus.c,v 1.6 2021/04/24 23:36:24 thorpej Exp $ */ +/* $NetBSD: amd64_mainbus.c,v 1.6.8.1 2021/08/03 23:24:35 thorpej Exp $ */ /* NetBSD: mainbus.c,v 1.39 2018/12/02 08:19:44 cherry Exp */ /* @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: amd64_mainbus.c,v 1.6 2021/04/24 23:36:24 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amd64_mainbus.c,v 1.6.8.1 2021/08/03 23:24:35 thorpej Exp $"); #include #include @@ -180,8 +180,7 @@ amd64_mainbus_attach(device_t parent, de mba.mba_acpi.aa_dmat = &pci_bus_dma_tag; mba.mba_acpi.aa_dmat64 = &pci_bus_dma64_tag; config_found(self, &mba.mba_acpi, NULL, - CFARG_IATTR, "acpibus", - CFARG_EOL); + CFARGS(.iattr = "acpibus")); } #endif @@ -191,8 +190,7 @@ amd64_mainbus_attach(device_t parent, de mba.mba_ipmi.iaa_memt = x86_bus_space_mem; if (ipmi_probe(&mba.mba_ipmi)) config_found(self, &mba.mba_ipmi, NULL, - CFARG_IATTR, "ipmibus", - CFARG_EOL); + CFARGS(.iattr = "ipmibus")); #endif #if NPCI > 0 @@ -220,8 +218,7 @@ amd64_mainbus_attach(device_t parent, de #endif if (npcibus == 0) config_found(self, &mba.mba_pba, pcibusprint, - CFARG_IATTR, "pcibus", - CFARG_EOL); + CFARGS(.iattr = "pcibus")); #if NACPICA > 0 if (mp_verbose) @@ -236,8 +233,7 @@ amd64_mainbus_attach(device_t parent, de mba.mba_iba.iba_iot = x86_bus_space_io; mba.mba_iba.iba_memt = x86_bus_space_mem; config_found(self, &mba.mba_iba, isabusprint, - CFARG_IATTR, "isabus", - CFARG_EOL); + CFARGS(.iattr = "isabus")); } #endif
CVS commit: src/usr.bin/rlogin
Module Name:src
Committed By: chs
Date: Tue Aug 3 23:21:07 UTC 2021
Modified Files:
src/usr.bin/rlogin: rlogin.c
Log Message:
revert rev 1.45:
"PR/54435: Adjust for new kernel behavior of soreceive(9) clearing MSG_OOB"
That change was trying to make rlogin work again after the SIOCATMARK ioctl
was broken, but that kernel bug has now been fixed, so the original rlogin code
now works again. Further, the changed rlogin code actually did the wrong thing,
by treating reception of the MSG_OOB byte as meaning that we are now
"at the mark", but that is not true... we are "at the mark" only when
we have reached the point in the stream where the MSG_OOB byte was originally,
as indicated by SIOCATMARK. So going back to the previous code seems best
all around. ok'd by christos.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/rlogin/rlogin.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/rlogin/rlogin.c
diff -u src/usr.bin/rlogin/rlogin.c:1.47 src/usr.bin/rlogin/rlogin.c:1.48
--- src/usr.bin/rlogin/rlogin.c:1.47 Sun May 3 16:32:16 2020
+++ src/usr.bin/rlogin/rlogin.c Tue Aug 3 23:21:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rlogin.c,v 1.47 2020/05/03 16:32:16 christos Exp $ */
+/* $NetBSD: rlogin.c,v 1.48 2021/08/03 23:21:07 chs Exp $ */
/*
* Copyright (c) 1983, 1990, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)rlogin.c 8.4 (Berkeley) 4/29/95";
#else
-__RCSID("$NetBSD: rlogin.c,v 1.47 2020/05/03 16:32:16 christos Exp $");
+__RCSID("$NetBSD: rlogin.c,v 1.48 2021/08/03 23:21:07 chs Exp $");
#endif
#endif /* not lint */
@@ -577,34 +577,16 @@ static pid_t ppid;
static ssize_t rcvcnt, rcvstate;
static char rcvbuf[8 * 1024];
-static int
-recvx(int fd, void *buf, size_t len, int flags, int *msgflags)
-{
- struct msghdr msg;
- struct iovec iov;
- int error;
-
- memset(&msg, 0, sizeof(msg));
- msg.msg_iov = &iov;
- iov.iov_base = buf;
- iov.iov_len = len;
- error = recvmsg(fd, &msg, flags);
- if (error)
- return error;
- *msgflags = msg.msg_flags;
- return 0;
-}
-
static void
oob(int signo)
{
struct termios tty;
- int atmark = 0;
+ int atmark;
ssize_t n, rcvd;
char waste[BUFSIZ], mark;
rcvd = 0;
- while (recvx(rem, &mark, 1, MSG_OOB, &atmark) == -1) {
+ while (recv(rem, &mark, 1, MSG_OOB) == -1) {
switch (errno) {
case EWOULDBLOCK:
/*
@@ -628,7 +610,6 @@ oob(int signo)
return;
}
}
- atmark &= MSG_OOB;
if (mark & TIOCPKT_WINDOW) {
/* Let server know about window size changes */
(void)kill(ppid, SIGUSR1);
@@ -645,8 +626,17 @@ oob(int signo)
}
if (mark & TIOCPKT_FLUSHWRITE) {
(void)tcflush(1, TCIOFLUSH);
- if (!atmark)
+ for (;;) {
+ if (ioctl(rem, SIOCATMARK, &atmark) < 0) {
+warn("ioctl SIOCATMARK (ignored)");
+break;
+ }
+ if (atmark)
+break;
n = read(rem, waste, sizeof (waste));
+ if (n <= 0)
+break;
+ }
/*
* Don't want any pending data to be output, so clear the recv
* buffer. If we were hanging on a write when interrupted,
CVS commit: [thorpej-cfargs2] src/sys/arch/algor
Module Name:src Committed By: thorpej Date: Tue Aug 3 23:20:34 UTC 2021 Modified Files: src/sys/arch/algor/dev [thorpej-cfargs2]: bonito_mainbus.c mainbus.c vtpbc_mainbus.c src/sys/arch/algor/pci [thorpej-cfargs2]: pcib.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/algor/dev/bonito_mainbus.c cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/algor/dev/mainbus.c cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/algor/dev/vtpbc_mainbus.c cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/algor/pci/pcib.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/algor/dev/bonito_mainbus.c diff -u src/sys/arch/algor/dev/bonito_mainbus.c:1.18 src/sys/arch/algor/dev/bonito_mainbus.c:1.18.8.1 --- src/sys/arch/algor/dev/bonito_mainbus.c:1.18 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/algor/dev/bonito_mainbus.c Tue Aug 3 23:20:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: bonito_mainbus.c,v 1.18 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: bonito_mainbus.c,v 1.18.8.1 2021/08/03 23:20:34 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.18 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.18.8.1 2021/08/03 23:20:34 thorpej Exp $"); #include "opt_algor_p6032.h" @@ -113,5 +113,5 @@ bonito_mainbus_attach(device_t parent, d } #endif /* ALGOR_P6032 */ - config_found(self, &pba, pcibusprint, CFARG_EOL); + config_found(self, &pba, pcibusprint, CFARGS_NONE); } Index: src/sys/arch/algor/dev/mainbus.c diff -u src/sys/arch/algor/dev/mainbus.c:1.29 src/sys/arch/algor/dev/mainbus.c:1.29.8.1 --- src/sys/arch/algor/dev/mainbus.c:1.29 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/algor/dev/mainbus.c Tue Aug 3 23:20:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.29 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.29.8.1 2021/08/03 23:20:34 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29.8.1 2021/08/03 23:20:34 thorpej Exp $"); #include "opt_algor_p4032.h" #include "opt_algor_p5064.h" @@ -221,8 +221,7 @@ mainbus_attach(device_t parent, device_t ma.ma_addr = md->md_addr; ma.ma_irq = md->md_irq; config_found(self, &ma, mainbus_print, - CFARG_SUBMATCH, mainbus_submatch, - CFARG_EOL); + CFARGS(.submatch = mainbus_submatch)); } } Index: src/sys/arch/algor/dev/vtpbc_mainbus.c diff -u src/sys/arch/algor/dev/vtpbc_mainbus.c:1.20 src/sys/arch/algor/dev/vtpbc_mainbus.c:1.20.8.1 --- src/sys/arch/algor/dev/vtpbc_mainbus.c:1.20 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/algor/dev/vtpbc_mainbus.c Tue Aug 3 23:20:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vtpbc_mainbus.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: vtpbc_mainbus.c,v 1.20.8.1 2021/08/03 23:20:34 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.20.8.1 2021/08/03 23:20:34 thorpej Exp $"); #include "opt_algor_p4032.h" #include "opt_algor_p5064.h" @@ -128,5 +128,5 @@ vtpbc_mainbus_attach(device_t parent, de } #endif /* ALGOR_P4032 || ALGOR_P5064 */ - config_found(self, &pba, pcibusprint, CFARG_EOL); + config_found(self, &pba, pcibusprint, CFARGS_NONE); } Index: src/sys/arch/algor/pci/pcib.c diff -u src/sys/arch/algor/pci/pcib.c:1.27 src/sys/arch/algor/pci/pcib.c:1.27.8.1 --- src/sys/arch/algor/pci/pcib.c:1.27 Sat Apr 24 23:36:23 2021 +++ src/sys/arch/algor/pci/pcib.c Tue Aug 3 23:20:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pcib.c,v 1.27 2021/04/24 23:36:23 thorpej Exp $ */ +/* $NetBSD: pcib.c,v 1.27.8.1 2021/08/03 23:20:34 thorpej Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.27 2021/04/24 23:36:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.27.8.1 2021/08/03 23:20:34 thorpej Exp $"); #include "opt_algor_p5064.h" #include "opt_algor_p6032.h" @@ -317,7 +317,7 @@ pcib_bridge_callback(device_t self) iba.iba_ic->ic_attach_hook = pcib_isa_attach_hook; iba.iba_ic->ic_detach_hook = pcib_isa_detach_hook; - config_found(sc->sc_dev, &iba, isabusprint, CFARG_EOL); + config_found(sc->sc_dev, &iba, isabusprint, CFARGS_NONE); } void
CVS commit: [thorpej-cfargs2] src/sys/arch/acorn32
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
-__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
#include
@@ -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
-__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
-__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
#include
@@ -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
CVS commit: [thorpej-cfargs2] src/sys/arch/alpha
Module Name:src
Committed By: thorpej
Date: Tue Aug 3 23:14:59 UTC 2021
Modified Files:
src/sys/arch/alpha/alpha [thorpej-cfargs2]: mainbus.c
src/sys/arch/alpha/jensenio [thorpej-cfargs2]: jensenio.c
src/sys/arch/alpha/mcbus [thorpej-cfargs2]: mcbus.c
src/sys/arch/alpha/pci [thorpej-cfargs2]: apecs.c cia.c dwlpx.c
irongate.c lca.c mcpcia.c sio.c tsc.c tsciic.c ttwoga.c
src/sys/arch/alpha/sableio [thorpej-cfargs2]: sableio.c
src/sys/arch/alpha/tc [thorpej-cfargs2]: tcasic.c
src/sys/arch/alpha/tlsb [thorpej-cfargs2]: gbus.c kftxx.c tlsb.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/arch/alpha/alpha/mainbus.c
cvs rdiff -u -r1.21 -r1.21.6.1 src/sys/arch/alpha/jensenio/jensenio.c
cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/arch/alpha/mcbus/mcbus.c
cvs rdiff -u -r1.58 -r1.58.2.1 src/sys/arch/alpha/pci/apecs.c
cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/arch/alpha/pci/cia.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/arch/alpha/pci/dwlpx.c
cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/arch/alpha/pci/irongate.c
cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/arch/alpha/pci/lca.c
cvs rdiff -u -r1.34 -r1.34.2.1 src/sys/arch/alpha/pci/mcpcia.c
cvs rdiff -u -r1.56 -r1.56.6.1 src/sys/arch/alpha/pci/sio.c
cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/arch/alpha/pci/tsc.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/alpha/pci/tsciic.c
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/arch/alpha/pci/ttwoga.c
cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/arch/alpha/sableio/sableio.c
cvs rdiff -u -r1.51 -r1.51.6.1 src/sys/arch/alpha/tc/tcasic.c
cvs rdiff -u -r1.24 -r1.24.6.1 src/sys/arch/alpha/tlsb/gbus.c
cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/arch/alpha/tlsb/kftxx.c
cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/arch/alpha/tlsb/tlsb.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/alpha/alpha/mainbus.c
diff -u src/sys/arch/alpha/alpha/mainbus.c:1.36 src/sys/arch/alpha/alpha/mainbus.c:1.36.2.1
--- src/sys/arch/alpha/alpha/mainbus.c:1.36 Wed Jul 7 03:24:26 2021
+++ src/sys/arch/alpha/alpha/mainbus.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.36 2021/07/07 03:24:26 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.36.2.1 2021/08/03 23:14:58 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.36 2021/07/07 03:24:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.36.2.1 2021/08/03 23:14:58 thorpej Exp $");
#include
#include
@@ -85,7 +85,7 @@ mbattach(device_t parent, device_t self,
ma.ma_name = "cpu";
ma.ma_slot = i;
- if (config_found(self, &ma, mbprint, CFARG_EOL) != NULL)
+ if (config_found(self, &ma, mbprint, CFARGS_NONE) != NULL)
cpuattachcnt++;
}
if (ncpus != cpuattachcnt)
@@ -98,13 +98,13 @@ mbattach(device_t parent, device_t self,
if (alpha_is_qemu) {
ma.ma_name = "qemu";
ma.ma_slot = 0; /* meaningless */
- config_found(self, &ma, mbprint, CFARG_EOL);
+ config_found(self, &ma, mbprint, CFARGS_NONE);
}
if (platform.iobus != NULL) {
ma.ma_name = platform.iobus;
ma.ma_slot = 0; /* meaningless */
- config_found(self, &ma, mbprint, CFARG_EOL);
+ config_found(self, &ma, mbprint, CFARGS_NONE);
}
}
Index: src/sys/arch/alpha/jensenio/jensenio.c
diff -u src/sys/arch/alpha/jensenio/jensenio.c:1.21 src/sys/arch/alpha/jensenio/jensenio.c:1.21.6.1
--- src/sys/arch/alpha/jensenio/jensenio.c:1.21 Fri May 7 16:58:34 2021
+++ src/sys/arch/alpha/jensenio/jensenio.c Tue Aug 3 23:14:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio.c,v 1.21 2021/05/07 16:58:34 thorpej Exp $ */
+/* $NetBSD: jensenio.c,v 1.21.6.1 2021/08/03 23:14:58 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.21 2021/05/07 16:58:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.21.6.1 2021/08/03 23:14:58 thorpej Exp $");
#include
#include
@@ -186,10 +186,9 @@ jensenio_attach(device_t parent, device_
locs[JENSENIOCF_PORT] = jensenio_devs[i].jd_ioaddr;
config_found(self, &ja, jensenio_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, "jensenio",
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .iattr = "jensenio",
+ .locators = locs));
}
/*
@@ -203,8 +202,7 @@ jensenio_attach(device_t parent, device_
ja.ja_eisa.eba_dmat = &jcp->jc_dmat_eisa;
ja.ja_eisa.eba_ec = &jcp->jc_ec;
config_found(self, &ja.ja_eisa, eisabusprint,
- CFARG_IATTR, "eisabus",
- CFARG_EOL);
+ CFARGS(.iattr = "eisabus"));
/*
* Attach the ISA bus.
@@ -217,8 +215,7 @@ jensenio_attach(device_t parent, device_
ja.
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Tue Aug 3 23:12:14 UTC 2021 Modified Files: src/sys/arch/mips/cavium: octeon_cpunode.c src/sys/arch/powerpc/include/booke: spr.h src/sys/arch/riscv/riscv: fpu.c locore.S src/sys/arch/vax/include: ka48.h src/sys/dev/i2c: ds1307.c src/sys/sys: evcnt.h Log Message: Fix various typos in comments. Also add missing NetBSD RCS Id in some of these files. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mips/cavium/octeon_cpunode.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/include/booke/spr.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/riscv/fpu.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/riscv/riscv/locore.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/include/ka48.h cvs rdiff -u -r1.38 -r1.39 src/sys/dev/i2c/ds1307.c cvs rdiff -u -r1.9 -r1.10 src/sys/sys/evcnt.h 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/mips/cavium/octeon_cpunode.c diff -u src/sys/arch/mips/cavium/octeon_cpunode.c:1.19 src/sys/arch/mips/cavium/octeon_cpunode.c:1.20 --- src/sys/arch/mips/cavium/octeon_cpunode.c:1.19 Sat Apr 24 23:36:42 2021 +++ src/sys/arch/mips/cavium/octeon_cpunode.c Tue Aug 3 23:12:14 2021 @@ -1,3 +1,5 @@ +/* $NetBSD: octeon_cpunode.c,v 1.20 2021/08/03 23:12:14 andvar Exp $ */ + /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,7 +31,7 @@ #define __INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: octeon_cpunode.c,v 1.19 2021/04/24 23:36:42 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: octeon_cpunode.c,v 1.20 2021/08/03 23:12:14 andvar Exp $"); #include "locators.h" #include "cpunode.h" @@ -214,7 +216,7 @@ octeon_cpu_init(struct cpu_info *ci) (*mips64r2_locore_vec.ljv_tlb_invalidate_all)(); mips3_cp0_wired_write(pmap_tlb0_info.ti_wired); - // First thing is setup the execption vectors for this cpu. + // First thing is setup the exception vectors for this cpu. mips64r2_vector_init(&mips_splsw); // Next rewrite those exceptions to use this cpu's cpu_info. Index: src/sys/arch/powerpc/include/booke/spr.h diff -u src/sys/arch/powerpc/include/booke/spr.h:1.13 src/sys/arch/powerpc/include/booke/spr.h:1.14 --- src/sys/arch/powerpc/include/booke/spr.h:1.13 Sat Dec 27 12:36:48 2014 +++ src/sys/arch/powerpc/include/booke/spr.h Tue Aug 3 23:12:14 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: spr.h,v 1.13 2014/12/27 12:36:48 nonaka Exp $ */ +/* $NetBSD: spr.h,v 1.14 2021/08/03 23:12:14 andvar Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -280,7 +280,7 @@ #define TSR_ENW 0x8000 /* Enable Next Watchdog (W1C) */ #define TSR_WIS 0x4000 /* Watchdog Interrupt Status (W1C) */ #define TSR_WRS 0x3000 /* Watchdog Reset Status (W1C) */ -#define TSR_DIS 0x0800 /* Decementer Interrupt Status (W1C) */ +#define TSR_DIS 0x0800 /* Decrementer Interrupt Status (W1C) */ #define TSR_FIS 0x0400 /* Fixed-interval Interrupt Status (W1C) */ #define SPR_TCR 340 /* E... Timer Control Register */ #define TCR_WP 0xc000 /* Watchdog Period */ @@ -290,7 +290,7 @@ #define TCR_WRC 0x3000 /* Watchdog Timer Reset Control */ #define TCR_WRC_RESET 0x2000 #define TCR_WIE 0x0800 /* Watchdog Time Interrupt Enable */ -#define TCR_DIE 0x0400 /* Decremnter Interrupt Enable */ +#define TCR_DIE 0x0400 /* Decrementer Interrupt Enable */ #define TCR_FP 0x0300 /* Fixed-interval Timer Period */ #define TCR_FP_2_N(n) 64 - (n)) & 0x30) << 20) | (((64 - (n)) & 0xf) << 13)) #define TCR_FP_2_64 0x @@ -337,8 +337,8 @@ #define SPEFSCR_FDBZ 0x0400 /* 21: Embedded Floating-Point Divide By Zero Error */ #define SPEFSCR_FUNF 0x0200 /* 22: Embedded Floating-Point Underflow Error */ #define SPEFSCR_FOVF 0x0100 /* 23: Embedded Floating-Point Overflow Error */ -#define SPEFSCR_FINXE 0x0040 /* 25: Embedded Floating-Point Inexact Execption Enable */ -#define SPEFSCR_FINVE 0x0020 /* 26: Embedded Floating-Point Invalid Operation/Input Error Execption Enable */ +#define SPEFSCR_FINXE 0x0040 /* 25: Embedded Floating-Point Inexact Exception Enable */ +#define SPEFSCR_FINVE 0x0020 /* 26: Embedded Floating-Point Invalid Operation/Input Error Exception Enable */ #define SPEFSCR_FDBZE 0x0010 /* 27: Embedded Floating-Point Divide By Zero Exception Enable */ #define SPEFSCR_FUNFE 0x0008 /* 28: Embedded Floating-Point Underflow Exception Enable */ #define SPEFSCR_FOVFE 0x0004 /* 29: Embedded Floating-Point Overflow Exception Enable */ @@ -347,8 +347,8 @@ #define SPEFSCR_FRMC_UPWARD 0x0002 /* Round toward +infinity */ #define SPEFSCR_FRMC_TOWARDZERO 0x0001 /* Round toward zero */ #define SPEFSCR_FRMC_TONEAREST 0x
CVS commit: [thorpej-cfargs2] src/sys/arch
Module Name:src Committed By: thorpej Date: Tue Aug 3 23:05:52 UTC 2021 Modified Files: src/sys/arch/amiga/amiga [thorpej-cfargs2]: autoconf.c device.h src/sys/arch/amiga/clockport [thorpej-cfargs2]: a1k2cp.c clockport.c gencp.c src/sys/arch/amiga/dev [thorpej-cfargs2]: acafh.c afsc.c ahsc.c amidisplaycc.c atzsc.c bppcsc.c cbiiisc.c drsc.c drsupio.c empsc.c fd.c gayle_pcmcia.c grf.c grf_cc.c grf_cl.c grf_cv.c grf_cv3d.c grf_et.c grf_rh.c grf_rt.c grf_ul.c gtsc.c gvpbus.c gvpio.c hyper.c ioblix_zbus.c ivsc.c kbd.c mfc.c mgnsc.c mlhsc.c mntva.c ms.c otgsc.c p5bus.c wesc.c wstsc.c xsh.c xsurf.c z3rambd.c zbus.c zssc.c src/sys/arch/amiga/pci [thorpej-cfargs2]: cv3dpb.c em4k.c empb.c mppb.c p5pb.c src/sys/arch/amigappc/amigappc [thorpej-cfargs2]: autoconf.c mainbus.c Log Message: Adapt to CFARGS(). To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.119.6.1 src/sys/arch/amiga/amiga/autoconf.c cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/arch/amiga/amiga/device.h cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/amiga/clockport/a1k2cp.c cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/amiga/clockport/clockport.c cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/amiga/clockport/gencp.c cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/amiga/dev/acafh.c \ src/sys/arch/amiga/dev/bppcsc.c src/sys/arch/amiga/dev/mntva.c \ src/sys/arch/amiga/dev/xsurf.c src/sys/arch/amiga/dev/z3rambd.c cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/arch/amiga/dev/afsc.c cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/arch/amiga/dev/ahsc.c cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/arch/amiga/dev/amidisplaycc.c cvs rdiff -u -r1.44 -r1.44.8.1 src/sys/arch/amiga/dev/atzsc.c cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/amiga/dev/cbiiisc.c \ src/sys/arch/amiga/dev/drsupio.c cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/arch/amiga/dev/drsc.c \ src/sys/arch/amiga/dev/otgsc.c cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/arch/amiga/dev/empsc.c cvs rdiff -u -r1.98 -r1.98.8.1 src/sys/arch/amiga/dev/fd.c cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/arch/amiga/dev/gayle_pcmcia.c \ src/sys/arch/amiga/dev/mlhsc.c cvs rdiff -u -r1.66 -r1.66.6.1 src/sys/arch/amiga/dev/grf.c cvs rdiff -u -r1.42 -r1.42.6.1 src/sys/arch/amiga/dev/grf_cc.c cvs rdiff -u -r1.51 -r1.51.6.1 src/sys/arch/amiga/dev/grf_cl.c cvs rdiff -u -r1.60 -r1.60.6.1 src/sys/arch/amiga/dev/grf_cv.c cvs rdiff -u -r1.35 -r1.35.6.1 src/sys/arch/amiga/dev/grf_cv3d.c cvs rdiff -u -r1.37 -r1.37.6.1 src/sys/arch/amiga/dev/grf_et.c cvs rdiff -u -r1.58 -r1.58.6.1 src/sys/arch/amiga/dev/grf_rh.c cvs rdiff -u -r1.59 -r1.59.6.1 src/sys/arch/amiga/dev/grf_rt.c cvs rdiff -u -r1.52 -r1.52.6.1 src/sys/arch/amiga/dev/grf_ul.c cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/arch/amiga/dev/gtsc.c cvs rdiff -u -r1.27 -r1.27.8.1 src/sys/arch/amiga/dev/gvpbus.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/amiga/dev/gvpio.c cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/amiga/dev/hyper.c cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/amiga/dev/ioblix_zbus.c cvs rdiff -u -r1.38 -r1.38.8.1 src/sys/arch/amiga/dev/ivsc.c cvs rdiff -u -r1.60 -r1.60.2.1 src/sys/arch/amiga/dev/kbd.c cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/arch/amiga/dev/mfc.c cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/arch/amiga/dev/mgnsc.c \ src/sys/arch/amiga/dev/zssc.c cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/arch/amiga/dev/ms.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/amiga/dev/p5bus.c cvs rdiff -u -r1.41 -r1.41.8.1 src/sys/arch/amiga/dev/wesc.c cvs rdiff -u -r1.36 -r1.36.8.1 src/sys/arch/amiga/dev/wstsc.c cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/amiga/dev/xsh.c cvs rdiff -u -r1.76 -r1.76.6.1 src/sys/arch/amiga/dev/zbus.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/amiga/pci/cv3dpb.c cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/amiga/pci/em4k.c cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/amiga/pci/empb.c cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/amiga/pci/mppb.c cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/amiga/pci/p5pb.c cvs rdiff -u -r1.8 -r1.8.6.1 src/sys/arch/amigappc/amigappc/autoconf.c cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/amigappc/amigappc/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/amiga/amiga/autoconf.c diff -u src/sys/arch/amiga/amiga/autoconf.c:1.119 src/sys/arch/amiga/amiga/autoconf.c:1.119.6.1 --- src/sys/arch/amiga/amiga/autoconf.c:1.119 Tue Apr 27 14:48:28 2021 +++ src/sys/arch/amiga/amiga/autoconf.c Tue Aug 3 23:05:51 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.119 2021/04/27 14:48:28 thorpej Exp $ */ +/* $NetBSD: autoconf.c,v 1.119.6.1 2021/08/03 23:05:51 thorpej Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -30,10 +30,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define __SUBR_AUTOCONF_PRIVATE /* XXX amiga_config_found() */ - #include -__KERNEL_RCSID(0, "$NetBSD: autoc
CVS commit: src
Module Name:src
Committed By: rillig
Date: Tue Aug 3 21:18:24 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: gcc_cast_union.c gcc_cast_union.exp
src/usr.bin/xlint/lint1: decl.c
Log Message:
lint: in strict enum mode, error out on enum type mismatch in union cast
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/gcc_cast_union.c \
src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp
cvs rdiff -u -r1.218 -r1.219 src/usr.bin/xlint/lint1/decl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/gcc_cast_union.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_cast_union.c:1.2 src/tests/usr.bin/xlint/lint1/gcc_cast_union.c:1.3
--- src/tests/usr.bin/xlint/lint1/gcc_cast_union.c:1.2 Tue Aug 3 21:09:26 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_cast_union.c Tue Aug 3 21:18:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gcc_cast_union.c,v 1.2 2021/08/03 21:09:26 rillig Exp $ */
+/* $NetBSD: gcc_cast_union.c,v 1.3 2021/08/03 21:18:24 rillig Exp $ */
# 3 "gcc_cast_union.c"
/*
@@ -81,7 +81,7 @@ test(void)
any = (union anything)E1;
any = (union anything)E2;
/* GCC allows enum mismatch even with -Wenum-conversion */
- /* XXX: Lint should warn about enum type mismatch */
+ /* expect+1: error: type 'enum other_enum' is not a member of 'union anything' [329] */
any = (union anything)OTHER;
/* expect+1: error: type 'pointer to char' is not a member of 'union anything' [329] */
any = (union anything)"char *";
Index: src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp
diff -u src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp:1.2 src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp:1.3
--- src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp:1.2 Tue Aug 3 21:09:26 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp Tue Aug 3 21:18:24 2021
@@ -1,3 +1,4 @@
+gcc_cast_union.c(85): error: type 'enum other_enum' is not a member of 'union anything' [329]
gcc_cast_union.c(87): error: type 'pointer to char' is not a member of 'union anything' [329]
gcc_cast_union.c(90): error: type 'pointer to double' is not a member of 'union anything' [329]
gcc_cast_union.c(92): error: type 'pointer to double' is not a member of 'union anything' [329]
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.218 src/usr.bin/xlint/lint1/decl.c:1.219
--- src/usr.bin/xlint/lint1/decl.c:1.218 Tue Aug 3 18:38:02 2021
+++ src/usr.bin/xlint/lint1/decl.c Tue Aug 3 21:18:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.218 2021/08/03 18:38:02 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.219 2021/08/03 21:18:24 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.218 2021/08/03 18:38:02 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.219 2021/08/03 21:18:24 rillig Exp $");
#endif
#include
@@ -2225,6 +2225,9 @@ eqtype(const type_t *tp1, const type_t *
if (t == STRUCT || t == UNION)
return tp1->t_str == tp2->t_str;
+ if (t == ENUM && eflag)
+ return tp1->t_enum == tp2->t_enum;
+
if (t == ARRAY && tp1->t_dim != tp2->t_dim) {
if (tp1->t_dim != 0 && tp2->t_dim != 0)
return false;
CVS commit: src
Module Name:src
Committed By: rillig
Date: Tue Aug 3 21:09:26 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: gcc_cast_union.c gcc_cast_union.exp
src/usr.bin/xlint/lint1: tree.c
Log Message:
lint: merge almost duplicate code from 'sametype' into 'eqtype'
In 'sametype', the branch for comparing array types was unreachable
since it requires both tspecs to be the same, but t2 underwent the
array-to-pointer conversion.
Previously, lint warned about enum type mismatches, even without -e for
strict enum mode. Instead, it got the case for 'char *' wrong, which is
now fixed. Now lint behaves like GCC 10.3.0 in this regard. The
warning about enum mismatch is useful though, so it may be re-added in a
future commit.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/gcc_cast_union.c \
src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp
cvs rdiff -u -r1.329 -r1.330 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/gcc_cast_union.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_cast_union.c:1.1 src/tests/usr.bin/xlint/lint1/gcc_cast_union.c:1.2
--- src/tests/usr.bin/xlint/lint1/gcc_cast_union.c:1.1 Tue Aug 3 20:34:23 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_cast_union.c Tue Aug 3 21:09:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gcc_cast_union.c,v 1.1 2021/08/03 20:34:23 rillig Exp $ */
+/* $NetBSD: gcc_cast_union.c,v 1.2 2021/08/03 21:09:26 rillig Exp $ */
# 3 "gcc_cast_union.c"
/*
@@ -11,6 +11,8 @@
* https://gcc.gnu.org/onlinedocs/gcc/Cast-to-Union.html
*/
+/* lint1-extra-flags: -e */
+
union anything {
_Bool m_bool;
char m_char;
@@ -79,9 +81,9 @@ test(void)
any = (union anything)E1;
any = (union anything)E2;
/* GCC allows enum mismatch even with -Wenum-conversion */
- /* expect+1: error: type 'enum other_enum' is not a member of 'union anything' [329] */
+ /* XXX: Lint should warn about enum type mismatch */
any = (union anything)OTHER;
- /* GCC strictly complains that 'char *' is not in the union. */
+ /* expect+1: error: type 'pointer to char' is not a member of 'union anything' [329] */
any = (union anything)"char *";
any = (union anything)(const char *)"char *";
/* expect+1: error: type 'pointer to double' is not a member of 'union anything' [329] */
Index: src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp
diff -u src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp:1.1 src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp:1.2
--- src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp:1.1 Tue Aug 3 20:34:23 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp Tue Aug 3 21:09:26 2021
@@ -1,4 +1,4 @@
-gcc_cast_union.c(83): error: type 'enum other_enum' is not a member of 'union anything' [329]
-gcc_cast_union.c(88): error: type 'pointer to double' is not a member of 'union anything' [329]
+gcc_cast_union.c(87): error: type 'pointer to char' is not a member of 'union anything' [329]
gcc_cast_union.c(90): error: type 'pointer to double' is not a member of 'union anything' [329]
-gcc_cast_union.c(92): error: type 'pointer to int' is not a member of 'union anything' [329]
+gcc_cast_union.c(92): error: type 'pointer to double' is not a member of 'union anything' [329]
+gcc_cast_union.c(94): error: type 'pointer to int' is not a member of 'union anything' [329]
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.329 src/usr.bin/xlint/lint1/tree.c:1.330
--- src/usr.bin/xlint/lint1/tree.c:1.329 Tue Aug 3 20:57:06 2021
+++ src/usr.bin/xlint/lint1/tree.c Tue Aug 3 21:09:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.329 2021/08/03 20:57:06 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.330 2021/08/03 21:09:26 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.329 2021/08/03 20:57:06 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.330 2021/08/03 21:09:26 rillig Exp $");
#endif
#include
@@ -102,36 +102,6 @@ op_name(op_t op)
return modtab[op].m_name;
}
-static bool
-sametype(const type_t *t1, const type_t *t2)
-{
-
- /* Maybe this can be merged into 'eqtype'. */
-
- if (t1->t_tspec != t2->t_tspec)
- return false;
-
- /* Ignore const/volatile */
-
- switch (t1->t_tspec) {
- case ARRAY:
- if (t1->t_dim != t2->t_dim)
- return false;
- /*FALLTHROUGH*/
- case PTR:
- return sametype(t1->t_subt, t2->t_subt);
- case ENUM:
- return strcmp(t1->t_enum->en_tag->s_name,
- t2->t_enum->en_tag->s_name) == 0;
- case STRUCT:
- case UNION:
- return strcmp(t1->t_str->sou_tag->s_name,
- t2->t_str->sou_tag->s_name) == 0;
- default:
- return true;
- }
-}
-
/* Build 'pointer to tp', 'array of tp' or 'function returning tp'. */
type_t *
derive_type(type_t *tp, tspec_t t)
@@ -3401,7 +3371,8 @@ cast(tnode_t *tn, type_t *tp)
return NULL;
CVS commit: src/usr.sbin/rpc.pcnfsd
Module Name:src Committed By: andvar Date: Tue Aug 3 20:59:20 UTC 2021 Modified Files: src/usr.sbin/rpc.pcnfsd: common.h Log Message: s/pasword/password/ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/rpc.pcnfsd/common.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/rpc.pcnfsd/common.h diff -u src/usr.sbin/rpc.pcnfsd/common.h:1.2 src/usr.sbin/rpc.pcnfsd/common.h:1.3 --- src/usr.sbin/rpc.pcnfsd/common.h:1.2 Tue Jul 25 22:20:26 1995 +++ src/usr.sbin/rpc.pcnfsd/common.h Tue Aug 3 20:59:20 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: common.h,v 1.2 1995/07/25 22:20:26 gwr Exp $ */ +/* $NetBSD: common.h,v 1.3 2021/08/03 20:59:20 andvar Exp $ */ /* RE_SID: @(%)/usr/dosnfs/shades_SCCS/unix/pcnfsd/v2/src/SCCS/s.common.h 1.3 91/12/17 14:32:05 SMI */ /* @@ -89,7 +89,7 @@ **- ** Define (via Makefile) the following symbol to use a cache of recently-used ** user names. This has certain uses in university and other settings -** where (1) the pasword file is very large, and (2) a group of users +** where (1) the password file is very large, and (2) a group of users ** frequently logs in together using the same account (for example, ** a class userid). **- @@ -132,7 +132,7 @@ ** to determine if a password entry contains a legal shell (and therefore ** identifies a user who may log in). The default is to check that ** the last two characters of the shell field are "sh", which should -** cope with "sh", "csh", "ksh", "bash" See the routine get_pasword() +** cope with "sh", "csh", "ksh", "bash" See the routine get_password() ** in pcnfsd_misc.c for more details. ** ** Note: For some reason that I haven't yet figured out, getusershell()
CVS commit: src
Module Name:src
Committed By: rillig
Date: Tue Aug 3 20:57:06 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_union_cast.c d_c99_union_cast.exp
msg_328.c msg_328.exp msg_329.c msg_329.exp
src/usr.bin/xlint/lint1: err.c tree.c
Log Message:
lint: union casts are only available as a GCC extension, not in C99
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_328.c \
src/tests/usr.bin/xlint/lint1/msg_328.exp \
src/tests/usr.bin/xlint/lint1/msg_329.c
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_329.exp
cvs rdiff -u -r1.133 -r1.134 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.328 -r1.329 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.6 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.7
--- src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.6 Tue Aug 3 20:46:10 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c Tue Aug 3 20:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_union_cast.c,v 1.6 2021/08/03 20:46:10 rillig Exp $ */
+/* $NetBSD: d_c99_union_cast.c,v 1.7 2021/08/03 20:57:06 rillig Exp $ */
# 3 "d_c99_union_cast.c"
/* C99 does not define union cast, it is a GCC extension. */
@@ -18,9 +18,9 @@ union foo {
void
foo(struct bar *a)
{
- /* TODO: warn about union casts in general */
+ /* expect+1: error: union cast is a GCC extension [328] */
a = ((union foo)a).a;
- /* expect+1: error: type 'pointer to char' is not a member of 'union foo' [329] */
+ /* expect+1: error: union cast is a GCC extension [328] */
a = ((union foo)"string");
a->a++;
}
Index: src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp
diff -u src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp:1.5 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp:1.6
--- src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp:1.5 Tue Aug 3 20:46:10 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp Tue Aug 3 20:57:06 2021
@@ -1 +1,2 @@
-d_c99_union_cast.c(24): error: type 'pointer to char' is not a member of 'union foo' [329]
+d_c99_union_cast.c(22): error: union cast is a GCC extension [328]
+d_c99_union_cast.c(24): error: union cast is a GCC extension [328]
Index: src/tests/usr.bin/xlint/lint1/msg_328.c
diff -u src/tests/usr.bin/xlint/lint1/msg_328.c:1.2 src/tests/usr.bin/xlint/lint1/msg_328.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_328.c:1.2 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_328.c Tue Aug 3 20:57:06 2021
@@ -1,7 +1,19 @@
-/* $NetBSD: msg_328.c,v 1.2 2021/02/21 09:07:58 rillig Exp $ */
+/* $NetBSD: msg_328.c,v 1.3 2021/08/03 20:57:06 rillig Exp $ */
# 3 "msg_328.c"
-// Test for message: union cast is a C9X feature [328]
+// Test for message: union cast is a GCC extension [328]
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+/* lint1-flags: -Sw */
+
+union target {
+ int b;
+};
+
+void
+foo(void)
+{
+ union target arg = { 123 };
+ /* expect+1: error: union cast is a GCC extension [328] */
+ arg = (union target)3;
+ arg.b++;
+}
Index: src/tests/usr.bin/xlint/lint1/msg_328.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_328.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_328.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_328.exp:1.2 Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_328.exp Tue Aug 3 20:57:06 2021
@@ -1 +1 @@
-msg_328.c(6): error: syntax error ':' [249]
+msg_328.c(17): error: union cast is a GCC extension [328]
Index: src/tests/usr.bin/xlint/lint1/msg_329.c
diff -u src/tests/usr.bin/xlint/lint1/msg_329.c:1.2 src/tests/usr.bin/xlint/lint1/msg_329.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_329.c:1.2 Sun Jan 24 17:44:37 2021
+++ src/tests/usr.bin/xlint/lint1/msg_329.c Tue Aug 3 20:57:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_329.c,v 1.2 2021/01/24 17:44:37 rillig Exp $ */
+/* $NetBSD: msg_329.c,v 1.3 2021/08/03 20:57:06 rillig Exp $ */
# 3 "msg_329.c"
// Test for message: type '%s' is not a member of '%s' [329]
@@ -30,9 +30,6 @@ example(void)
*
* This is a GCC extension.
* See https://gcc.gnu.org/onlinedocs/gcc/Cast-to-Union.html.
- *
- * FIXME: lint says in message 328 that "union cast is a C9X feature",
- * but that is wrong. It is a GCC feature.
*/
union u u_i1 = (union u)3;
union u u_vp = (union u)(void *)0;
Index: src/tests/usr.bin/xlint/lint1/msg_329.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_329.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_329.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_329.exp:1.3 Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Tue Aug 3 20:46:10 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_union_cast.c d_c99_union_cast.exp
Log Message:
tests/lint: prepare non-GCC test for union casts
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.5 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.6
--- src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.5 Tue Aug 3 20:34:23 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c Tue Aug 3 20:46:10 2021
@@ -1,8 +1,10 @@
-/* $NetBSD: d_c99_union_cast.c,v 1.5 2021/08/03 20:34:23 rillig Exp $ */
+/* $NetBSD: d_c99_union_cast.c,v 1.6 2021/08/03 20:46:10 rillig Exp $ */
# 3 "d_c99_union_cast.c"
/* C99 does not define union cast, it is a GCC extension. */
+/* lint1-flags: -Sw */
+
struct bar {
int a;
int b;
@@ -14,9 +16,11 @@ union foo {
};
void
-foo(void)
+foo(struct bar *a)
{
- struct bar *a; /* expect: 192 */
-
- ((union foo)a).a;
+ /* TODO: warn about union casts in general */
+ a = ((union foo)a).a;
+ /* expect+1: error: type 'pointer to char' is not a member of 'union foo' [329] */
+ a = ((union foo)"string");
+ a->a++;
}
Index: src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp
diff -u src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp:1.4 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp:1.5
--- src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp:1.4 Fri Apr 9 20:12:00 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_cast.exp Tue Aug 3 20:46:10 2021
@@ -1 +1 @@
-d_c99_union_cast.c(19): warning: 'a' unused in function 'foo' [192]
+d_c99_union_cast.c(24): error: type 'pointer to char' is not a member of 'union foo' [329]
CVS commit: src
Module Name:src
Committed By: rillig
Date: Tue Aug 3 20:34:23 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile d_c99_union_cast.c
Added Files:
src/tests/usr.bin/xlint/lint1: gcc_cast_union.c gcc_cast_union.exp
Log Message:
tests/lint: test GCC extension for casting to union type
To generate a diff of this commit:
cvs rdiff -u -r1.1101 -r1.1102 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.100 -r1.101 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/gcc_cast_union.c \
src/tests/usr.bin/xlint/lint1/gcc_cast_union.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1101 src/distrib/sets/lists/tests/mi:1.1102
--- src/distrib/sets/lists/tests/mi:1.1101 Tue Aug 3 18:03:54 2021
+++ src/distrib/sets/lists/tests/mi Tue Aug 3 20:34:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1101 2021/08/03 18:03:54 rillig Exp $
+# $NetBSD: mi,v 1.1102 2021/08/03 20:34:23 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6266,6 +6266,8 @@
./usr/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_bit_field_types.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_bit_field_types.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/gcc_cast_union.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/gcc_cast_union.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_stmt_asm.c tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.100 src/tests/usr.bin/xlint/lint1/Makefile:1.101
--- src/tests/usr.bin/xlint/lint1/Makefile:1.100 Tue Aug 3 18:03:54 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile Tue Aug 3 20:34:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2021/08/03 18:03:54 rillig Exp $
+# $NetBSD: Makefile,v 1.101 2021/08/03 20:34:23 rillig Exp $
NOMAN= # defined
MAX_MESSAGE= 345 # see lint1/err.c
@@ -160,6 +160,8 @@ FILES+= gcc_attribute_var.c
FILES+= gcc_attribute_var.exp
FILES+= gcc_bit_field_types.c
FILES+= gcc_bit_field_types.exp
+FILES+= gcc_cast_union.c
+FILES+= gcc_cast_union.exp
FILES+= gcc_init_compound_literal.c
FILES+= gcc_init_compound_literal.exp
FILES+= gcc_stmt_asm.c
Index: src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.4 src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.5
--- src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c:1.4 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_union_cast.c Tue Aug 3 20:34:23 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: d_c99_union_cast.c,v 1.4 2021/02/21 09:07:58 rillig Exp $ */
+/* $NetBSD: d_c99_union_cast.c,v 1.5 2021/08/03 20:34:23 rillig Exp $ */
# 3 "d_c99_union_cast.c"
-/* union cast */
+/* C99 does not define union cast, it is a GCC extension. */
struct bar {
int a;
Added files:
Index: src/tests/usr.bin/xlint/lint1/gcc_cast_union.c
diff -u /dev/null src/tests/usr.bin/xlint/lint1/gcc_cast_union.c:1.1
--- /dev/null Tue Aug 3 20:34:23 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_cast_union.c Tue Aug 3 20:34:23 2021
@@ -0,0 +1,98 @@
+/* $NetBSD: gcc_cast_union.c,v 1.1 2021/08/03 20:34:23 rillig Exp $ */
+# 3 "gcc_cast_union.c"
+
+/*
+ * Test the GCC extension for casting to a union type.
+ *
+ * As of GCC 10.3.0, GCC only prints a generic warning without any details:
+ * error: cast to union type from type not present in union
+ * No idea why it neither mentions the union type nor the actual type.
+ *
+ * https://gcc.gnu.org/onlinedocs/gcc/Cast-to-Union.html
+ */
+
+union anything {
+ _Bool m_bool;
+ char m_char;
+ signed char m_signed_char;
+ unsigned char m_unsigned_char;
+ short m_short;
+ unsigned short m_unsigned_short;
+ int m_int;
+ unsigned int m_unsigned_int;
+ long m_long;
+ unsigned long m_unsigned_long;
+ long long m_long_long;
+ unsigned long long m_unsigned_long_long;
+ /* skip __int128_t and __uint128_t for now */
+ float m_float;
+ double m_double;
+ long double m_long_double;
+
+ struct m_struct {
+ int member;
+ } m_struct;
+ union m_union {
+ int member;
+ } m_union;
+ enum m_enum1 {
+ E1
+ } m_enum1;
+ enum m_enum2 {
+ E2
+ } m_enum2;
+ const char *m_const_char_pointer;
+ double m_double_array[5];
+ void (*m_function)(void *);
+ void (*m_function_varargs)(void *, ...);
+ float _Co
CVS commit: src/sys/kern
Module Name:src Committed By: chs Date: Tue Aug 3 20:27:08 UTC 2021 Modified Files: src/sys/kern: uipc_socket.c Log Message: in sbsavetimestamp(), initialize struct timeval to 0 with memset() so that the implicit padding is initialized. this avoids later copying uninitialized memory out to user space. detected by KMSAN. To generate a diff of this commit: cvs rdiff -u -r1.294 -r1.295 src/sys/kern/uipc_socket.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/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.294 src/sys/kern/uipc_socket.c:1.295 --- src/sys/kern/uipc_socket.c:1.294 Fri Dec 11 03:00:09 2020 +++ src/sys/kern/uipc_socket.c Tue Aug 3 20:27:08 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.294 2020/12/11 03:00:09 thorpej Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.295 2021/08/03 20:27:08 chs Exp $ */ /* * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.294 2020/12/11 03:00:09 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.295 2021/08/03 20:27:08 chs Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -2432,6 +2432,7 @@ sbsavetimestamp(int opt, struct mbuf **m struct timeval tv; int error; + memset(&tv, 0, sizeof(tv)); microtime(&tv); MODULE_HOOK_CALL(uipc_socket_50_sbts_hook, (opt, &mp), enosys(), error);
CVS commit: src/sys/kern
Module Name:src
Committed By: chs
Date: Tue Aug 3 20:25:43 UTC 2021
Modified Files:
src/sys/kern: vfs_wapbl.c
Log Message:
initialize wc_unused to 0, to avoid writing uninitialized memory to disk.
detected by KMSAN.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/kern/vfs_wapbl.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/kern/vfs_wapbl.c
diff -u src/sys/kern/vfs_wapbl.c:1.108 src/sys/kern/vfs_wapbl.c:1.109
--- src/sys/kern/vfs_wapbl.c:1.108 Sun Apr 12 17:02:52 2020
+++ src/sys/kern/vfs_wapbl.c Tue Aug 3 20:25:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_wapbl.c,v 1.108 2020/04/12 17:02:52 jdolecek Exp $ */
+/* $NetBSD: vfs_wapbl.c,v 1.109 2021/08/03 20:25:43 chs Exp $ */
/*-
* Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#define WAPBL_INTERNAL
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.108 2020/04/12 17:02:52 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.109 2021/08/03 20:25:43 chs Exp $");
#include
#include
@@ -2559,6 +2559,7 @@ wapbl_write_blocks(struct wapbl *wl, off
wc->wc_type = WAPBL_WC_BLOCKS;
wc->wc_len = blocklen;
wc->wc_blkcount = 0;
+ wc->wc_unused = 0;
while (bp && (wc->wc_blkcount < wl->wl_brperjblock)) {
/*
* Make sure all the physical block numbers are up to
@@ -2647,6 +2648,7 @@ wapbl_write_revocations(struct wapbl *wl
wc->wc_type = WAPBL_WC_REVOCATIONS;
wc->wc_len = blocklen;
wc->wc_blkcount = 0;
+ wc->wc_unused = 0;
while (wd && (wc->wc_blkcount < wl->wl_brperjblock)) {
wc->wc_blocks[wc->wc_blkcount].wc_daddr =
wd->wd_blkno;
CVS commit: src/external/gpl2/gettext/dist/gettext-runtime
Module Name:src Committed By: chs Date: Tue Aug 3 20:22:15 UTC 2021 Modified Files: src/external/gpl2/gettext/dist/gettext-runtime: Makefile.in Log Message: do not descend into the man or tests directory. this avoids a problem where git sets the file timestamps differently than CVS does and accidentally causes make to try to rebuild various targets that don't work during the tools build. this matches the change that was made to Makefile.am in our tree. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in diff -u src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in:1.2 src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in:1.3 --- src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in:1.2 Tue Jan 12 22:58:02 2016 +++ src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in Tue Aug 3 20:22:15 2021 @@ -347,7 +347,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../autoconf-l # The list of subdirectories depends on whether --disable-libasprintf was # specified. @ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf -SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests +SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po m4 # Allow users to use "gnulib-tool --update".
CVS commit: src
Module Name:src Committed By: rillig Date: Tue Aug 3 18:44:33 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: c11_generic_expression.exp d_c99_bool_strict_syshdr.exp d_fold_test.exp expr_cast.c expr_cast.exp msg_096.exp msg_109.exp msg_126.exp msg_170.exp msg_204.exp msg_214.c msg_214.exp msg_343.exp src/usr.bin/xlint/lint1: err.c func.c Log Message: lint: add quotes around placeholder in message 214 function '%s' expects to return value To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp cvs rdiff -u -r1.9 -r1.10 \ src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/d_fold_test.exp \ src/tests/usr.bin/xlint/lint1/msg_096.exp \ src/tests/usr.bin/xlint/lint1/msg_109.exp \ src/tests/usr.bin/xlint/lint1/msg_170.exp \ src/tests/usr.bin/xlint/lint1/msg_343.exp cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/expr_cast.c \ src/tests/usr.bin/xlint/lint1/expr_cast.exp cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_126.exp \ src/tests/usr.bin/xlint/lint1/msg_204.exp cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_214.c \ src/tests/usr.bin/xlint/lint1/msg_214.exp cvs rdiff -u -r1.132 -r1.133 src/usr.bin/xlint/lint1/err.c cvs rdiff -u -r1.118 -r1.119 src/usr.bin/xlint/lint1/func.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp diff -u src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.7 src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.8 --- src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.7 Sun Jul 11 20:37:21 2021 +++ src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp Tue Aug 3 18:44:33 2021 @@ -1,4 +1,4 @@ -c11_generic_expression.c(29): warning: function classify_type_without_default expects to return value [214] +c11_generic_expression.c(29): warning: function 'classify_type_without_default' expects to return value [214] c11_generic_expression.c(21): warning: argument 'var' unused in function 'classify_type_without_default' [231] c11_generic_expression.c(37): warning: argument 'var' unused in function 'classify_type_with_default' [231] c11_generic_expression.c(53): warning: argument 'c' unused in function 'classify_char' [231] Index: src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp diff -u src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp:1.9 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp:1.10 --- src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp:1.9 Sun Mar 21 20:44:59 2021 +++ src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp Tue Aug 3 18:44:33 2021 @@ -3,4 +3,4 @@ d_c99_bool_strict_syshdr.c(53): error: c d_c99_bool_strict_syshdr.c(87): error: operands of '=' have incompatible types (_Bool != int) [107] d_c99_bool_strict_syshdr.c(162): error: return value type mismatch (_Bool) and (int) [211] d_c99_bool_strict_syshdr.c(175): error: operand of '!' must be bool, not 'int' [330] -d_c99_bool_strict_syshdr.c(175): warning: function str_equal_bad expects to return value [214] +d_c99_bool_strict_syshdr.c(175): warning: function 'str_equal_bad' expects to return value [214] Index: src/tests/usr.bin/xlint/lint1/d_fold_test.exp diff -u src/tests/usr.bin/xlint/lint1/d_fold_test.exp:1.4 src/tests/usr.bin/xlint/lint1/d_fold_test.exp:1.5 --- src/tests/usr.bin/xlint/lint1/d_fold_test.exp:1.4 Fri Apr 9 20:12:00 2021 +++ src/tests/usr.bin/xlint/lint1/d_fold_test.exp Tue Aug 3 18:44:33 2021 @@ -10,5 +10,5 @@ d_fold_test.c(66): warning: argument 's' d_fold_test.c(67): error: controlling expressions must have scalar type [204] d_fold_test.c(67): warning: argument 's' unused in function 'do_while_struct' [231] d_fold_test.c(70): error: first operand must have scalar type, op ? : [170] -d_fold_test.c(70): warning: function conditional_struct expects to return value [214] +d_fold_test.c(70): warning: function 'conditional_struct' expects to return value [214] d_fold_test.c(70): warning: argument 's' unused in function 'conditional_struct' [231] Index: src/tests/usr.bin/xlint/lint1/msg_096.exp diff -u src/tests/usr.bin/xlint/lint1/msg_096.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_096.exp:1.5 --- src/tests/usr.bin/xlint/lint1/msg_096.exp:1.4 Fri Apr 9 20:12:01 2021 +++ src/tests/usr.bin/xlint/lint1/msg_096.exp Tue Aug 3 18:44:33 2021 @@ -1,3 +1,3 @@ msg_096.c(21): error: cannot dereference non-pointer type [96] -msg_096.c(21): warning: function unary_asterisk expects to return value [214] +msg_096.c(21): warning: function 'unary_asterisk' expects to return value [214] msg_096.c(19): warning: argument 'i' unused in function 'unary_asterisk' [231] Index: src/tests/usr.bin/xlint/lint1/msg_109.exp diff -u src/tests/usr.bin/x
CVS commit: src
Module Name:src
Committed By: rillig
Date: Tue Aug 3 18:38:02 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: expr_cast.c expr_cast.exp msg_214.c
msg_214.exp
src/usr.bin/xlint/lint1: decl.c tree.c
Log Message:
lint: casting to a struct is not allowed in C99, only with GCC
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/expr_cast.c \
src/tests/usr.bin/xlint/lint1/expr_cast.exp
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_214.c \
src/tests/usr.bin/xlint/lint1/msg_214.exp
cvs rdiff -u -r1.217 -r1.218 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.327 -r1.328 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/expr_cast.c
diff -u src/tests/usr.bin/xlint/lint1/expr_cast.c:1.1 src/tests/usr.bin/xlint/lint1/expr_cast.c:1.2
--- src/tests/usr.bin/xlint/lint1/expr_cast.c:1.1 Tue Aug 3 18:03:54 2021
+++ src/tests/usr.bin/xlint/lint1/expr_cast.c Tue Aug 3 18:38:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: expr_cast.c,v 1.1 2021/08/03 18:03:54 rillig Exp $ */
+/* $NetBSD: expr_cast.c,v 1.2 2021/08/03 18:38:02 rillig Exp $ */
# 3 "expr_cast.c"
/*
@@ -6,8 +6,14 @@
*
* K&R C does not mention any restrictions on the target type.
* C90 requires both the source type and the target type to be scalar.
+ *
+ * GCC allows casting to a struct type but there is no documentation about
+ * it at https://gcc.gnu.org/onlinedocs/gcc/C-Extensions.html. See
+ * c-typeck.c, function build_c_cast, RECORD_OR_UNION_TYPE_P.
*/
+/* lint1-flags: -Sw */
+
struct S {
int member;
};
@@ -20,14 +26,8 @@ cast(void)
} local = {
0.0
};
- /* expect-3: warning: 'local' set but not used in function 'cast' [191] */
- /*
- * ^^ XXX: The variable _is_ used, but only in a semantically wrong
- * expression. Lint should rather warn about the invalid cast in the
- * 'return' statement, but since all C compilers since C90 are
- * required to detect this already, there is no point in duplicating
- * that work.
- */
+ /* expect+2: error: invalid cast from 'struct S' to 'struct S' [147] */
+ /* expect+1: warning: function cast expects to return value [214] */
return (struct S)local;
}
Index: src/tests/usr.bin/xlint/lint1/expr_cast.exp
diff -u src/tests/usr.bin/xlint/lint1/expr_cast.exp:1.1 src/tests/usr.bin/xlint/lint1/expr_cast.exp:1.2
--- src/tests/usr.bin/xlint/lint1/expr_cast.exp:1.1 Tue Aug 3 18:03:54 2021
+++ src/tests/usr.bin/xlint/lint1/expr_cast.exp Tue Aug 3 18:38:02 2021
@@ -1 +1,2 @@
-expr_cast.c(20): warning: 'local' set but not used in function 'cast' [191]
+expr_cast.c(32): error: invalid cast from 'struct S' to 'struct S' [147]
+expr_cast.c(32): warning: function cast expects to return value [214]
Index: src/tests/usr.bin/xlint/lint1/msg_214.c
diff -u src/tests/usr.bin/xlint/lint1/msg_214.c:1.2 src/tests/usr.bin/xlint/lint1/msg_214.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_214.c:1.2 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_214.c Tue Aug 3 18:38:02 2021
@@ -1,7 +1,12 @@
-/* $NetBSD: msg_214.c,v 1.2 2021/02/21 09:07:58 rillig Exp $ */
+/* $NetBSD: msg_214.c,v 1.3 2021/08/03 18:38:02 rillig Exp $ */
# 3 "msg_214.c"
// Test for message: function %s expects to return value [214]
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+int
+int_function(void)
+{
+ /* TODO: add quotes around '%s' */
+ /* expect+1: warning: function int_function expects to return value [214] */
+ return;
+}
Index: src/tests/usr.bin/xlint/lint1/msg_214.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_214.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_214.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_214.exp:1.2 Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_214.exp Tue Aug 3 18:38:02 2021
@@ -1 +1 @@
-msg_214.c(6): error: syntax error ':' [249]
+msg_214.c(11): warning: function int_function expects to return value [214]
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.217 src/usr.bin/xlint/lint1/decl.c:1.218
--- src/usr.bin/xlint/lint1/decl.c:1.217 Sun Aug 1 18:37:29 2021
+++ src/usr.bin/xlint/lint1/decl.c Tue Aug 3 18:38:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.217 2021/08/01 18:37:29 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.218 2021/08/03 18:38:02 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.217 2021/08/01 18:37:29 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.218 2021/08/03 18:38:02 rillig Exp $");
#endif
#include
@@ -2230,7 +2230,7 @@ eqtype(const type_t *tp1, const type_t *
return false;
}
- /* dont check prototypes for traditional */
+ /* don't ch
CVS commit: src
Module Name:src
Committed By: rillig
Date: Tue Aug 3 18:03:54 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile
Added Files:
src/tests/usr.bin/xlint/lint1: expr_cast.c expr_cast.exp
Log Message:
tests/lint: test casting a struct to another struct
To generate a diff of this commit:
cvs rdiff -u -r1.1100 -r1.1101 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.99 -r1.100 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/expr_cast.c \
src/tests/usr.bin/xlint/lint1/expr_cast.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1100 src/distrib/sets/lists/tests/mi:1.1101
--- src/distrib/sets/lists/tests/mi:1.1100 Sun Aug 1 16:29:28 2021
+++ src/distrib/sets/lists/tests/mi Tue Aug 3 18:03:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1100 2021/08/01 16:29:28 rillig Exp $
+# $NetBSD: mi,v 1.1101 2021/08/03 18:03:54 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6240,6 +6240,8 @@
./usr/tests/usr.bin/xlint/lint1/expr_binary.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/expr_binary_trad.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/expr_binary_trad.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/expr_cast.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/expr_cast.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/expr_precedence.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/expr_precedence.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/expr_range.c tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.99 src/tests/usr.bin/xlint/lint1/Makefile:1.100
--- src/tests/usr.bin/xlint/lint1/Makefile:1.99 Sun Aug 1 16:29:28 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile Tue Aug 3 18:03:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2021/08/01 16:29:28 rillig Exp $
+# $NetBSD: Makefile,v 1.100 2021/08/03 18:03:54 rillig Exp $
NOMAN= # defined
MAX_MESSAGE= 345 # see lint1/err.c
@@ -135,6 +135,8 @@ FILES+= expr_binary.c
FILES+= expr_binary.exp
FILES+= expr_binary_trad.c
FILES+= expr_binary_trad.exp
+FILES+= expr_cast.c
+FILES+= expr_cast.exp
FILES+= expr_precedence.c
FILES+= expr_precedence.exp
FILES+= expr_range.c
Added files:
Index: src/tests/usr.bin/xlint/lint1/expr_cast.c
diff -u /dev/null src/tests/usr.bin/xlint/lint1/expr_cast.c:1.1
--- /dev/null Tue Aug 3 18:03:54 2021
+++ src/tests/usr.bin/xlint/lint1/expr_cast.c Tue Aug 3 18:03:54 2021
@@ -0,0 +1,33 @@
+/* $NetBSD: expr_cast.c,v 1.1 2021/08/03 18:03:54 rillig Exp $ */
+# 3 "expr_cast.c"
+
+/*
+ * Tests for value conversion using a cast-expression.
+ *
+ * K&R C does not mention any restrictions on the target type.
+ * C90 requires both the source type and the target type to be scalar.
+ */
+
+struct S {
+ int member;
+};
+
+struct S
+cast(void)
+{
+ struct S {
+ double incompatible;
+ } local = {
+ 0.0
+ };
+ /* expect-3: warning: 'local' set but not used in function 'cast' [191] */
+ /*
+ * ^^ XXX: The variable _is_ used, but only in a semantically wrong
+ * expression. Lint should rather warn about the invalid cast in the
+ * 'return' statement, but since all C compilers since C90 are
+ * required to detect this already, there is no point in duplicating
+ * that work.
+ */
+
+ return (struct S)local;
+}
Index: src/tests/usr.bin/xlint/lint1/expr_cast.exp
diff -u /dev/null src/tests/usr.bin/xlint/lint1/expr_cast.exp:1.1
--- /dev/null Tue Aug 3 18:03:54 2021
+++ src/tests/usr.bin/xlint/lint1/expr_cast.exp Tue Aug 3 18:03:54 2021
@@ -0,0 +1 @@
+expr_cast.c(20): warning: 'local' set but not used in function 'cast' [191]
CVS commit: src/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Tue Aug 3 17:44:59 UTC 2021
Modified Files:
src/usr.bin/xlint/common: emit.c externs.h tyname.c
src/usr.bin/xlint/lint1: tree.c
Log Message:
lint: clean up and move 'sametype'
This function is only used by lint1. That's good since the lint2 code
was completely broken, as it would regard any two struct types as being
the same.
Remove the large switch statement since it is unlikely that there will
be new type derivations in C anytime soon.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/xlint/common/emit.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/xlint/common/externs.h
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/xlint/common/tyname.c
cvs rdiff -u -r1.326 -r1.327 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/common/emit.c
diff -u src/usr.bin/xlint/common/emit.c:1.11 src/usr.bin/xlint/common/emit.c:1.12
--- src/usr.bin/xlint/common/emit.c:1.11 Sat Mar 27 11:08:00 2021
+++ src/usr.bin/xlint/common/emit.c Tue Aug 3 17:44:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: emit.c,v 1.11 2021/03/27 11:08:00 rillig Exp $ */
+/* $NetBSD: emit.c,v 1.12 2021/08/03 17:44:58 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,10 +37,9 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: emit.c,v 1.11 2021/03/27 11:08:00 rillig Exp $");
+__RCSID("$NetBSD: emit.c,v 1.12 2021/08/03 17:44:58 rillig Exp $");
#endif
-#include
#include
#include
Index: src/usr.bin/xlint/common/externs.h
diff -u src/usr.bin/xlint/common/externs.h:1.17 src/usr.bin/xlint/common/externs.h:1.18
--- src/usr.bin/xlint/common/externs.h:1.17 Sun Aug 1 18:13:53 2021
+++ src/usr.bin/xlint/common/externs.h Tue Aug 3 17:44:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: externs.h,v 1.17 2021/08/01 18:13:53 rillig Exp $ */
+/* $NetBSD: externs.h,v 1.18 2021/08/03 17:44:58 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -47,7 +47,6 @@ extern void inittyp(void);
* tyname.c
*/
extern const char *type_name(const type_t *);
-extern bool sametype(const type_t *, const type_t *);
extern const char *tspec_name(tspec_t);
/*
Index: src/usr.bin/xlint/common/tyname.c
diff -u src/usr.bin/xlint/common/tyname.c:1.43 src/usr.bin/xlint/common/tyname.c:1.44
--- src/usr.bin/xlint/common/tyname.c:1.43 Fri Jul 2 18:22:09 2021
+++ src/usr.bin/xlint/common/tyname.c Tue Aug 3 17:44:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tyname.c,v 1.43 2021/07/02 18:22:09 rillig Exp $ */
+/* $NetBSD: tyname.c,v 1.44 2021/08/03 17:44:58 rillig Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tyname.c,v 1.43 2021/07/02 18:22:09 rillig Exp $");
+__RCSID("$NetBSD: tyname.c,v 1.44 2021/08/03 17:44:58 rillig Exp $");
#endif
#include
@@ -59,7 +59,7 @@ __RCSID("$NetBSD: tyname.c,v 1.43 2021/0
/* A tree of strings. */
typedef struct name_tree_node {
- char *ntn_name;
+ const char *ntn_name;
struct name_tree_node *ntn_less;
struct name_tree_node *ntn_greater;
} name_tree_node;
@@ -85,7 +85,7 @@ new_name_tree_node(const char *name)
return n;
}
-/* Return the canonical instance of the string, with unlimited life time. */
+/* Return the canonical instance of the string, with unlimited lifetime. */
static const char *
intern(const char *name)
{
@@ -189,70 +189,6 @@ tspec_name(tspec_t t)
}
}
-bool
-sametype(const type_t *t1, const type_t *t2)
-{
- tspec_t t;
-
- if (t1->t_tspec != t2->t_tspec)
- return false;
-
- /* Ignore const/volatile */
-
- switch (t = t1->t_tspec) {
- case BOOL:
- case CHAR:
- case UCHAR:
- case SCHAR:
- case SHORT:
- case USHORT:
- case INT:
- case UINT:
- case LONG:
- case ULONG:
- case QUAD:
- case UQUAD:
-#ifdef INT128_SIZE
- case INT128:
- case UINT128:
-#endif
- case FLOAT:
- case DOUBLE:
- case LDOUBLE:
- case VOID:
- case FUNC:
- case COMPLEX:
- case FCOMPLEX:
- case DCOMPLEX:
- case LCOMPLEX:
- return true;
- case ARRAY:
- if (t1->t_dim != t2->t_dim)
- return false;
- /*FALLTHROUGH*/
- case PTR:
- return sametype(t1->t_subt, t2->t_subt);
- case ENUM:
-#ifdef t_enum
- return strcmp(t1->t_enum->en_tag->s_name,
- t2->t_enum->en_tag->s_name) == 0;
-#else
- return true;
-#endif
- case STRUCT:
- case UNION:
-#ifdef t_str
- return strcmp(t1->t_str->sou_tag->s_name,
- t2->t_str->sou_tag->s_name) == 0;
-#else
- return true;
-#endif
- default:
- INTERNAL_ERROR("tyname(%d)", t);
- return false;
- }
-}
-
static void
type_name_of_function(buffer *buf, const type_t *tp)
{
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.326 src/usr.bin/xlint/lint1/tree.c:1.327
--- src/usr.bin/xlint/lint1/tree.c:1.326 Sun Aug 1 19:11:54 2021
+++ src/usr.bin/xlint/lint1/tree.c Tue Aug 3 17:44:59 2021
@@ -1,4 +
CVS commit: src/usr.bin/xlint/common
Module Name:src Committed By: rillig Date: Tue Aug 3 17:27:48 UTC 2021 Modified Files: src/usr.bin/xlint/common: param.h Log Message: lint: reduce number of negations in preprocessor condition No functional change. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/xlint/common/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/xlint/common/param.h diff -u src/usr.bin/xlint/common/param.h:1.8 src/usr.bin/xlint/common/param.h:1.9 --- src/usr.bin/xlint/common/param.h:1.8 Wed Dec 30 11:43:13 2020 +++ src/usr.bin/xlint/common/param.h Tue Aug 3 17:27:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.8 2020/12/30 11:43:13 rillig Exp $ */ +/* $NetBSD: param.h,v 1.9 2021/08/03 17:27:48 rillig Exp $ */ /* * Copyright (c) 1994, 1995 Jochen Pohl @@ -63,7 +63,7 @@ /* * The sparc64 long double code generation is broken in old gcc. */ -#if !defined(__sparc64__) || !defined(__GNUC__) || __GNUC__ > 2 +#if !(defined(__sparc64__) && defined(__GNUC__) && __GNUC__ <= 2) typedef long double ldbl_t; #else typedef double ldbl_t;
CVS commit: src/usr.bin/xlint/common
Module Name:src
Committed By: rillig
Date: Tue Aug 3 17:20:02 UTC 2021
Modified Files:
src/usr.bin/xlint/common: mem.c
Log Message:
lint: make memory management code easier to read
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/xlint/common/mem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/common/mem.c
diff -u src/usr.bin/xlint/common/mem.c:1.15 src/usr.bin/xlint/common/mem.c:1.16
--- src/usr.bin/xlint/common/mem.c:1.15 Sun Aug 1 18:13:53 2021
+++ src/usr.bin/xlint/common/mem.c Tue Aug 3 17:20:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.15 2021/08/01 18:13:53 rillig Exp $ */
+/* $NetBSD: mem.c,v 1.16 2021/08/03 17:20:02 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem.c,v 1.15 2021/08/01 18:13:53 rillig Exp $");
+__RCSID("$NetBSD: mem.c,v 1.16 2021/08/03 17:20:02 rillig Exp $");
#endif
#include
@@ -46,53 +46,41 @@ __RCSID("$NetBSD: mem.c,v 1.15 2021/08/0
#include "lint.h"
-static void __attribute__((noreturn))
-nomem(void)
+static void *
+not_null(void *ptr)
{
- errx(1, "virtual memory exhausted");
+ if (ptr == NULL)
+ errx(1, "virtual memory exhausted");
+ return ptr;
}
void *
xmalloc(size_t s)
{
- void *p;
- if ((p = malloc(s)) == NULL)
- nomem();
- return p;
+ return not_null(malloc(s));
}
void *
xcalloc(size_t n, size_t s)
{
- void *p;
- if ((p = calloc(n, s)) == NULL)
- nomem();
- return p;
+ return not_null(calloc(n, s));
}
void *
xrealloc(void *p, size_t s)
{
- void *n;
- if ((n = realloc(p, s)) == NULL) {
- free(p);
- nomem();
- }
- return n;
+ return not_null(realloc(p, s));
}
char *
xstrdup(const char *s)
{
- char *s2;
- if ((s2 = strdup(s)) == NULL)
- nomem();
- return s2;
+ return not_null(strdup(s));
}
char *
@@ -106,6 +94,6 @@ xasprintf(const char *fmt, ...)
e = vasprintf(&str, fmt, ap);
va_end(ap);
if (e < 0)
- nomem();
+ not_null(NULL);
return str;
}
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: snj Date: Tue Aug 3 16:14:21 UTC 2021 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: 1326 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.3 diff -u src/doc/CHANGES-9.3:1.1.2.18 src/doc/CHANGES-9.3:1.1.2.19 --- src/doc/CHANGES-9.3:1.1.2.18 Wed Jul 28 15:00:31 2021 +++ src/doc/CHANGES-9.3 Tue Aug 3 16:14:21 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.3,v 1.1.2.18 2021/07/28 15:00:31 snj Exp $ +# $NetBSD: CHANGES-9.3,v 1.1.2.19 2021/08/03 16:14:21 snj Exp $ A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3 release: @@ -387,3 +387,10 @@ sys/dev/audio/audio.c1.105 not be set at the same time. PR kern/56308. [isaki, ticket #1325] +distrib/sets/lists/man/mi 1.1724 +share/man/man4/man4.x86/Makefile 1.23 via patch +share/man/man4/man4.x86/amdccp.4 1.1 + + Add a man page for amdccp(4) + [nia, ticket #1326] +
CVS commit: [netbsd-9] src
Module Name:src Committed By: snj Date: Tue Aug 3 16:10:24 UTC 2021 Modified Files: src/distrib/sets/lists/man [netbsd-9]: mi src/share/man/man4/man4.x86 [netbsd-9]: Makefile Added Files: src/share/man/man4/man4.x86 [netbsd-9]: amdccp.4 Log Message: Pull up following revision(s) (requested by nia in ticket #1326): distrib/sets/lists/man/mi: revision 1.1724 share/man/man4/man4.x86/amdccp.4: revision 1.1 share/man/man4/man4.x86/Makefile: revision 1.23 via patch Add a man page for amdccp(4) To generate a diff of this commit: cvs rdiff -u -r1.1649.2.8 -r1.1649.2.9 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.19 -r1.19.2.1 src/share/man/man4/man4.x86/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/share/man/man4/man4.x86/amdccp.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1649.2.8 src/distrib/sets/lists/man/mi:1.1649.2.9 --- src/distrib/sets/lists/man/mi:1.1649.2.8 Fri Apr 30 13:49:55 2021 +++ src/distrib/sets/lists/man/mi Tue Aug 3 16:10:24 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1649.2.8 2021/04/30 13:49:55 martin Exp $ +# $NetBSD: mi,v 1.1649.2.9 2021/08/03 16:10:24 snj Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2038,6 +2038,7 @@ ./usr/share/man/cat4/x68k/pow.0 man-obsolete obsolete ./usr/share/man/cat4/x68k/powsw.0 man-sys-catman .cat ./usr/share/man/cat4/x68k/vs.0 man-sys-catman .cat +./usr/share/man/cat4/x86/amdccp.0 man-sys-catman .cat ./usr/share/man/cat4/x86/amdpcib.0 man-sys-catman .cat ./usr/share/man/cat4/x86/amdsmn.0 man-sys-catman .cat ./usr/share/man/cat4/x86/amdzentemp.0 man-sys-catman .cat @@ -5136,6 +5137,7 @@ ./usr/share/man/html4/x68k/pow.html man-obsolete obsolete ./usr/share/man/html4/x68k/powsw.html man-sys-htmlman html ./usr/share/man/html4/x68k/vs.html man-sys-htmlman html +./usr/share/man/html4/x86/amdccp.html man-sys-htmlman html ./usr/share/man/html4/x86/amdpcib.html man-sys-htmlman html ./usr/share/man/html4/x86/amdsmn.html man-sys-htmlman html ./usr/share/man/html4/x86/amdzentemp.html man-sys-htmlman html @@ -8166,6 +8168,7 @@ ./usr/share/man/man4/x68k/pow.4 man-obsolete obsolete ./usr/share/man/man4/x68k/powsw.4 man-sys-man .man ./usr/share/man/man4/x68k/vs.4 man-sys-man .man +./usr/share/man/man4/x86/amdccp.4 man-sys-man .man ./usr/share/man/man4/x86/amdpcib.4 man-sys-man .man ./usr/share/man/man4/x86/amdsmn.4 man-sys-man .man ./usr/share/man/man4/x86/amdzentemp.4 man-sys-man .man Index: src/share/man/man4/man4.x86/Makefile diff -u src/share/man/man4/man4.x86/Makefile:1.19 src/share/man/man4/man4.x86/Makefile:1.19.2.1 --- src/share/man/man4/man4.x86/Makefile:1.19 Sat Jul 21 09:51:20 2018 +++ src/share/man/man4/man4.x86/Makefile Tue Aug 3 16:10:24 2021 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2018/07/21 09:51:20 kre Exp $ +# $NetBSD: Makefile,v 1.19.2.1 2021/08/03 16:10:24 snj Exp $ -MAN= amdpcib.4 apic.4 balloon.4 coretemp.4 est.4 fdc.4 \ +MAN= amdccp.4 amdpcib.4 apic.4 balloon.4 coretemp.4 est.4 fdc.4 \ fwhrng.4 hpet.4 ichlpcib.4 imcsmb.4 lpt.4 mem.4 odcm.4 powernow.4 \ soekrisgpio.4 tco.4 vmt.4 vmx.4 \ amdsmn.4 amdzentemp.4 Added files: Index: src/share/man/man4/man4.x86/amdccp.4 diff -u /dev/null src/share/man/man4/man4.x86/amdccp.4:1.1.2.2 --- /dev/null Tue Aug 3 16:10:25 2021 +++ src/share/man/man4/man4.x86/amdccp.4 Tue Aug 3 16:10:24 2021 @@ -0,0 +1,54 @@ +.\" $NetBSD: amdccp.4,v 1.1.2.2 2021/08/03 16:10:24 snj Exp $ +.\" +.\" Copyright (c) 2021 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING
CVS commit: [thorpej-cfargs2] src/sys
Module Name:src
Committed By: thorpej
Date: Tue Aug 3 15:00:15 UTC 2021
Modified Files:
src/sys/kern [thorpej-cfargs2]: subr_autoconf.c
src/sys/sys [thorpej-cfargs2]: device.h
Log Message:
Address concerns about limited compile-time type checking with the
tag-value mechanism of specifying arguments to config_search(),
config_found(), and config_attach() by replacing the tag-value scheme
with a "struct cfargs", a pointer to which is passed to the aforementioned
functions instead.
The structure has a version field to allow for future ABI versioning
flexibility. The external structure is canononicalized internally
before use.
To ease the initialization of this structure, use a variadic preprocessor
macro, CFARGS(), to construct an anonymous "struct cfargs" inline, the
address of which is passed to the target function. A CFARGS_NONE macro
provides a symbolic stand-in for when the caller doesn't want to pass
arguments (currently expands to NULL and is handled during canonicalization).
To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.288.2.1 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.171 -r1.171.2.1 src/sys/sys/device.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.288 src/sys/kern/subr_autoconf.c:1.288.2.1
--- src/sys/kern/subr_autoconf.c:1.288 Mon Jun 14 08:55:49 2021
+++ src/sys/kern/subr_autoconf.c Tue Aug 3 15:00:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.288 2021/06/14 08:55:49 skrll Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.288.2.1 2021/08/03 15:00:15 thorpej Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -76,10 +76,8 @@
* @(#)subr_autoconf.c 8.3 (Berkeley) 5/17/94
*/
-#define __SUBR_AUTOCONF_PRIVATE /* see */
-
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.288 2021/06/14 08:55:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.288.2.1 2021/08/03 15:00:15 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -168,6 +166,20 @@ struct alldevs_foray {
struct devicelist af_garbage;
};
+/*
+ * Internal version of the cfargs structure; all versions are
+ * canonicalized to this.
+ */
+struct cfargs_internal {
+ union {
+ cfsubmatch_t submatch;/* submatch function (direct config) */
+ cfsearch_t search; /* search function (indirect config) */
+ };
+ const char * iattr; /* interface attribute */
+ const int * locators; /* locators array */
+ devhandle_t devhandle; /* devhandle_t (by value) */
+};
+
static char *number(char *, int);
static void mapply(struct matchinfo *, cfdata_t);
static void config_devdelete(device_t);
@@ -177,6 +189,8 @@ static void config_devlink(device_t);
static void config_alldevs_enter(struct alldevs_foray *);
static void config_alldevs_exit(struct alldevs_foray *);
static void config_add_attrib_dict(device_t);
+static device_t config_attach_internal(device_t, cfdata_t, void *,
+ cfprint_t, const struct cfargs_internal *);
static void config_collect_garbage(struct devicelist *);
static void config_dump_garbage(struct devicelist *);
@@ -1068,65 +1082,37 @@ config_probe(device_t parent, cfdata_t c
return config_match(parent, cf, aux);
}
-static void
-config_get_cfargs(cfarg_t tag,
- cfsubmatch_t *fnp, /* output */
- const char **ifattrp, /* output */
- const int **locsp, /* output */
- devhandle_t *handlep, /* output */
- va_list ap)
-{
- cfsubmatch_t fn = NULL;
- const char *ifattr = NULL;
- const int *locs = NULL;
- devhandle_t handle;
-
- devhandle_invalidate(&handle);
-
- while (tag != CFARG_EOL) {
- switch (tag) {
- /*
- * CFARG_SUBMATCH and CFARG_SEARCH are synonyms, but this
- * is merely an implementation detail. They are distinct
- * from the caller's point of view.
- */
- case CFARG_SUBMATCH:
- case CFARG_SEARCH:
- /* Only allow one function to be specified. */
- if (fn != NULL) {
-panic("%s: caller specified both "
-"SUBMATCH and SEARCH", __func__);
- }
- fn = va_arg(ap, cfsubmatch_t);
- break;
-
- case CFARG_IATTR:
- ifattr = va_arg(ap, const char *);
- break;
+static struct cfargs_internal *
+cfargs_canonicalize(const struct cfargs * const cfargs,
+struct cfargs_internal * const store)
+{
+ struct cfargs_internal *args = store;
- case CFARG_LOCATORS:
- locs = va_arg(ap, const int *);
- break;
+ memset(args, 0, sizeof(*args));
- case CFARG_DEVHANDLE:
- handle = va_arg(ap, devhandle_t);
- break;
+ /* If none specified, are all-NULL pointers are good. */
+ if (cfargs == NULL) {
+ return args;
+ }
- default:
- panic("%s: unknown cfarg tag: %d\n",
- __func__, tag);
- }
- tag = va_arg(ap, cfarg_t);
+ /*
+ * submatch and search are mutually-exclusive.
+ */
+ if (cfargs->submatch != NULL && cfargs->search != NULL) {
+ panic("cfargs_canonicalize: submatch and search are "
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Tue Aug 3 13:40:33 UTC 2021
Modified Files:
src/usr.sbin/sysinst: util.c
Log Message:
Cleanup alarm(3) handling in the timezone selection menu for error
cases, pointed out by RVP.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.58 src/usr.sbin/sysinst/util.c:1.59
--- src/usr.sbin/sysinst/util.c:1.58 Tue Jul 20 16:40:12 2021
+++ src/usr.sbin/sysinst/util.c Tue Aug 3 13:40:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.58 2021/07/20 16:40:12 martin Exp $ */
+/* $NetBSD: util.c,v 1.59 2021/08/03 13:40:33 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1881,25 +1881,26 @@ set_timezone(void)
tzm_set_names, NULL, NULL,
"\nPlease consult the install documents.",
MSG_exit_menu_generic);
- if (menu_no < 0)
- goto done; /* error - skip timezone setting */
+ if (menu_no >= 0) {
+ time_menu = menu_no;
+ process_menu(menu_no, NULL);
+ time_menu = -1;
- time_menu = menu_no;
- process_menu(menu_no, NULL);
- time_menu = -1;
-
- free_menu(menu_no);
+ free_menu(menu_no);
+ }
+ alarm(0);
signal(SIGALRM, SIG_IGN);
- snprintf(localtime_target, sizeof(localtime_target),
- "/usr/share/zoneinfo/%s", tz_selected);
- strlcpy(localtime_link, target_expand("/etc/localtime"),
- sizeof localtime_link);
- unlink(localtime_link);
- symlink(localtime_target, localtime_link);
+ if (menu_no >= 0) {
+ snprintf(localtime_target, sizeof(localtime_target),
+ "/usr/share/zoneinfo/%s", tz_selected);
+ strlcpy(localtime_link, target_expand("/etc/localtime"),
+ sizeof localtime_link);
+ unlink(localtime_link);
+ symlink(localtime_target, localtime_link);
+ }
-done:
return 1;
}
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Tue Aug 3 13:34:04 UTC 2021
Modified Files:
src/usr.sbin/sysinst: run.c
Log Message:
When reading output from a program we don't know how much it will
be - so scale the buffer (within reasonable limits).
Problem pointed out by RVP, triggered e.g. by disks with lots of GPT
partitions.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sysinst/run.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/run.c
diff -u src/usr.sbin/sysinst/run.c:1.13 src/usr.sbin/sysinst/run.c:1.14
--- src/usr.sbin/sysinst/run.c:1.13 Sat Nov 16 20:26:59 2019
+++ src/usr.sbin/sysinst/run.c Tue Aug 3 13:34:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: run.c,v 1.13 2019/11/16 20:26:59 martin Exp $ */
+/* $NetBSD: run.c,v 1.14 2021/08/03 13:34:04 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -176,6 +176,7 @@ collect(int kind, char **buffer, const c
{
size_t nbytes; /* Number of bytes in buffer. */
size_t fbytes; /* Number of bytes in file. */
+ size_t abytes; /* allocated size of buffer */
struct stat st; /* stat information. */
int ch;
FILE *f;
@@ -198,6 +199,9 @@ collect(int kind, char **buffer, const c
/* Open the file. */
f = fopen(fileorcmd, "r");
if (f == NULL) {
+ if (logfp)
+fprintf(logfp, "%s: failed to open %s\n",
+__func__, fileorcmd);
*buffer = NULL;
return -1;
}
@@ -205,25 +209,47 @@ collect(int kind, char **buffer, const c
/* Open the program. */
f = popen(fileorcmd, "r");
if (f == NULL) {
+ if (logfp)
+fprintf(logfp, "%s: failed to open %s\n",
+__func__, fileorcmd);
*buffer = NULL;
return -1;
}
- fbytes = BUFSIZE;
+ fbytes = 0;
}
if (fbytes == 0)
- fbytes = BUFSIZE;
+ abytes = BUFSIZE;
+ else
+ abytes = fbytes+1;
/* Allocate the buffer size. */
- *buffer = cp = malloc(fbytes + 1);
+ *buffer = cp = malloc(abytes);
if (!cp)
nbytes = -1;
else {
/* Read the buffer. */
nbytes = 0;
- while (nbytes < fbytes && (ch = fgetc(f)) != EOF)
+ while ((ch = fgetc(f)) != EOF) {
+ if (nbytes >= abytes-1) {
+if (fbytes > 0 || abytes >= 512*BUFSIZE) {
+ free(cp);
+ *buffer = cp = NULL;
+ nbytes = -1;
+ break;
+}
+abytes *= 2;
+*buffer = cp = realloc(cp, abytes);
+if (!cp) {
+ nbytes = -1;
+ break;
+}
+
+ }
cp[nbytes++] = ch;
- cp[nbytes] = 0;
+ }
+ if (cp)
+ cp[nbytes] = 0;
}
if (kind == T_FILE)
@@ -231,6 +257,9 @@ collect(int kind, char **buffer, const c
else
pclose(f);
+ if (nbytes <= 0 && logfp)
+ fprintf(logfp, "%s: failed for %s\n", __func__, fileorcmd);
+
return nbytes;
}
CVS commit: src/sys/dev/spi
Module Name:src
Committed By: tnn
Date: Tue Aug 3 11:30:26 UTC 2021
Modified Files:
src/sys/dev/spi: ssdfb_spi.c
Log Message:
ssdfb: support having an optional reset pin
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/spi/ssdfb_spi.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/dev/spi/ssdfb_spi.c
diff -u src/sys/dev/spi/ssdfb_spi.c:1.6 src/sys/dev/spi/ssdfb_spi.c:1.7
--- src/sys/dev/spi/ssdfb_spi.c:1.6 Sun Aug 1 14:56:18 2021
+++ src/sys/dev/spi/ssdfb_spi.c Tue Aug 3 11:30:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ssdfb_spi.c,v 1.6 2021/08/01 14:56:18 tnn Exp $ */
+/* $NetBSD: ssdfb_spi.c,v 1.7 2021/08/03 11:30:25 tnn Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ssdfb_spi.c,v 1.6 2021/08/01 14:56:18 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssdfb_spi.c,v 1.7 2021/08/03 11:30:25 tnn Exp $");
#include
#include
@@ -55,6 +55,7 @@ struct ssdfb_spi_softc {
struct spi_handle *sc_sh;
#ifdef FDT
struct fdtbus_gpio_pin *sc_gpio_dc;
+ struct fdtbus_gpio_pin *sc_gpio_res;
#endif
bool sc_3wiremode;
};
@@ -133,13 +134,22 @@ ssdfb_spi_attach(device_t parent, device
* 4 wire mode sends 8 bit sequences and requires an auxiliary GPIO
* pin for the command/data bit.
*/
- sc->sc_3wiremode = true;
#ifdef FDT
const int phandle = sa->sa_cookie;
- sc->sc_gpio_dc = fdtbus_gpio_acquire(phandle, "dc-gpio", GPIO_PIN_OUTPUT);
+ sc->sc_gpio_dc =
+ fdtbus_gpio_acquire(phandle, "dc-gpio", GPIO_PIN_OUTPUT);
if (!sc->sc_gpio_dc)
- sc->sc_gpio_dc = fdtbus_gpio_acquire(phandle, "cd-gpio", GPIO_PIN_OUTPUT);
+ sc->sc_gpio_dc =
+ fdtbus_gpio_acquire(phandle, "cd-gpio", GPIO_PIN_OUTPUT);
sc->sc_3wiremode = (sc->sc_gpio_dc == NULL);
+ sc->sc_gpio_res =
+ fdtbus_gpio_acquire(phandle, "res-gpio", GPIO_PIN_OUTPUT);
+ if (sc->sc_gpio_res) {
+ fdtbus_gpio_write_raw(sc->sc_gpio_res, 0);
+ DELAY(100);
+ fdtbus_gpio_write_raw(sc->sc_gpio_res, 1);
+ DELAY(100);
+ }
#else
sc->sc_3wiremode = true;
#endif
CVS commit: src
Module Name:src Committed By: rin Date: Tue Aug 3 09:25:44 UTC 2021 Modified Files: src/doc: CHANGES src/sys/arch/evbppc/dht: machdep.c src/sys/arch/evbppc/evbppc: evbppc_machdep.c src/sys/arch/evbppc/explora: machdep.c src/sys/arch/evbppc/include: cpu.h src/sys/arch/evbppc/obs405: obs200_machdep.c obs266_machdep.c obs600_machdep.c src/sys/arch/evbppc/virtex: machdep.c src/sys/arch/evbppc/walnut: machdep.c src/sys/modules/arch: archdirs.mk Removed Files: src/sys/modules/arch/powerpc/powerpc-ibm4xx: Makefile bsd.powerpc-ibm4xx.mk Log Message: Switch evbppc/ibm4xx to generic evbppc (same as oea) kernel modules. I've confirmed that kernels similar to amd64/conf/MODULAR work fine both on 403 and 405. XXX Unfortunately, we cannot immediately switch evbppc/booke to generic kernel modules yet; it has its own intr.h implementation. To generate a diff of this commit: cvs rdiff -u -r1.2816 -r1.2817 src/doc/CHANGES cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/dht/machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/evbppc/evbppc_machdep.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbppc/explora/machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/include/cpu.h cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbppc/obs405/obs200_machdep.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbppc/obs405/obs266_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbppc/obs405/obs600_machdep.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/virtex/machdep.c cvs rdiff -u -r1.67 -r1.68 src/sys/arch/evbppc/walnut/machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/modules/arch/archdirs.mk cvs rdiff -u -r1.1 -r0 src/sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile \ src/sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2816 src/doc/CHANGES:1.2817 --- src/doc/CHANGES:1.2816 Tue Jul 27 12:40:07 2021 +++ src/doc/CHANGES Tue Aug 3 09:25:43 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2816 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2817 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -389,3 +389,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: [tsutsui 20210709] kernel: Tie the maximum file lock per unprivilegied uid to kern.maxfiles [manu 20210727] + evbppc: Switch ibm4xx to generic evbppc kernel modules. [rin 20210803] Index: src/sys/arch/evbppc/dht/machdep.c diff -u src/sys/arch/evbppc/dht/machdep.c:1.1 src/sys/arch/evbppc/dht/machdep.c:1.2 --- src/sys/arch/evbppc/dht/machdep.c:1.1 Fri Apr 2 07:00:33 2021 +++ src/sys/arch/evbppc/dht/machdep.c Tue Aug 3 09:25:43 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.1 2021/04/02 07:00:33 rin Exp $ */ +/* $NetBSD: machdep.c,v 1.2 2021/08/03 09:25:43 rin Exp $ */ /* * Taken from src/sys/arch/evbppc/walnut/machdep.c: @@ -72,7 +72,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1 2021/04/02 07:00:33 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2 2021/08/03 09:25:43 rin Exp $"); #include "opt_ddb.h" #include "opt_pci.h" @@ -188,9 +188,6 @@ initppc(vaddr_t startkernel, vaddr_t end if (boothowto & RB_KDB) Debugger(); #endif - - /* Look for the ibm4xx modules in the right place */ - module_machine = module_machine_ibm4xx; } void Index: src/sys/arch/evbppc/evbppc/evbppc_machdep.c diff -u src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.14 src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.15 --- src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.14 Tue Mar 30 02:41:14 2021 +++ src/sys/arch/evbppc/evbppc/evbppc_machdep.c Tue Aug 3 09:25:43 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: evbppc_machdep.c,v 1.14 2021/03/30 02:41:14 rin Exp $ */ +/* $NetBSD: evbppc_machdep.c,v 1.15 2021/08/03 09:25:43 rin Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.14 2021/03/30 02:41:14 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.15 2021/08/03 09:25:43 rin Exp $"); #include #include @@ -91,11 +91,6 @@ struct vm_map *phys_map = NULL; char machine[] = MACHINE; char machine_arch[] = MACHINE_ARCH; -/* - * ibm4xx kernels need to set module_machine to this for modules to work. - */ -char module_machine_ibm4xx[] = "powerpc-ibm4xx"; - int fake_mapiodev = 1; /* Index: src/sys/arch/evbppc/explora/machdep.c diff -u src/sys/arch/evbppc/explora/machdep.c:1.51 src/sys/arch/evbppc/explora/machdep.c:1.52 --- src/sys/arch/evbppc/explora/machdep.c:1.51 Tue Mar 30 03:20:13 2021 +++ src/sys/arch/evbppc/explora/machdep.c Tue Aug 3 09:25:43 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.51
CVS commit: src/lib/libcurses
Module Name:src Committed By: nia Date: Tue Aug 3 07:58:50 UTC 2021 Modified Files: src/lib/libcurses: curses_attributes.3 curses_standout.3 Log Message: curses: clarify standout as the "best" _supported_ highlighting mode of the current terminal To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libcurses/curses_attributes.3 cvs rdiff -u -r1.9 -r1.10 src/lib/libcurses/curses_standout.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/curses_attributes.3 diff -u src/lib/libcurses/curses_attributes.3:1.10 src/lib/libcurses/curses_attributes.3:1.11 --- src/lib/libcurses/curses_attributes.3:1.10 Mon Aug 2 11:11:20 2021 +++ src/lib/libcurses/curses_attributes.3 Tue Aug 3 07:58:50 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_attributes.3,v 1.10 2021/08/02 11:11:20 nia Exp $ +.\" $NetBSD: curses_attributes.3,v 1.11 2021/08/03 07:58:50 nia Exp $ .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. .\" @@ -102,7 +102,8 @@ The attributes that can be manipulated a .It A_NORMAL no special attributes are applied .It A_STANDOUT -characters are displayed in the "best" highlighting mode of the terminal +characters are displayed in the "best" supported highlighting mode of the +terminal .It A_UNDERLINE characters are displayed underlined .It A_REVERSE @@ -193,7 +194,8 @@ The additional wide attributes that can .Pp .Bl -tag -width "COLOR_PAIR(n)" -compact -offset indent .It WA_STANDOUT -characters are displayed in the "best" highlighting mode of the terminal +characters are displayed in the "best" supported highlighting mode of the +terminal .It WA_UNDERLINE characters are displayed underlined .It WA_REVERSE Index: src/lib/libcurses/curses_standout.3 diff -u src/lib/libcurses/curses_standout.3:1.9 src/lib/libcurses/curses_standout.3:1.10 --- src/lib/libcurses/curses_standout.3:1.9 Mon Aug 2 11:11:20 2021 +++ src/lib/libcurses/curses_standout.3 Tue Aug 3 07:58:50 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_standout.3,v 1.9 2021/08/02 11:11:20 nia Exp $ +.\" $NetBSD: curses_standout.3,v 1.10 2021/08/03 07:58:50 nia Exp $ .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. .\" @@ -55,7 +55,7 @@ These functions manipulate the standout attribute on .Dv stdscr or on the specified window. -The standout attribute applies the "best highlighting mode" +The standout attribute applies the "best" supported highlighting mode supported by the current terminal, which may be an alias of other attributes. .Pp
CVS commit: src/sys/dev/sdmmc
Module Name:src Committed By: msaitoh Date: Tue Aug 3 07:54:39 UTC 2021 Modified Files: src/sys/dev/sdmmc: sdmmc_mem.c Log Message: Use unsigned to avoid undefined behavior in sdmmc_mem_sd_switch(). Found by kUBSan. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/dev/sdmmc/sdmmc_mem.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/dev/sdmmc/sdmmc_mem.c diff -u src/sys/dev/sdmmc/sdmmc_mem.c:1.73 src/sys/dev/sdmmc/sdmmc_mem.c:1.74 --- src/sys/dev/sdmmc/sdmmc_mem.c:1.73 Sun Jun 13 09:50:02 2021 +++ src/sys/dev/sdmmc/sdmmc_mem.c Tue Aug 3 07:54:39 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sdmmc_mem.c,v 1.73 2021/06/13 09:50:02 mlelstv Exp $ */ +/* $NetBSD: sdmmc_mem.c,v 1.74 2021/08/03 07:54:39 msaitoh Exp $ */ /* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */ /* @@ -45,7 +45,7 @@ /* Routines for SD/MMC memory cards. */ #include -__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.73 2021/06/13 09:50:02 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.74 2021/08/03 07:54:39 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_sdmmc.h" @@ -1604,8 +1604,8 @@ sdmmc_mem_sd_switch(struct sdmmc_functio cmd.c_datalen = statlen; cmd.c_blklen = statlen; cmd.c_opcode = SD_SEND_SWITCH_FUNC; - cmd.c_arg = - (!!mode << 31) | (function << gsft) | (0x00ff & ~(0xf << gsft)); + cmd.c_arg = ((uint32_t)!!mode << 31) | + (function << gsft) | (0x00ff & ~(0xf << gsft)); cmd.c_flags = SCF_CMD_ADTC | SCF_CMD_READ | SCF_RSP_R1 | SCF_RSP_SPI_R1; if (ISSET(sc->sc_caps, SMC_CAPS_DMA)) cmd.c_dmamap = sc->sc_dmap;
CVS commit: src/usr.bin/make
Module Name:src Committed By: wiz Date: Tue Aug 3 07:12:50 UTC 2021 Modified Files: src/usr.bin/make: make.1 Log Message: Document :On modifiers in more detail. To generate a diff of this commit: cvs rdiff -u -r1.298 -r1.299 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.298 src/usr.bin/make/make.1:1.299 --- src/usr.bin/make/make.1:1.298 Fri Jul 30 22:16:09 2021 +++ src/usr.bin/make/make.1 Tue Aug 3 07:12:50 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.298 2021/07/30 22:16:09 rillig Exp $ +.\" $NetBSD: make.1,v 1.299 2021/08/03 07:12:50 wiz Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd July 30, 2021 +.Dd August 3, 2021 .Dt MAKE 1 .Os .Sh NAME @@ -1235,11 +1235,13 @@ Orders every word in variable alphabetic .It Cm \&:On Orders every word in variable numerically. A number followed by one of -.Ql K , +.Ql k , .Ql M or .Ql G -is multiplied by the appropriate factor. +is multiplied by the appropriate factor (1024 (k), 1048576 (M), or +1073741824 (G)). +Both upper- and lower-case letters are accepted. .It Cm \&:Or Orders every word in variable in reverse alphabetical order. .It Cm \&:Orn
