 @@ -1,14 +1,14 @@
-/* $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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <dev/acpi/acpi_i2c.h>
 #define _COMPONENT	ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME	("acpi_i2c")
 static void
 acpi_enter_i2c_hid(struct acpi_devnode *devnode, prop_dictionary_t dev)
+{
 	ACPI_OBJECT_LIST arg;
 	ACPI_OBJECT obj[4];
 @@ -193,27 +193,27 @@ acpi_enter_i2c_device(struct acpi_devnod
 	prop_dictionary_set_uint32(dev, "addr", i2cc.i2c_addr);
 	prop_dictionary_set_uint64(dev, "cookie", (uintptr_t)ad->ad_handle);
 	/* first search by name, then by CID */
 	i2c_id = acpi_i2c_search(name);
 	idlist = &ad->ad_devinfo->CompatibleIdList;
 	for (cidi = 0;
 	    cidi < idlist->Count && i2c_id == NULL;
 	    cidi++) {
 		i2c_id = acpi_i2c_search(idlist->Ids[cidi].String);
+	}
 	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);
+		}
 		if (i2c_id->parse != NULL)
 			i2c_id->parse(ad, dev);
+	}
 	prop_array_add(array, dev);
 	prop_object_release(dev);
+}
 prop_array_t

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Written by Iain Hibbert for Itronix Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -22,27 +22,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 @@ -162,27 +162,27 @@ static const struct btproto bthidev_int_
 /*****************************************************************************
+ *
  *	bthidev autoconf(9) routines
  */
 static int
 bthidev_match(device_t self, cfdata_t cfdata, void *aux)
+{
 	prop_dictionary_t dict = aux;
 	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;
+}
 static void
 bthidev_attach(device_t parent, device_t self, void *aux)
