PERFORCE change 167119 for review
Alexander Motin
mav at FreeBSD.org
Sat Aug 8 22:16:51 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=167119
Change 167119 by mav at mav_mavbook on 2009/08/08 22:16:18
Remove unneeded ATA_PROTO_ATAPI_12 checks.
Affected files ...
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#16 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#13 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#10 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#10 edit
Differences ...
==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#16 (text+ko) ====
@@ -152,15 +152,11 @@
int count, int flags, int timeout)
{
struct ata_request *request = ata_alloc_request();
- struct ata_device *atadev = device_get_softc(dev);
int error = ENOMEM;
if (request) {
request->dev = dev;
- if ((atadev->param.config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_12)
- bcopy(ccb, request->u.atapi.ccb, 12);
- else
- bcopy(ccb, request->u.atapi.ccb, 16);
+ bcopy(ccb, request->u.atapi.ccb, 16);
request->data = data;
request->bytecount = count;
request->transfersize = min(request->bytecount, 65534);
==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#13 (text+ko) ====
@@ -863,9 +863,7 @@
}
request->dev = dev;
request->bio = bp;
- bcopy(ccb, request->u.atapi.ccb,
- (atadev->param.config & ATA_PROTO_MASK) ==
- ATA_PROTO_ATAPI_12 ? 16 : 12);
+ bcopy(ccb, request->u.atapi.ccb, 16);
request->data = bp->bio_data;
request->bytecount = count * blocksize;
request->transfersize = min(request->bytecount, 65534);
==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#10 (text+ko) ====
@@ -240,9 +240,7 @@
}
request->dev = dev;
request->bio = bp;
- bcopy(ccb, request->u.atapi.ccb,
- (atadev->param.config & ATA_PROTO_MASK) ==
- ATA_PROTO_ATAPI_12 ? 16 : 12);
+ bcopy(ccb, request->u.atapi.ccb, 16);
request->data = bp->bio_data;
request->bytecount = count * fdp->sectorsize;
request->transfersize = min(request->bytecount, 65534);
==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#10 (text+ko) ====
@@ -373,7 +373,6 @@
ast_strategy(struct bio *bp)
{
device_t dev = bp->bio_dev->si_drv1;
- struct ata_device *atadev = device_get_softc(dev);
struct ast_softc *stp = device_get_ivars(dev);
struct ata_request *request;
u_int32_t blkcount;
@@ -426,9 +425,7 @@
}
request->dev = dev;
request->driver = bp;
- bcopy(ccb, request->u.atapi.ccb,
- (atadev->param.config & ATA_PROTO_MASK) ==
- ATA_PROTO_ATAPI_12 ? 16 : 12);
+ bcopy(ccb, request->u.atapi.ccb, 16);
request->data = bp->bio_data;
request->bytecount = blkcount * stp->blksize;
request->transfersize = min(request->bytecount, 65534);
More information about the p4-projects
mailing list