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

V4L/DVB (11177): pvrusb2: Tie in saa7115 sub-device handling

Browse source 
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mike Isely 2009-03-07 00:43:26 -03:00 committed by Mauro Carvalho Chehab
parent 5f6dae802c
commit 6f9565120f
3 changed files with 58 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/video/pvrusb2/pvrusb2-hdw.c
View file

@ -37,6 +37,7 @@
#include "pvrusb2-debug.h" #include "pvrusb2-debug.h"
#include "pvrusb2-fx2-cmd.h" #include "pvrusb2-fx2-cmd.h"
#include "pvrusb2-wm8775.h" #include "pvrusb2-wm8775.h"
#include "pvrusb2-video-v4l.h"
#define TV_MIN_FREQ 55250000L #define TV_MIN_FREQ 55250000L
#define TV_MAX_FREQ 850000000L #define TV_MAX_FREQ 850000000L
@ -111,6 +112,7 @@ typedef void (*pvr2_subdev_update_func)(struct pvr2_hdw *,
static const pvr2_subdev_update_func pvr2_module_update_functions[] = { static const pvr2_subdev_update_func pvr2_module_update_functions[] = {
[PVR2_CLIENT_ID_WM8775] = pvr2_wm8775_update, [PVR2_CLIENT_ID_WM8775] = pvr2_wm8775_update,
[PVR2_CLIENT_ID_SAA7115] = pvr2_saa7115_subdev_update,
}; };
static const char *module_names[] = { static const char *module_names[] = {

64
drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
View file

@ -28,9 +28,10 @@
*/ */
#include "pvrusb2-video-v4l.h" #include "pvrusb2-video-v4l.h"
#include "pvrusb2-i2c-cmd-v4l2.h"
#include "pvrusb2-i2c-cmd-v4l2.h"
#include "pvrusb2-hdw-internal.h" #include "pvrusb2-hdw-internal.h"
#include "pvrusb2-debug.h" #include "pvrusb2-debug.h"
#include <linux/videodev2.h> #include <linux/videodev2.h>
@ -39,15 +40,6 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/slab.h> #include <linux/slab.h>
struct pvr2_v4l_decoder {
struct pvr2_i2c_handler handler;
struct pvr2_decoder_ctrl ctrl;
struct pvr2_i2c_client *client;
struct pvr2_hdw *hdw;
unsigned long stale_mask;
};
struct routing_scheme { struct routing_scheme {
const int *def; const int *def;
unsigned int cnt; unsigned int cnt;
@ -70,6 +62,16 @@ static const struct routing_scheme routing_schemes[] = {
}, },
}; };
struct pvr2_v4l_decoder {
struct pvr2_i2c_handler handler;
struct pvr2_decoder_ctrl ctrl;
struct pvr2_i2c_client *client;
struct pvr2_hdw *hdw;
unsigned long stale_mask;
};
static void set_input(struct pvr2_v4l_decoder *ctxt) static void set_input(struct pvr2_v4l_decoder *ctxt)
{ {
struct pvr2_hdw *hdw = ctxt->hdw; struct pvr2_hdw *hdw = ctxt->hdw;
@ -245,6 +247,48 @@ int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *hdw,
} }
void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
{
if (hdw->srate_dirty) {
u32 val;
pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_audio %d",
hdw->srate_val);
switch (hdw->srate_val) {
default:
case V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000:
val = 48000;
break;
case V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100:
val = 44100;
break;
case V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000:
val = 32000;
break;
}
sd->ops->audio->s_clock_freq(sd, val);
}
if (hdw->input_dirty) {
struct v4l2_routing route;
const struct routing_scheme *sp;
unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)",
hdw->input_val);
if ((sid < ARRAY_SIZE(routing_schemes)) &&
((sp = routing_schemes + sid) != NULL) &&
(hdw->input_val >= 0) &&
(hdw->input_val < sp->cnt)) {
route.input = sp->def[hdw->input_val];
} else {
pvr2_trace(PVR2_TRACE_ERROR_LEGS,
"*** WARNING *** subdev v4l2 set_input:"
" Invalid routing scheme (%u) and/or input (%d)",
sid, hdw->input_val);
return;
}
route.output = 0;
sd->ops->video->s_routing(sd, &route);
}
}
/* /*

2
drivers/media/video/pvrusb2/pvrusb2-video-v4l.h
View file

@ -37,6 +37,8 @@
int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *,struct pvr2_i2c_client *); int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *,struct pvr2_i2c_client *);
#include "pvrusb2-hdw-internal.h"
void pvr2_saa7115_subdev_update(struct pvr2_hdw *, struct v4l2_subdev *);
#endif /* __PVRUSB2_VIDEO_V4L_H */ #endif /* __PVRUSB2_VIDEO_V4L_H */