diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
commit | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch) | |
tree | 999c6a6580b76a083c8efb9dabff709d1c49fcd0 /drivers/media/video/saa7134/saa7134.h | |
parent | 492b057c426e4aa747484958e18e9da29003985d (diff) | |
parent | 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff) |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 0cbaf90d4874..82268848f26a 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -252,7 +252,7 @@ struct saa7134_format { | |||
252 | #define SAA7134_BOARD_BEHOLD_505FM 126 | 252 | #define SAA7134_BOARD_BEHOLD_505FM 126 |
253 | #define SAA7134_BOARD_BEHOLD_507_9FM 127 | 253 | #define SAA7134_BOARD_BEHOLD_507_9FM 127 |
254 | #define SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM 128 | 254 | #define SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM 128 |
255 | #define SAA7134_BOARD_BEHOLD_607_9FM 129 | 255 | #define SAA7134_BOARD_BEHOLD_607FM_MK3 129 |
256 | #define SAA7134_BOARD_BEHOLD_M6 130 | 256 | #define SAA7134_BOARD_BEHOLD_M6 130 |
257 | #define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131 | 257 | #define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131 |
258 | #define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132 | 258 | #define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132 |
@@ -280,6 +280,18 @@ struct saa7134_format { | |||
280 | #define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154 | 280 | #define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154 |
281 | #define SAA7134_BOARD_HAUPPAUGE_HVR1120 155 | 281 | #define SAA7134_BOARD_HAUPPAUGE_HVR1120 155 |
282 | #define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156 | 282 | #define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156 |
283 | #define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157 | ||
284 | #define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158 | ||
285 | #define SAA7134_BOARD_BEHOLD_505RDS 159 | ||
286 | #define SAA7134_BOARD_BEHOLD_507RDS_MK3 160 | ||
287 | #define SAA7134_BOARD_BEHOLD_507RDS_MK5 161 | ||
288 | #define SAA7134_BOARD_BEHOLD_607FM_MK5 162 | ||
289 | #define SAA7134_BOARD_BEHOLD_609FM_MK3 163 | ||
290 | #define SAA7134_BOARD_BEHOLD_609FM_MK5 164 | ||
291 | #define SAA7134_BOARD_BEHOLD_607RDS_MK3 165 | ||
292 | #define SAA7134_BOARD_BEHOLD_607RDS_MK5 166 | ||
293 | #define SAA7134_BOARD_BEHOLD_609RDS_MK3 167 | ||
294 | #define SAA7134_BOARD_BEHOLD_609RDS_MK5 168 | ||
283 | 295 | ||
284 | #define SAA7134_MAXBOARDS 32 | 296 | #define SAA7134_MAXBOARDS 32 |
285 | #define SAA7134_INPUT_MAX 8 | 297 | #define SAA7134_INPUT_MAX 8 |
@@ -364,6 +376,7 @@ struct saa7134_board { | |||
364 | #define INTERLACE_OFF 2 | 376 | #define INTERLACE_OFF 2 |
365 | 377 | ||
366 | #define BUFFER_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */ | 378 | #define BUFFER_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */ |
379 | #define TS_BUFFER_TIMEOUT msecs_to_jiffies(1000) /* 1 second */ | ||
367 | 380 | ||
368 | struct saa7134_dev; | 381 | struct saa7134_dev; |
369 | struct saa7134_dma; | 382 | struct saa7134_dma; |
@@ -480,12 +493,6 @@ struct saa7134_mpeg_ops { | |||
480 | void (*signal_change)(struct saa7134_dev *dev); | 493 | void (*signal_change)(struct saa7134_dev *dev); |
481 | }; | 494 | }; |
482 | 495 | ||
483 | enum saa7134_ts_status { | ||
484 | SAA7134_TS_STOPPED, | ||
485 | SAA7134_TS_BUFF_DONE, | ||
486 | SAA7134_TS_STARTED, | ||
487 | }; | ||
488 | |||
489 | /* global device status */ | 496 | /* global device status */ |
490 | struct saa7134_dev { | 497 | struct saa7134_dev { |
491 | struct list_head devlist; | 498 | struct list_head devlist; |
@@ -580,8 +587,7 @@ struct saa7134_dev { | |||
580 | /* SAA7134_MPEG_* */ | 587 | /* SAA7134_MPEG_* */ |
581 | struct saa7134_ts ts; | 588 | struct saa7134_ts ts; |
582 | struct saa7134_dmaqueue ts_q; | 589 | struct saa7134_dmaqueue ts_q; |
583 | enum saa7134_ts_status ts_state; | 590 | int ts_started; |
584 | unsigned int buff_cnt; | ||
585 | struct saa7134_mpeg_ops *mops; | 591 | struct saa7134_mpeg_ops *mops; |
586 | 592 | ||
587 | /* SAA7134_MPEG_EMPRESS only */ | 593 | /* SAA7134_MPEG_EMPRESS only */ |
@@ -739,6 +745,9 @@ void saa7134_ts_unregister(struct saa7134_mpeg_ops *ops); | |||
739 | 745 | ||
740 | int saa7134_ts_init_hw(struct saa7134_dev *dev); | 746 | int saa7134_ts_init_hw(struct saa7134_dev *dev); |
741 | 747 | ||
748 | int saa7134_ts_start(struct saa7134_dev *dev); | ||
749 | int saa7134_ts_stop(struct saa7134_dev *dev); | ||
750 | |||
742 | /* ----------------------------------------------------------- */ | 751 | /* ----------------------------------------------------------- */ |
743 | /* saa7134-vbi.c */ | 752 | /* saa7134-vbi.c */ |
744 | 753 | ||
@@ -786,7 +795,7 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status); | |||
786 | int saa7134_input_init1(struct saa7134_dev *dev); | 795 | int saa7134_input_init1(struct saa7134_dev *dev); |
787 | void saa7134_input_fini(struct saa7134_dev *dev); | 796 | void saa7134_input_fini(struct saa7134_dev *dev); |
788 | void saa7134_input_irq(struct saa7134_dev *dev); | 797 | void saa7134_input_irq(struct saa7134_dev *dev); |
789 | void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir); | 798 | void saa7134_probe_i2c_ir(struct saa7134_dev *dev); |
790 | void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir); | 799 | void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir); |
791 | void saa7134_ir_stop(struct saa7134_dev *dev); | 800 | void saa7134_ir_stop(struct saa7134_dev *dev); |
792 | 801 | ||