Module Name: src Committed By: msaitoh Date: Thu Jul 2 09:02:04 UTC 2020
Modified Files: src/sys/dev/pci: if_cas.c if_gem_pci.c if_hme_pci.c if_stge.c Log Message: prop_data_data_nocopy -> prop_data_value To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/if_cas.c cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/if_gem_pci.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/if_hme_pci.c cvs rdiff -u -r1.86 -r1.87 src/sys/dev/pci/if_stge.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/pci/if_cas.c diff -u src/sys/dev/pci/if_cas.c:1.42 src/sys/dev/pci/if_cas.c:1.43 --- src/sys/dev/pci/if_cas.c:1.42 Sun Mar 8 03:16:20 2020 +++ src/sys/dev/pci/if_cas.c Thu Jul 2 09:02:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cas.c,v 1.42 2020/03/08 03:16:20 thorpej Exp $ */ +/* $NetBSD: if_cas.c,v 1.43 2020/07/02 09:02:04 msaitoh Exp $ */ /* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */ /* @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.42 2020/03/08 03:16:20 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.43 2020/07/02 09:02:04 msaitoh Exp $"); #ifndef _MODULE #include "opt_inet.h" @@ -441,7 +441,7 @@ cas_attach(device_t parent, device_t sel if ((data = prop_dictionary_get(device_properties(sc->sc_dev), "mac-address")) != NULL) - memcpy(enaddr, prop_data_data_nocopy(data), ETHER_ADDR_LEN); + memcpy(enaddr, prop_data_value(data), ETHER_ADDR_LEN); if (cas_pci_readvpd(sc, pa, (data == NULL) ? enaddr : 0) != 0) { aprint_error_dev(sc->sc_dev, "no Ethernet address found\n"); memset(enaddr, 0, sizeof(enaddr)); Index: src/sys/dev/pci/if_gem_pci.c diff -u src/sys/dev/pci/if_gem_pci.c:1.51 src/sys/dev/pci/if_gem_pci.c:1.52 --- src/sys/dev/pci/if_gem_pci.c:1.51 Sat May 30 16:35:02 2020 +++ src/sys/dev/pci/if_gem_pci.c Thu Jul 2 09:02:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_gem_pci.c,v 1.51 2020/05/30 16:35:02 thorpej Exp $ */ +/* $NetBSD: if_gem_pci.c,v 1.52 2020/07/02 09:02:04 msaitoh Exp $ */ /* * @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.51 2020/05/30 16:35:02 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.52 2020/07/02 09:02:04 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -235,11 +235,11 @@ gem_pci_attach(device_t parent, device_t if ((data = prop_dictionary_get(device_properties(sc->sc_dev), "mac-address")) != NULL) { - memcpy(enaddr, prop_data_data_nocopy(data), ETHER_ADDR_LEN); + memcpy(enaddr, prop_data_value(data), ETHER_ADDR_LEN); got_addr = 1; if ((data = prop_dictionary_get(device_properties(sc->sc_dev), "shared-pins")) != NULL) { - memcpy(buf, prop_data_data_nocopy(data), + memcpy(buf, prop_data_value(data), prop_data_size(data)); if (isserdes(buf)) { sc->sc_flags |= GEM_SERDES; Index: src/sys/dev/pci/if_hme_pci.c diff -u src/sys/dev/pci/if_hme_pci.c:1.38 src/sys/dev/pci/if_hme_pci.c:1.39 --- src/sys/dev/pci/if_hme_pci.c:1.38 Sun Dec 9 11:14:02 2018 +++ src/sys/dev/pci/if_hme_pci.c Thu Jul 2 09:02:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_hme_pci.c,v 1.38 2018/12/09 11:14:02 jdolecek Exp $ */ +/* $NetBSD: if_hme_pci.c,v 1.39 2020/07/02 09:02:04 msaitoh Exp $ */ /* * Copyright (c) 2000 Matthew R. Green @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.38 2018/12/09 11:14:02 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.39 2020/07/02 09:02:04 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -215,7 +215,7 @@ hmeattach_pci(device_t parent, device_t eaddrprop = prop_dictionary_get(device_properties(self), "mac-address"); if (eaddrprop != NULL && prop_data_size(eaddrprop) == ETHER_ADDR_LEN) { - memcpy(&sc->sc_enaddr, prop_data_data_nocopy(eaddrprop), + memcpy(&sc->sc_enaddr, prop_data_value(eaddrprop), ETHER_ADDR_LEN); goto got_eaddr; } Index: src/sys/dev/pci/if_stge.c diff -u src/sys/dev/pci/if_stge.c:1.86 src/sys/dev/pci/if_stge.c:1.87 --- src/sys/dev/pci/if_stge.c:1.86 Sun Mar 15 22:20:31 2020 +++ src/sys/dev/pci/if_stge.c Thu Jul 2 09:02:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_stge.c,v 1.86 2020/03/15 22:20:31 thorpej Exp $ */ +/* $NetBSD: if_stge.c,v 1.87 2020/07/02 09:02:04 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.86 2020/03/15 22:20:31 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.87 2020/07/02 09:02:04 msaitoh Exp $"); #include <sys/param.h> @@ -600,7 +600,7 @@ stge_attach(device_t parent, device_t se */ KASSERT(prop_object_type(data) == PROP_TYPE_DATA); KASSERT(prop_data_size(data) == ETHER_ADDR_LEN); - (void)memcpy(enaddr, prop_data_data_nocopy(data), + (void)memcpy(enaddr, prop_data_value(data), ETHER_ADDR_LEN); } else { uint16_t myaddr[ETHER_ADDR_LEN / 2];