Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/news68k bcopy() -> memcpy() (I guess there is no ov...



details:   https://anonhg.NetBSD.org/src/rev/20d25deb6728
branches:  trunk
changeset: 512159:20d25deb6728
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jul 07 05:09:43 2001 +0000

description:
bcopy() -> memcpy() (I guess there is no overlap here)

diffstat:

 sys/arch/news68k/dev/zs.c          |  10 +++++-----
 sys/arch/news68k/news68k/machdep.c |   4 ++--
 sys/arch/news68k/news68k/trap.c    |  10 ++++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diffs (86 lines):

diff -r 1b5e3f0dc577 -r 20d25deb6728 sys/arch/news68k/dev/zs.c
--- a/sys/arch/news68k/dev/zs.c Sat Jul 07 05:08:19 2001 +0000
+++ b/sys/arch/news68k/dev/zs.c Sat Jul 07 05:09:43 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zs.c,v 1.5 2000/10/14 16:45:49 tsutsui Exp $   */
+/*     $NetBSD: zs.c,v 1.6 2001/07/07 05:09:43 tsutsui Exp $   */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -226,14 +226,14 @@
                        zs_init_reg[2] = ha->ha_vect;
 
                if (zc == zc_cons) {
-                       bcopy(zs_conschan, cs, sizeof(struct zs_chanstate));
+                       memcpy(cs, zs_conschan, sizeof(struct zs_chanstate));
                        zs_conschan = cs;
                        zsc_args.hwflags = ZS_HWFLAG_CONSOLE;
                } else {
                        cs->cs_reg_csr  = &zc->zc_csr;
                        cs->cs_reg_data = &zc->zc_data;
-                       bcopy(zs_init_reg, cs->cs_creg, 16);
-                       bcopy(zs_init_reg, cs->cs_preg, 16);
+                       memcpy(cs->cs_creg, zs_init_reg, 16);
+                       memcpy(cs->cs_preg, zs_init_reg, 16);
                        cs->cs_defspeed = zs_defspeed;
                        zsc_args.hwflags = 0;
                }
@@ -620,7 +620,7 @@
        cs->cs_reg_data = &zc_cons->zc_data;
 
        /* Initialize the pending registers. */
-       bcopy(zs_init_reg, cs->cs_preg, 16);
+       memcpy(cs->cs_preg, zs_init_reg, 16);
        cs->cs_preg[5] |= ZSWR5_DTR | ZSWR5_RTS;
 
        cs->cs_preg[12] = BPS_TO_TCONST(pclk[systype] / 16, 9600); /* XXX */
diff -r 1b5e3f0dc577 -r 20d25deb6728 sys/arch/news68k/news68k/machdep.c
--- a/sys/arch/news68k/news68k/machdep.c        Sat Jul 07 05:08:19 2001 +0000
+++ b/sys/arch/news68k/news68k/machdep.c        Sat Jul 07 05:09:43 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.21 2001/06/02 18:09:17 chs Exp $ */
+/*     $NetBSD: machdep.c,v 1.22 2001/07/07 05:09:44 tsutsui Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -593,7 +593,7 @@
        CORE_SETMAGIC(*kseg, KCORE_MAGIC, MID_MACHINE, CORE_CPU);
        kseg->c_size = dbtob(1) - ALIGN(sizeof(kcore_seg_t));
 
-       bcopy(&cpu_kcore_hdr, chdr, sizeof(cpu_kcore_hdr_t));
+       memcpy(chdr, &cpu_kcore_hdr, sizeof(cpu_kcore_hdr_t));
        error = (*dump)(dumpdev, *blknop, (caddr_t)buf, sizeof(buf));
        *blknop += btodb(sizeof(buf));
        return (error);
diff -r 1b5e3f0dc577 -r 20d25deb6728 sys/arch/news68k/news68k/trap.c
--- a/sys/arch/news68k/news68k/trap.c   Sat Jul 07 05:08:19 2001 +0000
+++ b/sys/arch/news68k/news68k/trap.c   Sat Jul 07 05:09:43 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.17 2001/06/02 18:09:17 chs Exp $    */
+/*     $NetBSD: trap.c,v 1.18 2001/07/07 05:09:44 tsutsui Exp $        */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -705,7 +705,7 @@
                            VM_PROT_WRITE|PMAP_WIRED);
                        pmap_update();
                        fa = (u_int)&vmmap[m68k_page_offset(f->f_fa) & ~0xF];
-                       bcopy((caddr_t)&f->f_pd0, (caddr_t)fa, 16);
+                       memcpy((caddr_t)fa, (caddr_t)&f->f_pd0, 16);
                        (void) pmap_extract(pmap_kernel(), (vaddr_t)fa, &pa);
                        DCFL(pa);
                        pmap_remove(pmap_kernel(), (vaddr_t)vmmap,
@@ -730,9 +730,11 @@
                wbstats.move16s++;
 #endif
                if (KDFAULT(f->f_wb1s))
-                       bcopy((caddr_t)&f->f_pd0, (caddr_t)(f->f_fa & ~0xF), 16);
+                       memcpy((caddr_t)(f->f_fa & ~0xf), (caddr_t)&f->f_pd0,
+                           16);
                else
-                       err = suline((caddr_t)(f->f_fa & ~0xF), (caddr_t)&f->f_pd0);
+                       err = suline((caddr_t)(f->f_fa & ~0xF),
+                           (caddr_t)&f->f_pd0);
                if (err) {
                        fa = f->f_fa & ~0xF;
 #ifdef DEBUG



Home | Main Index | Thread Index | Old Index