summaryrefslogtreecommitdiff
path: root/linux/drivers/media/common/saa7146.h
diff options
context:
space:
mode:
authorMichael Hunold <devnull@localhost>2002-12-22 19:34:54 +0000
committerMichael Hunold <devnull@localhost>2002-12-22 19:34:54 +0000
commit8b66183832300c20e17957fdfabc112b2d0ed8d1 (patch)
treec002284e1874e0350c7d0a2825e51159d7d64fea /linux/drivers/media/common/saa7146.h
parent12c89ec2f0b891897eeb8a0ff6c38a6067553a7d (diff)
downloadmediapointer-dvb-s2-8b66183832300c20e17957fdfabc112b2d0ed8d1.tar.gz
mediapointer-dvb-s2-8b66183832300c20e17957fdfabc112b2d0ed8d1.tar.bz2
Changed i2c_writeout() and the irq handler to use a waitqueue
instead of busy waiting for an i2c transaction to finish. Left the old method in there. if you need it (or if i screwed up), set "use_i2c_irq" to zero in saa7146_i2c.c to get the old behaviour.
Diffstat (limited to 'linux/drivers/media/common/saa7146.h')
-rw-r--r--linux/drivers/media/common/saa7146.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/common/saa7146.h b/linux/drivers/media/common/saa7146.h
index 282be0531..c650cf70d 100644
--- a/linux/drivers/media/common/saa7146.h
+++ b/linux/drivers/media/common/saa7146.h
@@ -237,6 +237,8 @@ struct saa7146_dev
/* i2c-stuff */
u32 i2c_bitrate;
u32* i2c_mem; /* pointer to i2c memory */
+ wait_queue_head_t i2c_wq;
+ int i2c_op;
/* memories */
u32* clipping; /* pointer to clipping memory */
@@ -257,7 +259,7 @@ struct saa7146_dev
/* video capture */
struct saa7146_dmaqueue video_q;
- struct saa7146_fh *streaming;
+ struct saa7146_fh *streaming;
/* common: fixme? shouldn't this be in saa7146_fh?
(this leads to a more complicated question: shall the driver