Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/cadence Use prop_data_value (not prop_data_data_nocopy)



details:   https://anonhg.NetBSD.org/src/rev/b53bbb403405
branches:  trunk
changeset: 1011397:b53bbb403405
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Jun 28 12:43:00 2020 +0000

description:
Use prop_data_value (not prop_data_data_nocopy)

diffstat:

 sys/arch/arm/ti/omap3_dss.c |  7 +++----
 sys/dev/cadence/if_cemac.c  |  6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r 54bcefa50935 -r b53bbb403405 sys/arch/arm/ti/omap3_dss.c
--- a/sys/arch/arm/ti/omap3_dss.c       Sun Jun 28 11:39:50 2020 +0000
+++ b/sys/arch/arm/ti/omap3_dss.c       Sun Jun 28 12:43:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap3_dss.c,v 1.1 2019/10/31 17:08:54 jmcneill Exp $   */
+/*     $NetBSD: omap3_dss.c,v 1.2 2020/06/28 12:43:00 skrll Exp $      */
 
 /*
  * Copyright (c) 2010 Michael Lorenz
@@ -33,7 +33,7 @@
 #include "opt_wsdisplay_compat.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_dss.c,v 1.1 2019/10/31 17:08:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_dss.c,v 1.2 2020/06/28 12:43:00 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -262,8 +262,7 @@
 
                sc->sc_edid_size = uimin(prop_data_size(edid_data), 1024);
                memset(sc->sc_edid_data, 0, sizeof(sc->sc_edid_data));
-               memcpy(sc->sc_edid_data, prop_data_data_nocopy(edid_data),
-                   sc->sc_edid_size);
+               memcpy(sc->sc_edid_data, prop_data_value(edid_data), sc->sc_edid_size);
 
                edid_parse(sc->sc_edid_data, &ei);
                edid_print(&ei);
diff -r 54bcefa50935 -r b53bbb403405 sys/dev/cadence/if_cemac.c
--- a/sys/dev/cadence/if_cemac.c        Sun Jun 28 11:39:50 2020 +0000
+++ b/sys/dev/cadence/if_cemac.c        Sun Jun 28 12:43:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cemac.c,v 1.22 2020/01/29 05:54:29 thorpej Exp $    */
+/*     $NetBSD: if_cemac.c,v 1.23 2020/06/28 12:43:00 skrll Exp $      */
 
 /*
  * Copyright (c) 2015  Genetec Corporation.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.22 2020/01/29 05:54:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.23 2020/06/28 12:43:00 skrll Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -210,7 +210,7 @@
        if (enaddr != NULL) {
                KASSERT(prop_object_type(enaddr) == PROP_TYPE_DATA);
                KASSERT(prop_data_size(enaddr) == ETHER_ADDR_LEN);
-               memcpy(sc->sc_enaddr, prop_data_data_nocopy(enaddr),
+               memcpy(sc->sc_enaddr, prop_data_value(enaddr),
                       ETHER_ADDR_LEN);
        } else {
                static const uint8_t hardcoded[ETHER_ADDR_LEN] = {



Home | Main Index | Thread Index | Old Index