Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (138 commits)
  firewire: Convert OHCI driver to use standard goto unwinding for error handling.
  firewire: Always use parens with sizeof.
  firewire: Drop single buffer request support.
  firewire: Add a comment to describe why we split the sg list.
  firewire: Return SCSI_MLQUEUE_HOST_BUSY for out of memory cases in queuecommand.
  firewire: Handle the last few DMA mapping error cases.
  firewire: Allocate scsi_host up front and allocate the sbp2_device as hostdata.
  firewire: Provide module aliase for backwards compatibility.
  firewire: Add to fw-core-y instead of assigning fw-core-objs in Makefile.
  firewire: Break out shared IEEE1394 constant to separate header file.
  firewire: Use linux/*.h instead of asm/*.h header files.
  firewire: Uppercase most macro names.
  firewire: Coding style cleanup: no spaces after function names.
  firewire: Convert card_rwsem to a regular mutex.
  firewire: Clean up comment style.
  firewire: Use lib/ implementation of CRC ITU-T.
  CRC ITU-T V.41
  firewire: Rename fw-device-cdev.c to fw-cdev.c and move header to include/linux.
  firewire: Future proof the iso ioctls by adding a handle for the iso context.
  firewire: Add read/write and size annotations to IOC numbers.
  ...

Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 67 insertions, 0 deletions

diff --git a/include/linux/firewire-constants.h b/include/linux/firewire-constants.h
new file mode 100644
index 000000000000..b316770a43fd
--- /dev/null
+++ b/include/linux/firewire-constants.h
@@ -0,0 +1,67 @@
+#ifndef _LINUX_FIREWIRE_CONSTANTS_H
+#define _LINUX_FIREWIRE_CONSTANTS_H
+
+#define TCODE_WRITE_QUADLET_REQUEST     0x0
+#define TCODE_WRITE_BLOCK_REQUEST       0x1
+#define TCODE_WRITE_RESPONSE            0x2
+#define TCODE_READ_QUADLET_REQUEST      0x4
+#define TCODE_READ_BLOCK_REQUEST        0x5
+#define TCODE_READ_QUADLET_RESPONSE     0x6
+#define TCODE_READ_BLOCK_RESPONSE       0x7
+#define TCODE_CYCLE_START               0x8
+#define TCODE_LOCK_REQUEST              0x9
+#define TCODE_STREAM_DATA               0xa
+#define TCODE_LOCK_RESPONSE             0xb
+
+#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 EXTCODE_VENDOR_DEPENDENT        0x7
+
+/* Juju specific tcodes */
+#define TCODE_LOCK_MASK_SWAP            (0x10 | EXTCODE_MASK_SWAP)
+#define TCODE_LOCK_COMPARE_SWAP         (0x10 | EXTCODE_COMPARE_SWAP)
+#define TCODE_LOCK_FETCH_ADD            (0x10 | EXTCODE_FETCH_ADD)
+#define TCODE_LOCK_LITTLE_ADD           (0x10 | EXTCODE_LITTLE_ADD)
+#define TCODE_LOCK_BOUNDED_ADD          (0x10 | EXTCODE_BOUNDED_ADD)
+#define TCODE_LOCK_WRAP_ADD             (0x10 | EXTCODE_WRAP_ADD)
+#define TCODE_LOCK_VENDOR_DEPENDENT     (0x10 | EXTCODE_VENDOR_DEPENDENT)
+
+#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 SCODE_100                       0x0
+#define SCODE_200                       0x1
+#define SCODE_400                       0x2
+#define SCODE_800                       0x3
+#define SCODE_1600                      0x4
+#define SCODE_3200                      0x5
+#define SCODE_BETA                      0x3
+
+#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 RETRY_1                         0x00
+#define RETRY_X                         0x01
+#define RETRY_A                         0x02
+#define RETRY_B                         0x03
+
+#endif /* _LINUX_FIREWIRE_CONSTANTS_H */