git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
usb
/
mon
/
usb_mon.h
diff --git
a/drivers/usb/mon/usb_mon.h
b/drivers/usb/mon/usb_mon.h
index
4be0f93
..
ab9d02d
100644
(file)
--- a/
drivers/usb/mon/usb_mon.h
+++ b/
drivers/usb/mon/usb_mon.h
@@
-20,6
+20,7
@@
struct mon_bus {
struct dentry *dent_s; /* Debugging file */
struct dentry *dent_t; /* Text interface file */
struct usb_bus *u_bus;
struct dentry *dent_s; /* Debugging file */
struct dentry *dent_t; /* Text interface file */
struct usb_bus *u_bus;
+ int uses_dma;
/* Ref */
int nreaders; /* Under mon_lock AND mbus->lock */
/* Ref */
int nreaders; /* Under mon_lock AND mbus->lock */
@@
-27,6
+28,7
@@
struct mon_bus {
struct kref ref; /* Under mon_lock */
/* Stats */
struct kref ref; /* Under mon_lock */
/* Stats */
+ unsigned int cnt_events;
unsigned int cnt_text_lost;
};
unsigned int cnt_text_lost;
};
@@
-39,6
+41,7
@@
struct mon_reader {
void *r_data; /* Use container_of instead? */
void (*rnf_submit)(void *data, struct urb *urb);
void *r_data; /* Use container_of instead? */
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);
};
@@
-49,9
+52,9
@@
void mon_reader_del(struct mon_bus *mbus, struct mon_reader *r);
*/
extern char mon_dmapeek(unsigned char *dst, dma_addr_t dma_addr, int len);
*/
extern char mon_dmapeek(unsigned char *dst, dma_addr_t dma_addr, int len);
-extern struct
semaphore
mon_lock;
+extern struct
mutex
mon_lock;
-extern struct file_operations mon_fops_text;
-extern struct file_operations mon_fops_stat;
+extern
const
struct file_operations mon_fops_text;
+extern
const
struct file_operations mon_fops_stat;
#endif /* __USB_MON_H */
#endif /* __USB_MON_H */