From owner-p4-projects@FreeBSD.ORG Sat Aug 8 22:16:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38C4910656E1; Sat, 8 Aug 2009 22:16:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27E011065676 for ; Sat, 8 Aug 2009 22:16:48 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F16C08FC0A for ; Sat, 8 Aug 2009 22:16:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n78MGl5N093063 for ; Sat, 8 Aug 2009 22:16:47 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n78MGlWW093061 for perforce@freebsd.org; Sat, 8 Aug 2009 22:16:47 GMT (envelope-from mav@freebsd.org) Date: Sat, 8 Aug 2009 22:16:47 GMT Message-Id: <200908082216.n78MGlWW093061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 167119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Aug 2009 22:16:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=167119 Change 167119 by mav@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);