Module Name: src
Committed By: thorpej
Date: Fri Jun 12 15:34:20 UTC 2020
Modified Files:
src/sys/dev/cardbus: cardbus.c
src/sys/dev/ic: ath.c
Log Message:
pmf-powerdown == false --> pmf-no-powerdown == true
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/ic/ath.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/cardbus/cardbus.c
diff -u src/sys/dev/cardbus/cardbus.c:1.109 src/sys/dev/cardbus/cardbus.c:1.110
--- src/sys/dev/cardbus/cardbus.c:1.109 Sun Nov 10 21:16:34 2019
+++ src/sys/dev/cardbus/cardbus.c Fri Jun 12 15:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus.c,v 1.109 2019/11/10 21:16:34 chs Exp $ */
+/* $NetBSD: cardbus.c,v 1.110 2020/06/12 15:34:20 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998, 1999 and 2000
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.109 2019/11/10 21:16:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.110 2020/06/12 15:34:20 thorpej Exp $");
#include "opt_cardbus.h"
@@ -775,7 +775,7 @@ enable_function(struct cardbus_softc *sc
static void
disable_function(struct cardbus_softc *sc, int function)
{
- bool powerdown;
+ bool no_powerdown;
cardbus_devfunc_t ct;
device_t dv;
int i;
@@ -788,7 +788,7 @@ disable_function(struct cardbus_softc *s
continue;
dv = ct->ct_device;
if (prop_dictionary_get_bool(device_properties(dv),
- "pmf-powerdown", &powerdown) && !powerdown)
+ "pmf-no-powerdown", &no_powerdown) && no_powerdown)
return;
}
/* power-off because no functions are enabled */
Index: src/sys/dev/ic/ath.c
diff -u src/sys/dev/ic/ath.c:1.130 src/sys/dev/ic/ath.c:1.131
--- src/sys/dev/ic/ath.c:1.130 Wed Jan 29 14:09:58 2020
+++ src/sys/dev/ic/ath.c Fri Jun 12 15:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.130 2020/01/29 14:09:58 thorpej Exp $ */
+/* $NetBSD: ath.c,v 1.131 2020/06/12 15:34:20 thorpej Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.130 2020/01/29 14:09:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.131 2020/06/12 15:34:20 thorpej Exp $");
#endif
/*
@@ -307,7 +307,7 @@ ath_attach(u_int16_t devid, struct ath_s
sc->sc_ah = ah;
if (!prop_dictionary_set_bool(device_properties(sc->sc_dev),
- "pmf-powerdown", false))
+ "pmf-no-powerdown", true))
goto bad;
/*
