ARM:OMAP: Integrated blk request queues for mbox fwk

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-omap / mailbox.h

diff --git a/include/asm-arm/arch-omap/mailbox.h b/include/asm-arm/arch-omap/mailbox.h
index 87395ea58b2d5db22bbfd6fe6183b7e8fd8e0b12..8d12ced432b39f511d05d7f454ce0e47fb2ba9ef 100644 (file)
--- a/include/asm-arm/arch-omap/mailbox.h
+++ b/include/asm-arm/arch-omap/mailbox.h
@@ -5,11 +5,11 @@
 
 #include <linux/wait.h>
 #include <linux/workqueue.h>
+#include <linux/blkdev.h>
 
 typedef u32 mbox_msg_t;
 typedef void (mbox_receiver_t)(mbox_msg_t msg);
 struct omap_mbox;
-struct omap_mbq;
 
 typedef int __bitwise omap_mbox_irq_t;
 #define IRQ_TX ((__force omap_mbox_irq_t) 1)
@@ -21,48 +21,52 @@ typedef int __bitwise omap_mbox_type_t;
 
 struct omap_mbox_ops {
        omap_mbox_type_t        type;
-       int (*startup)(struct omap_mbox *mbox);
-       void (*shutdown)(struct omap_mbox *mbox);
+       int             (*startup)(struct omap_mbox *mbox);
+       void            (*shutdown)(struct omap_mbox *mbox);
        /* fifo */
-       mbox_msg_t (*fifo_read)(struct omap_mbox *mbox);
-       void (*fifo_write)(struct omap_mbox *mbox, mbox_msg_t msg);
-       int (*fifo_empty)(struct omap_mbox *mbox);
-       int (*fifo_full)(struct omap_mbox *mbox);
+       mbox_msg_t      (*fifo_read)(struct omap_mbox *mbox);
+       void            (*fifo_write)(struct omap_mbox *mbox, mbox_msg_t msg);
+       int             (*fifo_empty)(struct omap_mbox *mbox);
+       int             (*fifo_full)(struct omap_mbox *mbox);
        /* irq */
-       void (*enable_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
-       void (*disable_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
-       void (*ack_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
-       int (*is_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
+       void            (*enable_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
+       void            (*disable_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
+       void            (*ack_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
+       int             (*is_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
 };
 
 struct omap_mbox {
-       char *name;
-       spinlock_t lock;
-       unsigned int irq;
-       struct omap_mbox_ops *ops;
+       char                    *name;
+       spinlock_t              lock;
+       unsigned int            irq;
 
-       wait_queue_head_t tx_waitq;
+       struct workqueue_struct *workq;
+       struct work_struct      msg_receive;
 
-       struct work_struct msg_receive;
-       void (*msg_receive_cb)(mbox_msg_t);
-       struct omap_mbq *mbq;
+       request_queue_t         *txq, *rxq;
 
-       int (*msg_sender_cb)(void*);
+       void    (*msg_receive_cb)(mbox_msg_t);
+       int     (*msg_sender_cb)(void*);
 
-       mbox_msg_t seq_snd, seq_rcv;
+       struct omap_mbox_ops    *ops;
 
-       struct device dev;
+       mbox_msg_t              seq_snd, seq_rcv;
 
-       void *priv;
+       struct device           dev;
 
-       struct omap_mbox *next;
+       struct omap_mbox        *next;
+       void                    *priv;
+
+       void                    (*err_notify)(void);
 };
 
-int omap_mbox_msg_send(struct omap_mbox *mbox_h, mbox_msg_t msg, void* arg);
-void omap_mbox_init_seq(struct omap_mbox *mbox);
+int omap_mbox_msg_send(struct omap_mbox *, mbox_msg_t msg, void *);
+void omap_mbox_init_seq(struct omap_mbox *);
+
+struct omap_mbox *omap_mbox_get(const char *);
+void omap_mbox_put(struct omap_mbox *);
 
-struct omap_mbox *omap_mbox_get(const char *name);
-int omap_mbox_register(struct omap_mbox *mbox);
-int omap_mbox_unregister(struct omap_mbox *mbox);
+int omap_mbox_register(struct omap_mbox *);
+int omap_mbox_unregister(struct omap_mbox *);
 
 #endif /* MAILBOX_H */