Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Adapt to proplib api changes



details:   https://anonhg.NetBSD.org/src/rev/31e8c98acf27
branches:  trunk
changeset: 935547:31e8c98acf27
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jul 05 09:53:54 2020 +0000

description:
Adapt to proplib api changes

diffstat:

 sys/arch/sparc64/dev/ffb.c          |  6 +++---
 sys/arch/sparc64/sparc64/autoconf.c |  6 +++---
 sys/dev/pci/radeonfb.c              |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r 6759c1ee408e -r 31e8c98acf27 sys/arch/sparc64/dev/ffb.c
--- a/sys/arch/sparc64/dev/ffb.c        Sun Jul 05 09:27:11 2020 +0000
+++ b/sys/arch/sparc64/dev/ffb.c        Sun Jul 05 09:53:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffb.c,v 1.64 2019/12/22 23:23:31 thorpej Exp $ */
+/*     $NetBSD: ffb.c,v 1.65 2020/07/05 09:55:07 martin Exp $  */
 /*     $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $      */
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.64 2019/12/22 23:23:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.65 2020/07/05 09:55:07 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -306,7 +306,7 @@
                if (ffb_debug)
                        edid_print(&sc->sc_edid_info);
 
-               data = prop_data_create_data(sc->sc_edid_data, EDID_DATA_LEN);
+               data = prop_data_create_copy(sc->sc_edid_data, EDID_DATA_LEN);
                prop_dictionary_set(device_properties(self), "EDID", data);
                prop_object_release(data);
 
diff -r 6759c1ee408e -r 31e8c98acf27 sys/arch/sparc64/sparc64/autoconf.c
--- a/sys/arch/sparc64/sparc64/autoconf.c       Sun Jul 05 09:27:11 2020 +0000
+++ b/sys/arch/sparc64/sparc64/autoconf.c       Sun Jul 05 09:53:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.220 2020/07/05 09:27:11 martin Exp $ */
+/*     $NetBSD: autoconf.c,v 1.221 2020/07/05 09:56:06 martin Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.220 2020/07/05 09:27:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.221 2020/07/05 09:56:06 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -1413,7 +1413,7 @@
                        prop_dictionary_set_uint64(sens, "cookie", 0);
                        prop_dictionary_set_string(sens, "name",
                            "temperature-sensor");
-                       data = prop_data_create_data(&name_lm[0],
+                       data = prop_data_create_copy(&name_lm[0],
                            sizeof(name_lm));
                        prop_dictionary_set(sens, "compatible", data);
                        prop_object_release(data);
diff -r 6759c1ee408e -r 31e8c98acf27 sys/dev/pci/radeonfb.c
--- a/sys/dev/pci/radeonfb.c    Sun Jul 05 09:27:11 2020 +0000
+++ b/sys/dev/pci/radeonfb.c    Sun Jul 05 09:53:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeonfb.c,v 1.108 2020/06/11 07:51:26 macallan Exp $ */
+/*     $NetBSD: radeonfb.c,v 1.109 2020/07/05 09:53:54 martin Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.108 2020/06/11 07:51:26 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.109 2020/07/05 09:53:54 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1596,7 +1596,7 @@
                return defval;
        }
        KASSERT(prop_object_type(pn) == PROP_TYPE_NUMBER);
-       return (prop_number_integer_value(pn));
+       return prop_number_unsigned_value(pn);
 }
 
 int
@@ -1978,7 +1978,7 @@
                      sc->sc_dev), "EDID")) != NULL) {
 
                        aprint_debug_dev(sc->sc_dev, "using static EDID\n");
-                       memcpy(edid, prop_data_data_nocopy(edid_data), 128);
+                       memcpy(edid, prop_data_value(edid_data), 128);
                        if (edid_parse(edid, eip) == 0) {
 
                                sc->sc_ports[i].rp_edid_valid = 1;



Home | Main Index | Thread Index | Old Index