a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (3608): Implement new routing commands in saa7127.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:50:20 -03:00 committed by Mauro Carvalho Chehab
parent 1f8f5fa9b7
commit 39b6f687d3
2 changed files with 59 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/media/video/saa7127.c
View File

@ -54,6 +54,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/saa7127.h>
static int debug = 0; static int debug = 0;
static int test_image = 0; static int test_image = 0;
@ -222,22 +223,6 @@ static struct i2c_reg_value saa7127_init_config_50hz[] = {
{ 0, 0 } { 0, 0 }
}; };
/* Enumeration for the Supported input types */
enum saa7127_input_type {
SAA7127_INPUT_TYPE_NORMAL,
SAA7127_INPUT_TYPE_TEST_IMAGE
};
/* Enumeration for the Supported Output signal types */
enum saa7127_output_type {
SAA7127_OUTPUT_TYPE_BOTH,
SAA7127_OUTPUT_TYPE_COMPOSITE,
SAA7127_OUTPUT_TYPE_SVIDEO,
SAA7127_OUTPUT_TYPE_RGB,
SAA7127_OUTPUT_TYPE_YUV_C,
SAA7127_OUTPUT_TYPE_YUV_V
};
/* /*
********************************************************************** **********************************************************************
* *
@ -561,7 +546,7 @@ static int saa7127_command(struct i2c_client *client,
{ {
struct saa7127_state *state = i2c_get_clientdata(client); struct saa7127_state *state = i2c_get_clientdata(client);
struct v4l2_format *fmt = arg; struct v4l2_format *fmt = arg;
int *iarg = arg; struct v4l2_routing *route = arg;
switch (cmd) { switch (cmd) {
case VIDIOC_S_STD: case VIDIOC_S_STD:
@ -573,15 +558,23 @@ static int saa7127_command(struct i2c_client *client,
*(v4l2_std_id *)arg = state->std; *(v4l2_std_id *)arg = state->std;
break; break;
case VIDIOC_S_INPUT: case VIDIOC_INT_G_VIDEO_ROUTING:
if (state->input_type == *iarg) route->input = state->input_type;
route->output = state->output_type;
break; break;
return saa7127_set_input_type(client, *iarg);
case VIDIOC_S_OUTPUT: case VIDIOC_INT_S_VIDEO_ROUTING:
if (state->output_type == *iarg) {
break; int rc = 0;
return saa7127_set_output_type(client, *iarg);
if (state->input_type != route->input) {
rc = saa7127_set_input_type(client, route->input);
}
if (rc == 0 && state->output_type != route->output) {
rc = saa7127_set_output_type(client, route->output);
}
return rc;
}
case VIDIOC_STREAMON: case VIDIOC_STREAMON:
case VIDIOC_STREAMOFF: case VIDIOC_STREAMOFF:

41
include/media/saa7127.h Normal file
View File

@ -0,0 +1,41 @@
/*
saa7127.h - definition for saa7126/7/8/9 inputs/outputs
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 _SAA7127_H_
#define _SAA7127_H_
/* Enumeration for the supported input types */
enum saa7127_input_type {
SAA7127_INPUT_TYPE_NORMAL,
SAA7127_INPUT_TYPE_TEST_IMAGE
};
/* Enumeration for the supported output signal types */
enum saa7127_output_type {
SAA7127_OUTPUT_TYPE_BOTH,
SAA7127_OUTPUT_TYPE_COMPOSITE,
SAA7127_OUTPUT_TYPE_SVIDEO,
SAA7127_OUTPUT_TYPE_RGB,
SAA7127_OUTPUT_TYPE_YUV_C,
SAA7127_OUTPUT_TYPE_YUV_V
};
#endif