Module Name: src
Committed By: thorpej
Date: Thu Jun 11 02:39:31 UTC 2020
Modified Files:
src/sys/dev/acpi: acpi_i2c.c
src/sys/dev/bluetooth: bthidev.c bthub.c btmagic.c btsco.c
src/sys/dev/fdt: fdtbus.c
src/sys/dev/hdaudio: hdafg.c hdaudio.c
src/sys/dev/i2c: i2c.c
src/sys/dev/ofw: ofw_subr.c
src/sys/dev/pci: if_ixl.c if_tl.c if_wm.c
src/sys/dev/spi: spi.c
src/sys/dev/sysmon: swsensor.c sysmon_envsys.c sysmon_envsys_util.c
sysmon_power.c
src/sys/dev/usb: usb_subr.c
src/sys/dev/wscons: wsdisplay_util.c
src/sys/dev/wsfb: genfb.c
Log Message:
Update for proplib(3) API changes.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpi_i2c.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/bluetooth/bthidev.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/bluetooth/bthub.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/bluetooth/btmagic.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/bluetooth/btsco.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/fdt/fdtbus.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/hdaudio/hdafg.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/hdaudio/hdaudio.c
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ofw/ofw_subr.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/pci/if_ixl.c
cvs rdiff -u -r1.120 -r1.121 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.676 -r1.677 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/spi/spi.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/sysmon/swsensor.c
cvs rdiff -u -r1.146 -r1.147 src/sys/dev/sysmon/sysmon_envsys.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sysmon/sysmon_envsys_util.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.247 -r1.248 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/wscons/wsdisplay_util.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/wsfb/genfb.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/acpi/acpi_i2c.c
diff -u src/sys/dev/acpi/acpi_i2c.c:1.6 src/sys/dev/acpi/acpi_i2c.c:1.7
--- src/sys/dev/acpi/acpi_i2c.c:1.6 Mon Jun 8 20:21:56 2020
+++ src/sys/dev/acpi/acpi_i2c.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_i2c.c,v 1.6 2020/06/08 20:21:56 thorpej Exp $ */
+/* $NetBSD: acpi_i2c.c,v 1.7 2020/06/11 02:39:30 thorpej Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.6 2020/06/08 20:21:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.7 2020/06/11 02:39:30 thorpej Exp $");
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
@@ -203,7 +203,7 @@ acpi_enter_i2c_device(struct acpi_devnod
if (i2c_id != NULL) {
if (i2c_id->compat != NULL) {
prop_data_t data;
- data = prop_data_create_data(i2c_id->compat,
+ data = prop_data_create_copy(i2c_id->compat,
i2c_id->compatlen);
prop_dictionary_set(dev, "compatible", data);
prop_object_release(data);
Index: src/sys/dev/bluetooth/bthidev.c
diff -u src/sys/dev/bluetooth/bthidev.c:1.31 src/sys/dev/bluetooth/bthidev.c:1.32
--- src/sys/dev/bluetooth/bthidev.c:1.31 Thu Nov 15 23:01:45 2018
+++ src/sys/dev/bluetooth/bthidev.c Thu Jun 11 02:39:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bthidev.c,v 1.31 2018/11/15 23:01:45 jakllsch Exp $ */
+/* $NetBSD: bthidev.c,v 1.32 2020/06/11 02:39:31 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.31 2018/11/15 23:01:45 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.32 2020/06/11 02:39:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -172,7 +172,7 @@ bthidev_match(device_t self, cfdata_t cf
prop_object_t obj;
obj = prop_dictionary_get(dict, BTDEVservice);
- if (prop_string_equals_cstring(obj, "HID"))
+ if (prop_string_equals_string(obj, "HID"))
return 1;
return 0;
@@ -216,24 +216,24 @@ bthidev_attach(device_t parent, device_t
* extract config from proplist
*/
obj = prop_dictionary_get(dict, BTDEVladdr);
- bdaddr_copy(&sc->sc_laddr, prop_data_data_nocopy(obj));
+ bdaddr_copy(&sc->sc_laddr, prop_data_value(obj));
obj = prop_dictionary_get(dict, BTDEVraddr);
- bdaddr_copy(&sc->sc_raddr, prop_data_data_nocopy(obj));
+ bdaddr_copy(&sc->sc_raddr, prop_data_value(obj));
obj = prop_dictionary_get(dict, BTDEVvendor);
- vendor = (int)prop_number_integer_value(obj);
+ vendor = (int)prop_number_signed_value(obj);
obj = prop_dictionary_get(dict, BTDEVproduct);
- product = (int)prop_number_integer_value(obj);
+ product = (int)prop_number_signed_value(obj);
obj = prop_dictionary_get(dict, BTDEVmode);
if (prop_object_type(obj) == PROP_TYPE_STRING) {
- if (prop_string_equals_cstring(obj, BTDEVauth))
+ if (prop_string_equals_string(obj, BTDEVauth))
sockopt_setint(&sc->sc_mode, L2CAP_LM_AUTH);
- else if (prop_string_equals_cstring(obj, BTDEVencrypt))
+ else if (prop_string_equals_string(obj, BTDEVencrypt))
sockopt_setint(&sc->sc_mode, L2CAP_LM_ENCRYPT);
- else if (prop_string_equals_cstring(obj, BTDEVsecure))
+ else if (prop_string_equals_string(obj, BTDEVsecure))
sockopt_setint(&sc->sc_mode, L2CAP_LM_SECURE);
else {
aprint_error(" unknown %s\n", BTDEVmode);
@@ -241,13 +241,13 @@ bthidev_attach(device_t parent, device_t
}
aprint_verbose(" %s %s", BTDEVmode,
- prop_string_cstring_nocopy(obj));
+ prop_string_value(obj));
} else
sockopt_setint(&sc->sc_mode, 0);
obj = prop_dictionary_get(dict, BTHIDEVcontrolpsm);
if (prop_object_type(obj) == PROP_TYPE_NUMBER) {
- sc->sc_ctlpsm = prop_number_integer_value(obj);
+ sc->sc_ctlpsm = prop_number_signed_value(obj);
if (L2CAP_PSM_INVALID(sc->sc_ctlpsm)) {
aprint_error(" invalid %s\n", BTHIDEVcontrolpsm);
return;
@@ -256,7 +256,7 @@ bthidev_attach(device_t parent, device_t
obj = prop_dictionary_get(dict, BTHIDEVinterruptpsm);
if (prop_object_type(obj) == PROP_TYPE_NUMBER) {
- sc->sc_intpsm = prop_number_integer_value(obj);
+ sc->sc_intpsm = prop_number_signed_value(obj);
if (L2CAP_PSM_INVALID(sc->sc_intpsm)) {
aprint_error(" invalid %s\n", BTHIDEVinterruptpsm);
return;
@@ -266,7 +266,7 @@ bthidev_attach(device_t parent, device_t
obj = prop_dictionary_get(dict, BTHIDEVdescriptor);
if (prop_object_type(obj) == PROP_TYPE_DATA) {
dlen = prop_data_size(obj);
- desc = prop_data_data_nocopy(obj);
+ desc = prop_data_value(obj);
} else {
aprint_error(" no %s\n", BTHIDEVdescriptor);
return;
Index: src/sys/dev/bluetooth/bthub.c
diff -u src/sys/dev/bluetooth/bthub.c:1.23 src/sys/dev/bluetooth/bthub.c:1.24
--- src/sys/dev/bluetooth/bthub.c:1.23 Mon Jun 8 20:20:54 2020
+++ src/sys/dev/bluetooth/bthub.c Thu Jun 11 02:39:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bthub.c,v 1.23 2020/06/08 20:20:54 thorpej Exp $ */
+/* $NetBSD: bthub.c,v 1.24 2020/06/11 02:39:31 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.23 2020/06/08 20:20:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.24 2020/06/11 02:39:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -205,7 +205,7 @@ bthub_pioctl(dev_t devno, unsigned long
/* validate remote address */
raddr = prop_dictionary_get(dict, BTDEVraddr);
if (prop_data_size(raddr) != sizeof(bdaddr_t)
- || bdaddr_any(prop_data_data_nocopy(raddr)))
+ || bdaddr_any(prop_data_value(raddr)))
return EINVAL;
/* validate service name */
@@ -269,11 +269,11 @@ bthub_print(void *aux, const char *pnp)
if (pnp != NULL) {
obj = prop_dictionary_get(dict, BTDEVtype);
aprint_normal("%s: %s '%s',", pnp, BTDEVtype,
- prop_string_cstring_nocopy(obj));
+ prop_string_value(obj));
}
obj = prop_dictionary_get(dict, BTDEVraddr);
- raddr = prop_data_data_nocopy(obj);
+ raddr = prop_data_value(obj);
aprint_verbose(" %s %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
BTDEVraddr,
Index: src/sys/dev/bluetooth/btmagic.c
diff -u src/sys/dev/bluetooth/btmagic.c:1.18 src/sys/dev/bluetooth/btmagic.c:1.19
--- src/sys/dev/bluetooth/btmagic.c:1.18 Mon Sep 3 16:29:30 2018
+++ src/sys/dev/bluetooth/btmagic.c Thu Jun 11 02:39:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: btmagic.c,v 1.18 2018/09/03 16:29:30 riastradh Exp $ */
+/* $NetBSD: btmagic.c,v 1.19 2020/06/11 02:39:31 thorpej Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.18 2018/09/03 16:29:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btmagic.c,v 1.19 2020/06/11 02:39:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -311,18 +311,18 @@ btmagic_attach(device_t parent, device_t
* extract config from proplist
*/
obj = prop_dictionary_get(aux, BTDEVladdr);
- bdaddr_copy(&sc->sc_laddr, prop_data_data_nocopy(obj));
+ bdaddr_copy(&sc->sc_laddr, prop_data_value(obj));
obj = prop_dictionary_get(aux, BTDEVraddr);
- bdaddr_copy(&sc->sc_raddr, prop_data_data_nocopy(obj));
+ bdaddr_copy(&sc->sc_raddr, prop_data_value(obj));
obj = prop_dictionary_get(aux, BTDEVmode);
if (prop_object_type(obj) == PROP_TYPE_STRING) {
- if (prop_string_equals_cstring(obj, BTDEVauth))
+ if (prop_string_equals_string(obj, BTDEVauth))
sockopt_setint(&sc->sc_mode, L2CAP_LM_AUTH);
- else if (prop_string_equals_cstring(obj, BTDEVencrypt))
+ else if (prop_string_equals_string(obj, BTDEVencrypt))
sockopt_setint(&sc->sc_mode, L2CAP_LM_ENCRYPT);
- else if (prop_string_equals_cstring(obj, BTDEVsecure))
+ else if (prop_string_equals_string(obj, BTDEVsecure))
sockopt_setint(&sc->sc_mode, L2CAP_LM_SECURE);
else {
aprint_error(" unknown %s\n", BTDEVmode);
@@ -330,7 +330,7 @@ btmagic_attach(device_t parent, device_t
}
aprint_verbose(" %s %s", BTDEVmode,
- prop_string_cstring_nocopy(obj));
+ prop_string_value(obj));
} else
sockopt_setint(&sc->sc_mode, 0);
Index: src/sys/dev/bluetooth/btsco.c
diff -u src/sys/dev/bluetooth/btsco.c:1.41 src/sys/dev/bluetooth/btsco.c:1.42
--- src/sys/dev/bluetooth/btsco.c:1.41 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/bluetooth/btsco.c Thu Jun 11 02:39:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: btsco.c,v 1.41 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: btsco.c,v 1.42 2020/06/11 02:39:31 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.41 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.42 2020/06/11 02:39:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -258,10 +258,10 @@ btsco_match(device_t self, cfdata_t cfda
prop_object_t obj;
obj = prop_dictionary_get(dict, BTDEVservice);
- if (prop_string_equals_cstring(obj, "HSET"))
+ if (prop_string_equals_string(obj, "HSET"))
return 1;
- if (prop_string_equals_cstring(obj, "HF"))
+ if (prop_string_equals_string(obj, "HF"))
return 1;
return 0;
@@ -288,25 +288,25 @@ btsco_attach(device_t parent, device_t s
* copy in our configuration info
*/
obj = prop_dictionary_get(dict, BTDEVladdr);
- bdaddr_copy(&sc->sc_laddr, prop_data_data_nocopy(obj));
+ bdaddr_copy(&sc->sc_laddr, prop_data_value(obj));
obj = prop_dictionary_get(dict, BTDEVraddr);
- bdaddr_copy(&sc->sc_raddr, prop_data_data_nocopy(obj));
+ bdaddr_copy(&sc->sc_raddr, prop_data_value(obj));
obj = prop_dictionary_get(dict, BTDEVservice);
- if (prop_string_equals_cstring(obj, "HF")) {
+ if (prop_string_equals_string(obj, "HF")) {
sc->sc_flags |= BTSCO_LISTEN;
aprint_verbose(" listen mode");
}
obj = prop_dictionary_get(dict, BTSCOchannel);
if (prop_object_type(obj) != PROP_TYPE_NUMBER
- || prop_number_integer_value(obj) < RFCOMM_CHANNEL_MIN
- || prop_number_integer_value(obj) > RFCOMM_CHANNEL_MAX) {
+ || prop_number_signed_value(obj) < RFCOMM_CHANNEL_MIN
+ || prop_number_signed_value(obj) > RFCOMM_CHANNEL_MAX) {
aprint_error(" invalid %s", BTSCOchannel);
return;
}
- sc->sc_channel = prop_number_integer_value(obj);
+ sc->sc_channel = prop_number_signed_value(obj);
aprint_verbose(" channel %d", sc->sc_channel);
aprint_normal("\n");
Index: src/sys/dev/fdt/fdtbus.c
diff -u src/sys/dev/fdt/fdtbus.c:1.33 src/sys/dev/fdt/fdtbus.c:1.34
--- src/sys/dev/fdt/fdtbus.c:1.33 Thu Feb 20 01:35:55 2020
+++ src/sys/dev/fdt/fdtbus.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.33 2020/02/20 01:35:55 jmcneill Exp $ */
+/* $NetBSD: fdtbus.c,v 1.34 2020/06/11 02:39:30 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.33 2020/02/20 01:35:55 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.34 2020/06/11 02:39:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -406,7 +406,7 @@ fdt_scan(struct fdt_softc *sc, int pass)
if (node->n_dev) {
dict = device_properties(node->n_dev);
if (fdtbus_get_path(node->n_phandle, buf, sizeof(buf)))
- prop_dictionary_set_cstring(dict, "fdt-path", buf);
+ prop_dictionary_set_string(dict, "fdt-path", buf);
}
}
}
Index: src/sys/dev/hdaudio/hdafg.c
diff -u src/sys/dev/hdaudio/hdafg.c:1.22 src/sys/dev/hdaudio/hdafg.c:1.23
--- src/sys/dev/hdaudio/hdafg.c:1.22 Sun Apr 19 04:13:09 2020
+++ src/sys/dev/hdaudio/hdafg.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.22 2020/04/19 04:13:09 isaki Exp $ */
+/* $NetBSD: hdafg.c,v 1.23 2020/06/11 02:39:30 thorpej Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk>
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.22 2020/04/19 04:13:09 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.23 2020/06/11 02:39:30 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -4371,7 +4371,7 @@ hdafg_widget_info(void *opaque, prop_dic
wcap = hda_get_wparam(w, PIN_CAPABILITIES);
config = hdaudio_command(sc->sc_codec, w->w_nid,
CORB_GET_CONFIGURATION_DEFAULT, 0);
- prop_dictionary_set_cstring_nocopy(response, "name", w->w_name);
+ prop_dictionary_set_string_nocopy(response, "name", w->w_name);
prop_dictionary_set_bool(response, "enable", w->w_enable);
prop_dictionary_set_uint8(response, "nid", w->w_nid);
prop_dictionary_set_uint8(response, "type", w->w_type);
@@ -4383,8 +4383,8 @@ hdafg_widget_info(void *opaque, prop_dic
for (i = 0; i < w->w_nconns; i++) {
if (w->w_conns[i] == 0)
continue;
- prop_array_add(connlist,
- prop_number_create_unsigned_integer(w->w_conns[i]));
+ prop_array_add_and_rel(connlist,
+ prop_number_create_unsigned(w->w_conns[i]));
}
prop_dictionary_set(response, "connlist", connlist);
prop_object_release(connlist);
Index: src/sys/dev/hdaudio/hdaudio.c
diff -u src/sys/dev/hdaudio/hdaudio.c:1.10 src/sys/dev/hdaudio/hdaudio.c:1.11
--- src/sys/dev/hdaudio/hdaudio.c:1.10 Sat Feb 8 00:14:06 2020
+++ src/sys/dev/hdaudio/hdaudio.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.10 2020/02/08 00:14:06 jmcneill Exp $ */
+/* $NetBSD: hdaudio.c,v 1.11 2020/06/11 02:39:30 thorpej Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.10 2020/02/08 00:14:06 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.11 2020/06/11 02:39:30 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1351,7 +1351,7 @@ hdaudioioctl_fgrp_info(struct hdaudio_so
dict = prop_dictionary_create();
if (dict == NULL)
return ENOMEM;
- prop_dictionary_set_cstring_nocopy(dict,
+ prop_dictionary_set_string_nocopy(dict,
"type", hdaudioioctl_fgrp_to_cstr(fg->fg_type));
prop_dictionary_set_int16(dict, "nid", fg->fg_nid);
prop_dictionary_set_int16(dict, "codecid", codecid);
@@ -1362,10 +1362,10 @@ hdaudioioctl_fgrp_info(struct hdaudio_so
prop_dictionary_set_uint32(dict, "subsystem-id",
sc->sc_subsystem);
if (fg->fg_device)
- prop_dictionary_set_cstring(dict, "device",
+ prop_dictionary_set_string(dict, "device",
device_xname(fg->fg_device));
else
- prop_dictionary_set_cstring_nocopy(dict,
+ prop_dictionary_set_string_nocopy(dict,
"device", "<none>");
prop_array_add(array, dict);
}
Index: src/sys/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.72 src/sys/dev/i2c/i2c.c:1.73
--- src/sys/dev/i2c/i2c.c:1.72 Mon Dec 23 18:27:11 2019
+++ src/sys/dev/i2c/i2c.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c.c,v 1.72 2019/12/23 18:27:11 thorpej Exp $ */
+/* $NetBSD: i2c.c,v 1.73 2020/06/11 02:39:30 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.72 2019/12/23 18:27:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.73 2020/06/11 02:39:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -231,7 +231,7 @@ iic_indirect_driver_is_whitelisted(struc
iter = prop_array_iterator(whitelist);
while ((pstr = prop_object_iterator_next(iter)) != NULL) {
- if (prop_string_equals_cstring(pstr, cf->cf_name)) {
+ if (prop_string_equals_string(pstr, cf->cf_name)) {
rv = true;
break;
}
@@ -265,19 +265,19 @@ iic_search(device_t parent, cfdata_t cf,
I2C_PROP_INDIRECT_PROBE_STRATEGY);
if (pstr == NULL) {
/* Use the default. */
- } else if (prop_string_equals_cstring(pstr,
+ } else if (prop_string_equals_string(pstr,
I2C_PROBE_STRATEGY_QUICK_WRITE)) {
probe_func = iic_probe_smbus_quick_write;
- } else if (prop_string_equals_cstring(pstr,
+ } else if (prop_string_equals_string(pstr,
I2C_PROBE_STRATEGY_RECEIVE_BYTE)) {
probe_func = iic_probe_smbus_receive_byte;
- } else if (prop_string_equals_cstring(pstr,
+ } else if (prop_string_equals_string(pstr,
I2C_PROBE_STRATEGY_NONE)) {
probe_func = iic_probe_none;
} else {
aprint_error_dev(sc->sc_dev,
"unknown probe strategy '%s'; defaulting to '%s'\n",
- prop_string_cstring_nocopy(pstr),
+ prop_string_value(pstr),
I2C_PROBE_STRATEGY_QUICK_WRITE);
/* Use the default. */
@@ -470,7 +470,7 @@ iic_attach(device_t parent, device_t sel
cdata = prop_dictionary_get(dev, "compatible");
if (cdata)
iic_fill_compat(&ia,
- prop_data_data_nocopy(cdata),
+ prop_data_value(cdata),
prop_data_size(cdata), &buf);
if (name == NULL && cdata == NULL) {
Index: src/sys/dev/ofw/ofw_subr.c
diff -u src/sys/dev/ofw/ofw_subr.c:1.34 src/sys/dev/ofw/ofw_subr.c:1.35
--- src/sys/dev/ofw/ofw_subr.c:1.34 Tue Aug 6 18:17:52 2019
+++ src/sys/dev/ofw/ofw_subr.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_subr.c,v 1.34 2019/08/06 18:17:52 tnn Exp $ */
+/* $NetBSD: ofw_subr.c,v 1.35 2020/06/11 02:39:30 thorpej Exp $ */
/*
* Copyright 1998
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.34 2019/08/06 18:17:52 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.35 2020/06/11 02:39:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -489,7 +489,7 @@ of_enter_i2c_devs(prop_dictionary_t prop
array = prop_array_create();
dev = prop_dictionary_create();
- prop_dictionary_set_cstring(dev, "name", name);
+ prop_dictionary_set_string(dev, "name", name);
prop_dictionary_set_uint32(dev, "addr", addr);
prop_dictionary_set_uint64(dev, "cookie", node);
of_to_dataprop(dev, node, "compatible", "compatible");
@@ -543,7 +543,7 @@ of_enter_spi_devs(prop_dictionary_t prop
array = prop_array_create();
dev = prop_dictionary_create();
- prop_dictionary_set_cstring(dev, "name", name);
+ prop_dictionary_set_string(dev, "name", name);
prop_dictionary_set_uint32(dev, "slave", slave);
prop_dictionary_set_uint32(dev, "mode", mode);
if (maxfreq > 0)
Index: src/sys/dev/pci/if_ixl.c
diff -u src/sys/dev/pci/if_ixl.c:1.66 src/sys/dev/pci/if_ixl.c:1.67
--- src/sys/dev/pci/if_ixl.c:1.66 Thu May 14 08:34:18 2020
+++ src/sys/dev/pci/if_ixl.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.66 2020/05/14 08:34:18 msaitoh Exp $ */
+/* $NetBSD: if_ixl.c,v 1.67 2020/06/11 02:39:30 thorpej Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.66 2020/05/14 08:34:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.67 2020/06/11 02:39:30 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -7065,7 +7065,7 @@ ixl_parse_modprop(prop_dictionary_t dict
obj = prop_dictionary_get(dict, "stats_interval");
if (obj != NULL && prop_object_type(obj) == PROP_TYPE_NUMBER) {
- val = prop_number_integer_value((prop_number_t)obj);
+ val = prop_number_signed_value((prop_number_t)obj);
/* the range has no reason */
if (100 < val && val < 180000) {
@@ -7075,7 +7075,7 @@ ixl_parse_modprop(prop_dictionary_t dict
obj = prop_dictionary_get(dict, "nqps_limit");
if (obj != NULL && prop_object_type(obj) == PROP_TYPE_NUMBER) {
- val = prop_number_integer_value((prop_number_t)obj);
+ val = prop_number_signed_value((prop_number_t)obj);
if (val <= INT32_MAX)
ixl_param_nqps_limit = val;
Index: src/sys/dev/pci/if_tl.c
diff -u src/sys/dev/pci/if_tl.c:1.120 src/sys/dev/pci/if_tl.c:1.121
--- src/sys/dev/pci/if_tl.c:1.120 Fri Feb 28 06:53:22 2020
+++ src/sys/dev/pci/if_tl.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.120 2020/02/28 06:53:22 msaitoh Exp $ */
+/* $NetBSD: if_tl.c,v 1.121 2020/06/11 02:39:30 thorpej Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.120 2020/02/28 06:53:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.121 2020/06/11 02:39:30 thorpej Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -645,7 +645,7 @@ tl_init(struct ifnet *ifp)
"tl-dma-page-boundary");
if (prop_boundary != NULL) {
KASSERT(prop_object_type(prop_boundary) == PROP_TYPE_NUMBER);
- boundary = (bus_size_t)prop_number_integer_value(prop_boundary);
+ boundary = (bus_size_t)prop_number_unsigned_value(prop_boundary);
} else {
boundary = 0;
}
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.676 src/sys/dev/pci/if_wm.c:1.677
--- src/sys/dev/pci/if_wm.c:1.676 Thu Apr 30 03:42:10 2020
+++ src/sys/dev/pci/if_wm.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.676 2020/04/30 03:42:10 riastradh Exp $ */
+/* $NetBSD: if_wm.c,v 1.677 2020/06/11 02:39:30 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.676 2020/04/30 03:42:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.677 2020/06/11 02:39:30 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -2560,7 +2560,7 @@ alloc_retry:
pn = prop_dictionary_get(dict, "i82543-cfg1");
if (pn != NULL) {
KASSERT(prop_object_type(pn) == PROP_TYPE_NUMBER);
- cfg1 = (uint16_t) prop_number_integer_value(pn);
+ cfg1 = (uint16_t) prop_number_signed_value(pn);
} else {
if (wm_nvm_read(sc, NVM_OFF_CFG1, 1, &cfg1)) {
aprint_error_dev(sc->sc_dev, "unable to read CFG1\n");
@@ -2571,7 +2571,7 @@ alloc_retry:
pn = prop_dictionary_get(dict, "i82543-cfg2");
if (pn != NULL) {
KASSERT(prop_object_type(pn) == PROP_TYPE_NUMBER);
- cfg2 = (uint16_t) prop_number_integer_value(pn);
+ cfg2 = (uint16_t) prop_number_signed_value(pn);
} else {
if (wm_nvm_read(sc, NVM_OFF_CFG2, 1, &cfg2)) {
aprint_error_dev(sc->sc_dev, "unable to read CFG2\n");
@@ -2700,7 +2700,7 @@ alloc_retry:
pn = prop_dictionary_get(dict, "i82543-swdpin");
if (pn != NULL) {
KASSERT(prop_object_type(pn) == PROP_TYPE_NUMBER);
- swdpin = (uint16_t) prop_number_integer_value(pn);
+ swdpin = (uint16_t) prop_number_signed_value(pn);
} else {
if (wm_nvm_read(sc, NVM_OFF_SWDPIN, 1, &swdpin)) {
aprint_error_dev(sc->sc_dev,
Index: src/sys/dev/spi/spi.c
diff -u src/sys/dev/spi/spi.c:1.13 src/sys/dev/spi/spi.c:1.14
--- src/sys/dev/spi/spi.c:1.13 Wed Nov 27 07:26:08 2019
+++ src/sys/dev/spi/spi.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: spi.c,v 1.13 2019/11/27 07:26:08 hkenken Exp $ */
+/* $NetBSD: spi.c,v 1.14 2020/06/11 02:39:30 thorpej Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.13 2019/11/27 07:26:08 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.14 2020/06/11 02:39:30 thorpej Exp $");
#include "locators.h"
@@ -247,7 +247,7 @@ spi_direct_attach_child_devices(device_t
buf = NULL;
spi_fill_compat(&sa,
- prop_data_data_nocopy(cdata),
+ prop_data_value(cdata),
prop_data_size(cdata), &buf);
(void) config_found_sm_loc(parent, "spi",
loc, &sa, spi_print,
Index: src/sys/dev/sysmon/swsensor.c
diff -u src/sys/dev/sysmon/swsensor.c:1.17 src/sys/dev/sysmon/swsensor.c:1.18
--- src/sys/dev/sysmon/swsensor.c:1.17 Mon Jun 8 20:18:13 2020
+++ src/sys/dev/sysmon/swsensor.c Thu Jun 11 02:39:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: swsensor.c,v 1.17 2020/06/08 20:18:13 thorpej Exp $ */
+/* $NetBSD: swsensor.c,v 1.18 2020/06/11 02:39:31 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.17 2020/06/08 20:18:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swsensor.c,v 1.18 2020/06/11 02:39:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -216,7 +216,7 @@ swsensor_init(void *arg)
po = prop_dictionary_get_keysym(pd, obj);
type = prop_object_type(po);
if (type == PROP_TYPE_NUMBER)
- val = prop_number_integer_value(po);
+ val = prop_number_signed_value(po);
/* Sensor type/units */
if (strcmp(key, "type") == 0) {
@@ -230,7 +230,7 @@ swsensor_init(void *arg)
}
if (type != PROP_TYPE_STRING)
return EINVAL;
- str = prop_string_cstring_nocopy(po);
+ str = prop_string_value(po);
descr = sme_find_table_desc(SME_DESC_UNITS,
str);
if (descr == NULL)
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.146 src/sys/dev/sysmon/sysmon_envsys.c:1.147
--- src/sys/dev/sysmon/sysmon_envsys.c:1.146 Mon Jun 8 20:18:13 2020
+++ src/sys/dev/sysmon/sysmon_envsys.c Thu Jun 11 02:39:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.146 2020/06/08 20:18:13 thorpej Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.147 2020/06/11 02:39:31 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.146 2020/06/08 20:18:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.147 2020/06/11 02:39:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1151,7 +1151,7 @@ sme_sensor_dictionary_get(prop_array_t a
while ((dict = prop_object_iterator_next(iter))) {
obj = prop_dictionary_get(dict, "index");
- if (prop_string_equals_cstring(obj, index))
+ if (prop_string_equals_string(obj, index))
break;
}
@@ -1392,7 +1392,7 @@ sme_add_property_dictionary(struct sysmo
class = "ac-adapter";
else
class = "other";
- if (!prop_dictionary_set_cstring_nocopy(pdict, "device-class", class)) {
+ if (!prop_dictionary_set_string_nocopy(pdict, "device-class", class)) {
error = EINVAL;
goto out;
}
@@ -1904,7 +1904,7 @@ sme_userset_dictionary(struct sysmon_env
obj2 = prop_dictionary_get(udict, "description");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_STRING) {
targetfound = true;
- blah = prop_string_cstring_nocopy(obj2);
+ blah = prop_string_value(obj2);
/*
* Check for duplicate description.
@@ -1947,7 +1947,7 @@ sme_userset_dictionary(struct sysmon_env
targetfound = true;
if (edata->flags & ENVSYS_FCHANGERFACT) {
mutex_enter(&sme->sme_mtx);
- edata->rfact = prop_number_integer_value(obj2);
+ edata->rfact = prop_number_signed_value(obj2);
edata->upropset |= PROP_RFACT;
mutex_exit(&sme->sme_mtx);
DPRINTF(("%s: sensor%d changed rfact to %d\n",
@@ -1966,7 +1966,7 @@ sme_userset_dictionary(struct sysmon_env
obj2 = prop_dictionary_get(udict, "critical-capacity");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- lims.sel_critmin = prop_number_integer_value(obj2);
+ lims.sel_critmin = prop_number_signed_value(obj2);
props |= PROP_BATTCAP;
}
@@ -1976,7 +1976,7 @@ sme_userset_dictionary(struct sysmon_env
obj2 = prop_dictionary_get(udict, "warning-capacity");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- lims.sel_warnmin = prop_number_integer_value(obj2);
+ lims.sel_warnmin = prop_number_signed_value(obj2);
props |= PROP_BATTWARN;
}
@@ -1986,7 +1986,7 @@ sme_userset_dictionary(struct sysmon_env
obj2 = prop_dictionary_get(udict, "high-capacity");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- lims.sel_warnmin = prop_number_integer_value(obj2);
+ lims.sel_warnmin = prop_number_signed_value(obj2);
props |= PROP_BATTHIGH;
}
@@ -1996,7 +1996,7 @@ sme_userset_dictionary(struct sysmon_env
obj2 = prop_dictionary_get(udict, "maximum-capacity");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- lims.sel_warnmin = prop_number_integer_value(obj2);
+ lims.sel_warnmin = prop_number_signed_value(obj2);
props |= PROP_BATTMAX;
}
@@ -2006,7 +2006,7 @@ sme_userset_dictionary(struct sysmon_env
obj2 = prop_dictionary_get(udict, "critical-max");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- lims.sel_critmax = prop_number_integer_value(obj2);
+ lims.sel_critmax = prop_number_signed_value(obj2);
props |= PROP_CRITMAX;
}
@@ -2016,7 +2016,7 @@ sme_userset_dictionary(struct sysmon_env
obj2 = prop_dictionary_get(udict, "warning-max");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- lims.sel_warnmax = prop_number_integer_value(obj2);
+ lims.sel_warnmax = prop_number_signed_value(obj2);
props |= PROP_WARNMAX;
}
@@ -2026,7 +2026,7 @@ sme_userset_dictionary(struct sysmon_env
obj2 = prop_dictionary_get(udict, "critical-min");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- lims.sel_critmin = prop_number_integer_value(obj2);
+ lims.sel_critmin = prop_number_signed_value(obj2);
props |= PROP_CRITMIN;
}
@@ -2036,7 +2036,7 @@ sme_userset_dictionary(struct sysmon_env
obj2 = prop_dictionary_get(udict, "warning-min");
if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
targetfound = true;
- lims.sel_warnmin = prop_number_integer_value(obj2);
+ lims.sel_warnmin = prop_number_signed_value(obj2);
props |= PROP_WARNMIN;
}
Index: src/sys/dev/sysmon/sysmon_envsys_util.c
diff -u src/sys/dev/sysmon/sysmon_envsys_util.c:1.6 src/sys/dev/sysmon/sysmon_envsys_util.c:1.7
--- src/sys/dev/sysmon/sysmon_envsys_util.c:1.6 Mon Jun 8 20:18:13 2020
+++ src/sys/dev/sysmon/sysmon_envsys_util.c Thu Jun 11 02:39:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_util.c,v 1.6 2020/06/08 20:18:13 thorpej Exp $ */
+/* $NetBSD: sysmon_envsys_util.c,v 1.7 2020/06/11 02:39:31 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.6 2020/06/08 20:18:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_util.c,v 1.7 2020/06/11 02:39:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -132,14 +132,14 @@ sme_sensor_upstring(prop_dictionary_t di
obj = prop_dictionary_get(dict, key);
if (obj == NULL) {
- if (!prop_dictionary_set_cstring(dict, key, str)) {
+ if (!prop_dictionary_set_string(dict, key, str)) {
DPRINTF(("%s: (up) set_cstring %s:%s\n",
__func__, key, str));
return EINVAL;
}
} else {
- if (!prop_string_equals_cstring(obj, str)) {
- if (!prop_dictionary_set_cstring(dict, key, str)) {
+ if (!prop_string_equals_string(obj, str)) {
+ if (!prop_dictionary_set_string(dict, key, str)) {
DPRINTF(("%s: (set) set_cstring %s:%s\n",
__func__, key, str));
return EINVAL;
Index: src/sys/dev/sysmon/sysmon_power.c
diff -u src/sys/dev/sysmon/sysmon_power.c:1.63 src/sys/dev/sysmon/sysmon_power.c:1.64
--- src/sys/dev/sysmon/sysmon_power.c:1.63 Mon Jun 8 20:18:13 2020
+++ src/sys/dev/sysmon/sysmon_power.c Thu Jun 11 02:39:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.63 2020/06/08 20:18:13 thorpej Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.64 2020/06/11 02:39:31 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.63 2020/06/08 20:18:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.64 2020/06/11 02:39:31 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -708,7 +708,7 @@ sysmon_power_make_dictionary(prop_dictio
#define SETPROP(key, str) \
do { \
- if ((str) != NULL && !prop_dictionary_set_cstring(dict, \
+ if ((str) != NULL && !prop_dictionary_set_string(dict, \
(key), \
(str))) { \
printf("%s: failed to set %s\n", __func__, (str)); \
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.247 src/sys/dev/usb/usb_subr.c:1.248
--- src/sys/dev/usb/usb_subr.c:1.247 Sun May 31 18:33:08 2020
+++ src/sys/dev/usb/usb_subr.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.247 2020/05/31 18:33:08 maxv Exp $ */
+/* $NetBSD: usb_subr.c,v 1.248 2020/06/11 02:39:30 thorpej Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.247 2020/05/31 18:33:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.248 2020/06/11 02:39:30 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -865,7 +865,7 @@ static void
usbd_serialnumber(device_t dv, struct usbd_device *dev)
{
if (dev->ud_serial) {
- prop_dictionary_set_cstring(device_properties(dv),
+ prop_dictionary_set_string(device_properties(dv),
"serialnumber", dev->ud_serial);
}
}
Index: src/sys/dev/wscons/wsdisplay_util.c
diff -u src/sys/dev/wscons/wsdisplay_util.c:1.2 src/sys/dev/wscons/wsdisplay_util.c:1.3
--- src/sys/dev/wscons/wsdisplay_util.c:1.2 Thu Jan 31 10:57:31 2013
+++ src/sys/dev/wscons/wsdisplay_util.c Thu Jun 11 02:39:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_util.c,v 1.2 2013/01/31 10:57:31 macallan Exp $ */
+/* $NetBSD: wsdisplay_util.c,v 1.3 2020/06/11 02:39:31 thorpej Exp $ */
/*-
* Copyright (c) 2011 Michael Lorenz
@@ -54,7 +54,7 @@ wsdisplayio_get_edid(device_t dev, struc
d->data_size = edid_size;
if (d->buffer_size < edid_size)
return EAGAIN;
- return copyout(prop_data_data_nocopy(edid_data),
+ return copyout(prop_data_value(edid_data),
d->edid_data, edid_size);
}
return ENODEV;
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.73 src/sys/dev/wsfb/genfb.c:1.74
--- src/sys/dev/wsfb/genfb.c:1.73 Sat May 30 14:15:43 2020
+++ src/sys/dev/wsfb/genfb.c Thu Jun 11 02:39:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.73 2020/05/30 14:15:43 jdolecek Exp $ */
+/* $NetBSD: genfb.c,v 1.74 2020/06/11 02:39:31 thorpej Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.73 2020/05/30 14:15:43 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.74 2020/06/11 02:39:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -642,7 +642,7 @@ genfb_calc_hsize(struct genfb_softc *sc)
edid = kmem_alloc(sizeof(*edid), KM_SLEEP);
- edid_ptr = prop_data_data_nocopy(edid_data);
+ edid_ptr = prop_data_value(edid_data);
if (edid_parse(__UNCONST(edid_ptr), edid) == 0)
hsize = (int)edid->edid_max_hsize * 10;
else
