From owner-p4-projects@FreeBSD.ORG  Mon Jun 29 08:36:25 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EA0D21065673; Mon, 29 Jun 2009 08:36:24 +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 A8A4F106566C
	for <perforce@freebsd.org>; Mon, 29 Jun 2009 08:36:24 +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 969858FC17
	for <perforce@freebsd.org>; Mon, 29 Jun 2009 08:36:24 +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 n5T8aO5C075838
	for <perforce@freebsd.org>; Mon, 29 Jun 2009 08:36:24 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5T8aO7P075836
	for perforce@freebsd.org; Mon, 29 Jun 2009 08:36:24 GMT
	(envelope-from mav@freebsd.org)
Date: Mon, 29 Jun 2009 08:36:24 GMT
Message-Id: <200906290836.n5T8aO7P075836@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 165372 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: Mon, 29 Jun 2009 08:36:26 -0000

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

Change 165372 by mav@mav_mavbook on 2009/06/29 08:35:31

	Report base transfer speed if SIM does not provide detailed info.

Affected files ...

.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#11 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#11 (text+ko) ====

@@ -919,6 +919,14 @@
 		if ((spi->valid & CTS_SPI_VALID_SYNC_RATE) != 0) {
 			freq = scsi_calc_syncsrate(spi->sync_period);
 			speed = freq;
+		} else {
+			struct ccb_pathinq cpi;
+
+			retval = get_cpi(device, &cpi);
+			if (retval == 0) {
+				speed = cpi.base_transfer_speed;
+				freq = 0;
+			}
 		}
 
 		fprintf(stdout, "%s%d: ", device->device_name,