diff --git a/sys/netisdn/i4b_ctl.c b/sys/netisdn/i4b_ctl.c index db70596abd9d..fbe2faf94565 100644 --- a/sys/netisdn/i4b_ctl.c +++ b/sys/netisdn/i4b_ctl.c @@ -27,7 +27,7 @@ * i4b_ctl.c - i4b system control port driver * ------------------------------------------ * - * $Id: i4b_ctl.c,v 1.3 2001/04/21 07:23:41 martin Exp $ + * $Id: i4b_ctl.c,v 1.4 2001/07/08 10:33:58 martin Exp $ * * $FreeBSD$ * @@ -323,7 +323,7 @@ i4bctlioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) break; } - bcopy(&sc->stat, &l2s->lapdstat, sizeof(lapdstat_t)); + memcpy(&l2s->lapdstat, &sc->stat, sizeof(lapdstat_t)); break; } diff --git a/sys/netisdn/i4b_l4.c b/sys/netisdn/i4b_l4.c index df285f1d9d0d..b1404bf7760b 100644 --- a/sys/netisdn/i4b_l4.c +++ b/sys/netisdn/i4b_l4.c @@ -27,7 +27,7 @@ * i4b_l4.c - kernel interface to userland * ----------------------------------------- * - * $Id: i4b_l4.c,v 1.3 2001/03/24 12:40:32 martin Exp $ + * $Id: i4b_l4.c,v 1.4 2001/07/08 10:33:59 martin Exp $ * * $FreeBSD$ * @@ -88,10 +88,6 @@ #include #include -#if !defined(__FreeBSD__) && !defined(__NetBSD__) -#define memcpy(dst, src, len) bcopy((src), (dst), (len)) -#endif - unsigned int i4b_l4_debug = L4_DEBUG_DEFAULT; struct ctrl_type_desc ctrl_types[CTRL_NUMTYPES] = { { NULL, NULL} }; @@ -247,7 +243,7 @@ i4b_l4_dialoutnumber(int driver, int driver_unit, int cmdlen, char *cmd) cmdlen = TELNO_MAX; md->cmdlen = cmdlen; - bcopy(cmd, md->cmd, cmdlen); + memcpy(md->cmd, cmd, cmdlen); i4bputqueue(m); } } diff --git a/sys/netisdn/i4b_q931.c b/sys/netisdn/i4b_q931.c index 0a145538a56e..51c6b186985c 100644 --- a/sys/netisdn/i4b_q931.c +++ b/sys/netisdn/i4b_q931.c @@ -27,7 +27,7 @@ * i4b_q931.c - Q931 received messages handling * -------------------------------------------- * - * $Id: i4b_q931.c,v 1.3 2001/03/24 12:40:32 martin Exp $ + * $Id: i4b_q931.c,v 1.4 2001/07/08 10:33:59 martin Exp $ * * $FreeBSD$ * @@ -76,10 +76,6 @@ #include -#ifndef __FreeBSD__ -#define memcpy(d,s,l) bcopy(s,d,l) -#endif - unsigned int i4b_l3_debug = L3_DEBUG_DEFAULT; call_desc_t call_desc[N_CALL_DESC]; /* call descriptor array */