diff options
| author | Ross Cohen <rcohen@snurgle.org> | 2008-09-29 22:36:24 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-10 15:31:11 -0700 |
| commit | df20d69ec968b33526461457c219ad4ba8ba8ac8 (patch) | |
| tree | 378597585d42511271d9a8c65d6b1e0aa076698c /drivers/staging/go7007/wis-saa7113.c | |
| parent | d63d692a44c918723895f792ffd17eab7bcfb8ef (diff) | |
| download | kernel_samsung_smdk4412-df20d69ec968b33526461457c219ad4ba8ba8ac8.zip kernel_samsung_smdk4412-df20d69ec968b33526461457c219ad4ba8ba8ac8.tar.gz kernel_samsung_smdk4412-df20d69ec968b33526461457c219ad4ba8ba8ac8.tar.bz2 | |
Staging: go7007 v4l fixes
Fix up some of the v4l issues that were recently changed to make the
go7007 driver a bit cleaner.
From: Ross Cohen <rcohen@snurgle.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/go7007/wis-saa7113.c')
| -rw-r--r-- | drivers/staging/go7007/wis-saa7113.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/drivers/staging/go7007/wis-saa7113.c b/drivers/staging/go7007/wis-saa7113.c index 4b14ca8..c1aff1b 100644 --- a/drivers/staging/go7007/wis-saa7113.c +++ b/drivers/staging/go7007/wis-saa7113.c @@ -19,8 +19,7 @@ #include <linux/init.h> #include <linux/version.h> #include <linux/i2c.h> -#include <linux/videodev.h> -#include <linux/video_decoder.h> +#include <linux/videodev2.h> #include <linux/ioctl.h> #include "wis-i2c.h" @@ -124,7 +123,7 @@ static int wis_saa7113_command(struct i2c_client *client, struct wis_saa7113 *dec = i2c_get_clientdata(client); switch (cmd) { - case DECODER_SET_INPUT: + case VIDIOC_S_INPUT: { int *input = arg; @@ -133,23 +132,19 @@ static int wis_saa7113_command(struct i2c_client *client, *input < 6 ? 0x40 : 0x80); break; } - case DECODER_SET_NORM: + case VIDIOC_S_STD: { - int *input = arg; + v4l2_std_id *input = arg; dec->norm = *input; - switch (dec->norm) { - case VIDEO_MODE_PAL: - write_reg(client, 0x0e, 0x01); - write_reg(client, 0x10, 0x48); - break; - case VIDEO_MODE_NTSC: + if (dec->norm & V4L2_STD_NTSC) { write_reg(client, 0x0e, 0x01); write_reg(client, 0x10, 0x40); - break; - case VIDEO_MODE_SECAM: + } else if (dec->norm & V4L2_STD_PAL) { + write_reg(client, 0x0e, 0x01); + write_reg(client, 0x10, 0x48); + } else if (dec->norm * V4L2_STD_SECAM) { write_reg(client, 0x0e, 0x50); write_reg(client, 0x10, 0x48); - break; } break; } @@ -295,7 +290,7 @@ static int wis_saa7113_detect(struct i2c_adapter *adapter, int addr, int kind) kfree(client); return -ENOMEM; } - dec->norm = VIDEO_MODE_NTSC; + dec->norm = V4L2_STD_NTSC; dec->brightness = 128; dec->contrast = 71; dec->saturation = 64; |