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-tw9903.c | |
parent | d63d692a44c918723895f792ffd17eab7bcfb8ef (diff) | |
download | op-kernel-dev-df20d69ec968b33526461457c219ad4ba8ba8ac8.zip op-kernel-dev-df20d69ec968b33526461457c219ad4ba8ba8ac8.tar.gz |
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-tw9903.c')
-rw-r--r-- | drivers/staging/go7007/wis-tw9903.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/staging/go7007/wis-tw9903.c b/drivers/staging/go7007/wis-tw9903.c index 1cdf01a..d8e4196 100644 --- a/drivers/staging/go7007/wis-tw9903.c +++ b/drivers/staging/go7007/wis-tw9903.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" @@ -106,7 +105,7 @@ static int wis_tw9903_command(struct i2c_client *client, struct wis_tw9903 *dec = i2c_get_clientdata(client); switch (cmd) { - case DECODER_SET_INPUT: + case VIDIOC_S_INPUT: { int *input = arg; @@ -119,7 +118,7 @@ static int wis_tw9903_command(struct i2c_client *client, struct video_decoder_resolution *res = arg; /*int hscale = 256 * 720 / res->width;*/ int hscale = 256 * 720 / (res->width - (res->width > 704 ? 0 : 8)); - int vscale = 256 * (dec->norm == VIDEO_MODE_NTSC ? 240 : 288) + int vscale = 256 * (dec->norm & V4L2_STD_NTSC ? 240 : 288) / res->height; u8 regs[] = { 0x0d, vscale & 0xff, @@ -134,14 +133,14 @@ static int wis_tw9903_command(struct i2c_client *client, break; } #endif - case DECODER_SET_NORM: + case VIDIOC_S_STD: { - int *input = arg; + v4l2_std_id *input = arg; u8 regs[] = { - 0x05, *input == VIDEO_MODE_NTSC ? 0x80 : 0x00, - 0x07, *input == VIDEO_MODE_NTSC ? 0x02 : 0x12, - 0x08, *input == VIDEO_MODE_NTSC ? 0x14 : 0x18, - 0x09, *input == VIDEO_MODE_NTSC ? 0xf0 : 0x20, + 0x05, *input & V4L2_STD_NTSC ? 0x80 : 0x00, + 0x07, *input & V4L2_STD_NTSC ? 0x02 : 0x12, + 0x08, *input & V4L2_STD_NTSC ? 0x14 : 0x18, + 0x09, *input & V4L2_STD_NTSC ? 0xf0 : 0x20, 0, 0, }; write_regs(client, regs); @@ -297,7 +296,7 @@ static int wis_tw9903_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 = 0; dec->contrast = 0x60; dec->hue = 0; |