Restore tuning capabilities in V4L2 MXB driver
PATCH 1/1 Restore tuning capabilities in V4L2 MXB driver
Hello Linus,
the behaviour of the all-in-one Video4Linux tuner driver apparently changed. It now wants to know the tv standard, otherwise it refuses to tune.
The attached patch restores tuning capabilities in my driver for the MXB analog tv card.
Please apply.
Regards
Michael Hunold.
This patch restores tuning functionality in my driver for the "Multimedia eXtension Board". The all-in-one tuner driver apparently changed it's behaviour.
Signed-off-by Michael Hunold <[email protected]>
drivers/media/video/mxb.c +9 -1
@@ -1,7 +1,7 @@/* mxb - v4l2 driver for the Multimedia eXtension Board - Copyright (C) 1998-2003 Michael Hunold <[email protected]> +Copyright (C) 1998-2006 Michael Hunold <[email protected]> Visit http://www.mihu.de/linux/saa7146/mxb/ for further details about this card.
@@ -327,6 +327,7 @@struct video_decoder_init init;struct i2c_msg msg;struct tuner_setup tun_setup; +v4l2_std_id std =V4L2_STD_PAL_BG ;int i =0 , err =0 ;struct tea6415c_multiplex vm;
@@ -361,6 +362,9 @@ mxb->tuner->driver->command (mxb->tuner,VIDIOC_S_FREQUENCY , &mxb->cur_freq); +/* set a default video standard */ + mxb->tuner->driver->command (mxb->tuner,VIDIOC_S_STD , &std); +/* mute audio on tea6420s */ mxb->tea6420_1->driver->command (mxb->tea6420_1,TEA6420_SWITCH , &TEA6420_line[6 ][0 ]); mxb->tea6420_2->driver->command (mxb->tea6420_2,TEA6420_SWITCH , &TEA6420_line[6 ][1 ]);
@@ -921,17 +925,21 @@int one =1 ;if (V4L2_STD_PAL_I == std->id ) { +v4l2_std_id std =V4L2_STD_PAL_I ;DEB_D (("VIDIOC_S_STD: setting mxb for PAL_I.\n" ));/* set the 7146 gpio register -- I don't know what this does exactly */ saa7146_write (dev,GPIO_CTRL ,0x00404050 );/* unset the 7111 gpio register -- I don't know what this does exactly */ mxb->saa7111a->driver->command (mxb->saa7111a,DECODER_SET_GPIO , &zero); + mxb->tuner->driver->command (mxb->tuner,VIDIOC_S_STD , &std); }else { +v4l2_std_id std =V4L2_STD_PAL_BG ;DEB_D (("VIDIOC_S_STD: setting mxb for PAL/NTSC/SECAM.\n" ));/* set the 7146 gpio register -- I don't know what this does exactly */ saa7146_write (dev,GPIO_CTRL ,0x00404050 );/* set the 7111 gpio register -- I don't know what this does exactly */ mxb->saa7111a->driver->command (mxb->saa7111a,DECODER_SET_GPIO , &one); + mxb->tuner->driver->command (mxb->tuner,VIDIOC_S_STD , &std); }return 0 ; }