+{
 	struct bthidev_softc *sc = device_private(self);
 	prop_dictionary_t dict = aux;
 	prop_object_t obj;
 	device_t dev;
 	struct bthidev_attach_args bha;
 @@ -206,77 +206,77 @@ bthidev_attach(device_t parent, device_t
 	sc->sc_state = BTHID_CLOSED;
 	sc->sc_flags = BTHID_CONNECTING;
 	sc->sc_ctlpsm = L2CAP_PSM_HID_CNTL;
 	sc->sc_intpsm = L2CAP_PSM_HID_INTR;
 	sockopt_init(&sc->sc_mode, BTPROTO_L2CAP, SO_L2CAP_LM, 0);
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&sc->sc_cv, device_xname(self));
 	/*
 	 * 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);
 			return;
+		}
 		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;
+		}
+	}
 	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;
+		}
+	}
 	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;
+	}
 	obj = prop_dictionary_get(dict, BTHIDEVreconnect);
 	if (prop_object_type(obj) == PROP_TYPE_BOOL
 	    && !prop_bool_true(obj))
 		sc->sc_flags |= BTHID_RECONNECT;
 	/*
 	 * Parse the descriptor and attach child devices, one per report.
 	 */

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Written by Iain Hibbert for Itronix Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -22,27 +22,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <prop/proplib.h>
 @@ -195,27 +195,27 @@ bthub_pioctl(dev_t devno, unsigned long
 		self = device_lookup(&bthub_cd, unit);
 		if (self == NULL)
 			continue;
 		prop = device_properties(self);
 		obj = prop_dictionary_get(prop, BTDEVladdr);
 		if (prop_data_equals(laddr, obj))
 			break;
+	}
 	/* 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 */
 	service = prop_dictionary_get(dict, BTDEVservice);
 	if (prop_object_type(service) != PROP_TYPE_STRING)
 		return EINVAL;
 	/* locate matching child device, if any */
 	deviter_init(&di, 0);
 	while ((dev = deviter_next(&di)) != NULL) {
 		if (device_parent(dev) != self)
 			continue;
 @@ -259,26 +259,26 @@ bthub_pioctl(dev_t devno, unsigned long
 	return 0;
+}
 static int
 bthub_print(void *aux, const char *pnp)
+{
 	prop_dictionary_t dict = aux;
 	prop_object_t obj;
 	const bdaddr_t *raddr;
 	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,
 			raddr->b[5], raddr->b[4], raddr->b[3],
 			raddr->b[2], raddr->b[1], raddr->b[0]);
 	return UNCONF;
+}

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Iain Hibbert.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -75,27 +75,27 @@
  * for such complications.
+ *
  * This driver interprets the touch reports only as far as emulating a
  * middle mouse button and providing horizontal and vertical scroll action.
  * Full gesture support would be more complicated and is left as an exercise
  * for the reader.
+ *
  * Credit for decoding the proprietary touch reports goes to Michael Poole
  * who wrote the Linux hid-magicmouse input driver.
+ *
  *****************************************************************************/
 #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>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/socketvar.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 @@ -301,46 +301,46 @@ btmagic_attach(device_t parent, device_t
 	sc->sc_state = BTMAGIC_CLOSED;
 	sc->sc_mb_id = -1;
 	sc->sc_tapmb_id = -1;
 	callout_init(&sc->sc_timeout, 0);
 	callout_setfunc(&sc->sc_timeout, btmagic_timeout, sc);
 	callout_init(&sc->sc_tapcallout, 0);
 	callout_setfunc(&sc->sc_tapcallout, btmagic_tapcallout, sc);
 	sockopt_init(&sc->sc_mode, BTPROTO_L2CAP, SO_L2CAP_LM, 0);
 	/*
 	 * 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);
 			return;
+		}
 		aprint_verbose(" %s %s", BTDEVmode,
-		    prop_string_cstring_nocopy(obj));
+		    prop_string_value(obj));
 	} else
 		sockopt_setint(&sc->sc_mode, 0);
 	aprint_normal(": 3 buttons, W and Z dirs\n");
 	aprint_naive("\n");
 	/*
 	 * set defaults
 	 */
 	sc->sc_resolution = 650;
 	sc->sc_firm = 6;
 	sc->sc_dist = 130;
 	sc->sc_scale = 20;

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Written by Iain Hibbert for Itronix Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -22,27 +22,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/socketvar.h>
 #include <sys/systm.h>
 @@ -248,75 +248,75 @@ static void btsco_intr(void *);
 /*****************************************************************************
+ *
  *	btsco autoconf(9) routines
  */
 static int
 btsco_match(device_t self, cfdata_t cfdata, void *aux)
+{
 	prop_dictionary_t dict = aux;
 	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;
+}
 static void
 btsco_attach(device_t parent, device_t self, void *aux)
+{
 	struct btsco_softc *sc = device_private(self);
 	prop_dictionary_t dict = aux;
 	prop_object_t obj;
 	/*
 	 * Init softc
 	 */
 	sc->sc_vgs = 200;
 	sc->sc_vgm = 200;
 	sc->sc_state = BTSCO_CLOSED;
 	sc->sc_name = device_xname(self);
 	cv_init(&sc->sc_connect, "connect");
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	/*
 	 * 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_signed_value(obj) < RFCOMM_CHANNEL_MIN
-	    || prop_number_integer_value(obj) > RFCOMM_CHANNEL_MAX) {
+	    || 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");
 	DPRINTF("sc=%p\n", sc);
 	/*
 	 * set up transmit interrupt
 	 */
 	sc->sc_intr = softint_establish(SOFTINT_NET, btsco_intr, sc);
 	if (sc->sc_intr == NULL) {
 		aprint_error_dev(self, "softint_establish failed\n");
 		return;

 @@ -1,14 +1,14 @@
-/* $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 <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #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>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/cpu.h>
 #include <sys/bus.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/fdt/fdtvar.h>
 @@ -396,27 +396,27 @@ fdt_scan(struct fdt_softc *sc, int pass)
 			/*
 			 * Default pass.
 			 */
 			fdt_pre_attach(node);
 			node->n_dev = config_found_sm_loc(node->n_bus, "fdt", locs,
 			    &faa, fdtbus_print, fdt_scan_submatch);
 			if (node->n_dev != NULL)
 				fdt_post_attach(node);
+		}
 		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);
+		}
+	}
+}
 static void
 fdt_pre_attach(struct fdt_node *node)
