Signed-off-by: Alexey Dobriyan <[email protected]>
---
drivers/scsi/iteraid.c | 46 ++++++----------------------------------------
1 files changed, 6 insertions(+), 40 deletions(-)
Index: linux-iteraid/drivers/scsi/iteraid.c
===================================================================
--- linux-iteraid.orig/drivers/scsi/iteraid.c 2005-06-18 02:00:27.000000000 +0400
+++ linux-iteraid/drivers/scsi/iteraid.c 2005-06-18 02:20:45.000000000 +0400
@@ -3194,36 +3194,6 @@ static u8 IdeVerify(PChannel pChan, PSCS
return SRB_STATUS_PENDING;
} /* end IdeVerify */
-/************************************************************************
- * This function is used to copy memory with overlapped destination and
- * source. I guess ScsiPortMoveMemory cannot handle this well. Can it?
- ************************************************************************/
-static void
-IT8212MoveMemory(unsigned char *DestAddr, unsigned char *SrcAddr, u32 ByteCount)
-{
- long i;
-
- dprintk("IT8212MoveMemory: DestAddr=0x%p, SrcAddr=0x%p, "
- "ByteCount=0x%x\n", DestAddr, SrcAddr, ByteCount);
- if (DestAddr > SrcAddr) {
-
- /*
- * If Destination Area is in the back of the Source Area, copy
- * from the end of the requested area.
- */
- for (i = (ByteCount - 1); i >= 0; i--)
- *(DestAddr + i) = *(SrcAddr + i);
- } else if (DestAddr < SrcAddr) {
-
- /*
- * If Destination Area is in the front of the Source Area, copy
- * from the begin of the requested area.
- */
- for (i = 0; i < ByteCount; i++)
- *(DestAddr + i) = *(SrcAddr + i);
- }
-} /* end IT8212MoveMemory */
-
/*
* Convert SCSI packet command to Atapi packet command.
*/
@@ -3349,16 +3319,12 @@ static void Scsi2Atapi(PChannel pChan, P
sizeof(SCSI_MODE_PARAMETER_HEADER6) -
sizeof(SCSI_MODE_PARAMTER_BLOCK_DESCRIPTER);
if (byteCount > 0) {
- IT8212MoveMemory((unsigned char *)header10 +
- sizeof
- (SCSI_MODE_PARAMETER_HEADER10),
- (unsigned char *)header10 +
- sizeof
- (SCSI_MODE_PARAMETER_HEADER6)
- +
- sizeof
- (SCSI_MODE_PARAMTER_BLOCK_DESCRIPTER),
- byteCount);
+ memmove((unsigned char *)header10 +
+ sizeof(SCSI_MODE_PARAMETER_HEADER10),
+ (unsigned char *)header10 +
+ sizeof(SCSI_MODE_PARAMETER_HEADER6) +
+ sizeof(SCSI_MODE_PARAMTER_BLOCK_DESCRIPTER),
+ byteCount);
}
/*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
