Merge with Linux 2.3.40.

1 files changed, 110 insertions, 0 deletions

diff --git a/drivers/ieee1394/raw1394.h b/drivers/ieee1394/raw1394.h
new file mode 100644
index 000000000..b1b0e4b90
--- /dev/null
+++ b/drivers/ieee1394/raw1394.h
@@ -0,0 +1,110 @@
+
+#ifndef IEEE1394_RAW1394_H
+#define IEEE1394_RAW1394_H
+
+#define RAW1394_DEVICE_MAJOR      171
+#define RAW1394_DEVICE_NAME       "raw1394"
+
+#define RAW1394_KERNELAPI_VERSION 1
+
+/* state: opened */
+#define RAW1394_REQ_INITIALIZE    1
+
+/* state: initialized */
+#define RAW1394_REQ_LIST_CARDS    2
+#define RAW1394_REQ_SET_CARD      3
+
+/* state: connected */
+#define RAW1394_REQ_ASYNC_READ    100
+#define RAW1394_REQ_ASYNC_WRITE   101
+#define RAW1394_REQ_LOCK          102
+#define RAW1394_REQ_LOCK64        103
+
+#define RAW1394_REQ_ISO_LISTEN    200
+
+/* kernel to user */
+#define RAW1394_REQ_BUS_RESET     10000
+#define RAW1394_REQ_ISO_RECEIVE   10001
+
+/* error codes */
+#define RAW1394_ERROR_NONE        0
+#define RAW1394_ERROR_COMPAT      (-1001)
+#define RAW1394_ERROR_STATE_ORDER (-1002)
+#define RAW1394_ERROR_GENERATION  (-1003)
+#define RAW1394_ERROR_INVALID_ARG (-1004)
+#define RAW1394_ERROR_MEMFAULT    (-1005)
+#define RAW1394_ERROR_ALREADY     (-1006)
+
+#define RAW1394_ERROR_EXCESSIVE   (-1020)
+#define RAW1394_ERROR_UNTIDY_LEN  (-1021)
+
+#define RAW1394_ERROR_SEND_ERROR  (-1100)
+#define RAW1394_ERROR_ABORTED     (-1101)
+#define RAW1394_ERROR_TIMEOUT     (-1102)
+
+
+struct raw1394_request {
+        int type;
+        int error;
+        int misc;
+
+        unsigned int generation;
+        octlet_t address;
+
+        unsigned long tag;
+
+        size_t length;
+        quadlet_t *sendb;
+        quadlet_t *recvb;
+};
+
+struct raw1394_khost_list {
+        int nodes;
+        char name[32];
+};
+
+#ifdef __KERNEL__
+
+struct iso_block_store {
+        atomic_t refcount;
+        quadlet_t data[0];
+};
+
+struct file_info {
+        struct list_head list;
+
+        enum { opened, initialized, connected } state;
+
+        struct hpsb_host *host;
+
+        struct list_head req_pending;
+        struct list_head req_complete;
+        struct semaphore complete_sem;
+        spinlock_t reqlists_lock;
+        wait_queue_head_t poll_wait_complete;
+
+        u64 listen_channels;
+        quadlet_t *iso_buffer;
+        size_t iso_buffer_length;
+};
+
+struct pending_request {
+        struct list_head list;
+        struct file_info *file_info;
+        struct hpsb_packet *packet;
+        struct tq_struct tq;
+        struct iso_block_store *ibs;
+        quadlet_t *data;
+        int free_data;
+        struct raw1394_request req;
+};
+
+struct host_info {
+        struct list_head list;
+        struct hpsb_host *host;
+        struct list_head file_info_list;
+};
+
+#endif /* __KERNEL__ */
+
+#endif /* IEEE1394_RAW1394_H */