Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8329f8e authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab
Browse files

[media] pvrusb2: Base available video standards on what hardware supports 



With the transition to ioctl2, the pvrusb2 driver's own standards
enumeration is no longer used.  Instead a generic algorithm internal
to v4l is used (which is a great idea - since the pvrusb2
implementation itself was generic anyway).  This change ensures that
the v4l algorithm works with the correct set of hardware supported
standards.  This resolves a FIXME left behind from the videodev_ioctl2
transition.

Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 99ba1514

drivers/media/video/pvrusb2/pvrusb2-v4l2.c

+7 −4
Original line number Diff line number Diff line
@@ -1348,10 +1348,13 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, 
	memcpy(&dip->devbase,&vdev_template,sizeof(vdev_template));

	dip->devbase.release = pvr2_video_device_release;

	dip->devbase.ioctl_ops = &pvr2_ioctl_ops;

	/* FIXME: tvnorms should be set to the set of supported standards

	   by this device. Then video_ioctl2 will implement VIDIOC_ENUMSTD

	   based on this field. */

	dip->devbase.tvnorms = V4L2_STD_ALL;

	{

		int val;

		pvr2_ctrl_get_value(

			pvr2_hdw_get_ctrl_by_id(vp->channel.mc_head->hdw,

						PVR2_CID_STDAVAIL), &val);

		dip->devbase.tvnorms = (v4l2_std_id)val;

	}



	mindevnum = -1;

	unit_number = pvr2_hdw_get_unit_number(vp->channel.mc_head->hdw);