Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[pandora-kernel.git] / net / bluetooth / hidp / hidp.h

diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h
index 8d934a1..13de5fa 100644 (file)
--- a/net/bluetooth/hidp/hidp.h
+++ b/net/bluetooth/hidp/hidp.h
@@ -80,6 +80,8 @@
 #define HIDP_VIRTUAL_CABLE_UNPLUG      0
 #define HIDP_BOOT_PROTOCOL_MODE                1
 #define HIDP_BLUETOOTH_VENDOR_ID       9
+#define        HIDP_WAITING_FOR_RETURN         10
+#define HIDP_WAITING_FOR_SEND_ACK      11
 
 struct hidp_connadd_req {
        int   ctrl_sock;        // Connected control socket
@@ -154,9 +156,22 @@ struct hidp_session {
        struct sk_buff_head ctrl_transmit;
        struct sk_buff_head intr_transmit;
 
+       /* Used in hidp_get_raw_report() */
+       int waiting_report_type; /* HIDP_DATA_RTYPE_* */
+       int waiting_report_number; /* -1 for not numbered */
+       struct mutex report_mutex;
+       struct sk_buff *report_return;
+       wait_queue_head_t report_queue;
+
+       /* Used in hidp_output_raw_report() */
+       int output_report_success; /* boolean */
+
        /* Report descriptor */
        __u8 *rd_data;
        uint rd_size;
+
+       wait_queue_head_t startup_queue;
+       int waiting_for_startup;
 };
 
 static inline void hidp_schedule(struct hidp_session *session)