+{
 	const char *cfgname;
 	int error;
 	node->n_pinctrl_init = fdtbus_pinctrl_has_config(node->n_phandle, "init");
 	cfgname = node->n_pinctrl_init ? "init" : "default";

 @@ -1,14 +1,14 @@
-/* $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 <support@precedence.co.uk>
  * Copyright (c) 2009-2011 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Precedence Technologies Ltd
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -50,27 +50,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #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>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/audioio.h>
 #include <dev/audio/audio_if.h>
 @@ -4361,40 +4361,40 @@ hdafg_widget_info(void *opaque, prop_dic
 	if (prop_dictionary_get_uint16(request, "index", &index) == false)
 		return EINVAL;
 	nid = sc->sc_startnode + index;
 	if (nid >= sc->sc_endnode)
 		return EINVAL;
 	w = hdafg_widget_lookup(sc, nid);
 	if (w == NULL)
 		return ENXIO;
 	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);
 	prop_dictionary_set_uint32(response, "config", config);
 	prop_dictionary_set_uint32(response, "cap", wcap);
 	if (w->w_nconns == 0)
 		return 0;
 	connlist = prop_array_create();
 	for (i = 0; i < w->w_nconns; i++) {
 		if (w->w_conns[i] == 0)
 			continue;
-		prop_array_add(connlist,
+		prop_array_add_and_rel(connlist,
-		    prop_number_create_unsigned_integer(w->w_conns[i]));
+		    prop_number_create_unsigned(w->w_conns[i]));
+	}
 	prop_dictionary_set(response, "connlist", connlist);
 	prop_object_release(connlist);
 	return 0;
+}
 static int
 hdafg_codec_info(void *opaque, prop_dictionary_t request,
     prop_dictionary_t response)
+{
 	struct hdafg_softc *sc = opaque;
 	prop_dictionary_set_uint16(response, "vendor-id",
 	    sc->sc_vendor);

 @@ -1,14 +1,14 @@
-/* $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 <support@precedence.co.uk>
  * Copyright (c) 2009 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Precedence Technologies Ltd
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -20,27 +20,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #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>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include "hdaudiovar.h"
 #include "hdaudioreg.h"
 #include "hdaudioio.h"
 @@ -1341,41 +1341,41 @@ hdaudioioctl_fgrp_info(struct hdaudio_so
 	array = prop_array_create();
 	if (array == NULL)
 		return ENOMEM;
 	for (codecid = 0; codecid < HDAUDIO_MAX_CODECS; codecid++) {
 		co = &sc->sc_codec[codecid];
 		if (co->co_valid == false)
 			continue;
 		for (fgid = 0; fgid < co->co_nfg; fgid++) {
 			fg = &co->co_fg[fgid];
 			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);
 			prop_dictionary_set_uint16(dict, "vendor-id",
 			    fg->fg_vendor);
 			prop_dictionary_set_uint16(dict, "product-id",
 			    fg->fg_product);
 			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);
+		}
+	}
 	prop_dictionary_set(response, "function-group-info", array);
 	return 0;
+}
 static int
 hdaudioioctl_fgrp_getconfig(struct hdaudio_softc *sc,
     prop_dictionary_t request, prop_dictionary_t response)
+{

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef _KERNEL_OPT
 #include "opt_i2c.h"
 #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>
 #include <sys/device.h>
 #include <sys/event.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/module.h>
 @@ -221,27 +221,27 @@ iic_indirect_driver_is_whitelisted(struc
 		/* No whitelist -> everything allowed */
 		return (true);
+	}
 	if ((ptype = prop_object_type(whitelist)) != PROP_TYPE_ARRAY) {
 		aprint_error_dev(sc->sc_dev,
 		    "invalid property type (%d) for '%s'; must be array (%d)\n",
 		    ptype, I2C_PROP_INDIRECT_DEVICE_WHITELIST, PROP_TYPE_ARRAY);
 		return (false);
+	}
 	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;
