aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ieee1394/ieee1394.h2
-rw-r--r--drivers/ieee1394/ieee1394_core.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/ieee1394/ieee1394.h b/drivers/ieee1394/ieee1394.h
index 936d776de00a..d911abe3a35e 100644
--- a/drivers/ieee1394/ieee1394.h
+++ b/drivers/ieee1394/ieee1394.h
@@ -77,6 +77,8 @@ extern const char *hpsb_speedto_str[];
77#define SELFID_PORT_NCONN 0x1 77#define SELFID_PORT_NCONN 0x1
78#define SELFID_PORT_NONE 0x0 78#define SELFID_PORT_NONE 0x0
79 79
80#define SELFID_SPEED_UNKNOWN 0x3 /* 1394b PHY */
81
80#define PHYPACKET_LINKON 0x40000000 82#define PHYPACKET_LINKON 0x40000000
81#define PHYPACKET_PHYCONFIG_R 0x00800000 83#define PHYPACKET_PHYCONFIG_R 0x00800000
82#define PHYPACKET_PHYCONFIG_T 0x00400000 84#define PHYPACKET_PHYCONFIG_T 0x00400000
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
index f43739c5cab2..559c477092f8 100644
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -355,10 +355,12 @@ static void build_speed_map(struct hpsb_host *host, int nodecount)
355 } 355 }
356 } 356 }
357 357
358#if SELFID_SPEED_UNKNOWN != IEEE1394_SPEED_MAX
358 /* assume maximum speed for 1394b PHYs, nodemgr will correct it */ 359 /* assume maximum speed for 1394b PHYs, nodemgr will correct it */
359 for (n = 0; n < nodecount; n++) 360 for (n = 0; n < nodecount; n++)
360 if (speedcap[n] == 3) 361 if (speedcap[n] == SELFID_SPEED_UNKNOWN)
361 speedcap[n] = IEEE1394_SPEED_MAX; 362 speedcap[n] = IEEE1394_SPEED_MAX;
363#endif
362} 364}
363 365
364 366