summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2002-05-22 15:40:47 +0000
committerwiz <wiz@NetBSD.org>2002-05-22 15:40:47 +0000
commit45bbb2368ffe71fd90bb5d66dc82f1f581e4168d (patch)
treef02309a22f631532695d95a3604ddef49f07794b /sys/dev
parentc46d7a2d08722845c1dc22326b4ba94c046c5cd4 (diff)
bcopy -> memcpy. Reviewed by Greg Oster.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/raidframe/rf_dagdegrd.c6
-rw-r--r--sys/dev/raidframe/rf_dagdegwr.c6
-rw-r--r--sys/dev/raidframe/rf_decluster.c6
-rw-r--r--sys/dev/raidframe/rf_map.c12
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c6
-rw-r--r--sys/dev/raidframe/rf_paritylog.c6
-rw-r--r--sys/dev/raidframe/rf_pq.c6
7 files changed, 24 insertions, 24 deletions
diff --git a/sys/dev/raidframe/rf_dagdegrd.c b/sys/dev/raidframe/rf_dagdegrd.c
index 2366fb534a2..79c1ecba80a 100644
--- a/sys/dev/raidframe/rf_dagdegrd.c
+++ b/sys/dev/raidframe/rf_dagdegrd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegrd.c,v 1.10 2001/11/13 07:11:12 lukem Exp $ */
+/* $NetBSD: rf_dagdegrd.c,v 1.11 2002/05/22 15:40:47 wiz Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.10 2001/11/13 07:11:12 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.11 2002/05/22 15:40:47 wiz Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -421,7 +421,7 @@ rf_CreateDegradedReadDAG(
* xored in */
if (overlappingPDAs[i]) {
RF_MallocAndAdd(pda, sizeof(RF_PhysDiskAddr_t), (RF_PhysDiskAddr_t *), allocList);
- bcopy((char *) rudNodes[i].params[0].p, (char *) pda, sizeof(RF_PhysDiskAddr_t));
+ memcpy((char *) pda, (char *) rudNodes[i].params[0].p, sizeof(RF_PhysDiskAddr_t));
rf_RangeRestrictPDA(raidPtr, failedPDA, pda, RF_RESTRICT_DOBUFFER, 0);
xorNode->params[paramNum++].p = pda;
xorNode->params[paramNum++].p = pda->bufPtr;
diff --git a/sys/dev/raidframe/rf_dagdegwr.c b/sys/dev/raidframe/rf_dagdegwr.c
index 178405127be..f2bac7f775b 100644
--- a/sys/dev/raidframe/rf_dagdegwr.c
+++ b/sys/dev/raidframe/rf_dagdegwr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegwr.c,v 1.9 2001/11/13 07:11:13 lukem Exp $ */
+/* $NetBSD: rf_dagdegwr.c,v 1.10 2002/05/22 15:40:48 wiz Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.9 2001/11/13 07:11:13 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.10 2002/05/22 15:40:48 wiz Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -404,7 +404,7 @@ rf_CommonCreateSimpleDegradedWriteDAG(raidPtr, asmap, dag_h, bp, flags,
* xored in */
if (overlappingPDAs[i]) {
RF_MallocAndAdd(pda, sizeof(RF_PhysDiskAddr_t), (RF_PhysDiskAddr_t *), allocList);
- bcopy((char *) wndNodes[i].params[0].p, (char *) pda, sizeof(RF_PhysDiskAddr_t));
+ memcpy((char *) pda, (char *) wndNodes[i].params[0].p, sizeof(RF_PhysDiskAddr_t));
rf_RangeRestrictPDA(raidPtr, failedPDA, pda, RF_RESTRICT_DOBUFFER, 0);
xorNode->params[paramNum++].p = pda;
xorNode->params[paramNum++].p = pda->bufPtr;
diff --git a/sys/dev/raidframe/rf_decluster.c b/sys/dev/raidframe/rf_decluster.c
index 72f259d4ac4..82405c45e61 100644
--- a/sys/dev/raidframe/rf_decluster.c
+++ b/sys/dev/raidframe/rf_decluster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_decluster.c,v 1.8 2001/11/13 07:11:13 lukem Exp $ */
+/* $NetBSD: rf_decluster.c,v 1.9 2002/05/22 15:40:49 wiz Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -48,7 +48,7 @@
*--------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.8 2001/11/13 07:11:13 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.9 2002/05/22 15:40:49 wiz Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -103,7 +103,7 @@ rf_ConfigureDeclustered(
/* 2. extract parameters from the config structure */
if (layoutPtr->map->flags & RF_DISTRIBUTE_SPARE) {
- (void) bcopy(cfgBuf, info->sparemap_fname, RF_SPAREMAP_NAME_LEN);
+ (void)memcpy(info->sparemap_fname, cfgBuf, RF_SPAREMAP_NAME_LEN);
}
cfgBuf += RF_SPAREMAP_NAME_LEN;
diff --git a/sys/dev/raidframe/rf_map.c b/sys/dev/raidframe/rf_map.c
index 770df0d5a0f..9ed9ca1013b 100644
--- a/sys/dev/raidframe/rf_map.c
+++ b/sys/dev/raidframe/rf_map.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_map.c,v 1.11 2002/01/07 05:30:53 oster Exp $ */
+/* $NetBSD: rf_map.c,v 1.12 2002/05/22 15:40:49 wiz Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.11 2002/01/07 05:30:53 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.12 2002/05/22 15:40:49 wiz Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -305,7 +305,7 @@ rf_DuplicateASM(asmap)
new_pda = NULL;
new_asm = rf_AllocAccessStripeMapComponent();
- bcopy((char *) asmap, (char *) new_asm, sizeof(RF_AccessStripeMap_t));
+ memcpy((char *) new_asm, (char *) asmap, sizeof(RF_AccessStripeMap_t));
new_asm->numFailedPDAs = 0; /* ??? */
new_asm->failedPDAs[0] = NULL;
new_asm->physInfo = NULL;
@@ -315,7 +315,7 @@ rf_DuplicateASM(asmap)
for (pda = asmap->physInfo; pda; pda = pda->next) { /* copy the physInfo
* list */
t_pda = rf_AllocPhysDiskAddr();
- bcopy((char *) pda, (char *) t_pda, sizeof(RF_PhysDiskAddr_t));
+ memcpy((char *) t_pda, (char *) pda, sizeof(RF_PhysDiskAddr_t));
t_pda->next = NULL;
if (!new_asm->physInfo) {
new_asm->physInfo = t_pda;
@@ -330,7 +330,7 @@ rf_DuplicateASM(asmap)
for (pda = asmap->parityInfo; pda; pda = pda->next) { /* copy the parityInfo
* list */
t_pda = rf_AllocPhysDiskAddr();
- bcopy((char *) pda, (char *) t_pda, sizeof(RF_PhysDiskAddr_t));
+ memcpy((char *) t_pda, (char *) pda, sizeof(RF_PhysDiskAddr_t));
t_pda->next = NULL;
if (!new_asm->parityInfo) {
new_asm->parityInfo = t_pda;
@@ -356,7 +356,7 @@ rf_DuplicatePDA(pda)
RF_PhysDiskAddr_t *new;
new = rf_AllocPhysDiskAddr();
- bcopy((char *) pda, (char *) new, sizeof(RF_PhysDiskAddr_t));
+ memcpy((char *) new, (char *) pda, sizeof(RF_PhysDiskAddr_t));
return (new);
}
/*****************************************************************************************
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index ec9deda7af8..f8256b2444f 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.117 2002/03/08 20:48:39 thorpej Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.118 2002/05/22 15:40:50 wiz Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -114,7 +114,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.117 2002/03/08 20:48:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.118 2002/05/22 15:40:50 wiz Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -1271,7 +1271,7 @@ raidioctl(dev, cmd, data, flag, p)
RF_Malloc(rrcopy, sizeof(*rrcopy), (struct rf_recon_req *));
if (rrcopy == NULL)
return(ENOMEM);
- bcopy(rr, rrcopy, sizeof(*rr));
+ memcpy(rrcopy, rr, sizeof(*rr));
rrcopy->raidPtr = (void *) raidPtr;
retcode = RF_CREATE_THREAD(raidPtr->recon_thread,
diff --git a/sys/dev/raidframe/rf_paritylog.c b/sys/dev/raidframe/rf_paritylog.c
index 841c848d67e..6f7e0e1ab65 100644
--- a/sys/dev/raidframe/rf_paritylog.c
+++ b/sys/dev/raidframe/rf_paritylog.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritylog.c,v 1.7 2001/11/13 07:11:15 lukem Exp $ */
+/* $NetBSD: rf_paritylog.c,v 1.8 2002/05/22 15:40:51 wiz Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritylog.c,v 1.7 2001/11/13 07:11:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritylog.c,v 1.8 2002/05/22 15:40:51 wiz Exp $");
#include "rf_archs.h"
@@ -810,7 +810,7 @@ rf_ParityLogAppend(
RF_ASSERT(log->records[logItem].parityAddr.startSector < raidPtr->regionInfo[regionID].parityStartAddr + raidPtr->regionInfo[regionID].numSectorsParity);
log->records[logItem].parityAddr.numSector = 1;
log->records[logItem].operation = item->common->operation;
- bcopy((item->common->bufPtr + (item->bufOffset++ * (1 << item->common->raidPtr->logBytesPerSector))), log->bufPtr + (logItem * (1 << item->common->raidPtr->logBytesPerSector)), (1 << item->common->raidPtr->logBytesPerSector));
+ memcpy(log->bufPtr + (logItem * (1 << item->common->raidPtr->logBytesPerSector)), (item->common->bufPtr + (item->bufOffset++ * (1 << item->common->raidPtr->logBytesPerSector))), (1 << item->common->raidPtr->logBytesPerSector));
item->diskAddress.numSector--;
item->diskAddress.startSector++;
if (item->diskAddress.numSector == 0)
diff --git a/sys/dev/raidframe/rf_pq.c b/sys/dev/raidframe/rf_pq.c
index 284edf21b4f..18a1c9d0712 100644
--- a/sys/dev/raidframe/rf_pq.c
+++ b/sys/dev/raidframe/rf_pq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_pq.c,v 1.11 2001/11/13 07:11:16 lukem Exp $ */
+/* $NetBSD: rf_pq.c,v 1.12 2002/05/22 15:40:51 wiz Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_pq.c,v 1.11 2001/11/13 07:11:16 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_pq.c,v 1.12 2002/05/22 15:40:51 wiz Exp $");
#include "rf_archs.h"
@@ -568,7 +568,7 @@ rf_RecoveryQFunc(node)
RF_ETIMER_START(timer);
/* start by copying Q into the buffer */
- bcopy(node->params[node->numParams - 3].p, node->results[0],
+ memcpy(node->results[0], node->params[node->numParams - 3].p,
rf_RaidAddressToByte(raidPtr, failedPDA->numSector));
for (i = 0; i < node->numParams - 4; i += 2) {
RF_ASSERT(node->params[i + 1].p != node->results[0]);