 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.219 2020/06/12 03:32:30 thorpej Exp $ */
+/*	$NetBSD: autoconf.c,v 1.220 2020/07/05 09:27:11 martin Exp $ */
 /*
  * Copyright (c) 1996
  *    The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
 @@ -38,27 +38,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)autoconf.c	8.4 (Berkeley) 10/1/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.219 2020/06/12 03:32:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.220 2020/07/05 09:27:11 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 @@ -1040,27 +1040,27 @@ device_setofnode(device_t dev, int node)
 	obj = prop_number_create_signed(node);
 	if (obj == NULL)
 		return;
 	prop_dictionary_set(props, OFNODEKEY, obj);
 	prop_object_release(obj);
 	DPRINTF(ACDB_BOOTDEV, (" [device %s has node %x] ",
 	    device_xname(dev), node));
+}
 static void
 add_gpio_LED(prop_array_t pins, const char *name, int num, int act, int def)
+{
 	prop_dictionary_t pin = prop_dictionary_create();
-	prop_dictionary_set_cstring(pin, "name", name);
+	prop_dictionary_set_string(pin, "name", name);
 	prop_dictionary_set_uint32(pin, "type", 0);	/* 0 for LED, for now */
 	prop_dictionary_set_uint32(pin, "pin", num);
 	prop_dictionary_set_bool(pin, "active_high", act);
 	if (def != -1)
 		prop_dictionary_set_int32(pin, "default_state", def);
 	prop_array_add(pins, pin);
 	prop_object_release(pin);
+}
 static void
 add_gpio_props_v210(device_t dev, void *aux)
+{
 	struct i2c_attach_args *ia = aux;
 @@ -1096,27 +1096,27 @@ add_drivebay_props_v210(device_t dev, in
 	char path[256]= "";
 	OF_package_to_path(ofnode, path, sizeof(path));
 	/* see if we're on the onboard controller's 1st channel */
 	if (strcmp(path, "/pci@1c,600000/scsi@2") != 0)
 		return;
 	/* yes, yes we are */
 	if ( target < 2) {
 		prop_dictionary_t dict = device_properties(dev);
 		char name[16];
 		snprintf(name, sizeof(name), "bay%d", target);
-		prop_dictionary_set_cstring(dict, "location", name);
+		prop_dictionary_set_string(dict, "location", name);
+	}
+}
 /*
  * Called back during autoconfiguration for each device found
  */
 void
 device_register(device_t dev, void *aux)
+{
 	device_t busdev = device_parent(dev);
 	int ofnode = 0;
 	/*
 @@ -1248,27 +1248,27 @@ device_register(device_t dev, void *aux)
 			/*
 			 * Is it a network interface with FCode?
 			 */
 			if (strcmp(tmpstr, "network") == 0 ||
 			    strcmp(tmpstr2, "network") == 0) {
 				prop_dictionary_set_bool(dict,
 				    "without-seeprom", true);
 				prom_getether(ofnode, eaddr);
 			} else {
 				if (!prom_get_node_ether(ofnode, eaddr))
 					goto noether;
+			}
-			blob = prop_data_create_data(eaddr, ETHER_ADDR_LEN);
+			blob = prop_data_create_copy(eaddr, ETHER_ADDR_LEN);
 			prop_dictionary_set(dict, "mac-address", blob);
 			prop_object_release(blob);
 			of_to_dataprop(dict, ofnode, "shared-pins",
 			    "shared-pins");
+		}
 noether:
 		/* is this a FC node? */
 		if (strcmp(tmpstr, "scsi-fcp") == 0) {
 			dict = device_properties(dev);
 			if (OF_getprop(ofnode, "port-wwn", &pwwn, sizeof(pwwn))
 @@ -1347,27 +1347,27 @@ noether:
 		/*
 		 * Add SPARCle spdmem devices (0x50 and 0x51) that the
 		 * firmware does not know about.
 		 */
 		if (!strcmp(machine_model, "TAD,SPARCLE")) {
 			prop_dictionary_t props = device_properties(busdev);
 			prop_array_t cfg = prop_array_create();
 			int i;
 			DPRINTF(ACDB_PROBE, ("\nAdding spdmem for SPARCle "));
 			for (i = 0x50; i <= 0x51; i++) {
 				prop_dictionary_t spd =
 				    prop_dictionary_create();
-				prop_dictionary_set_cstring(spd, "name",
+				prop_dictionary_set_string(spd, "name",
 				    "dimm-spd");
 				prop_dictionary_set_uint32(spd, "addr", i);
 				prop_dictionary_set_uint64(spd, "cookie", 0);
 				prop_array_add(cfg, spd);
 				prop_object_release(spd);
+			}
 			prop_dictionary_set(props, "i2c-child-devices", cfg);
 			prop_object_release(cfg);
+		}
 		/*
 		 * Add V210/V240 environmental sensors that are not in
 @@ -1388,40 +1388,40 @@ noether:
 			cfg = prop_dictionary_get(props, "i2c-child-devices");
  			if (!cfg) {
 				cfg = prop_array_create();
 				prop_dictionary_set(props, "i2c-child-devices",
 				    cfg);
 				prop_dictionary_set_bool(props,
 				    "i2c-no-indirect-config", true);
+			}
 			/* ADM1026 at 0x2e */
 			sens = prop_dictionary_create();
 			prop_dictionary_set_uint32(sens, "addr", 0x2e);
 			prop_dictionary_set_uint64(sens, "cookie", 0);
-			prop_dictionary_set_cstring(sens, "name",
+			prop_dictionary_set_string(sens, "name",
 			    "hardware-monitor");
-			data = prop_data_create_data(&name_adm[0],
+			data = prop_data_create_copy(&name_adm[0],
 			    sizeof(name_adm));
 			prop_dictionary_set(sens, "compatible", data);
 			prop_object_release(data);
 			prop_array_add(cfg, sens);
 			prop_object_release(sens);
 			/* LM75 at 0x4e */
 			sens = prop_dictionary_create();
 			prop_dictionary_set_uint32(sens, "addr", 0x4e);
 			prop_dictionary_set_uint64(sens, "cookie", 0);
-			prop_dictionary_set_cstring(sens, "name",
+			prop_dictionary_set_string(sens, "name",
 			    "temperature-sensor");
 			data = prop_data_create_data(&name_lm[0],
 			    sizeof(name_lm));
 			prop_dictionary_set(sens, "compatible", data);
 			prop_object_release(data);
 			prop_array_add(cfg, sens);
 			prop_object_release(sens);
+		}
+	}
 	/* set properties for PCI framebuffers */
 	if (device_is_a(busdev, "pci")) {
 		/* see if this is going to be console */
 @@ -1659,23 +1659,23 @@ copyprops(device_t busdev, int node, pro
 	if (!is_console)
 		return;
 	options = OF_finddevice("/options");
 	if ((options == 0) || (options == -1))
 		return;
 	if (OF_getprop(options, "output-device", output_device, OFPATHLEN) == 0)
 		return;
 	/* find the mode string if there is one */
 	pos = strstr(output_device, ":r");
 	if (pos == NULL)
 		return;
-	prop_dictionary_set_cstring(dict, "videomode", pos + 2);
+	prop_dictionary_set_string(dict, "videomode", pos + 2);
+}
 static void
 of_set_palette(void *cookie, int index, int r, int g, int b)
+{
 	int ih = (int)((intptr_t)cookie);
 	OF_call_method_1("color!", ih, 4, r, g, b, index);
+}