1 files changed, 1 insertions, 60 deletions
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index a1507cf8d764..acdc3be38c61 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -25,18 +25,7 @@
 #include <linux/list.h>
 #include <linux/fs.h>
 #include <linux/dma-mapping.h>
+#include <linux/firewire-constants.h>
-#define TCODE_WRITE_QUADLET_REQUEST     0
-#define TCODE_WRITE_BLOCK_REQUEST       1
-#define TCODE_WRITE_RESPONSE            2
-#define TCODE_READ_QUADLET_REQUEST      4
-#define TCODE_READ_BLOCK_REQUEST        5
-#define TCODE_READ_QUADLET_RESPONSE     6
-#define TCODE_READ_BLOCK_RESPONSE       7
-#define TCODE_CYCLE_START               8
-#define TCODE_LOCK_REQUEST              9
-#define TCODE_STREAM_DATA               10
-#define TCODE_LOCK_RESPONSE             11
 #define TCODE_IS_READ_REQUEST(tcode)    (((tcode) & ~1) == 4)
 #define TCODE_IS_BLOCK_PACKET(tcode)    (((tcode) &  1) != 0)
@@ -45,54 +34,6 @@
 #define TCODE_HAS_REQUEST_DATA(tcode)   (((tcode) & 12) != 4)
 #define TCODE_HAS_RESPONSE_DATA(tcode)  (((tcode) & 12) != 0)
-/* Juju specific tcodes */
-#define TCODE_DEALLOCATE                0x10
-#define TCODE_LOCK_MASK_SWAP            0x11
-#define TCODE_LOCK_COMPARE_SWAP         0x12
-#define TCODE_LOCK_FETCH_ADD            0x13
-#define TCODE_LOCK_LITTLE_ADD           0x14
-#define TCODE_LOCK_BOUNDED_ADD          0x15
-#define TCODE_LOCK_WRAP_ADD             0x16
-#define TCODE_LOCK_VENDOR_SPECIFIC      0x17
-#define SCODE_100                       0x0
-#define SCODE_200                       0x1
-#define SCODE_400                       0x2
-#define SCODE_BETA                      0x3
-#define EXTCODE_MASK_SWAP       0x1
-#define EXTCODE_COMPARE_SWAP    0x2
-#define EXTCODE_FETCH_ADD       0x3
-#define EXTCODE_LITTLE_ADD      0x4
-#define EXTCODE_BOUNDED_ADD     0x5
-#define EXTCODE_WRAP_ADD        0x6
-#define ACK_COMPLETE            0x1
-#define ACK_PENDING             0x2
-#define ACK_BUSY_X              0x4
-#define ACK_BUSY_A              0x5
-#define ACK_BUSY_B              0x6
-#define ACK_DATA_ERROR          0xd
-#define ACK_TYPE_ERROR          0xe
-#define RCODE_COMPLETE          0x0
-#define RCODE_CONFLICT_ERROR    0x4
-#define RCODE_DATA_ERROR        0x5
-#define RCODE_TYPE_ERROR        0x6
-#define RCODE_ADDRESS_ERROR     0x7
-/* Juju specific rcodes */
-#define RCODE_SEND_ERROR        0x10
-#define RCODE_CANCELLED         0x11
-#define RCODE_BUSY              0x12
-#define RCODE_GENERATION        0x13
-#define RCODE_NO_ACK            0x14
-#define RETRY_1 0x00
-#define RETRY_X 0x01
-#define RETRY_A 0x02
-#define RETRY_B 0x03
 #define LOCAL_BUS 0xffc0
 #define SELFID_PORT_CHILD       0x3

diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h index a1507cf8d764..acdc3be38c61 100644 --- a/drivers/firewire/fw-transaction.h +++ b/drivers/firewire/fw-transaction.h
@@ -25,18 +25,7 @@
25	#include <linux/list.h>	25	#include <linux/list.h>
26	#include <linux/fs.h>	26	#include <linux/fs.h>
27	#include <linux/dma-mapping.h>	27	#include <linux/dma-mapping.h>
28		28	#include <linux/firewire-constants.h>
29	#define TCODE_WRITE_QUADLET_REQUEST 0
30	#define TCODE_WRITE_BLOCK_REQUEST 1
31	#define TCODE_WRITE_RESPONSE 2
32	#define TCODE_READ_QUADLET_REQUEST 4
33	#define TCODE_READ_BLOCK_REQUEST 5
34	#define TCODE_READ_QUADLET_RESPONSE 6
35	#define TCODE_READ_BLOCK_RESPONSE 7
36	#define TCODE_CYCLE_START 8
37	#define TCODE_LOCK_REQUEST 9
38	#define TCODE_STREAM_DATA 10
39	#define TCODE_LOCK_RESPONSE 11
40		29
41	#define TCODE_IS_READ_REQUEST(tcode) (((tcode) & ~1) == 4)	30	#define TCODE_IS_READ_REQUEST(tcode) (((tcode) & ~1) == 4)
42	#define TCODE_IS_BLOCK_PACKET(tcode) (((tcode) & 1) != 0)	31	#define TCODE_IS_BLOCK_PACKET(tcode) (((tcode) & 1) != 0)
@@ -45,54 +34,6 @@
45	#define TCODE_HAS_REQUEST_DATA(tcode) (((tcode) & 12) != 4)	34	#define TCODE_HAS_REQUEST_DATA(tcode) (((tcode) & 12) != 4)
46	#define TCODE_HAS_RESPONSE_DATA(tcode) (((tcode) & 12) != 0)	35	#define TCODE_HAS_RESPONSE_DATA(tcode) (((tcode) & 12) != 0)
47		36
48	/* Juju specific tcodes */
49	#define TCODE_DEALLOCATE 0x10
50	#define TCODE_LOCK_MASK_SWAP 0x11
51	#define TCODE_LOCK_COMPARE_SWAP 0x12
52	#define TCODE_LOCK_FETCH_ADD 0x13
53	#define TCODE_LOCK_LITTLE_ADD 0x14
54	#define TCODE_LOCK_BOUNDED_ADD 0x15
55	#define TCODE_LOCK_WRAP_ADD 0x16
56	#define TCODE_LOCK_VENDOR_SPECIFIC 0x17
57
58	#define SCODE_100 0x0
59	#define SCODE_200 0x1
60	#define SCODE_400 0x2
61	#define SCODE_BETA 0x3
62
63	#define EXTCODE_MASK_SWAP 0x1
64	#define EXTCODE_COMPARE_SWAP 0x2
65	#define EXTCODE_FETCH_ADD 0x3
66	#define EXTCODE_LITTLE_ADD 0x4
67	#define EXTCODE_BOUNDED_ADD 0x5
68	#define EXTCODE_WRAP_ADD 0x6
69
70	#define ACK_COMPLETE 0x1
71	#define ACK_PENDING 0x2
72	#define ACK_BUSY_X 0x4
73	#define ACK_BUSY_A 0x5
74	#define ACK_BUSY_B 0x6
75	#define ACK_DATA_ERROR 0xd
76	#define ACK_TYPE_ERROR 0xe
77
78	#define RCODE_COMPLETE 0x0
79	#define RCODE_CONFLICT_ERROR 0x4
80	#define RCODE_DATA_ERROR 0x5
81	#define RCODE_TYPE_ERROR 0x6
82	#define RCODE_ADDRESS_ERROR 0x7
83
84	/* Juju specific rcodes */
85	#define RCODE_SEND_ERROR 0x10
86	#define RCODE_CANCELLED 0x11
87	#define RCODE_BUSY 0x12
88	#define RCODE_GENERATION 0x13
89	#define RCODE_NO_ACK 0x14
90
91	#define RETRY_1 0x00
92	#define RETRY_X 0x01
93	#define RETRY_A 0x02
94	#define RETRY_B 0x03
95
96	#define LOCAL_BUS 0xffc0	37	#define LOCAL_BUS 0xffc0
97		38
98	#define SELFID_PORT_CHILD 0x3	39	#define SELFID_PORT_CHILD 0x3