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

[sfrench/cifs-2.6.git] / drivers / media / video / pvrusb2 / pvrusb2-io.h

diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.h b/drivers/media/video/pvrusb2/pvrusb2-io.h
index 93279cc2a35e7e29785b8fd4346b32e5f1d0c2f7..42fcf8281a879c10624157043bb7681bcac29ddc 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-io.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.h
@@ -36,6 +36,15 @@ enum pvr2_buffer_state {
 struct pvr2_stream;
 struct pvr2_buffer;
 
+struct pvr2_stream_stats {
+       unsigned int buffers_in_queue;
+       unsigned int buffers_in_idle;
+       unsigned int buffers_in_ready;
+       unsigned int buffers_processed;
+       unsigned int buffers_failed;
+       unsigned int bytes_processed;
+};
+
 /* Initialize / tear down stream structure */
 struct pvr2_stream *pvr2_stream_create(void);
 void pvr2_stream_destroy(struct pvr2_stream *);
@@ -45,6 +54,9 @@ void pvr2_stream_setup(struct pvr2_stream *,
 void pvr2_stream_set_callback(struct pvr2_stream *,
                              pvr2_stream_callback func,
                              void *data);
+void pvr2_stream_get_stats(struct pvr2_stream *,
+                          struct pvr2_stream_stats *,
+                          int zero_counts);
 
 /* Query / set the nominal buffer count */
 int pvr2_stream_get_buffer_count(struct pvr2_stream *);