aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtv-driver.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.h')
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 2ceb5227637c..bc29436e8a3c 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -49,7 +49,6 @@
49#include <linux/i2c-algo-bit.h> 49#include <linux/i2c-algo-bit.h>
50#include <linux/list.h> 50#include <linux/list.h>
51#include <linux/unistd.h> 51#include <linux/unistd.h>
52#include <linux/byteorder/swab.h>
53#include <linux/pagemap.h> 52#include <linux/pagemap.h>
54#include <linux/scatterlist.h> 53#include <linux/scatterlist.h>
55#include <linux/workqueue.h> 54#include <linux/workqueue.h>
@@ -507,6 +506,8 @@ struct yuv_playback_info
507 struct v4l2_rect main_rect; 506 struct v4l2_rect main_rect;
508 u32 v4l2_src_w; 507 u32 v4l2_src_w;
509 u32 v4l2_src_h; 508 u32 v4l2_src_h;
509
510 u8 running; /* Have any frames been displayed */
510}; 511};
511 512
512#define IVTV_VBI_FRAMES 32 513#define IVTV_VBI_FRAMES 32
@@ -751,6 +752,12 @@ void ivtv_read_eeprom(struct ivtv *itv, struct tveeprom *tv);
751/* First-open initialization: load firmware, init cx25840, etc. */ 752/* First-open initialization: load firmware, init cx25840, etc. */
752int ivtv_init_on_first_open(struct ivtv *itv); 753int ivtv_init_on_first_open(struct ivtv *itv);
753 754
755/* Test if the current VBI mode is raw (1) or sliced (0) */
756static inline int ivtv_raw_vbi(const struct ivtv *itv)
757{
758 return itv->vbi.in.type == V4L2_BUF_TYPE_VBI_CAPTURE;
759}
760
754/* This is a PCI post thing, where if the pci register is not read, then 761/* This is a PCI post thing, where if the pci register is not read, then
755 the write doesn't always take effect right away. By reading back the 762 the write doesn't always take effect right away. By reading back the
756 register any pending PCI writes will be performed (in order), and so 763 register any pending PCI writes will be performed (in order), and so