+		}
+	}
 	prop_object_iterator_release(iter);
 	return (rv);
+}
 static int
 iic_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct iic_softc *sc = device_private(parent);
 @@ -255,39 +255,39 @@ iic_search(device_t parent, cfdata_t cf,
 	 * Before we do any more work, consult the allowed-driver
 	 * white-list for this bus (if any).
 	 */
 	if (iic_indirect_driver_is_whitelisted(sc, cf) == false)
 		return (0);
 	/* default to "quick write". */
 	probe_func = iic_probe_smbus_quick_write;
 	pstr = prop_dictionary_get(device_properties(sc->sc_dev),
 				   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. */
+	}
 	ia.ia_tag = sc->sc_tag;
 	ia.ia_name = NULL;
 	ia.ia_ncompat = 0;
 	ia.ia_compat = NULL;
 	ia.ia_prop = NULL;
 	if (cf->cf_loc[IICCF_ADDR] == IICCF_ADDR_DEFAULT) {
 @@ -460,27 +460,27 @@ iic_attach(device_t parent, device_t sel
 			loc[IICCF_ADDR] = addr;
 			memset(&ia, 0, sizeof ia);
 			ia.ia_addr = addr;
 			ia.ia_tag = ic;
 			ia.ia_name = name;
 			ia.ia_cookie = cookie;
 			ia.ia_prop = dev;
 			buf = NULL;
 			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) {
 				aprint_error_dev(self,
 				    "WARNING: ignoring bad child device entry "
 				    "for address 0x%02x\n", addr);
 			} else {
 				if (addr > I2C_MAX_ADDR) {
 					aprint_error_dev(self,
 					    "WARNING: ignoring bad device "
 					    "address @ 0x%02x\n", addr);
 				} else if (sc->sc_devices[addr] == NULL) {
 					sc->sc_devices[addr] =

 @@ -1,14 +1,14 @@
-/*	$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
  * Digital Equipment Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and
  * copied only in accordance with the following terms and conditions.
  * Subject to these conditions, you may download, copy, install,
  * use, modify and distribute this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce
  *    and retain this copyright notice and list of conditions as
 @@ -24,27 +24,27 @@
  * 3) This software is provided "AS-IS" and any express or implied
  *    warranties, including but not limited to, any implied warranties
  *    of merchantability, fitness for a particular purpose, or
  *    non-infringement are disclaimed. In no event shall DIGITAL be
  *    liable for any damages whatsoever, and in particular, DIGITAL
  *    shall not be liable for special, indirect, consequential, or
  *    incidental damages or damages for lost profits, loss of
  *    revenue or loss of use, whether such damages arise in contract,
  *    negligence, tort, under statute, in equity, at law or otherwise,
  *    even if advised of the possibility of such damage.
  */
 #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>
 #include <sys/malloc.h>
 #include <dev/ofw/openfirm.h>
 #define	OFW_MAX_STACK_BUF_SIZE	256
 #define	OFW_PATH_BUF_SIZE	512
 /*
  * int of_decode_int(p)
+ *
  * This routine converts OFW encoded-int datums
 @@ -479,27 +479,27 @@ of_enter_i2c_devs(prop_dictionary_t prop
 			    < sizeof(reg32))
 				continue;
 			addr = be32toh(reg32);
 		} else {
 			continue;
+		}
 		addr >>= addr_shift;
 		if (addr == 0) continue;
 		if (array == NULL)
 			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");
 		prop_array_add(array, dev);
 		prop_object_release(dev);
+	}
 	if (array != NULL) {
 		prop_dictionary_set(props, "i2c-child-devices", array);
 		prop_object_release(array);
+	}
+}
 @@ -533,27 +533,27 @@ of_enter_spi_devs(prop_dictionary_t prop
 			slave = be32toh(reg32);
 		} else {
 			continue;
+		}
 		if (of_getprop_uint32(node, "spi-max-frequency", &maxfreq)) {
 			maxfreq = 0;
+		}
 		mode = ((int)of_hasprop(node, "cpol") << 1) | (int)of_hasprop(node, "cpha");
 		if (array == NULL)
 			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)
 			prop_dictionary_set_uint32(dev, "spi-max-frequency", maxfreq);
 		prop_dictionary_set_uint64(dev, "cookie", node);
 		of_to_dataprop(dev, node, "compatible", "compatible");
 		prop_array_add(array, dev);
 		prop_object_release(dev);
+	}
 	if (array != NULL) {
 		prop_dictionary_set(props, "spi-child-devices", array);
 		prop_object_release(array);

 @@ -1,14 +1,14 @@
-/*	$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
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
+ *
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
 @@ -64,27 +64,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include "opt_if_ixl.h"
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/evcnt.h>
 #include <sys/interrupt.h>
 @@ -7055,37 +7055,37 @@ ixl_parse_modprop(prop_dictionary_t dict
 	int64_t val;
 	uint64_t uval;
 	if (dict == NULL)
 		return;
 	obj = prop_dictionary_get(dict, "nomsix");
 	if (obj != NULL && prop_object_type(obj) == PROP_TYPE_BOOL) {
 		ixl_param_nomsix = prop_bool_true((prop_bool_t)obj);
+	}
 	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) {
 			ixl_param_stats_interval = val;
+		}
+	}
 	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;
+	}
 	obj = prop_dictionary_get(dict, "rx_ndescs");
 	if (obj != NULL && prop_object_type(obj) == PROP_TYPE_NUMBER) {
 		uval = prop_number_unsigned_integer_value((prop_number_t)obj);
 		if (uval > 8)
 			ixl_param_rx_ndescs = uval;
+	}

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -21,27 +21,27 @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Texas Instruments ThunderLAN ethernet controller
  * ThunderLAN Programmer's Guide (TI Literature Number SPWU013A)
  * available from www.ti.com
  */
 #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
 #undef TLDEBUG_RX
 #undef TLDEBUG_TX
 #undef TLDEBUG_ADDR
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 @@ -635,27 +635,27 @@ tl_init(struct ifnet *ifp)
 		errstring = "out of memory for lists";
 		error = ENOMEM;
 		goto bad;
+	}
 	/*
 	 * Some boards (Set Engineering GFE) do not permit DMA transfers
 	 * across page boundaries.
 	 */
 	prop_boundary = prop_dictionary_get(device_properties(sc->sc_dev),
 	    "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;
+	}
 	error = bus_dmamap_create(sc->tl_dmatag,
 	    sizeof(struct tl_Rx_list) * TL_NBUF, 1,
 	    sizeof(struct tl_Rx_list) * TL_NBUF, 0, BUS_DMA_WAITOK,
 	    &sc->Rx_dmamap);
 	if (error == 0)
 		error = bus_dmamap_create(sc->tl_dmatag,
 		    sizeof(struct tl_Tx_list) * TL_NBUF, 1,
 		    sizeof(struct tl_Tx_list) * TL_NBUF, boundary,
 		    BUS_DMA_WAITOK, &sc->Tx_dmamap);

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -72,27 +72,27 @@
+ *
  * TODO (in order of importance):
+ *
  *	- Check XXX'ed comments
  *	- TX Multi queue improvement (refine queue selection logic)
  *	- Split header buffer for newer descriptors
  *	- EEE (Energy Efficiency Ethernet) for I354
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  */
 #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"
 #include "opt_if_wm.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 @@ -2550,38 +2550,38 @@ alloc_retry:
+		}
+	}
 	aprint_normal_dev(sc->sc_dev, "Ethernet address %s\n",
 	    ether_sprintf(enaddr));
 	/*
 	 * Read the config info from the EEPROM, and set up various
 	 * bits in the control registers based on their contents.
 	 */
 	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");
 			goto out;
+		}
+	}
 	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");
 			goto out;
