Module Name: src
Committed By: christos
Date: Mon Jun 21 03:12:54 UTC 2021
Modified Files:
src/sys/dev/i2c: adm1021.c dbcool.c dstemp.c i2c.c lm75.c pcagpio.c
pcf8574.c
Log Message:
fix proplib deprecation
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/i2c/adm1021.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/i2c/dstemp.c
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/i2c/lm75.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/i2c/pcagpio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/i2c/pcf8574.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/i2c/adm1021.c
diff -u src/sys/dev/i2c/adm1021.c:1.28 src/sys/dev/i2c/adm1021.c:1.29
--- src/sys/dev/i2c/adm1021.c:1.28 Tue Jun 15 00:41:01 2021
+++ src/sys/dev/i2c/adm1021.c Sun Jun 20 23:12:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: adm1021.c,v 1.28 2021/06/15 04:41:01 mlelstv Exp $ */
+/* $NetBSD: adm1021.c,v 1.29 2021/06/21 03:12:54 christos Exp $ */
/* $OpenBSD: adm1021.c,v 1.27 2007/06/24 05:34:35 dlg Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.28 2021/06/15 04:41:01 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.29 2021/06/21 03:12:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -409,11 +409,11 @@ admtemp_attach(device_t parent, device_t
sc->sc_sensor[ADMTEMP_EXT].flags =
ENVSYS_FMONLIMITS | ENVSYS_FHAS_ENTROPY;
- if (prop_dictionary_get_cstring_nocopy(sc->sc_prop, "s00", &desc)) {
+ if (prop_dictionary_get_string(sc->sc_prop, "s00", &desc)) {
strncpy(iname, desc, 64);
}
- if (prop_dictionary_get_cstring_nocopy(sc->sc_prop, "s01", &desc)) {
+ if (prop_dictionary_get_string(sc->sc_prop, "s01", &desc)) {
strncpy(ename, desc, 64);
}
Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.61 src/sys/dev/i2c/dbcool.c:1.62
--- src/sys/dev/i2c/dbcool.c:1.61 Tue Jun 15 00:39:49 2021
+++ src/sys/dev/i2c/dbcool.c Sun Jun 20 23:12:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.61 2021/06/15 04:39:49 mlelstv Exp $ */
+/* $NetBSD: dbcool.c,v 1.62 2021/06/21 03:12:54 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.61 2021/06/15 04:39:49 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.62 2021/06/21 03:12:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1697,7 +1697,7 @@ dbcool_attach_sensor(struct dbcool_softc
name_index = sc->sc_dc.dc_chip->table[idx].name_index;
snprintf(name, 7, "s%02x", sc->sc_dc.dc_chip->table[idx].reg.val_reg);
- if (prop_dictionary_get_cstring_nocopy(sc->sc_prop, name, &desc)) {
+ if (prop_dictionary_get_string(sc->sc_prop, name, &desc)) {
strlcpy(sc->sc_sensor[idx].desc, desc,
sizeof(sc->sc_sensor[idx].desc));
} else {
Index: src/sys/dev/i2c/dstemp.c
diff -u src/sys/dev/i2c/dstemp.c:1.13 src/sys/dev/i2c/dstemp.c:1.14
--- src/sys/dev/i2c/dstemp.c:1.13 Tue Jun 15 00:41:01 2021
+++ src/sys/dev/i2c/dstemp.c Sun Jun 20 23:12:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dstemp.c,v 1.13 2021/06/15 04:41:01 mlelstv Exp $ */
+/* $NetBSD: dstemp.c,v 1.14 2021/06/21 03:12:54 christos Exp $ */
/*-
* Copyright (c) 2018 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dstemp.c,v 1.13 2021/06/15 04:41:01 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dstemp.c,v 1.14 2021/06/21 03:12:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -126,9 +126,9 @@ dstemp_attach(device_t parent, device_t
sc->sc_sensor_temp.state = ENVSYS_SINVALID;
sc->sc_sensor_temp.flags = ENVSYS_FHAS_ENTROPY;
- if (prop_dictionary_get_cstring_nocopy(sc->sc_prop, "s00", &desc)) {
+ if (prop_dictionary_get_string(sc->sc_prop, "s00", &desc)) {
strncpy(name, desc, 64);
- } else if (prop_dictionary_get_cstring_nocopy(sc->sc_prop, "saa", &desc)) {
+ } else if (prop_dictionary_get_string(sc->sc_prop, "saa", &desc)) {
strncpy(name, desc, 64);
}
Index: src/sys/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.78 src/sys/dev/i2c/i2c.c:1.79
--- src/sys/dev/i2c/i2c.c:1.78 Sat Apr 24 19:36:54 2021
+++ src/sys/dev/i2c/i2c.c Sun Jun 20 23:12:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c.c,v 1.78 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: i2c.c,v 1.79 2021/06/21 03:12:54 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.78 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.79 2021/06/21 03:12:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -452,7 +452,7 @@ iic_attach(device_t parent, device_t sel
for (i = 0; i < count; i++) {
dev = prop_array_get(child_devices, i);
if (!dev) continue;
- if (!prop_dictionary_get_cstring_nocopy(
+ if (!prop_dictionary_get_string(
dev, "name", &name)) {
/* "name" property is optional. */
name = NULL;
Index: src/sys/dev/i2c/lm75.c
diff -u src/sys/dev/i2c/lm75.c:1.44 src/sys/dev/i2c/lm75.c:1.45
--- src/sys/dev/i2c/lm75.c:1.44 Sun Jun 13 05:46:04 2021
+++ src/sys/dev/i2c/lm75.c Sun Jun 20 23:12:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lm75.c,v 1.44 2021/06/13 09:46:04 mlelstv Exp $ */
+/* $NetBSD: lm75.c,v 1.45 2021/06/21 03:12:54 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.44 2021/06/13 09:46:04 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.45 2021/06/21 03:12:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -290,7 +290,7 @@ lmtemp_attach(device_t parent, device_t
ia->ia_name? ia->ia_name : device_xname(self),
sizeof(sc->sc_sensor.desc));
- if (prop_dictionary_get_cstring_nocopy(sc->sc_prop, "s00", &desc)) {
+ if (prop_dictionary_get_string(sc->sc_prop, "s00", &desc)) {
strncpy(name, desc, 64);
}
Index: src/sys/dev/i2c/pcagpio.c
diff -u src/sys/dev/i2c/pcagpio.c:1.10 src/sys/dev/i2c/pcagpio.c:1.11
--- src/sys/dev/i2c/pcagpio.c:1.10 Tue Jan 26 21:29:48 2021
+++ src/sys/dev/i2c/pcagpio.c Sun Jun 20 23:12:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcagpio.c,v 1.10 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: pcagpio.c,v 1.11 2021/06/21 03:12:54 christos Exp $ */
/*-
* Copyright (c) 2020 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcagpio.c,v 1.10 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcagpio.c,v 1.11 2021/06/21 03:12:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,7 +191,7 @@ pcagpio_attach(device_t parent, device_t
for (i = 0; i < prop_array_count(pins); i++) {
nptr = NULL;
pin = prop_array_get(pins, i);
- ok &= prop_dictionary_get_cstring_nocopy(pin, "name",
+ ok &= prop_dictionary_get_string(pin, "name",
&nptr);
ok &= prop_dictionary_get_uint32(pin, "pin", &num);
ok &= prop_dictionary_get_bool( pin, "active_high",
Index: src/sys/dev/i2c/pcf8574.c
diff -u src/sys/dev/i2c/pcf8574.c:1.9 src/sys/dev/i2c/pcf8574.c:1.10
--- src/sys/dev/i2c/pcf8574.c:1.9 Tue Jan 26 21:29:48 2021
+++ src/sys/dev/i2c/pcf8574.c Sun Jun 20 23:12:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8574.c,v 1.9 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: pcf8574.c,v 1.10 2021/06/21 03:12:54 christos Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcf8574.c,v 1.9 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcf8574.c,v 1.10 2021/06/21 03:12:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -175,7 +175,7 @@ pcf8574_attach(device_t parent, device_t
for (i = 0; i < prop_array_count(pins); i++) {
pin = prop_array_get(pins, i);
- ok &= prop_dictionary_get_cstring_nocopy(pin, "name", &nptr);
+ ok &= prop_dictionary_get_string(pin, "name", &nptr);
ok &= prop_dictionary_get_uint32(pin, "pin", &num);
ok &= prop_dictionary_get_bool(pin, "active_high", &act);
/* optional default state */
