mirror of
https://github.com/torvalds/linux
synced 2024-09-30 16:29:47 +00:00
b5dcee225c
Currently, include/media is messy, as it contains both the V4L2 core
headers and some driver-specific headers on the same place. That makes
harder to identify what core headers should be documented and what
headers belong to I2C drivers that are included only by bridge/main
drivers that would require the functions provided by them.
Let's move those i2c specific files to its own subdirectory.
The files to move were produced via the following script:
mkdir include/media/i2c
(cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done)
(cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/*/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done)
for i in include/media/*.h; do n=`basename $i`; (for j in $(git grep -l $n); do dirname $j; done)|sort|uniq|grep -ve '^.$' > list; num=$(wc -l list|cut -d' ' -f1); if [ $num == 1 ]; then if [ "`grep i2c list`" != "" ]; then git mv $i include/media/i2c; fi; fi; done
And the references corrected via this script:
MAIN_DIR="media/"
PREV_DIR="media/"
DIRS="i2c/"
echo "Checking affected files" >&2
for i in $DIRS; do
for j in $(find include/$MAIN_DIR/$i -type f -name '*.h'); do
n=`basename $j`
git grep -l $n
done
done|sort|uniq >files && (
echo "Handling files..." >&2;
echo "for i in \$(cat files|grep -v Documentation); do cat \$i | \\";
(
cd include/$MAIN_DIR;
for j in $DIRS; do
for i in $(ls $j); do
echo "perl -ne 's,(include [\\\"\\<])$PREV_DIR($i)([\\\"\\>]),\1$MAIN_DIR$j\2\3,; print \$_' |\\";
done;
done;
echo "cat > a && mv a \$i; done";
);
echo "Handling documentation..." >&2;
echo "for i in MAINTAINERS \$(cat files); do cat \$i | \\";
(
cd include/$MAIN_DIR;
for j in $DIRS; do
for i in $(ls $j); do
echo " perl -ne 's,include/$PREV_DIR($i)\b,include/$MAIN_DIR$j\1,; print \$_' |\\";
done;
done;
echo "cat > a && mv a \$i; done"
);
) >script && . ./script
Merged Sakari Ailus patch that moves smiapp.h to include/media/i2c.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
104 lines
2.9 KiB
C
104 lines
2.9 KiB
C
/*
|
|
*
|
|
*
|
|
* Copyright (C) 2005 Mike Isely <isely@pobox.com>
|
|
* Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
|
|
*
|
|
* 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
|
|
*
|
|
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
/*
|
|
|
|
This source file is specifically designed to interface with the
|
|
saa711x support that is available in the v4l available starting
|
|
with linux 2.6.15.
|
|
|
|
*/
|
|
|
|
#include "pvrusb2-video-v4l.h"
|
|
|
|
|
|
|
|
#include "pvrusb2-hdw-internal.h"
|
|
#include "pvrusb2-debug.h"
|
|
#include <linux/videodev2.h>
|
|
#include <media/v4l2-common.h>
|
|
#include <media/i2c/saa7115.h>
|
|
#include <linux/errno.h>
|
|
|
|
struct routing_scheme {
|
|
const int *def;
|
|
unsigned int cnt;
|
|
};
|
|
|
|
|
|
static const int routing_scheme0[] = {
|
|
[PVR2_CVAL_INPUT_TV] = SAA7115_COMPOSITE4,
|
|
/* In radio mode, we mute the video, but point at one
|
|
spot just to stay consistent */
|
|
[PVR2_CVAL_INPUT_RADIO] = SAA7115_COMPOSITE5,
|
|
[PVR2_CVAL_INPUT_COMPOSITE] = SAA7115_COMPOSITE5,
|
|
[PVR2_CVAL_INPUT_SVIDEO] = SAA7115_SVIDEO2,
|
|
};
|
|
|
|
static const struct routing_scheme routing_def0 = {
|
|
.def = routing_scheme0,
|
|
.cnt = ARRAY_SIZE(routing_scheme0),
|
|
};
|
|
|
|
static const int routing_scheme1[] = {
|
|
[PVR2_CVAL_INPUT_TV] = SAA7115_COMPOSITE4,
|
|
[PVR2_CVAL_INPUT_RADIO] = SAA7115_COMPOSITE5,
|
|
[PVR2_CVAL_INPUT_COMPOSITE] = SAA7115_COMPOSITE3,
|
|
[PVR2_CVAL_INPUT_SVIDEO] = SAA7115_SVIDEO2, /* or SVIDEO0, it seems */
|
|
};
|
|
|
|
static const struct routing_scheme routing_def1 = {
|
|
.def = routing_scheme1,
|
|
.cnt = ARRAY_SIZE(routing_scheme1),
|
|
};
|
|
|
|
static const struct routing_scheme *routing_schemes[] = {
|
|
[PVR2_ROUTING_SCHEME_HAUPPAUGE] = &routing_def0,
|
|
[PVR2_ROUTING_SCHEME_ONAIR] = &routing_def1,
|
|
};
|
|
|
|
void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
|
|
{
|
|
if (hdw->input_dirty || hdw->force_dirty) {
|
|
const struct routing_scheme *sp;
|
|
unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
|
|
u32 input;
|
|
|
|
pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)",
|
|
hdw->input_val);
|
|
|
|
sp = (sid < ARRAY_SIZE(routing_schemes)) ?
|
|
routing_schemes[sid] : NULL;
|
|
if ((sp == NULL) ||
|
|
(hdw->input_val < 0) ||
|
|
(hdw->input_val >= sp->cnt)) {
|
|
pvr2_trace(PVR2_TRACE_ERROR_LEGS,
|
|
"*** WARNING *** subdev v4l2 set_input:"
|
|
" Invalid routing scheme (%u)"
|
|
" and/or input (%d)",
|
|
sid, hdw->input_val);
|
|
return;
|
|
}
|
|
input = sp->def[hdw->input_val];
|
|
sd->ops->video->s_routing(sd, input, 0, 0);
|
|
}
|
|
}
|