aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index c725495826ce..a67dcf84b596 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -238,6 +238,7 @@ struct pvr2_hdw {
238 int state_encoder_run; /* Encoder is running */ 238 int state_encoder_run; /* Encoder is running */
239 int state_encoder_config; /* Encoder is configured */ 239 int state_encoder_config; /* Encoder is configured */
240 int state_encoder_waitok; /* Encoder pre-wait done */ 240 int state_encoder_waitok; /* Encoder pre-wait done */
241 int state_encoder_runok; /* Encoder has run for >= .25 sec */
241 int state_decoder_run; /* Decoder is running */ 242 int state_decoder_run; /* Decoder is running */
242 int state_usbstream_run; /* FX2 is streaming */ 243 int state_usbstream_run; /* FX2 is streaming */
243 int state_decoder_quiescent; /* Decoder idle for > 50msec */ 244 int state_decoder_quiescent; /* Decoder idle for > 50msec */
@@ -267,6 +268,9 @@ struct pvr2_hdw {
267 /* Timer for measuring encoder pre-wait time */ 268 /* Timer for measuring encoder pre-wait time */
268 struct timer_list encoder_wait_timer; 269 struct timer_list encoder_wait_timer;
269 270
271 /* Timer for measuring encoder minimum run time */
272 struct timer_list encoder_run_timer;
273
270 /* Place to block while waiting for state changes */ 274 /* Place to block while waiting for state changes */
271 wait_queue_head_t state_wait_data; 275 wait_queue_head_t state_wait_data;
272 276