CVS commit: src/sys/arch/macppc/dev

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Tue Jul 14 08:58:03 UTC 2020

Modified Files:
        src/sys/arch/macppc/dev: cuda.c pmu.c

Log Message:
Adapt to new proplib API


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/macppc/dev/cuda.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/macppc/dev/pmu.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/arch/macppc/dev/cuda.c
diff -u src/sys/arch/macppc/dev/cuda.c:1.25 src/sys/arch/macppc/dev/cuda.c:1.26
--- src/sys/arch/macppc/dev/cuda.c:1.25	Tue Jul 14 08:52:00 2020
+++ src/sys/arch/macppc/dev/cuda.c	Tue Jul 14 08:58:03 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: cuda.c,v 1.25 2020/07/14 08:52:00 martin Exp $ */
+/*	$NetBSD: cuda.c,v 1.26 2020/07/14 08:58:03 martin Exp $ */
 
 /*-
  * Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.25 2020/07/14 08:52:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.26 2020/07/14 08:58:03 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -259,7 +259,7 @@ cuda_attach(device_t parent, device_t se
 	node = OF_finddevice("/valkyrie");
 	if (node != -1) {
 		dev = prop_dictionary_create();
-		prop_dictionary_set_cstring(dev, "name", "videopll");
+		prop_dictionary_set_string(dev, "name", "videopll");
 		prop_dictionary_set_uint32(dev, "addr", 0x50);
 		prop_array_add(cfg, dev);
 		prop_object_release(dev);

Index: src/sys/arch/macppc/dev/pmu.c
diff -u src/sys/arch/macppc/dev/pmu.c:1.33 src/sys/arch/macppc/dev/pmu.c:1.34
--- src/sys/arch/macppc/dev/pmu.c:1.33	Sun Dec 22 23:23:30 2019
+++ src/sys/arch/macppc/dev/pmu.c	Tue Jul 14 08:58:03 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmu.c,v 1.33 2019/12/22 23:23:30 thorpej Exp $ */
+/*	$NetBSD: pmu.c,v 1.34 2020/07/14 08:58:03 martin Exp $ */
 
 /*-
  * Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.33 2019/12/22 23:23:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.34 2020/07/14 08:58:03 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -365,8 +365,8 @@ pmu_attach(device_t parent, device_t sel
 				addr = (addr & 0xff) >> 1;
 				DPRINTF("-> %s@%x\n", name, addr);
 				dev = prop_dictionary_create();
-				prop_dictionary_set_cstring(dev, "name", name);
-				data = prop_data_create_data(compat, strlen(compat)+1);
+				prop_dictionary_set_string(dev, "name", name);
+				data = prop_data_create_copy(compat, strlen(compat)+1);
 				prop_dictionary_set(dev, "compatible", data);
 				prop_object_release(data);
 				prop_dictionary_set_uint32(dev, "addr", addr);