aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r--drivers/media/video/saa7134/saa7134.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index b3e3957c89b5..62224cc958f1 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -231,6 +231,10 @@ struct saa7134_format {
231#define SAA7134_BOARD_ENCORE_ENLTV 106 231#define SAA7134_BOARD_ENCORE_ENLTV 106
232#define SAA7134_BOARD_ENCORE_ENLTV_FM 107 232#define SAA7134_BOARD_ENCORE_ENLTV_FM 107
233#define SAA7134_BOARD_CINERGY_HT_PCI 108 233#define SAA7134_BOARD_CINERGY_HT_PCI 108
234#define SAA7134_BOARD_PHILIPS_TIGER_S 109
235#define SAA7134_BOARD_AVERMEDIA_M102 110
236#define SAA7134_BOARD_ASUS_P7131_4871 111
237#define SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA 112
234 238
235#define SAA7134_MAXBOARDS 8 239#define SAA7134_MAXBOARDS 8
236#define SAA7134_INPUT_MAX 8 240#define SAA7134_INPUT_MAX 8
@@ -280,6 +284,7 @@ struct saa7134_board {
280 unsigned char radio_addr; 284 unsigned char radio_addr;
281 285
282 unsigned int tda9887_conf; 286 unsigned int tda9887_conf;
287 unsigned int tuner_config;
283 288
284 /* peripheral I/O */ 289 /* peripheral I/O */
285 enum saa7134_video_out video_out; 290 enum saa7134_video_out video_out;
@@ -435,6 +440,8 @@ struct saa7134_dev {
435#ifdef VIDIOC_G_PRIORITY 440#ifdef VIDIOC_G_PRIORITY
436 struct v4l2_prio_state prio; 441 struct v4l2_prio_state prio;
437#endif 442#endif
443 /* workstruct for loading modules */
444 struct work_struct request_module_wk;
438 445
439 /* insmod option/autodetected */ 446 /* insmod option/autodetected */
440 int autodetected; 447 int autodetected;
@@ -562,6 +569,8 @@ extern struct list_head saa7134_devlist;
562extern int saa7134_no_overlay; 569extern int saa7134_no_overlay;
563 570
564void saa7134_track_gpio(struct saa7134_dev *dev, char *msg); 571void saa7134_track_gpio(struct saa7134_dev *dev, char *msg);
572void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value);
573int saa7134_tuner_callback(void *ptr, int command, int arg);
565 574
566#define SAA7134_PGTABLE_SIZE 4096 575#define SAA7134_PGTABLE_SIZE 4096
567 576
@@ -620,7 +629,6 @@ int saa7134_common_ioctl(struct saa7134_dev *dev,
620 629
621int saa7134_video_init1(struct saa7134_dev *dev); 630int saa7134_video_init1(struct saa7134_dev *dev);
622int saa7134_video_init2(struct saa7134_dev *dev); 631int saa7134_video_init2(struct saa7134_dev *dev);
623int saa7134_video_fini(struct saa7134_dev *dev);
624void saa7134_irq_video_intl(struct saa7134_dev *dev); 632void saa7134_irq_video_intl(struct saa7134_dev *dev);
625void saa7134_irq_video_done(struct saa7134_dev *dev, unsigned long status); 633void saa7134_irq_video_done(struct saa7134_dev *dev, unsigned long status);
626 634