+		}
+	}
 	/* check for WM_F_WOL */
 	switch (sc->sc_type) {
 	case WM_T_82542_2_0:
 	case WM_T_82542_2_1:
 	case WM_T_82543:
 		/* dummy? */
 @@ -2690,27 +2690,27 @@ alloc_retry:
+			}
+		}
+	}
 	/*
 	 * XXX need special handling for some multiple port cards
 	 * to disable a paticular port.
 	 */
 	if (sc->sc_type >= WM_T_82544) {
 		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,
 				    "unable to read SWDPIN\n");
 				goto out;
+			}
+		}
+	}
 	if (cfg1 & NVM_CFG1_ILOS)
 		sc->sc_ctrl |= CTRL_ILOS;
 	/*

 @@ -1,14 +1,14 @@
-/* $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.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -32,27 +32,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/errno.h>
 #include <dev/spi/spivar.h>
 @@ -237,27 +237,27 @@ spi_direct_attach_child_devices(device_t
 			continue;
 		loc[SPICF_SLAVE] = slave;
 		memset(&sa, 0, sizeof sa);
 		sa.sa_handle = &sc->sc_slaves[i];
 		sa.sa_prop = child;
 		sa.sa_cookie = cookie;
 		if (ISSET(sa.sa_handle->sh_flags, SPIH_ATTACHED))
 			continue;
 		SET(sa.sa_handle->sh_flags, SPIH_ATTACHED);
 		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,
 					   NULL);
 		if (sa.sa_compat)
 			free(sa.sa_compat, M_TEMP);
 		if (buf)
 			free(buf, M_TEMP);
+	}
+}
 int

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -17,27 +17,27 @@
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
  * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/module.h>
 #include <sys/sysctl.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/sysmon/sysmon_envsysvar.h>
 #include <prop/proplib.h>
 #ifndef _MODULE
 #include "opt_modular.h"
 @@ -206,41 +206,41 @@ swsensor_init(void *arg)
 	sw_sensor_limit = 0;
 	/* Iterate over the provided dictionary, if any */
 	if (pd != NULL) {
 		iter = prop_dictionary_iterator(pd);
 		if (iter == NULL)
 			return ENOMEM;
 		while ((obj = prop_object_iterator_next(iter)) != NULL) {
 			key = prop_dictionary_keysym_value(obj);
 			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) {
 				if (type == PROP_TYPE_NUMBER) {
 					descr = sme_find_table_entry(
 							SME_DESC_UNITS, val);
 					if (descr == NULL)
 						return EINVAL;
 					swsensor_edata.units = descr->type;
 					continue;
+				}
 				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)
 					return EINVAL;
 				swsensor_edata.units = descr->type;
 				continue;
+			}
 			/* Sensor flags */
 			if (strcmp(key, "flags") == 0) {
 				if (type != PROP_TYPE_NUMBER)
 					return EINVAL;
 				swsensor_edata.flags = val;

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -54,27 +54,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Environmental sensor framework for sysmon, exported to userland
  * with proplib(3).
  */
 #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>
 #include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <sys/rndsource.h>
 #include <sys/module.h>
 @@ -1141,27 +1141,27 @@ sme_sensor_dictionary_get(prop_array_t a
+{
 	prop_object_iterator_t iter;
 	prop_dictionary_t dict;
 	prop_object_t obj;
 	KASSERT(array != NULL || index != NULL);
 	iter = prop_array_iterator(array);
 	if (!iter)
 		return NULL;
 	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;
+	}
 	prop_object_iterator_release(iter);
 	return dict;
+}
 /*
  * sme_remove_userprops:
+ *
  * 	+ Remove all properties from all devices that were set by
  * 	  the ENVSYS_SETDICTIONARY ioctl.
  */
 @@ -1382,27 +1382,27 @@ sme_add_property_dictionary(struct sysmo
+	}
 	if (!prop_dictionary_set_uint64(pdict, "refresh-timeout",
 					sme->sme_events_timeout)) {
 		error = EINVAL;
 		goto out;
+	}
 	if (sme->sme_class == SME_CLASS_BATTERY)
 		class = "battery";
 	else if (sme->sme_class == SME_CLASS_ACADAPTER)
 		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;
+	}
 	if (!prop_dictionary_set(dict, "device-properties", pdict)) {
 		error = EINVAL;
 		goto out;
+	}
 	/*
 	 * Add the device dictionary into the sysmon envsys array.
 	 */
 	if (!prop_array_add(array, dict))
 @@ -1894,27 +1894,27 @@ sme_userset_dictionary(struct sysmon_env
 		 */
 		if (!prop_string_equals(obj1, obj))
 			continue;
 		props = 0;
 		/*
 		 * Check if a new description operation was
 		 * requested by the user and set new description.
 		 */
 		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.
 			 */
 			for (i = 0; i < sme->sme_nsensors; i++) {
 				if (i == edata->sensor)
 					continue;
 				tdict = prop_array_get(array, i);
 				tobj =
 				    prop_dictionary_get(tdict, "description");
 				if (prop_string_equals(obj2, tobj)) {
 					error = EEXIST;
 					goto out;
 @@ -1937,116 +1937,116 @@ sme_userset_dictionary(struct sysmon_env
 			    __func__, edata->sensor, blah));
 			edata->upropset |= PROP_DESC;
 			mutex_exit(&sme->sme_mtx);
+		}
 		/*
 		 * did the user want to change the rfact?
 		 */
 		obj2 = prop_dictionary_get(udict, "rfact");
 		if (obj2 && prop_object_type(obj2) == PROP_TYPE_NUMBER) {
 			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",
 				    __func__, edata->sensor, edata->rfact));
 			} else {
 				error = ENOTSUP;
 				goto out;
+			}
+		}
 		sdt = sme_find_table_entry(SME_DESC_UNITS, edata->units);
 		/*
 		 * did the user want to set a critical capacity event?
 		 */
 		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;
