Commit 7383a473 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] pvrusb2: implement VIDIOC_QUERYSTD 



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

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

+7 −0
Original line number Diff line number Diff line
@@ -2993,6 +2993,13 @@ static void pvr2_subdev_set_control(struct pvr2_hdw *hdw, int id, 
		pvr2_subdev_set_control(hdw, id, #lab, (hdw)->lab##_val); \

	}



int pvr2_hdw_get_detected_std(struct pvr2_hdw *hdw, v4l2_std_id *std)

{

	v4l2_device_call_all(&hdw->v4l2_dev, 0,

			     video, querystd, std);

	return 0;

}



/* Execute whatever commands are required to update the state of all the

   sub-devices so that they match our current control values. */

static void pvr2_subdev_update(struct pvr2_hdw *hdw)

drivers/media/video/pvrusb2/pvrusb2-hdw.h

+3 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ struct pvr2_stream *pvr2_hdw_get_video_stream(struct pvr2_hdw *); 
int pvr2_hdw_get_stdenum_value(struct pvr2_hdw *hdw,struct v4l2_standard *std,

			       unsigned int idx);



/* Get the detected video standard */

int pvr2_hdw_get_detected_std(struct pvr2_hdw *hdw, v4l2_std_id *std);



/* Enable / disable retrieval of CPU firmware or prom contents.  This must

   be enabled before pvr2_hdw_cpufw_get() will function.  Note that doing

   this may prevent the device from running (and leaving this mode may

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

+7 −0
Original line number Diff line number Diff line
@@ -227,6 +227,13 @@ static long pvr2_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) 
		break;

	}



	case VIDIOC_QUERYSTD:

	{

		v4l2_std_id *std = arg;

		ret = pvr2_hdw_get_detected_std(hdw, std);

		break;

	}



	case VIDIOC_G_STD:

	{

		int val = 0;