Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6-omap-h63xx.git] / drivers / usb / mon / usb_mon.h

diff --git a/drivers/usb/mon/usb_mon.h b/drivers/usb/mon/usb_mon.h
index efdfd8993d9e2fc5b217ce498fbe48eed5d0d428..f5d84ff8c101b2c783a5b3cca9307ffb600ed21c 100644 (file)
--- a/drivers/usb/mon/usb_mon.h
+++ b/drivers/usb/mon/usb_mon.h
@@ -20,9 +20,11 @@ struct mon_bus {
        struct usb_bus *u_bus;
 
        int text_inited;
+       int bin_inited;
        struct dentry *dent_s;          /* Debugging file */
        struct dentry *dent_t;          /* Text interface file */
-       int uses_dma;
+       struct dentry *dent_u;          /* Second text interface file */
+       struct device *classdev;        /* Device in usbmon class */
 
        /* Ref */
        int nreaders;                   /* Under mon_lock AND mbus->lock */
@@ -44,7 +46,7 @@ struct mon_reader {
 
        void (*rnf_submit)(void *data, struct urb *urb);
        void (*rnf_error)(void *data, struct urb *urb, int error);
-       void (*rnf_complete)(void *data, struct urb *urb);
+       void (*rnf_complete)(void *data, struct urb *urb, int status);
 };
 
 void mon_reader_add(struct mon_bus *mbus, struct mon_reader *r);
@@ -54,7 +56,8 @@ struct mon_bus *mon_bus_lookup(unsigned int num);
 
 int /*bool*/ mon_text_add(struct mon_bus *mbus, const struct usb_bus *ubus);
 void mon_text_del(struct mon_bus *mbus);
-// void mon_bin_add(struct mon_bus *);
+int /*bool*/ mon_bin_add(struct mon_bus *mbus, const struct usb_bus *ubus);
+void mon_bin_del(struct mon_bus *mbus);
 
 int __init mon_text_init(void);
 void mon_text_exit(void);
@@ -81,4 +84,6 @@ extern struct mutex mon_lock;
 
 extern const struct file_operations mon_fops_stat;
 
+extern struct mon_bus mon_bus0;                /* Only for redundant checks */
+
 #endif /* __USB_MON_H */