diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-25 19:00:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-25 19:00:10 -0700 |
| commit | 804ca075d25251a5e8a4f416199f2da0f218e62d (patch) | |
| tree | cbb6ced971737d81c8ed3bcb5724687bce80a587 /include/media | |
| parent | 63d5381ed20e9e6a5723cfaf5a2ddce018c0a39e (diff) | |
| parent | 2a4e095a7562286c4cd6cc0dd2aad390f2941cbc (diff) | |
Merge DVB updates
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/saa7146.h | 2 | ||||
| -rw-r--r-- | include/media/saa7146_vv.h | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h index 5e9f64e67bc8..e62f03fb4c5d 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h @@ -154,7 +154,7 @@ struct saa7146_dev }; /* from saa7146_i2c.c */ -int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate); +int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, unsigned int class, u32 bitrate); int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg msgs[], int num, int retries); /* from saa7146_core.c */ diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 50ab25907eec..60cd29e52f2d 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -44,11 +44,9 @@ struct saa7146_standard int v_offset; /* number of lines of vertical offset before processing */ int v_field; /* number of lines in a field for HPS to process */ - int v_calc; /* number of vertical active lines */ int h_offset; /* horizontal offset of processing window */ int h_pixels; /* number of horizontal pixels to process */ - int h_calc; /* number of horizontal active pixels */ int v_max_out; int h_max_out; @@ -104,6 +102,9 @@ struct saa7146_fh { unsigned int resources; /* resource management for device open */ }; +#define STATUS_OVERLAY 0x01 +#define STATUS_CAPTURE 0x02 + struct saa7146_vv { int vbi_minor; @@ -117,14 +118,17 @@ struct saa7146_vv int video_minor; + int video_status; + struct saa7146_fh *video_fh; + /* video overlay */ struct v4l2_framebuffer ov_fb; struct saa7146_format *ov_fmt; struct saa7146_overlay *ov_data; + struct saa7146_fh *ov_suspend; /* video capture */ struct saa7146_dmaqueue video_q; - struct saa7146_fh *streaming; enum v4l2_field last_field; /* common: fixme? shouldn't this be in saa7146_fh? |