Commit 9d2599d9 authored by Michael Hunold's avatar Michael Hunold Committed by Linus Torvalds
Browse files

[PATCH] v4l: fix tuning with MXB driver 



I noticed that some past changes to the gerneric Video4Linux tuner module
for analog tuners broke my "Multimedia eXtension Board" driver.

The tuner driver was made aware of Video4Linux2 tuning ioctls, but my
driver was not ported and still uses the Video4Linux1 ioctls.  This does
not work anymore as intendend, the tuning is currently broken.

The attached patch fixes non-working tuning in MXB driver introduced by
some recent generic tuner changes by replacing Video4Linux1 tuner ioctls
with proper Video4Linux2 tuner ioctls.

- fix non-working tuning in MXB driver introduced by some recent generic
  tuner changes by replacing Video4Linux1 tuner ioctls with proper
  Video4Linux2 tuner ioctls

Signed-off-by: default avatarMichael Hunold <hunold@linuxtv.org>
Cc: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 29780bb7

drivers/media/video/mxb.c

+14 −25
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ struct mxb 


	int	cur_mode;	/* current audio mode (mono, stereo, ...) */

	int	cur_input;	/* current input */

	int	cur_freq;	/* current frequency the tuner is tuned to */

	int	cur_mute;	/* current mute status */

	struct v4l2_frequency	cur_freq;	/* current frequency the tuner is tuned to */

};



static struct saa7146_extension extension;
@@ -352,8 +352,14 @@ static int mxb_init_done(struct saa7146_dev* dev) 
	/* select a tuner type */

	tun_setup.mode_mask = T_ANALOG_TV;

	tun_setup.addr = ADDR_UNSET;

	tun_setup.type = 5;

	tun_setup.type = TUNER_PHILIPS_PAL;

	mxb->tuner->driver->command(mxb->tuner,TUNER_SET_TYPE_ADDR, &tun_setup);

	/* tune in some frequency on tuner */

	mxb->cur_freq.tuner = 0;

	mxb->cur_freq.type = V4L2_TUNER_ANALOG_TV;

	mxb->cur_freq.frequency = freq;

	mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_FREQUENCY,

					&mxb->cur_freq);



	/* mute audio on tea6420s */

	mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[6][0]);
@@ -371,12 +377,8 @@ static int mxb_init_done(struct saa7146_dev* dev) 
	vm.out = 13;

	mxb->tea6415c->driver->command(mxb->tea6415c,TEA6415C_SWITCH, &vm);

				

	/* tune in some frequency on tuner */

	mxb->tuner->driver->command(mxb->tuner, VIDIOCSFREQ, &freq);



	/* the rest for mxb */

	mxb->cur_input = 0;

	mxb->cur_freq = freq;

	mxb->cur_mute = 1;



	mxb->cur_mode = V4L2_TUNER_MODE_STEREO;
@@ -819,18 +821,14 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg) 
			return -EINVAL;

		}



		memset(f,0,sizeof(*f));

		f->type = V4L2_TUNER_ANALOG_TV;

		f->frequency =  mxb->cur_freq;

		*f = mxb->cur_freq;



		DEB_EE(("VIDIOC_G_FREQ: freq:0x%08x.\n", mxb->cur_freq));

		DEB_EE(("VIDIOC_G_FREQ: freq:0x%08x.\n", mxb->cur_freq.frequency));

		return 0;

	}

	case VIDIOC_S_FREQUENCY:

	{

		struct v4l2_frequency *f = arg;

		int t_locked = 0;

		int v_byte = 0;



		if (0 != f->tuner)

			return -EINVAL;
@@ -843,20 +841,11 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg) 
			return -EINVAL;

		}



		DEB_EE(("VIDIOC_S_FREQUENCY: freq:0x%08x.\n",f->frequency));



		mxb->cur_freq = f->frequency;

		mxb->cur_freq = *f;

		DEB_EE(("VIDIOC_S_FREQUENCY: freq:0x%08x.\n", mxb->cur_freq.frequency));



		/* tune in desired frequency */			

		mxb->tuner->driver->command(mxb->tuner, VIDIOCSFREQ, &mxb->cur_freq);



		/* check if pll of tuner & saa7111a is locked */

//		mxb->tuner->driver->command(mxb->tuner,TUNER_IS_LOCKED, &t_locked);

		mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_GET_STATUS, &v_byte);



		/* not locked -- anything to do here ? */

		if( 0 == t_locked || 0 == (v_byte & DECODER_STATUS_GOOD)) {

		}

		mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_FREQUENCY, &mxb->cur_freq);



		/* hack: changing the frequency should invalidate the vbi-counter (=> alevt) */

		spin_lock(&dev->slock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE