Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB (3607): Implement routing command for saa7115.c

Browse source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2006-03-25 09:20:28 -03:00 committed by Mauro Carvalho Chehab
parent 013423588a
commit 1f8f5fa9b7
2 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/media/video/saa7115.c
View file

@ -40,6 +40,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
#include <media/saa7115.h>
#include <asm/div64.h> #include <asm/div64.h>
MODULE_DESCRIPTION("Philips SAA7113/SAA7114/SAA7115 video decoder driver"); MODULE_DESCRIPTION("Philips SAA7113/SAA7114/SAA7115 video decoder driver");
@ -1180,6 +1181,46 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
state->radio = 1; state->radio = 1;
break; break;
case VIDIOC_INT_G_VIDEO_ROUTING:
{
struct v4l2_routing *route = arg;
route->input = state->input;
route->output = 0;
break;
}
case VIDIOC_INT_S_VIDEO_ROUTING:
{
struct v4l2_routing *route = arg;
v4l_dbg(1, debug, client, "decoder set input %d\n", route->input);
/* saa7113 does not have these inputs */
if (state->ident == V4L2_IDENT_SAA7113 &&
(route->input == SAA7115_COMPOSITE4 ||
route->input == SAA7115_COMPOSITE5)) {
return -EINVAL;
}
if (route->input > SAA7115_SVIDEO3)
return -EINVAL;
if (state->input == route->input)
break;
v4l_dbg(1, debug, client, "now setting %s input\n",
(route->input >= SAA7115_SVIDEO0) ? "S-Video" : "Composite");
state->input = route->input;
/* select mode */
saa7115_write(client, 0x02,
(saa7115_read(client, 0x02) & 0xf0) |
state->input);
/* bypass chrominance trap for S-Video modes */
saa7115_write(client, 0x09,
(saa7115_read(client, 0x09) & 0x7f) |
(state->input >= SAA7115_SVIDEO0 ? 0x80 : 0x0));
break;
}
case VIDIOC_G_INPUT: case VIDIOC_G_INPUT:
*(int *)arg = state->input; *(int *)arg = state->input;
break; break;

37
include/media/saa7115.h Normal file
View file

@ -0,0 +1,37 @@
/*
saa7115.h - definition for saa7113/4/5 inputs
Copyright (C) 2006 Hans Verkuil (hverkuil@xs4all.nl)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef _SAA7115_H_
#define _SAA7115_H_
/* SAA7113/4/5 HW inputs */
#define SAA7115_COMPOSITE0 0
#define SAA7115_COMPOSITE1 1
#define SAA7115_COMPOSITE2 2
#define SAA7115_COMPOSITE3 3
#define SAA7115_COMPOSITE4 4 /* not available for the saa7113 */
#define SAA7115_COMPOSITE5 5 /* not available for the saa7113 */
#define SAA7115_SVIDEO0 6
#define SAA7115_SVIDEO1 7
#define SAA7115_SVIDEO2 8
#define SAA7115_SVIDEO3 9
#endif