diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2020-06-27 13:32:00 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2020-06-27 13:32:00 +0000 |
| commit | 57e609dfd22943569ad7c27a86b7811dc6344cfa (patch) | |
| tree | 146b3b736467e378a44c263e9421b8d3f7225f49 /sys/dev | |
| parent | 1cedbb65210a5dcb2362e0ad87f6135d0b936a53 (diff) | |
prop_data_data_nocopy -> prop_data_value
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/bcmgenet.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/dm9000.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/dwc_gmac.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_wm.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/if_mue.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/if_smsc.c | 6 |
6 files changed, 17 insertions, 17 deletions
diff --git a/sys/dev/ic/bcmgenet.c b/sys/dev/ic/bcmgenet.c index 39f95aba267..397e2705603 100644 --- a/sys/dev/ic/bcmgenet.c +++ b/sys/dev/ic/bcmgenet.c @@ -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 <jmcneill@invisible.ca> @@ -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, uint8_t *eaddr) 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; } diff --git a/sys/dev/ic/dm9000.c b/sys/dev/ic/dm9000.c index e1ca8b4d492..c7ee1a15b06 100644 --- a/sys/dev/ic/dm9000.c +++ b/sys/dev/ic/dm9000.c @@ -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 uint8_t *notusedanymore) */ 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 { /* diff --git a/sys/dev/ic/dwc_gmac.c b/sys/dev/ic/dwc_gmac.c index ce1c31b32f7..57bbc00e810 100644 --- a/sys/dev/ic/dwc_gmac.c +++ b/sys/dev/ic/dwc_gmac.c @@ -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 *sc, int phy_id, uint32_t mii_clk) */ 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, diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c index 7a9af2e74ee..5d64bdb81c9 100644 --- a/sys/dev/pci/if_wm.c +++ b/sys/dev/pci/if_wm.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.678 2020/06/11 09:23:13 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.679 2020/06/27 13:32:00 jmcneill Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.678 2020/06/11 09:23:13 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.679 2020/06/27 13:32:00 jmcneill Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -2543,7 +2543,7 @@ alloc_retry: if (ea != NULL) { 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 (wm_read_mac_addr(sc, enaddr) != 0) { aprint_error_dev(sc->sc_dev, diff --git a/sys/dev/usb/if_mue.c b/sys/dev/usb/if_mue.c index 22ec372ab49..c35db7c87c0 100644 --- a/sys/dev/usb/if_mue.c +++ b/sys/dev/usb/if_mue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_mue.c,v 1.59 2020/03/15 23:04:50 thorpej Exp $ */ +/* $NetBSD: if_mue.c,v 1.60 2020/06/27 13:33:26 jmcneill Exp $ */ /* $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $ */ /* @@ -20,7 +20,7 @@ /* Driver for Microchip LAN7500/LAN7800 chipsets. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.59 2020/03/15 23:04:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.60 2020/06/27 13:33:26 jmcneill Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -732,7 +732,7 @@ mue_get_macaddr(struct usbnet *un, prop_dictionary_t dict) if (eaprop != NULL) { KASSERT(prop_object_type(eaprop) == PROP_TYPE_DATA); KASSERT(prop_data_size(eaprop) == ETHER_ADDR_LEN); - memcpy(un->un_eaddr, prop_data_data_nocopy(eaprop), + memcpy(un->un_eaddr, prop_data_value(eaprop), ETHER_ADDR_LEN); if (ETHER_IS_VALID(un->un_eaddr)) return 0; diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c index f00c9fa714f..5018a531efd 100644 --- a/sys/dev/usb/if_smsc.c +++ b/sys/dev/usb/if_smsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_smsc.c,v 1.68 2020/03/15 23:04:51 thorpej Exp $ */ +/* $NetBSD: if_smsc.c,v 1.69 2020/06/27 13:33:26 jmcneill Exp $ */ /* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */ /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */ @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.68 2020/03/15 23:04:51 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.69 2020/06/27 13:33:26 jmcneill Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -896,7 +896,7 @@ smsc_attach(device_t parent, device_t self, void *aux) if (eaprop != NULL) { KASSERT(prop_object_type(eaprop) == PROP_TYPE_DATA); KASSERT(prop_data_size(eaprop) == ETHER_ADDR_LEN); - memcpy(un->un_eaddr, prop_data_data_nocopy(eaprop), + memcpy(un->un_eaddr, prop_data_value(eaprop), ETHER_ADDR_LEN); } else { /* Check if there is already a MAC address in the register */ |
