diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-04-02 16:26:22 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-04-02 16:26:22 +0200 |
| commit | b4d23428b3c4456414ad8bf5e974757fd354a66f (patch) | |
| tree | f34d81519e2a8311aba732911b91889014c8a1b3 /linux/drivers/media/video/bt866.c | |
| parent | 696781508adb89f4ff88ecc99c83092cc031dd7b (diff) | |
| download | mediapointer-dvb-s2-b4d23428b3c4456414ad8bf5e974757fd354a66f.tar.gz mediapointer-dvb-s2-b4d23428b3c4456414ad8bf5e974757fd354a66f.tar.bz2 | |
v4l2-subdev: change s_routing prototype
From: Hans Verkuil <hverkuil@xs4all.nl>
It is no longer needed to use a struct pointer as argument, since v4l2_subdev
doesn't require that ioctl-like approach anymore. Instead just pass the input,
output and config (new!) arguments directly.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/bt866.c')
| -rw-r--r-- | linux/drivers/media/video/bt866.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/linux/drivers/media/video/bt866.c b/linux/drivers/media/video/bt866.c index 87845f34c..0221912d7 100644 --- a/linux/drivers/media/video/bt866.c +++ b/linux/drivers/media/video/bt866.c @@ -105,7 +105,8 @@ static int bt866_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std) return 0; } -static int bt866_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route) +static int bt866_s_routing(struct v4l2_subdev *sd, + u32 input, u32 output, u32 config) { static const __u8 init[] = { 0xc8, 0xcc, /* CRSCALE */ @@ -143,7 +144,7 @@ static int bt866_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *ro val = encoder->reg[0xdc]; - if (route->input == 0) + if (input == 0) val |= 0x40; /* CBSWAP */ else val &= ~0x40; /* !CBSWAP */ @@ -151,15 +152,15 @@ static int bt866_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *ro bt866_write(encoder, 0xdc, val); val = encoder->reg[0xcc]; - if (route->input == 2) + if (input == 2) val |= 0x01; /* OSDBAR */ else val &= ~0x01; /* !OSDBAR */ bt866_write(encoder, 0xcc, val); - v4l2_dbg(1, debug, sd, "set input %d\n", route->input); + v4l2_dbg(1, debug, sd, "set input %d\n", input); - switch (route->input) { + switch (input) { case 0: case 1: case 2: |