From owner-p4-projects@FreeBSD.ORG  Thu Jun 25 10:37:38 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 65F651065675; Thu, 25 Jun 2009 10:37:38 +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 256121065674
	for <perforce@freebsd.org>; Thu, 25 Jun 2009 10:37:38 +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 134C68FC17
	for <perforce@freebsd.org>; Thu, 25 Jun 2009 10:37:38 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5PAbbmG072799
	for <perforce@freebsd.org>; Thu, 25 Jun 2009 10:37:37 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5PAbbeH072797
	for perforce@freebsd.org; Thu, 25 Jun 2009 10:37:37 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 25 Jun 2009 10:37:37 GMT
Message-Id: <200906251037.n5PAbbeH072797@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 165148 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jun 2009 10:37:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=165148

Change 165148 by mav@mav_mavbook on 2009/06/25 10:37:16

	Corrent d_maxsize.
	Tune formatting.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#12 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#12 (text+ko) ====

@@ -644,8 +644,8 @@
 	softc->disk->d_drv1 = periph;
 	if (cgd->ident_data.support.command2 & ATA_SUPPORT_ADDRESS48)
 		softc->disk->d_maxsize = MAXPHYS; /* ahci driver limit */
-	else
-		softc->disk->d_maxsize = 255 * 512; /* 28bit ATA command limit */
+	else					/* 28bit ATA command limit */
+		softc->disk->d_maxsize = min(MAXPHYS, 255 * 512);
 	softc->disk->d_unit = periph->unit_number;
 	softc->disk->d_flags = 0;
 	if (softc->flags & ADA_FLAG_CAN_FLUSHCACHE)
@@ -654,13 +654,12 @@
 	adasetgeom(periph, cgd);
 	dp = &softc->params;
 	snprintf(announce_buf, sizeof(announce_buf),
-	        "%juMB (%ju %u byte sectors: %dH %dS/T "
-                    "%dC)", (uintmax_t)
-	        (((uintmax_t)dp->secsize *
-	        dp->sectors) / (1024*1024)),
-	        (uintmax_t)dp->sectors,
-	        dp->secsize, dp->heads,
-                dp->secs_per_track, dp->cylinders);
+		"%juMB (%ju %u byte sectors: %dH %dS/T %dC)",
+		(uintmax_t)(((uintmax_t)dp->secsize *
+		dp->sectors) / (1024*1024)),
+		(uintmax_t)dp->sectors,
+		dp->secsize, dp->heads,
+		dp->secs_per_track, dp->cylinders);
 	xpt_announce_periph(periph, announce_buf);
 	if (softc->flags & ADA_FLAG_CAN_NCQ) {
 		printf("%s%d: Native Command Queueing Enabled\n",