diff options
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-io.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-io.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-io.c b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c index 1c1cf9024..7b3b53010 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-io.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c @@ -31,6 +31,8 @@ #include <asm/semaphore.h> #endif +static const char *pvr2_buffer_state_decode(enum pvr2_buffer_state); + #define BUFFER_SIG 0x47653271 // #define SANITY_CHECK_BUFFERS @@ -535,12 +537,10 @@ void pvr2_stream_set_callback(struct pvr2_stream *sp, } /* Query / set the nominal buffer count */ -#if 0 int pvr2_stream_get_buffer_count(struct pvr2_stream *sp) { return sp->buffer_target_count; } -#endif /* 0 */ int pvr2_stream_set_buffer_count(struct pvr2_stream *sp,unsigned int cnt) { @@ -578,13 +578,14 @@ int pvr2_stream_get_ready_count(struct pvr2_stream *sp) { return sp->r_count; } - #if 0 int pvr2_stream_get_idle_count(struct pvr2_stream *sp) { return sp->i_count; } +#endif /* 0 */ +#if 0 void pvr2_stream_flush(struct pvr2_stream *sp) { @@ -592,7 +593,6 @@ void pvr2_stream_flush(struct pvr2_stream *sp) pvr2_stream_internal_flush(sp); } while(0); mutex_unlock(&sp->mutex); } - #endif /* 0 */ void pvr2_stream_kill(struct pvr2_stream *sp) @@ -663,8 +663,8 @@ int pvr2_buffer_idle(struct pvr2_buffer *bp) } while(0); mutex_unlock(&sp->mutex); return 0; } -#endif /* 0 */ +#endif /* 0 */ int pvr2_buffer_set_buffer(struct pvr2_buffer *bp,void *ptr,unsigned int cnt) { int ret = 0; @@ -708,8 +708,8 @@ enum pvr2_buffer_state pvr2_buffer_get_state(struct pvr2_buffer *bp) { return bp->state; } -#endif /* 0 */ +#endif /* 0 */ int pvr2_buffer_get_id(struct pvr2_buffer *bp) { return bp->id; |