Module Name: src
Committed By: thorpej
Date: Mon Apr 5 01:25:55 UTC 2021
Modified Files:
src/sys/arch/hpcmips/dev [thorpej-cfargs]: plum.c
src/sys/arch/hpcmips/tx [thorpej-cfargs]: txcsbus.c txsim.c
src/sys/arch/hpcmips/vr [thorpej-cfargs]: vrc4173bcu.c vrip.c
Log Message:
Decorate the problematic config_probe() calls (non-boolean return value)
with XXX.
To generate a diff of this commit:
cvs rdiff -u -r1.18.2.6 -r1.18.2.7 src/sys/arch/hpcmips/dev/plum.c
cvs rdiff -u -r1.22.52.6 -r1.22.52.7 src/sys/arch/hpcmips/tx/txcsbus.c
cvs rdiff -u -r1.17.52.6 -r1.17.52.7 src/sys/arch/hpcmips/tx/txsim.c
cvs rdiff -u -r1.24.28.6 -r1.24.28.7 src/sys/arch/hpcmips/vr/vrc4173bcu.c
cvs rdiff -u -r1.37.52.6 -r1.37.52.7 src/sys/arch/hpcmips/vr/vrip.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/hpcmips/dev/plum.c
diff -u src/sys/arch/hpcmips/dev/plum.c:1.18.2.6 src/sys/arch/hpcmips/dev/plum.c:1.18.2.7
--- src/sys/arch/hpcmips/dev/plum.c:1.18.2.6 Mon Apr 5 00:48:49 2021
+++ src/sys/arch/hpcmips/dev/plum.c Mon Apr 5 01:25:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: plum.c,v 1.18.2.6 2021/04/05 00:48:49 thorpej Exp $ */
+/* $NetBSD: plum.c,v 1.18.2.7 2021/04/05 01:25:55 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.18.2.6 2021/04/05 00:48:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.18.2.7 2021/04/05 01:25:55 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -161,7 +161,7 @@ plum_search(device_t parent, cfdata_t cf
pa.pa_memt = sc->sc_csmemt;
pa.pa_irq = sc->sc_irq;
- if (config_probe(parent, cf, &pa) == sc->sc_pri) {
+ if (/*XXX*/config_probe(parent, cf, &pa) == sc->sc_pri) {
config_attach(parent, cf, &pa, plum_print, CFARG_EOL);
}
Index: src/sys/arch/hpcmips/tx/txcsbus.c
diff -u src/sys/arch/hpcmips/tx/txcsbus.c:1.22.52.6 src/sys/arch/hpcmips/tx/txcsbus.c:1.22.52.7
--- src/sys/arch/hpcmips/tx/txcsbus.c:1.22.52.6 Mon Apr 5 00:48:49 2021
+++ src/sys/arch/hpcmips/tx/txcsbus.c Mon Apr 5 01:25:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: txcsbus.c,v 1.22.52.6 2021/04/05 00:48:49 thorpej Exp $ */
+/* $NetBSD: txcsbus.c,v 1.22.52.7 2021/04/05 01:25:55 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: txcsbus.c,v 1.22.52.6 2021/04/05 00:48:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: txcsbus.c,v 1.22.52.7 2021/04/05 01:25:55 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -238,7 +238,7 @@ txcsbus_search(device_t parent, cfdata_t
ca.ca_irq2 = cf->cf_loc[TXCSBUSCF_IRQ2];
ca.ca_irq3 = cf->cf_loc[TXCSBUSCF_IRQ3];
- if (config_probe(parent, cf, &ca) == sc->sc_pri) {
+ if (/*XXX*/config_probe(parent, cf, &ca) == sc->sc_pri) {
config_attach(parent, cf, &ca, txcsbus_print, CFARG_EOL);
}
Index: src/sys/arch/hpcmips/tx/txsim.c
diff -u src/sys/arch/hpcmips/tx/txsim.c:1.17.52.6 src/sys/arch/hpcmips/tx/txsim.c:1.17.52.7
--- src/sys/arch/hpcmips/tx/txsim.c:1.17.52.6 Mon Apr 5 00:48:49 2021
+++ src/sys/arch/hpcmips/tx/txsim.c Mon Apr 5 01:25:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: txsim.c,v 1.17.52.6 2021/04/05 00:48:49 thorpej Exp $ */
+/* $NetBSD: txsim.c,v 1.17.52.7 2021/04/05 01:25:55 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: txsim.c,v 1.17.52.6 2021/04/05 00:48:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: txsim.c,v 1.17.52.7 2021/04/05 01:25:55 thorpej Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -126,7 +126,7 @@ txsim_search(device_t parent, cfdata_t c
ta.ta_tc = tx_conf_get_tag();
- if (config_probe(parent, cf, &ta) == sc->sc_pri)
+ if (/*XXX*/config_probe(parent, cf, &ta) == sc->sc_pri)
config_attach(parent, cf, &ta, txsim_print, CFARG_EOL);
return (0);
Index: src/sys/arch/hpcmips/vr/vrc4173bcu.c
diff -u src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.24.28.6 src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.24.28.7
--- src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.24.28.6 Mon Apr 5 00:48:49 2021
+++ src/sys/arch/hpcmips/vr/vrc4173bcu.c Mon Apr 5 01:25:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vrc4173bcu.c,v 1.24.28.6 2021/04/05 00:48:49 thorpej Exp $ */
+/* $NetBSD: vrc4173bcu.c,v 1.24.28.7 2021/04/05 01:25:55 thorpej Exp $ */
/*-
* Copyright (c) 2001,2002 Enami Tsugutomo.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrc4173bcu.c,v 1.24.28.6 2021/04/05 00:48:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrc4173bcu.c,v 1.24.28.7 2021/04/05 01:25:55 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -469,7 +469,7 @@ vrc4173bcu_search(device_t parent, cfdat
va.va_cc = sc->sc_chipset.vc_cc;
va.va_ac = sc->sc_chipset.vc_ac;
va.va_dc = sc->sc_chipset.vc_dc;
- if ((config_probe(parent, cf, &va) == sc->sc_pri))
+ if (/*XXX*/config_probe(parent, cf, &va) == sc->sc_pri)
config_attach(parent, cf, &va, vrc4173bcu_print, CFARG_EOL);
return (0);
Index: src/sys/arch/hpcmips/vr/vrip.c
diff -u src/sys/arch/hpcmips/vr/vrip.c:1.37.52.6 src/sys/arch/hpcmips/vr/vrip.c:1.37.52.7
--- src/sys/arch/hpcmips/vr/vrip.c:1.37.52.6 Mon Apr 5 00:48:49 2021
+++ src/sys/arch/hpcmips/vr/vrip.c Mon Apr 5 01:25:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vrip.c,v 1.37.52.6 2021/04/05 00:48:49 thorpej Exp $ */
+/* $NetBSD: vrip.c,v 1.37.52.7 2021/04/05 01:25:55 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2002
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.37.52.6 2021/04/05 00:48:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.37.52.7 2021/04/05 01:25:55 thorpej Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -303,7 +303,7 @@ vrip_search(device_t parent, cfdata_t cf
va.va_cc = sc->sc_chipset.vc_cc;
va.va_ac = sc->sc_chipset.vc_ac;
va.va_dc = sc->sc_chipset.vc_dc;
- if ((config_probe(parent, cf, &va) == sc->sc_pri))
+ if (/*XXX*/config_probe(parent, cf, &va) == sc->sc_pri)
config_attach(parent, cf, &va, vrip_print, CFARG_EOL);
return (0);