+		}
 		/*
 		 * did the user want to set a warning capacity event?
 		 */
 		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;
+		}
 		/*
 		 * did the user want to set a high capacity event?
 		 */
 		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;
+		}
 		/*
 		 * did the user want to set a maximum capacity event?
 		 */
 		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;
+		}
 		/*
 		 * did the user want to set a critical max event?
 		 */
 		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;
+		}
 		/*
 		 * did the user want to set a warning max event?
 		 */
 		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;
+		}
 		/*
 		 * did the user want to set a critical min event?
 		 */
 		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;
+		}
 		/*
 		 * did the user want to set a warning min event?
 		 */
 		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;
+		}
 		if (props && (edata->flags & ENVSYS_FMONNOTSUPP) != 0) {
 			error = ENOTSUP;
 			goto out;
+		}
 		if (props || (edata->flags & ENVSYS_FHAS_ENTROPY) != 0) {
 			error = sme_event_register(dict, edata, sme, &lims,
 					props,
 					(edata->flags & ENVSYS_FPERCENT)?
 						PENVSYS_EVENT_CAPACITY:
 						PENVSYS_EVENT_LIMITS,

 @@ -1,14 +1,14 @@
-/* $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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/sysmon/sysmon_envsysvar.h>
 #include <prop/proplib.h>
 /*
  * Functions to create objects in a dictionary if they do not exist, or
  * for updating its value if it doesn't match with the value in dictionary.
 @@ -122,30 +122,30 @@ sme_sensor_upuint32(prop_dictionary_t di
 	return 0;
+}
 int
 sme_sensor_upstring(prop_dictionary_t dict, const char *key, const char *str)
+{
 	prop_object_t obj;
 	KASSERT(dict != NULL);
 	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_string_equals_string(obj, str)) {
-			if (!prop_dictionary_set_cstring(dict, key, str)) {
+			if (!prop_dictionary_set_string(dict, key, str)) {
 				DPRINTF(("%s: (set) set_cstring %s:%s\n",
 				    __func__, key, str));
 				return EINVAL;
+			}
+		}
+	}
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -59,27 +59,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Power management framework for sysmon.
+ *
  * We defer to a power management daemon running in userspace, since
  * power management is largely a policy issue.  This merely provides
  * for power management event notification to that daemon.
  */
 #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"
 #endif
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/poll.h>
 #include <sys/select.h>
 #include <sys/vnode.h>
 #include <sys/condvar.h>
 #include <sys/mutex.h>
 @@ -698,27 +698,27 @@ sysmon_power_make_dictionary(prop_dictio
 	 */
 	case POWER_EVENT_SWITCH_STATE_CHANGE:
+	    {
 		const struct power_event_description *peevent =
 		    pswitch_event_desc;
 		const struct power_event_description *petype =
 		    pswitch_type_desc;
 		struct sysmon_pswitch *smpsw =
 		    (struct sysmon_pswitch *)power_data;
 		const char *pwrtype = "pswitch";
 #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));	\
 		return EINVAL;						\
 	}								\
 } while (/* CONSTCOND */ 0)
 		SETPROP("driver-name", smpsw->smpsw_name);
 		for (i = 0; peevent[i].type != -1; i++)
 			if (peevent[i].type == event)
 				break;

 @@ -1,14 +1,14 @@
-/*	$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 $	*/
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include "opt_usb.h"
 #include "opt_usbverbose.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/select.h>
 @@ -855,27 +855,27 @@ usbd_attach_roothub(device_t parent, str
 	KERNEL_UNLOCK_ONE(curlwp);
 	if (dv) {
 		dev->ud_subdevs = kmem_alloc(sizeof(dv), KM_SLEEP);
 		dev->ud_subdevs[0] = dv;
 		dev->ud_subdevlen = 1;
+	}
 	return USBD_NORMAL_COMPLETION;
+}
 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);
+	}
+}
 static usbd_status
 usbd_attachwholedevice(device_t parent, struct usbd_device *dev, int port,
 	int usegeneric)
