Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / ieee1394 / ieee1394.h

diff --git a/drivers/ieee1394/ieee1394.h b/drivers/ieee1394/ieee1394.h
index b634a9b..936d776 100644 (file)
--- a/drivers/ieee1394/ieee1394.h
+++ b/drivers/ieee1394/ieee1394.h
@@ -62,6 +62,7 @@
 extern const char *hpsb_speedto_str[];
 
 
+/* 1394a cable PHY packets */
 #define SELFID_PWRCL_NO_POWER    0x0
 #define SELFID_PWRCL_PROVIDE_15W 0x1
 #define SELFID_PWRCL_PROVIDE_30W 0x2
@@ -76,8 +77,24 @@ extern const char *hpsb_speedto_str[];
 #define SELFID_PORT_NCONN        0x1
 #define SELFID_PORT_NONE         0x0
 
+#define PHYPACKET_LINKON                       0x40000000
+#define PHYPACKET_PHYCONFIG_R                  0x00800000
+#define PHYPACKET_PHYCONFIG_T                  0x00400000
+#define EXTPHYPACKET_TYPE_PING                 0x00000000
+#define EXTPHYPACKET_TYPE_REMOTEACCESS_BASE    0x00040000
+#define EXTPHYPACKET_TYPE_REMOTEACCESS_PAGED   0x00140000
+#define EXTPHYPACKET_TYPE_REMOTEREPLY_BASE     0x000C0000
+#define EXTPHYPACKET_TYPE_REMOTEREPLY_PAGED    0x001C0000
+#define EXTPHYPACKET_TYPE_REMOTECOMMAND                0x00200000
+#define EXTPHYPACKET_TYPE_REMOTECONFIRMATION   0x00280000
+#define EXTPHYPACKET_TYPE_RESUME               0x003C0000
 
-/* 1394a PHY bitmasks */
+#define EXTPHYPACKET_TYPEMASK                  0xC0FC0000
+
+#define PHYPACKET_PORT_SHIFT     24
+#define PHYPACKET_GAPCOUNT_SHIFT 16
+
+/* 1394a PHY register map bitmasks */
 #define PHY_00_PHYSICAL_ID       0xFC
 #define PHY_00_R                 0x02 /* Root */
 #define PHY_00_PS                0x01 /* Power Status*/