Module Name: src
Committed By: thorpej
Date: Mon Jun 8 20:18:13 UTC 2020
Modified Files:
src/sys/dev/sysmon: swsensor.c sysmon_envsys.c sysmon_envsys_util.c
sysmon_power.c
Log Message:
Update for proplib(3) API changes.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/sysmon/swsensor.c
cvs rdiff -u -r1.145 -r1.146 src/sys/dev/sysmon/sysmon_envsys.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/sysmon/sysmon_envsys_util.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/sysmon/sysmon_power.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/sysmon/swsensor.c
diff -u src/sys/dev/sysmon/swsensor.c:1.16 src/sys/dev/sysmon/swsensor.c:1.17
--- src/sys/dev/sysmon/swsensor.c:1.16 Mon Mar 16 21:20:09 2020
+++ src/sys/dev/sysmon/swsensor.c Mon Jun 8 20:18:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: swsensor.c,v 1.16 2020/03/16 21:20:09 pgoyette Exp $ */
+/* $NetBSD: swsensor.c,v 1.17 2020/06/08 20:18:13 thorpej Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swsensor.c,v 1.16 2020/03/16 21:20:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swsensor.c,v 1.17 2020/06/08 20:18:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -212,7 +212,7 @@ swsensor_init(void *arg)
return ENOMEM;
while ((obj = prop_object_iterator_next(iter)) != NULL) {
- key = prop_dictionary_keysym_cstring_nocopy(obj);
+ key = prop_dictionary_keysym_value(obj);
po = prop_dictionary_get_keysym(pd, obj);
type = prop_object_type(po);
if (type == PROP_TYPE_NUMBER)
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.145 src/sys/dev/sysmon/sysmon_envsys.c:1.146
--- src/sys/dev/sysmon/sysmon_envsys.c:1.145 Mon Jun 1 21:54:47 2020
+++ src/sys/dev/sysmon/sysmon_envsys.c Mon Jun 8 20:18:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.145 2020/06/01 21:54:47 riastradh Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.146 2020/06/08 20:18:13 thorpej Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.145 2020/06/01 21:54:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.146 2020/06/08 20:18:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -267,7 +267,7 @@ sysmonioctl_envsys(dev_t dev, u_long cmd
return EINVAL;
}
- devname = prop_dictionary_keysym_cstring_nocopy(obj);
+ devname = prop_dictionary_keysym_value(obj);
DPRINTF(("%s: processing the '%s' array requests\n",
__func__, devname));
@@ -950,9 +950,9 @@ sysmon_envsys_destroy_plist(prop_array_t
DPRINTFOBJ(("%s: iterating over dictionary\n", __func__));
while ((obj = prop_object_iterator_next(iter2)) != NULL) {
DPRINTFOBJ(("%s: obj=%s\n", __func__,
- prop_dictionary_keysym_cstring_nocopy(obj)));
+ prop_dictionary_keysym_value(obj)));
prop_dictionary_remove(dict,
- prop_dictionary_keysym_cstring_nocopy(obj));
+ prop_dictionary_keysym_value(obj));
prop_object_iterator_reset(iter2);
}
prop_object_iterator_release(iter2);
@@ -1848,7 +1848,7 @@ sme_userset_dictionary(struct sysmon_env
if (obj1 && prop_object_type(obj1) == PROP_TYPE_NUMBER) {
targetfound = true;
refresh_timo =
- prop_number_unsigned_integer_value(obj1);
+ prop_number_unsigned_value(obj1);
if (refresh_timo < 1)
error = EINVAL;
else {
Index: src/sys/dev/sysmon/sysmon_envsys_util.c
diff -u src/sys/dev/sysmon/sysmon_envsys_util.c:1.5 src/sys/dev/sysmon/sysmon_envsys_util.c:1.6
--- src/sys/dev/sysmon/sysmon_envsys_util.c:1.5 Fri Nov 16 08:00:16 2007
+++ src/sys/dev/sysmon/sysmon_envsys_util.c Mon Jun 8 20:18:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_util.c,v 1.5 2007/11/16 08:00:16 xtraeme Exp $ */
+/* $NetBSD: sysmon_envsys_util.c,v 1.6 2020/06/08 20:18:13 thorpej Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_util.c,v 1.5 2007/11/16 08:00:16 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_util.c,v 1.6 2020/06/08 20:18:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -78,7 +78,7 @@ sme_sensor_upint32(prop_dictionary_t dic
obj = prop_dictionary_get(dict, key);
if (obj) {
- if (!prop_number_equals_integer(obj, val)) {
+ if (!prop_number_equals_signed(obj, val)) {
if (!prop_dictionary_set_int32(dict, key, val)) {
DPRINTF(("%s: (up) set_int32 %s:%d\n",
__func__, key, val));
@@ -105,7 +105,7 @@ sme_sensor_upuint32(prop_dictionary_t di
obj = prop_dictionary_get(dict, key);
if (obj) {
- if (!prop_number_equals_unsigned_integer(obj, val)) {
+ if (!prop_number_equals_unsigned(obj, val)) {
if (!prop_dictionary_set_uint32(dict, key, val)) {
DPRINTF(("%s: (up) set_uint32 %s:%d\n",
__func__, key, val));
Index: src/sys/dev/sysmon/sysmon_power.c
diff -u src/sys/dev/sysmon/sysmon_power.c:1.62 src/sys/dev/sysmon/sysmon_power.c:1.63
--- src/sys/dev/sysmon/sysmon_power.c:1.62 Wed Jan 1 22:57:17 2020
+++ src/sys/dev/sysmon/sysmon_power.c Mon Jun 8 20:18:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.62 2020/01/01 22:57:17 thorpej Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.63 2020/06/08 20:18:13 thorpej Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.62 2020/01/01 22:57:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.63 2020/06/08 20:18:13 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -792,7 +792,7 @@ sysmon_power_destroy_dictionary(struct p
while ((obj = prop_object_iterator_next(iter)) != NULL) {
prop_dictionary_remove(ped->dict,
- prop_dictionary_keysym_cstring_nocopy(obj));
+ prop_dictionary_keysym_value(obj));
prop_object_iterator_reset(iter);
}
