mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 08:58:07 +00:00
d647f0b70c
Let's not mix headers used by the core with those headers that
are needed by some driver-specific interface header.
The headers used on drivers were manually moved using:
mkdir include/media/drv-intf/
git mv include/media/cx2341x.h include/media/cx25840.h \
include/media/exynos-fimc.h include/media/msp3400.h \
include/media/s3c_camif.h include/media/saa7146.h \
include/media/saa7146_vv.h include/media/sh_mobile_ceu.h \
include/media/sh_mobile_csi2.h include/media/sh_vou.h \
include/media/si476x.h include/media/soc_mediabus.h \
include/media/tea575x.h include/media/drv-intf/
And the references for those headers were corrected using:
MAIN_DIR="media/"
PREV_DIR="media/"
DIRS="drv-intf/"
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
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
86 lines
2.5 KiB
C
86 lines
2.5 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
|
|
*
|
|
*/
|
|
|
|
#include "pvrusb2-audio.h"
|
|
#include "pvrusb2-hdw-internal.h"
|
|
#include "pvrusb2-debug.h"
|
|
#include <linux/videodev2.h>
|
|
#include <media/drv-intf/msp3400.h>
|
|
#include <media/v4l2-common.h>
|
|
|
|
|
|
struct routing_scheme {
|
|
const int *def;
|
|
unsigned int cnt;
|
|
};
|
|
|
|
static const int routing_scheme0[] = {
|
|
[PVR2_CVAL_INPUT_TV] = MSP_INPUT_DEFAULT,
|
|
[PVR2_CVAL_INPUT_RADIO] = MSP_INPUT(MSP_IN_SCART2,
|
|
MSP_IN_TUNER1,
|
|
MSP_DSP_IN_SCART,
|
|
MSP_DSP_IN_SCART),
|
|
[PVR2_CVAL_INPUT_COMPOSITE] = MSP_INPUT(MSP_IN_SCART1,
|
|
MSP_IN_TUNER1,
|
|
MSP_DSP_IN_SCART,
|
|
MSP_DSP_IN_SCART),
|
|
[PVR2_CVAL_INPUT_SVIDEO] = MSP_INPUT(MSP_IN_SCART1,
|
|
MSP_IN_TUNER1,
|
|
MSP_DSP_IN_SCART,
|
|
MSP_DSP_IN_SCART),
|
|
};
|
|
|
|
static const struct routing_scheme routing_def0 = {
|
|
.def = routing_scheme0,
|
|
.cnt = ARRAY_SIZE(routing_scheme0),
|
|
};
|
|
|
|
static const struct routing_scheme *routing_schemes[] = {
|
|
[PVR2_ROUTING_SCHEME_HAUPPAUGE] = &routing_def0,
|
|
};
|
|
|
|
void pvr2_msp3400_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 msp3400 v4l2 set_stereo");
|
|
sp = (sid < ARRAY_SIZE(routing_schemes)) ?
|
|
routing_schemes[sid] : NULL;
|
|
|
|
if ((sp != NULL) &&
|
|
(hdw->input_val >= 0) &&
|
|
(hdw->input_val < sp->cnt)) {
|
|
input = sp->def[hdw->input_val];
|
|
} else {
|
|
pvr2_trace(PVR2_TRACE_ERROR_LEGS,
|
|
"*** WARNING *** subdev msp3400 set_input:"
|
|
" Invalid routing scheme (%u)"
|
|
" and/or input (%d)",
|
|
sid, hdw->input_val);
|
|
return;
|
|
}
|
|
sd->ops->audio->s_routing(sd, input,
|
|
MSP_OUTPUT(MSP_SC_IN_DSP_SCART1), 0);
|
|
}
|
|
}
|