diff options
| author | Michael Hunold <devnull@localhost> | 2003-07-17 09:03:24 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-07-17 09:03:24 +0000 |
| commit | 81117df4eb88a22c4f3e5ae030190c98ca033fc5 (patch) | |
| tree | 17c10eccded78a2e277e4b73d6e796de56dc8116 /linux/drivers/media/common | |
| parent | 8ea93347171a95476e21eaabd9ba31ae74f2d233 (diff) | |
| download | mediapointer-dvb-s2-81117df4eb88a22c4f3e5ae030190c98ca033fc5.tar.gz mediapointer-dvb-s2-81117df4eb88a22c4f3e5ae030190c98ca033fc5.tar.bz2 | |
[V4L] - fix static build for hexium_gemini and hexium_orion drivers (Thanks to Adrian Bunk <bunk@fs.tum.de> for reporting this)
[V4L] - set debug verbosity to 0 for hexium_gemini and hexium_orion drivers
[V4L] - make hexium_gemini and hexium_orion drivers depdend on i2c module
[V4L] - make saa7146 module depend on hexium_gemini and hexium_orion drivers
[V4L] - let the saa7146 i2c bus report itself as I2C_ADAP_CLASS_TV_ANALOG
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/Kconfig | 6 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_i2c.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 14 |
3 files changed, 14 insertions, 7 deletions
diff --git a/linux/drivers/media/common/Kconfig b/linux/drivers/media/common/Kconfig index 844e82dff..1a6b17203 100644 --- a/linux/drivers/media/common/Kconfig +++ b/linux/drivers/media/common/Kconfig @@ -1,8 +1,8 @@ config VIDEO_SAA7146 tristate - default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y - default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m - depends on VIDEO_DEV && PCI + default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y || VIDEO_HEXIUM_ORION=y || VIDEO_HEXIUM_GEMINI=y + default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m || VIDEO_HEXIUM_ORION=m || VIDEO_HEXIUM_GEMINI=m + depends on VIDEO_DEV && PCI && I2C config VIDEO_VIDEOBUF tristate diff --git a/linux/drivers/media/common/saa7146_i2c.c b/linux/drivers/media/common/saa7146_i2c.c index d904deae5..e9c1435b6 100644 --- a/linux/drivers/media/common/saa7146_i2c.c +++ b/linux/drivers/media/common/saa7146_i2c.c @@ -419,6 +419,7 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c i2c_adapter->id = I2C_ALGO_SAA7146; i2c_adapter->timeout = SAA7146_I2C_TIMEOUT; i2c_adapter->retries = SAA7146_I2C_RETRIES; + i2c_adapter->class = I2C_ADAP_CLASS_TV_ANALOG; } return 0; diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 502ffbc2c..921622aad 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1045,12 +1045,18 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int return videobuf_querybuf(q,arg); } case VIDIOC_QBUF: { - DEB_D(("VIDIOC_QBUF \n")); - return videobuf_qbuf(file,q,arg); + struct v4l2_buffer *b = arg; + int ret = 0; + ret = videobuf_qbuf(file,q,b); + DEB_D(("VIDIOC_QBUF: ret:%d, index:%d\n",ret,b->index)); + return ret; } case VIDIOC_DQBUF: { - DEB_D(("VIDIOC_DQBUF \n")); - return videobuf_dqbuf(file,q,arg); + struct v4l2_buffer *b = arg; + int ret = 0; + ret = videobuf_dqbuf(file,q,b); + DEB_D(("VIDIOC_DQBUF: ret:%d, index:%d\n",ret,b->index)); + return ret; } case VIDIOC_STREAMON: { DEB_D(("VIDIOC_STREAMON \n")); |