Module Name: src
Committed By: skrll
Date: Sun Jun 28 12:43:00 UTC 2020
Modified Files:
src/sys/arch/arm/ti: omap3_dss.c
src/sys/dev/cadence: if_cemac.c
Log Message:
Use prop_data_value (not prop_data_data_nocopy)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/omap3_dss.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/cadence/if_cemac.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/arm/ti/omap3_dss.c
diff -u src/sys/arch/arm/ti/omap3_dss.c:1.1 src/sys/arch/arm/ti/omap3_dss.c:1.2
--- src/sys/arch/arm/ti/omap3_dss.c:1.1 Thu Oct 31 17:08:54 2019
+++ src/sys/arch/arm/ti/omap3_dss.c Sun Jun 28 12:43:00 2020
@@ -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 @@ omapfb_attach(device_t parent, device_t
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);
Index: src/sys/dev/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.22 src/sys/dev/cadence/if_cemac.c:1.23
--- src/sys/dev/cadence/if_cemac.c:1.22 Wed Jan 29 05:54:29 2020
+++ src/sys/dev/cadence/if_cemac.c Sun Jun 28 12:43:00 2020
@@ -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 @@ cemac_attach_common(device_t self, bus_s
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] = {
