diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index a0884f639f65..491ab1f8fdd3 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -269,6 +269,12 @@ struct saa7134_format { | |||
269 | #define SAA7134_BOARD_BEHOLD_M6_EXTRA 144 | 269 | #define SAA7134_BOARD_BEHOLD_M6_EXTRA 144 |
270 | #define SAA7134_BOARD_AVERMEDIA_M103 145 | 270 | #define SAA7134_BOARD_AVERMEDIA_M103 145 |
271 | #define SAA7134_BOARD_ASUSTeK_P7131_ANALOG 146 | 271 | #define SAA7134_BOARD_ASUSTeK_P7131_ANALOG 146 |
272 | #define SAA7134_BOARD_ASUSTeK_TIGER_3IN1 147 | ||
273 | #define SAA7134_BOARD_ENCORE_ENLTV_FM53 148 | ||
274 | #define SAA7134_BOARD_AVERMEDIA_M135A 149 | ||
275 | #define SAA7134_BOARD_REAL_ANGEL_220 150 | ||
276 | #define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI 151 | ||
277 | #define SAA7134_BOARD_ASUSTeK_TIGER 152 | ||
272 | 278 | ||
273 | #define SAA7134_MAXBOARDS 8 | 279 | #define SAA7134_MAXBOARDS 8 |
274 | #define SAA7134_INPUT_MAX 8 | 280 | #define SAA7134_INPUT_MAX 8 |
@@ -462,6 +468,12 @@ struct saa7134_mpeg_ops { | |||
462 | void (*signal_change)(struct saa7134_dev *dev); | 468 | void (*signal_change)(struct saa7134_dev *dev); |
463 | }; | 469 | }; |
464 | 470 | ||
471 | enum saa7134_ts_status { | ||
472 | SAA7134_TS_STOPPED, | ||
473 | SAA7134_TS_BUFF_DONE, | ||
474 | SAA7134_TS_STARTED, | ||
475 | }; | ||
476 | |||
465 | /* global device status */ | 477 | /* global device status */ |
466 | struct saa7134_dev { | 478 | struct saa7134_dev { |
467 | struct list_head devlist; | 479 | struct list_head devlist; |
@@ -555,6 +567,8 @@ struct saa7134_dev { | |||
555 | /* SAA7134_MPEG_* */ | 567 | /* SAA7134_MPEG_* */ |
556 | struct saa7134_ts ts; | 568 | struct saa7134_ts ts; |
557 | struct saa7134_dmaqueue ts_q; | 569 | struct saa7134_dmaqueue ts_q; |
570 | enum saa7134_ts_status ts_state; | ||
571 | unsigned int buff_cnt; | ||
558 | struct saa7134_mpeg_ops *mops; | 572 | struct saa7134_mpeg_ops *mops; |
559 | struct i2c_client *mpeg_i2c_client; | 573 | struct i2c_client *mpeg_i2c_client; |
560 | 574 | ||
@@ -644,7 +658,7 @@ extern struct pci_device_id __devinitdata saa7134_pci_tbl[]; | |||
644 | 658 | ||
645 | extern int saa7134_board_init1(struct saa7134_dev *dev); | 659 | extern int saa7134_board_init1(struct saa7134_dev *dev); |
646 | extern int saa7134_board_init2(struct saa7134_dev *dev); | 660 | extern int saa7134_board_init2(struct saa7134_dev *dev); |
647 | int saa7134_tuner_callback(void *priv, int command, int arg); | 661 | int saa7134_tuner_callback(void *priv, int component, int command, int arg); |
648 | 662 | ||
649 | 663 | ||
650 | /* ----------------------------------------------------------- */ | 664 | /* ----------------------------------------------------------- */ |
@@ -654,6 +668,8 @@ int saa7134_i2c_register(struct saa7134_dev *dev); | |||
654 | int saa7134_i2c_unregister(struct saa7134_dev *dev); | 668 | int saa7134_i2c_unregister(struct saa7134_dev *dev); |
655 | void saa7134_i2c_call_clients(struct saa7134_dev *dev, | 669 | void saa7134_i2c_call_clients(struct saa7134_dev *dev, |
656 | unsigned int cmd, void *arg); | 670 | unsigned int cmd, void *arg); |
671 | int saa7134_i2c_call_saa6752(struct saa7134_dev *dev, | ||
672 | unsigned int cmd, void *arg); | ||
657 | 673 | ||
658 | 674 | ||
659 | /* ----------------------------------------------------------- */ | 675 | /* ----------------------------------------------------------- */ |
@@ -666,6 +682,7 @@ extern struct video_device saa7134_radio_template; | |||
666 | int saa7134_s_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); | 682 | int saa7134_s_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); |
667 | int saa7134_g_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); | 683 | int saa7134_g_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); |
668 | int saa7134_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c); | 684 | int saa7134_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c); |
685 | int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id *id); | ||
669 | 686 | ||
670 | int saa7134_videoport_init(struct saa7134_dev *dev); | 687 | int saa7134_videoport_init(struct saa7134_dev *dev); |
671 | void saa7134_set_tvnorm_hw(struct saa7134_dev *dev); | 688 | void saa7134_set_tvnorm_hw(struct saa7134_dev *dev); |