Module Name: src
Committed By: thorpej
Date: Fri Jun 12 03:41:57 UTC 2020
Modified Files:
src/sys/arch/sparc64/dev: jbus-i2c.c pcfiic_ebus.c
Log Message:
Update for proplib(3) API changes.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/dev/jbus-i2c.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/dev/pcfiic_ebus.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/sparc64/dev/jbus-i2c.c
diff -u src/sys/arch/sparc64/dev/jbus-i2c.c:1.4 src/sys/arch/sparc64/dev/jbus-i2c.c:1.5
--- src/sys/arch/sparc64/dev/jbus-i2c.c:1.4 Sun Dec 22 23:23:31 2019
+++ src/sys/arch/sparc64/dev/jbus-i2c.c Fri Jun 12 03:41:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: jbus-i2c.c,v 1.4 2019/12/22 23:23:31 thorpej Exp $ */
+/* $NetBSD: jbus-i2c.c,v 1.5 2020/06/12 03:41:57 thorpej Exp $ */
/*
* Copyright (c) 2018 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jbus-i2c.c,v 1.4 2019/12/22 23:23:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jbus-i2c.c,v 1.5 2020/06/12 03:41:57 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -136,7 +136,6 @@ jbusi2c_setup_i2c(struct jbusi2c_softc *
struct i2cbus_attach_args iba;
prop_array_t cfg;
prop_dictionary_t dev;
- prop_data_t data;
prop_dictionary_t dict = device_properties(sc->sc_dev);
int devs, regs[2], addr;
char name[64], compat[256];
@@ -167,10 +166,9 @@ jbusi2c_setup_i2c(struct jbusi2c_softc *
addr = (regs[1] & 0xff) >> 1;
DPRINTF("-> %s@%d,%x\n", name, regs[0], addr);
dev = prop_dictionary_create();
- prop_dictionary_set_cstring(dev, "name", name);
- data = prop_data_create_data(compat, strlen(compat)+1);
- prop_dictionary_set(dev, "compatible", data);
- prop_object_release(data);
+ prop_dictionary_set_string(dev, "name", name);
+ prop_dictionary_set_data(dev, "compatible", compat,
+ strlen(compat)+1);
prop_dictionary_set_uint32(dev, "addr", addr);
prop_dictionary_set_uint64(dev, "cookie", devs);
prop_array_add(cfg, dev);
Index: src/sys/arch/sparc64/dev/pcfiic_ebus.c
diff -u src/sys/arch/sparc64/dev/pcfiic_ebus.c:1.5 src/sys/arch/sparc64/dev/pcfiic_ebus.c:1.6
--- src/sys/arch/sparc64/dev/pcfiic_ebus.c:1.5 Sun Jan 3 17:32:17 2016
+++ src/sys/arch/sparc64/dev/pcfiic_ebus.c Fri Jun 12 03:41:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pcfiic_ebus.c,v 1.5 2016/01/03 17:32:17 jdc Exp $ */
+/* $NetBSD: pcfiic_ebus.c,v 1.6 2020/06/12 03:41:57 thorpej Exp $ */
/* $OpenBSD: pcfiic_ebus.c,v 1.13 2008/06/08 03:07:40 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcfiic_ebus.c,v 1.5 2016/01/03 17:32:17 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcfiic_ebus.c,v 1.6 2020/06/12 03:41:57 thorpej Exp $");
/*
* Device specific driver for the EBus i2c devices found on some sun4u
@@ -187,13 +187,10 @@ add_prop(prop_array_t c, const char *nam
int node)
{
prop_dictionary_t dev;
- prop_data_t data;
dev = prop_dictionary_create();
- prop_dictionary_set_cstring(dev, "name", name);
- data = prop_data_create_data(compat, strlen(compat)+1);
- prop_dictionary_set(dev, "compatible", data);
- prop_object_release(data);
+ prop_dictionary_set_string(dev, "name", name);
+ prop_dictionary_set_data(dev, "compatible", compat, strlen(compat)+1);
prop_dictionary_set_uint32(dev, "addr", addr);
prop_dictionary_set_uint64(dev, "cookie", node);
prop_array_add(c, dev);
