firewire: Break out shared IEEE1394 constant to separate header file.

Signed-off-by: Kristian Hoegsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

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>
-
-#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
+#include <linux/firewire-constants.h>
 
 #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