From owner-svn-src-head@FreeBSD.ORG Tue Feb 17 22:14:54 2009 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2CEE106567C; Tue, 17 Feb 2009 22:14:54 +0000 (UTC) (envelope-from keramida@ceid.upatras.gr) Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36]) by mx1.freebsd.org (Postfix) with ESMTP id 51E518FC1F; Tue, 17 Feb 2009 22:14:54 +0000 (UTC) (envelope-from keramida@ceid.upatras.gr) Received: from kobe.laptop (adsl126-61.kln.forthnet.gr [77.49.245.61]) (authenticated bits=128) by igloo.linux.gr (8.14.3/8.14.3/Debian-6) with ESMTP id n1HMEgDA022293 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 18 Feb 2009 00:14:47 +0200 Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.3/8.14.3) with ESMTP id n1HMEgsS031386; Wed, 18 Feb 2009 00:14:42 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id n1HMEg5d031385; Wed, 18 Feb 2009 00:14:42 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) From: Giorgos Keramidas To: Sean Bruno References: <200902171937.n1HJb4E6025748@svn.freebsd.org> Date: Wed, 18 Feb 2009 00:14:42 +0200 In-Reply-To: <200902171937.n1HJb4E6025748@svn.freebsd.org> (Sean Bruno's message of "Tue, 17 Feb 2009 19:37:04 +0000 (UTC)") Message-ID: <87iqn8yalp.fsf@kobe.laptop> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.90 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Hellug-MailScanner-ID: n1HMEgDA022293 X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-3.875, required 5, autolearn=not spam, ALL_TRUSTED -1.80, AWL 0.52, BAYES_00 -2.60) X-Hellug-MailScanner-From: keramida@ceid.upatras.gr X-Spam-Status: No Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r188726 - head/sys/dev/firewire X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Feb 2009 22:14:55 -0000 On Tue, 17 Feb 2009 19:37:04 +0000 (UTC), Sean Bruno wrote: > Author: sbruno > Date: Tue Feb 17 19:37:04 2009 > New Revision: 188726 > URL: http://svn.freebsd.org/changeset/base/188726 > > Log: > Introduce 1394a-2000 extended PHY Self ID packets. This breaks /head/usr.sbin/fwcontrol :( > Modified: head/sys/dev/firewire/firewire.h > ============================================================================== > --- head/sys/dev/firewire/firewire.h Tue Feb 17 19:17:25 2009 (r188725) > +++ head/sys/dev/firewire/firewire.h Tue Feb 17 19:37:04 2009 (r188726) > @@ -292,6 +292,10 @@ struct fw_devlstreq { > #define FW_SELF_ID_PORT_CONNECTED_TO_PARENT 2 > #define FW_SELF_ID_PORT_NOT_CONNECTED 1 > #define FW_SELF_ID_PORT_NOT_EXISTS 0 > + > +#define FW_SELF_ID_PAGE0 0 > +#define FW_SELF_ID_PAGE1 1 > + > #if BYTE_ORDER == BIG_ENDIAN > union fw_self_id { > struct { > @@ -301,7 +305,7 @@ union fw_self_id { > link_active:1, > gap_count:6, > phy_speed:2, > - phy_delay:2, > + reserved:2, phy_delay is used in usr.sbin/fwcontrol at recent /head snapshots, so the following change is also needed to build everything: %%% diff -r e41e9f254a62 usr.sbin/fwcontrol/fwcontrol.c --- a/usr.sbin/fwcontrol/fwcontrol.c Tue Feb 17 22:37:39 2009 +0200 +++ b/usr.sbin/fwcontrol/fwcontrol.c Wed Feb 18 00:13:18 2009 +0200 @@ -537,13 +537,12 @@ printf("%02d sequel packet\n", sid.p0.phy_id); continue; } - printf("%02d %2d %2d %4s %d %d %3s" + printf("%02d %2d %2d %4s %d %3s" " %s %s %s %d %d\n", sid.p0.phy_id, sid.p0.link_active, sid.p0.gap_count, speed[sid.p0.phy_speed], - sid.p0.phy_delay, sid.p0.contender, pwr_class[sid.p0.power_class], port_status[sid.p0.port0], %%%