summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Hunold <hunold@linuxtv.org>2004-10-19 18:19:08 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-19 18:19:08 -0700
commit2da8c87f193103fb4557094405f83fd13168a516 (patch)
treef61d37cc3d1c8f7ed484fdbaa0da51ed4262c919 /include
parent8c4accad8e11b37b5661f968781035be894da7ff (diff)
[PATCH] DVB: update saa7146
- [DVB] fix videodev has no release callback - [DVB] use PAGE_SIZE for pagetables, not home-brewn SAA7146_PGTABLE_SIZE - [DVB] use cpu_to_le32() at various places for endianess independency - [DVB] turn some error checks into BUG()s - [DVB] make saa7146_i2c_adapter_prepare() support an adapter class - [DVB] add support for V4L2_PIX_FMT_RGB32 pixelformat - [DVB] replace generic saa7146 i2c name by card specific name, suggested by Uli Luckas <luckas@musoft.de> Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/media/saa7146.h2
-rw-r--r--include/media/saa7146_vv.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index e62f03fb4c5d..5e9f64e67bc8 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, unsigned int class, u32 bitrate);
+int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, 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 de5672cdec02..61a509eb1bc6 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -35,6 +35,7 @@ struct saa7146_format {
u32 trans;
u8 depth;
u8 flags;
+ u8 swap;
};
struct saa7146_standard
@@ -188,8 +189,8 @@ struct saa7146_use_ops {
};
/* from saa7146_fops.c */
-int saa7146_register_device(struct video_device *vid, struct saa7146_dev* dev, char *name, int type);
-int saa7146_unregister_device(struct video_device *vid, struct saa7146_dev* dev);
+int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev, char *name, int type);
+int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev);
void saa7146_buffer_finish(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, int state);
void saa7146_buffer_next(struct saa7146_dev *dev, struct saa7146_dmaqueue *q,int vbi);
int saa7146_buffer_queue(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, struct saa7146_buf *buf);