Commit e474200d authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab

V4L/DVB (10433): cx18: Defer A/V core initialization until a valid cx18_av_cmd arrives

Signed-off-by: default avatarAndy Walls <awalls@radix.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 49796e40
...@@ -680,19 +680,45 @@ static int set_v4lfmt(struct cx18 *cx, struct v4l2_format *fmt) ...@@ -680,19 +680,45 @@ static int set_v4lfmt(struct cx18 *cx, struct v4l2_format *fmt)
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static int valid_av_cmd(unsigned int cmd)
{
switch (cmd) {
/* All commands supported by cx18_av_cmd() */
case VIDIOC_INT_DECODE_VBI_LINE:
case VIDIOC_INT_AUDIO_CLOCK_FREQ:
case VIDIOC_STREAMON:
case VIDIOC_STREAMOFF:
case VIDIOC_LOG_STATUS:
case VIDIOC_G_CTRL:
case VIDIOC_S_CTRL:
case VIDIOC_QUERYCTRL:
case VIDIOC_G_STD:
case VIDIOC_S_STD:
case AUDC_SET_RADIO:
case VIDIOC_INT_G_VIDEO_ROUTING:
case VIDIOC_INT_S_VIDEO_ROUTING:
case VIDIOC_INT_G_AUDIO_ROUTING:
case VIDIOC_INT_S_AUDIO_ROUTING:
case VIDIOC_S_FREQUENCY:
case VIDIOC_G_TUNER:
case VIDIOC_S_TUNER:
case VIDIOC_G_FMT:
case VIDIOC_S_FMT:
case VIDIOC_INT_RESET:
return 1;
default:
return 0;
}
return 0;
}
int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg) int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg)
{ {
struct cx18_av_state *state = &cx->av_state; struct cx18_av_state *state = &cx->av_state;
struct v4l2_tuner *vt = arg; struct v4l2_tuner *vt = arg;
struct v4l2_routing *route = arg; struct v4l2_routing *route = arg;
/* ignore these commands */ if (!state->is_initialized && valid_av_cmd(cmd)) {
switch (cmd) {
case TUNER_SET_TYPE_ADDR:
return 0;
}
if (!state->is_initialized) {
CX18_DEBUG_INFO("cmd %08x triggered fw load\n", cmd); CX18_DEBUG_INFO("cmd %08x triggered fw load\n", cmd);
/* initialize on first use */ /* initialize on first use */
state->is_initialized = 1; state->is_initialized = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment