Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for proplib(3) API changes.

This commit is contained in:
thorpej 2020-06-08 20:19:50 +00:00
parent 919267d79b
commit 98fcc28254
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/acpi/acpi_i2c.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_i2c.c,v 1.5 2019/09/28 11:24:10 bouyer Exp $ */
/* $NetBSD: acpi_i2c.c,v 1.6 2020/06/08 20:21:56 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.5 2019/09/28 11:24:10 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.6 2020/06/08 20:21:56 thorpej Exp $");
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
@ -189,7 +189,7 @@ acpi_enter_i2c_device(struct acpi_devnode *ad, prop_array_t array)
name = ad->ad_name;
else
name = ad->ad_devinfo->HardwareId.String;
prop_dictionary_set_cstring(dev, "name", name);
prop_dictionary_set_string(dev, "name", name);
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 */

6
sys/dev/bluetooth/bthub.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bthub.c,v 1.22 2015/05/09 22:23:40 dholland Exp $ */
/* $NetBSD: bthub.c,v 1.23 2020/06/08 20:20:54 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.22 2015/05/09 22:23:40 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.23 2020/06/08 20:20:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -110,7 +110,7 @@ bthub_attach(device_t parent, device_t self, void *aux)
prop_object_t obj;
dict = device_properties(self);
obj = prop_data_create_data(addr, sizeof(*addr));
obj = prop_data_create_copy(addr, sizeof(*addr));
prop_dictionary_set(dict, BTDEVladdr, obj);
prop_object_release(obj);

6
sys/kern/kern_module.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_module.c,v 1.149 2020/04/04 19:50:54 christos Exp $ */
/* $NetBSD: kern_module.c,v 1.150 2020/06/08 20:19:50 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.149 2020/04/04 19:50:54 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.150 2020/06/08 20:19:50 thorpej Exp $");
#define _MODULE_INTERNAL
@ -1799,7 +1799,7 @@ module_merge_dicts(prop_dictionary_t existing_dict,
while ((props_obj = prop_object_iterator_next(props_iter)) != NULL) {
props_keysym = (prop_dictionary_keysym_t)props_obj;
props_key = prop_dictionary_keysym_cstring_nocopy(props_keysym);
props_key = prop_dictionary_keysym_value(props_keysym);
props_obj = prop_dictionary_get_keysym(new_dict, props_keysym);
if ((props_obj == NULL) || !prop_dictionary_set(existing_dict,
props_key, props_obj)) {