Module Name: src
Committed By: jmcneill
Date: Sat Jun 27 13:34:20 UTC 2020
Modified Files:
src/sys/dev/ic: bcmgenet.c dm9000.c dwc_gmac.c
Log Message:
prop_data_data_nocopy -> prop_data_value
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/bcmgenet.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/dm9000.c
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/ic/dwc_gmac.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/dev/ic/bcmgenet.c
diff -u src/sys/dev/ic/bcmgenet.c:1.6 src/sys/dev/ic/bcmgenet.c:1.7
--- src/sys/dev/ic/bcmgenet.c:1.6 Mon May 25 19:49:28 2020
+++ src/sys/dev/ic/bcmgenet.c Sat Jun 27 13:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmgenet.c,v 1.6 2020/05/25 19:49:28 jmcneill Exp $ */
+/* $NetBSD: bcmgenet.c,v 1.7 2020/06/27 13:34:20 jmcneill Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <[email protected]>
@@ -34,7 +34,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.6 2020/05/25 19:49:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.7 2020/06/27 13:34:20 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -836,7 +836,7 @@ genet_get_eaddr(struct genet_softc *sc,
if (eaprop != NULL) {
KASSERT(prop_object_type(eaprop) == PROP_TYPE_DATA);
KASSERT(prop_data_size(eaprop) == ETHER_ADDR_LEN);
- memcpy(eaddr, prop_data_data_nocopy(eaprop),
+ memcpy(eaddr, prop_data_value(eaprop),
ETHER_ADDR_LEN);
return;
}
Index: src/sys/dev/ic/dm9000.c
diff -u src/sys/dev/ic/dm9000.c:1.28 src/sys/dev/ic/dm9000.c:1.29
--- src/sys/dev/ic/dm9000.c:1.28 Thu Apr 2 13:38:50 2020
+++ src/sys/dev/ic/dm9000.c Sat Jun 27 13:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000.c,v 1.28 2020/04/02 13:38:50 nisimura Exp $ */
+/* $NetBSD: dm9000.c,v 1.29 2020/06/27 13:34:20 jmcneill Exp $ */
/*
* Copyright (c) 2009 Paul Fleischer
@@ -224,7 +224,7 @@ dme_attach(struct dme_softc *sc, const u
*/
KASSERT(prop_object_type(ea) == PROP_TYPE_DATA);
KASSERT(prop_data_size(ea) == ETHER_ADDR_LEN);
- memcpy(enaddr, prop_data_data_nocopy(ea), ETHER_ADDR_LEN);
+ memcpy(enaddr, prop_data_value(ea), ETHER_ADDR_LEN);
aprint_debug_dev(sc->sc_dev, "got MAC address!\n");
} else {
/*
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.70 src/sys/dev/ic/dwc_gmac.c:1.71
--- src/sys/dev/ic/dwc_gmac.c:1.70 Sun May 17 21:50:47 2020
+++ src/sys/dev/ic/dwc_gmac.c Sat Jun 27 13:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.70 2020/05/17 21:50:47 chs Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.71 2020/06/27 13:34:20 jmcneill Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.70 2020/05/17 21:50:47 chs Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.71 2020/06/27 13:34:20 jmcneill Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -202,7 +202,7 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
*/
KASSERT(prop_object_type(ea) == PROP_TYPE_DATA);
KASSERT(prop_data_size(ea) == ETHER_ADDR_LEN);
- memcpy(enaddr, prop_data_data_nocopy(ea), ETHER_ADDR_LEN);
+ memcpy(enaddr, prop_data_value(ea), ETHER_ADDR_LEN);
} else {
/*
* If we did not get an externaly configure address,
