Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci prop_data_data_nocopy -> prop_data_value



details:   https://anonhg.NetBSD.org/src/rev/d5b775b59e4a
branches:  trunk
changeset: 935402:d5b775b59e4a
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jul 02 09:02:04 2020 +0000

description:
prop_data_data_nocopy -> prop_data_value

diffstat:

 sys/dev/pci/if_bge.c     |  6 +++---
 sys/dev/pci/if_cas.c     |  6 +++---
 sys/dev/pci/if_gem_pci.c |  8 ++++----
 sys/dev/pci/if_hme_pci.c |  6 +++---
 sys/dev/pci/if_sk.c      |  6 +++---
 sys/dev/pci/if_stge.c    |  6 +++---
 sys/dev/pci/if_tlp_pci.c |  8 ++++----
 7 files changed, 23 insertions(+), 23 deletions(-)

diffs (203 lines):

diff -r df02a103bdaa -r d5b775b59e4a sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Thu Jul 02 08:48:10 2020 +0000
+++ b/sys/dev/pci/if_bge.c      Thu Jul 02 09:02:04 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.345 2020/02/07 00:04:28 thorpej Exp $     */
+/*     $NetBSD: if_bge.c,v 1.346 2020/07/02 09:07:10 msaitoh Exp $     */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.345 2020/02/07 00:04:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.346 2020/07/02 09:07:10 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -6359,7 +6359,7 @@
        if (ea != NULL) {
                KASSERT(prop_object_type(ea) == PROP_TYPE_DATA);
                KASSERT(prop_data_size(ea) == ETHER_ADDR_LEN);
-               memcpy(ether_addr, prop_data_data_nocopy(ea), ETHER_ADDR_LEN);
+               memcpy(ether_addr, prop_data_value(ea), ETHER_ADDR_LEN);
                return 0;
        }
 
diff -r df02a103bdaa -r d5b775b59e4a sys/dev/pci/if_cas.c
--- a/sys/dev/pci/if_cas.c      Thu Jul 02 08:48:10 2020 +0000
+++ b/sys/dev/pci/if_cas.c      Thu Jul 02 09:02:04 2020 +0000
@@ -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 @@
 
        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));
diff -r df02a103bdaa -r d5b775b59e4a sys/dev/pci/if_gem_pci.c
--- a/sys/dev/pci/if_gem_pci.c  Thu Jul 02 08:48:10 2020 +0000
+++ b/sys/dev/pci/if_gem_pci.c  Thu Jul 02 09:02:04 2020 +0000
@@ -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 @@
 
        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;
diff -r df02a103bdaa -r d5b775b59e4a sys/dev/pci/if_hme_pci.c
--- a/sys/dev/pci/if_hme_pci.c  Thu Jul 02 08:48:10 2020 +0000
+++ b/sys/dev/pci/if_hme_pci.c  Thu Jul 02 09:02:04 2020 +0000
@@ -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 @@
        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;
        }
diff -r df02a103bdaa -r d5b775b59e4a sys/dev/pci/if_sk.c
--- a/sys/dev/pci/if_sk.c       Thu Jul 02 08:48:10 2020 +0000
+++ b/sys/dev/pci/if_sk.c       Thu Jul 02 09:02:04 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_sk.c,v 1.105 2020/02/24 12:20:30 rin Exp $  */
+/*     $NetBSD: if_sk.c,v 1.106 2020/07/02 09:07:10 msaitoh Exp $      */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.105 2020/02/24 12:20:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.106 2020/07/02 09:07:10 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1247,7 +1247,7 @@
                 */
                KASSERT(prop_object_type(data) == PROP_TYPE_DATA);
                KASSERT(prop_data_size(data) == ETHER_ADDR_LEN);
-               memcpy(sc_if->sk_enaddr, prop_data_data_nocopy(data),
+               memcpy(sc_if->sk_enaddr, prop_data_value(data),
                    ETHER_ADDR_LEN);
        } else
                for (i = 0; i < ETHER_ADDR_LEN; i++)
diff -r df02a103bdaa -r d5b775b59e4a sys/dev/pci/if_stge.c
--- a/sys/dev/pci/if_stge.c     Thu Jul 02 08:48:10 2020 +0000
+++ b/sys/dev/pci/if_stge.c     Thu Jul 02 09:02:04 2020 +0000
@@ -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 @@
                         */
                        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];
diff -r df02a103bdaa -r d5b775b59e4a sys/dev/pci/if_tlp_pci.c
--- a/sys/dev/pci/if_tlp_pci.c  Thu Jul 02 08:48:10 2020 +0000
+++ b/sys/dev/pci/if_tlp_pci.c  Thu Jul 02 09:02:04 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_pci.c,v 1.127 2019/11/10 21:16:36 chs Exp $     */
+/*     $NetBSD: if_tlp_pci.c,v 1.128 2020/07/02 09:07:10 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.127 2019/11/10 21:16:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.128 2020/07/02 09:07:10 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -647,7 +647,7 @@
                        KASSERT(prop_object_type(ea) == PROP_TYPE_DATA);
                        KASSERT(prop_data_size(ea) == ETHER_ADDR_LEN);
 
-                       memcpy(enaddr, prop_data_data_nocopy(ea),
+                       memcpy(enaddr, prop_data_value(ea),
                               ETHER_ADDR_LEN);
 
                        sc->sc_srom_addrbits = 6;
@@ -935,7 +935,7 @@
                        if (eaddrprop != NULL
                            && prop_data_size(eaddrprop) == ETHER_ADDR_LEN)
                                memcpy(enaddr,
-                                   prop_data_data_nocopy(eaddrprop),
+                                   prop_data_value(eaddrprop),
                                    ETHER_ADDR_LEN);
                        else
                                memcpy(enaddr, &sc->sc_srom[20],



Home | Main Index | Thread Index | Old Index