diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index f940d0254798..924ffd13637e 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -253,7 +253,17 @@ struct saa7134_format { | |||
253 | #define SAA7134_BOARD_BEHOLD_607_9FM 129 | 253 | #define SAA7134_BOARD_BEHOLD_607_9FM 129 |
254 | #define SAA7134_BOARD_BEHOLD_M6 130 | 254 | #define SAA7134_BOARD_BEHOLD_M6 130 |
255 | #define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131 | 255 | #define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131 |
256 | #define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132 | 256 | #define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132 |
257 | #define SAA7134_BOARD_PHILIPS_SNAKE 133 | ||
258 | #define SAA7134_BOARD_CREATIX_CTX953 134 | ||
259 | #define SAA7134_BOARD_MSI_TVANYWHERE_AD11 135 | ||
260 | #define SAA7134_BOARD_AVERMEDIA_CARDBUS_506 136 | ||
261 | #define SAA7134_BOARD_AVERMEDIA_A16D 137 | ||
262 | #define SAA7134_BOARD_AVERMEDIA_M115 138 | ||
263 | #define SAA7134_BOARD_VIDEOMATE_T750 139 | ||
264 | #define SAA7134_BOARD_AVERMEDIA_A700_PRO 140 | ||
265 | #define SAA7134_BOARD_AVERMEDIA_A700_HYBRID 141 | ||
266 | |||
257 | 267 | ||
258 | #define SAA7134_MAXBOARDS 8 | 268 | #define SAA7134_MAXBOARDS 8 |
259 | #define SAA7134_INPUT_MAX 8 | 269 | #define SAA7134_INPUT_MAX 8 |
@@ -380,9 +390,7 @@ struct saa7134_fh { | |||
380 | unsigned int radio; | 390 | unsigned int radio; |
381 | enum v4l2_buf_type type; | 391 | enum v4l2_buf_type type; |
382 | unsigned int resources; | 392 | unsigned int resources; |
383 | #ifdef VIDIOC_G_PRIORITY | ||
384 | enum v4l2_priority prio; | 393 | enum v4l2_priority prio; |
385 | #endif | ||
386 | 394 | ||
387 | /* video overlay */ | 395 | /* video overlay */ |
388 | struct v4l2_window win; | 396 | struct v4l2_window win; |
@@ -454,9 +462,7 @@ struct saa7134_dev { | |||
454 | struct list_head devlist; | 462 | struct list_head devlist; |
455 | struct mutex lock; | 463 | struct mutex lock; |
456 | spinlock_t slock; | 464 | spinlock_t slock; |
457 | #ifdef VIDIOC_G_PRIORITY | ||
458 | struct v4l2_prio_state prio; | 465 | struct v4l2_prio_state prio; |
459 | #endif | ||
460 | /* workstruct for loading modules */ | 466 | /* workstruct for loading modules */ |
461 | struct work_struct request_module_wk; | 467 | struct work_struct request_module_wk; |
462 | 468 | ||
@@ -556,7 +562,9 @@ struct saa7134_dev { | |||
556 | #if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) | 562 | #if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) |
557 | /* SAA7134_MPEG_DVB only */ | 563 | /* SAA7134_MPEG_DVB only */ |
558 | struct videobuf_dvb dvb; | 564 | struct videobuf_dvb dvb; |
559 | int (*original_demod_sleep)(struct dvb_frontend* fe); | 565 | int (*original_demod_sleep)(struct dvb_frontend *fe); |
566 | int (*original_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage); | ||
567 | int (*original_set_high_voltage)(struct dvb_frontend *fe, long arg); | ||
560 | #endif | 568 | #endif |
561 | }; | 569 | }; |
562 | 570 | ||
@@ -594,7 +602,6 @@ extern int saa7134_no_overlay; | |||
594 | 602 | ||
595 | void saa7134_track_gpio(struct saa7134_dev *dev, char *msg); | 603 | void saa7134_track_gpio(struct saa7134_dev *dev, char *msg); |
596 | void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value); | 604 | void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value); |
597 | int saa7134_tuner_callback(void *ptr, int command, int arg); | ||
598 | 605 | ||
599 | #define SAA7134_PGTABLE_SIZE 4096 | 606 | #define SAA7134_PGTABLE_SIZE 4096 |
600 | 607 | ||
@@ -631,6 +638,7 @@ extern struct pci_device_id __devinitdata saa7134_pci_tbl[]; | |||
631 | 638 | ||
632 | extern int saa7134_board_init1(struct saa7134_dev *dev); | 639 | extern int saa7134_board_init1(struct saa7134_dev *dev); |
633 | extern int saa7134_board_init2(struct saa7134_dev *dev); | 640 | extern int saa7134_board_init2(struct saa7134_dev *dev); |
641 | int saa7134_tuner_callback(void *priv, int command, int arg); | ||
634 | 642 | ||
635 | 643 | ||
636 | /* ----------------------------------------------------------- */ | 644 | /* ----------------------------------------------------------- */ |