Date: Wed, 18 Feb 2009 00:14:42 +0200 From: Giorgos Keramidas <keramida@ceid.upatras.gr> To: Sean Bruno <sbruno@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r188726 - head/sys/dev/firewire Message-ID: <87iqn8yalp.fsf@kobe.laptop> In-Reply-To: <200902171937.n1HJb4E6025748@svn.freebsd.org> (Sean Bruno's message of "Tue, 17 Feb 2009 19:37:04 %2B0000 (UTC)") References: <200902171937.n1HJb4E6025748@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 17 Feb 2009 19:37:04 +0000 (UTC), Sean Bruno <sbruno@FreeBSD.org> 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], %%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87iqn8yalp.fsf>