diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-02 18:35:00 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-02 18:35:00 +0200 |
| commit | cb228051a31b5d0f78a3b3e7e8a960d1658afcf5 (patch) | |
| tree | f96ed25f974ba3c1520c3ba04367c48fa4dc3530 /linux/drivers/media/video/saa7115.c | |
| parent | 7d27e5f3b2bbe8ca82a41dce5203a67d7595ab09 (diff) | |
| download | mediapointer-dvb-s2-cb228051a31b5d0f78a3b3e7e8a960d1658afcf5.tar.gz mediapointer-dvb-s2-cb228051a31b5d0f78a3b3e7e8a960d1658afcf5.tar.bz2 | |
Fix video input setting of em28xx, use _INT_S_VIDEO_ROUTING in tvp5150
From: Hans Verkuil <hverkuil@xs4all.nl>
- Use new routing input defines in em28xx-cards.c
- Fix S-Video settings for tvp5150-based cards (input was copied from saa7115
based cards and worked only because S-Video was selected in the default: case)
- Replace VIDIOC_S_INPUT by VIDIOC_INT_S_VIDEO_ROUTING in em28xx-video.c
- Remove the now obsolete VIDIOC_S_INPUT handler in saa7115.c
- Add VIDIOC_INT_G/S_VIDEO_ROUTING in tvp5150.c
- Add new media/tvp5150.h with the routing defines.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/saa7115.c')
| -rw-r--r-- | linux/drivers/media/video/saa7115.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c index 6c40aa397..ea7c7c65b 100644 --- a/linux/drivers/media/video/saa7115.c +++ b/linux/drivers/media/video/saa7115.c @@ -1251,34 +1251,6 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar break; } - case VIDIOC_G_INPUT: - *(int *)arg = state->input; - break; - - case VIDIOC_S_INPUT: - v4l_dbg(1, debug, client, "decoder set input %d\n", *iarg); - /* inputs from 0-9 are available */ - if (*iarg < 0 || *iarg > 9) { - return -EINVAL; - } - - if (state->input == *iarg) - break; - v4l_dbg(1, debug, client, "now setting %s input\n", - *iarg >= 6 ? "S-Video" : "Composite"); - state->input = *iarg; - - /* select mode */ - saa7115_write(client, 0x02, - (saa7115_read(client, 0x02) & 0xf0) | - state->input); - - /* bypass chrominance trap for modes 6..9 */ - saa7115_write(client, 0x09, - (saa7115_read(client, 0x09) & 0x7f) | - (state->input < 6 ? 0x0 : 0x80)); - break; - case VIDIOC_STREAMON: case VIDIOC_STREAMOFF: v4l_dbg(1, debug, client, "%s output\n", |