+{
 	struct usb_attach_arg uaa;
 	usb_device_descriptor_t *dd = &dev->ud_ddesc;
 	device_t dv;
 	int dlocs[USBDEVIFCF_NLOCS];

 @@ -1,14 +1,14 @@
-/*	$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
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/reboot.h>
 @@ -632,27 +632,27 @@ genfb_calc_hsize(struct genfb_softc *sc)
 	device_t dev = sc->sc_dev;
 	prop_dictionary_t dict = device_properties(dev);
 	prop_data_t edid_data;
 	struct edid_info *edid;
 	const char *edid_ptr;
 	int hsize;
 	edid_data = prop_dictionary_get(dict, "EDID");
 	if (edid_data == NULL || prop_data_size(edid_data) < 128)
 		return 0;
 	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
 		hsize = 0;
 	kmem_free(edid, sizeof(*edid));
 	return hsize;
+}
 /* Return the minimum number of character columns based on DPI */
 static int
 genfb_calc_cols(struct genfb_softc *sc)

 @@ -1,14 +1,14 @@
-/*	$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
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -44,27 +44,27 @@ wsdisplayio_get_edid(device_t dev, struc
+{
 	prop_data_t edid_data;
 	int edid_size;
 	edid_data = prop_dictionary_get(device_properties(dev), "EDID");
 	if (edid_data != NULL) {
 		edid_size = prop_data_size(edid_data);
 		/* less than 128 bytes is bogus */
 		if (edid_size < 128)
 			return ENODEV;
 		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;
+}
 /* convenience function to fill in stuff from rasops_info */
 int
 wsdisplayio_get_fbinfo(struct rasops_info *ri, struct wsdisplayio_fbinfo *fbi)
+{
 	fbi->fbi_width = ri->ri_width;
 	fbi->fbi_height = ri->ri_height;
 	fbi->fbi_stride = ri->ri_stride;
 	fbi->fbi_bitsperpixel = ri->ri_depth;