summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorhe <he@NetBSD.org>2008-03-31 06:19:59 +0000
committerhe <he@NetBSD.org>2008-03-31 06:19:59 +0000
commit87e42a468b293cf77624fa2eb2f4e896c9d735d0 (patch)
tree973b3a37fb942d5b5fcb2ad3bd1a24defbae1e26 /sys
parent50ea53d902adccd83cacb53e859b2844028758a6 (diff)
Convert from use of bcopy() to memcpy() so that this builds again.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/vax/boot/boot/autoconf.c6
-rw-r--r--sys/arch/vax/boot/boot/if_le.c13
2 files changed, 10 insertions, 9 deletions
diff --git a/sys/arch/vax/boot/boot/autoconf.c b/sys/arch/vax/boot/boot/autoconf.c
index 6bc28267a43..f98cd75ad54 100644
--- a/sys/arch/vax/boot/boot/autoconf.c
+++ b/sys/arch/vax/boot/boot/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.25 2007/03/04 06:00:56 christos Exp $ */
+/* $NetBSD: autoconf.c,v 1.26 2008/03/31 06:19:59 he Exp $ */
/*
* Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -111,10 +111,10 @@ autoconf()
if (copyrpb) {
struct rpb *prpb = (struct rpb *)bootregs[11];
- bcopy((void *)prpb, &bootrpb, sizeof(struct rpb));
+ memcpy(&bootrpb, (void *)prpb, sizeof(struct rpb));
if (prpb->iovec) {
bootrpb.iovec = (int)alloc(prpb->iovecsz);
- bcopy((void *)prpb->iovec, (void *)bootrpb.iovec,
+ memcpy((void *)bootrpb.iovec, (void *)prpb->iovec,
prpb->iovecsz);
}
}
diff --git a/sys/arch/vax/boot/boot/if_le.c b/sys/arch/vax/boot/boot/if_le.c
index af3b34a905a..c8bff71fe25 100644
--- a/sys/arch/vax/boot/boot/if_le.c
+++ b/sys/arch/vax/boot/boot/if_le.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.10 2006/06/11 08:35:00 he Exp $ */
+/* $NetBSD: if_le.c,v 1.11 2008/03/31 06:19:59 he Exp $ */
/*
* Copyright (c) 1997, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -172,7 +172,7 @@ igen:
initblock = (struct initblock *)
(QW_ALLOC(sizeof(struct initblock)) + addoff);
initblock->ib_mode = LE_MODE_NORMAL;
- bcopy(eaddr, initblock->ib_padr, 6);
+ memcpy(initblock->ib_padr, eaddr, 6);
initblock->ib_ladrf1 = 0;
initblock->ib_ladrf2 = 0;
@@ -267,8 +267,9 @@ retry:
copyin((rdesc[next_rdesc].bd_adrflg&0xffffff),
pkt, len);
else
- bcopy((char *)(rdesc[next_rdesc].bd_adrflg&0xffffff) +
- addoff, pkt, len);
+ memcpy(pkt,
+ (char *)(rdesc[next_rdesc].bd_adrflg&0xffffff) +
+ addoff, len);
}
rdesc[next_rdesc].bd_mcnt = 0;
@@ -307,8 +308,8 @@ retry:
if (kopiera)
copyout(pkt, (tdesc[next_tdesc].bd_adrflg & 0xffffff), len);
else
- bcopy(pkt, (char *)(tdesc[next_tdesc].bd_adrflg & 0xffffff) +
- addoff, len);
+ memcpy((char *)(tdesc[next_tdesc].bd_adrflg & 0xffffff) +
+ addoff, pkt, len);
tdesc[next_tdesc].bd_bcnt =
(len < ETHER_MIN_LEN ? -ETHER_MIN_LEN : -len);
tdesc[next_tdesc].bd_mcnt = 0;