diff options
author | Thierry Deval <tdeval@cvs.openbsd.org> | 2003-01-12 12:05:54 +0000 |
---|---|---|
committer | Thierry Deval <tdeval@cvs.openbsd.org> | 2003-01-12 12:05:54 +0000 |
commit | 759af359039d4b3c1c67d6af2b9d0cb6aab9951a (patch) | |
tree | b674e25d9f5161b1b7fccf8893b10d61bbb75991 /sys | |
parent | f006d0d7d291f56572cac0708d439f354df949ed (diff) |
Trust the link_speed from SelfID (PHY), better than a minimalist (usually
fixed) ConfigROM.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/ieee1394/fwnode.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/ieee1394/fwnode.c b/sys/dev/ieee1394/fwnode.c index 642df0ebe59..f90b1246df4 100644 --- a/sys/dev/ieee1394/fwnode.c +++ b/sys/dev/ieee1394/fwnode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fwnode.c,v 1.5 2002/12/13 21:35:11 tdeval Exp $ */ +/* $OpenBSD: fwnode.c,v 1.6 2003/01/12 12:05:53 tdeval Exp $ */ /* $NetBSD: fwnode.c,v 1.13 2002/04/03 04:15:59 jmc Exp $ */ /* @@ -149,6 +149,7 @@ fwnode_attach(struct device *parent, struct device *self, void *aux) MPRINTF("malloc(1394DATA)", ab->ab_data); ab->ab_data[0] = 0; + sc->sc_sc1394.sc1394_link_speed = fwa->link_speed; sc->sc_sc1394.sc1394_node_id = fwa->nodeid; memcpy(sc->sc_sc1394.sc1394_guid, fwa->uid, 8); sc->sc1394_read = fwa->read; @@ -448,8 +449,9 @@ fwnode_configrom_input(struct ieee1394_abuf *ab, int rcode) sc->sc_sc1394.sc1394_max_receive = IEEE1394_GET_MAX_REC(ntohl(sc->sc_configrom->data[0])); - sc->sc_sc1394.sc1394_link_speed = - IEEE1394_GET_LINK_SPD(ntohl(sc->sc_configrom->data[0])); + val = IEEE1394_GET_LINK_SPD(ntohl(sc->sc_configrom->data[0])); + DPRINTFN(1, ("%s: ConfigRom Link Speed: %s", + sc->sc_sc1394.sc1394_dev.dv_xname, ieee1394_speeds[val])); printf("%s: Link Speed: %s, max_rec: %d bytes\n", sc->sc_sc1394.sc1394_dev.dv_xname, ieee1394_speeds[sc->sc_sc1394.sc1394_link_speed], |