From owner-p4-projects@FreeBSD.ORG  Sat May 30 12:58:49 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1960B1065672; Sat, 30 May 2009 12:58:49 +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 CAC15106564A
	for <perforce@freebsd.org>; Sat, 30 May 2009 12:58: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 B96C18FC0A
	for <perforce@freebsd.org>; Sat, 30 May 2009 12:58:48 +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 n4UCwmxk039905
	for <perforce@freebsd.org>; Sat, 30 May 2009 12:58:48 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UCwmHM039903
	for perforce@freebsd.org; Sat, 30 May 2009 12:58:48 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 30 May 2009 12:58:48 GMT
Message-Id: <200905301258.n4UCwmHM039903@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 163080 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: Sat, 30 May 2009 12:58:50 -0000

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

Change 163080 by mav@mav_mavbook on 2009/05/30 12:57:50

	Print some more information about device.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#5 edit

Differences ...

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

@@ -45,6 +45,19 @@
 #include <cam/ata/ata_all.h>
 #include <sys/sbuf.h>
 
+static int
+ata_version(int ver)
+{
+	int bit;
+
+	if (ver == 0xffff)
+		return 0;
+	for (bit = 15; bit >= 0; bit--)
+		if (ver & (1<<bit))
+			return bit;
+	return 0;
+}
+
 void
 ata_print_ident(struct ata_params *ident_data)
 {
@@ -54,9 +67,17 @@
 		   sizeof(product));
 	cam_strvis(revision, ident_data->revision, sizeof(ident_data->revision),
 		   sizeof(revision));
-
-	printf("<%s %s> ATA device\n",
-	       product, revision);
+	printf("<%s %s> ATA/ATAPI-%d",
+	    product, revision, ata_version(ident_data->version_major));
+	if (ident_data->satacapabilities && ident_data->satacapabilities != 0xffff) {
+		if (ident_data->satacapabilities & ATA_SATA_GEN2)
+			printf(" SATA 2.x");
+		else if (ident_data->satacapabilities & ATA_SATA_GEN1)
+			printf(" SATA 1.x");
+		else
+			printf(" SATA");
+	}
+	printf(" device\n");
 }
 
 #endif /* _KERNEL */