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

Commit 902e197d authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cx88: fix querycap 



Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4a77a836

drivers/media/video/cx88/cx88-blackbird.c

+3 −9
Original line number Diff line number Diff line
@@ -729,14 +729,8 @@ static int vidioc_querycap (struct file *file, void *priv, 
	struct cx88_core  *core = dev->core;



	strcpy(cap->driver, "cx88_blackbird");

	strlcpy(cap->card, core->board.name, sizeof(cap->card));

	sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));

	cap->capabilities =

		V4L2_CAP_VIDEO_CAPTURE |

		V4L2_CAP_READWRITE     |

		V4L2_CAP_STREAMING;

	if (UNSET != core->board.tuner_type)

		cap->capabilities |= V4L2_CAP_TUNER;

	cx88_querycap(file, core, cap);

	return 0;

}

drivers/media/video/cx88/cx88-video.c

+31 −59
Original line number Diff line number Diff line
@@ -1195,6 +1195,33 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 
	return 0;

}



void cx88_querycap(struct file *file, struct cx88_core *core,

		struct v4l2_capability *cap)

{

	struct video_device *vdev = video_devdata(file);



	strlcpy(cap->card, core->board.name, sizeof(cap->card));

	cap->device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;

	if (UNSET != core->board.tuner_type)

		cap->device_caps |= V4L2_CAP_TUNER;

	switch (vdev->vfl_type) {

	case VFL_TYPE_RADIO:

		cap->device_caps = V4L2_CAP_RADIO | V4L2_CAP_TUNER;

		break;

	case VFL_TYPE_GRABBER:

		cap->device_caps |= V4L2_CAP_VIDEO_CAPTURE;

		break;

	case VFL_TYPE_VBI:

		cap->device_caps |= V4L2_CAP_VBI_CAPTURE;

		break;

	}

	cap->capabilities = cap->device_caps | V4L2_CAP_VIDEO_CAPTURE |

		V4L2_CAP_VBI_CAPTURE | V4L2_CAP_DEVICE_CAPS;

	if (core->board.radio.type == CX88_RADIO)

		cap->capabilities |= V4L2_CAP_RADIO;

}

EXPORT_SYMBOL(cx88_querycap);



static int vidioc_querycap(struct file *file, void  *priv,

					struct v4l2_capability *cap)

{
@@ -1202,15 +1229,8 @@ static int vidioc_querycap (struct file *file, void *priv, 
	struct cx88_core  *core = dev->core;



	strcpy(cap->driver, "cx8800");

	strlcpy(cap->card, core->board.name, sizeof(cap->card));

	sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));

	cap->capabilities =

		V4L2_CAP_VIDEO_CAPTURE |

		V4L2_CAP_READWRITE     |

		V4L2_CAP_STREAMING     |

		V4L2_CAP_VBI_CAPTURE;

	if (UNSET != core->board.tuner_type)

		cap->capabilities |= V4L2_CAP_TUNER;

	cx88_querycap(file, core, cap);

	return 0;

}
@@ -1513,19 +1533,6 @@ static int vidioc_s_register (struct file *file, void *fh, 
/* RADIO ESPECIFIC IOCTLS                                      */

/* ----------------------------------------------------------- */



static int radio_querycap (struct file *file, void  *priv,

					struct v4l2_capability *cap)

{

	struct cx8800_dev *dev  = ((struct cx8800_fh *)priv)->dev;

	struct cx88_core  *core = dev->core;



	strcpy(cap->driver, "cx8800");

	strlcpy(cap->card, core->board.name, sizeof(cap->card));

	sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));

	cap->capabilities = V4L2_CAP_TUNER;

	return 0;

}



static int radio_g_tuner (struct file *file, void *priv,

				struct v4l2_tuner *t)

{
@@ -1541,26 +1548,6 @@ static int radio_g_tuner (struct file *file, void *priv, 
	return 0;

}



static int radio_enum_input (struct file *file, void *priv,

				struct v4l2_input *i)

{

	if (i->index != 0)

		return -EINVAL;

	strcpy(i->name,"Radio");

	i->type = V4L2_INPUT_TYPE_TUNER;



	return 0;

}



static int radio_g_audio (struct file *file, void *priv, struct v4l2_audio *a)

{

	if (unlikely(a->index))

		return -EINVAL;



	strcpy(a->name,"Radio");

	return 0;

}



/* FIXME: Should add a standard for radio */



static int radio_s_tuner (struct file *file, void *priv,
@@ -1576,17 +1563,6 @@ static int radio_s_tuner (struct file *file, void *priv, 
	return 0;

}



static int radio_s_audio (struct file *file, void *fh,

			  struct v4l2_audio *a)

{

	return 0;

}



static int radio_s_input (struct file *file, void *fh, unsigned int i)

{

	return 0;

}



static int radio_queryctrl (struct file *file, void *priv,

			    struct v4l2_queryctrl *c)

{
@@ -1797,13 +1773,9 @@ static const struct v4l2_file_operations radio_fops = 
};



static const struct v4l2_ioctl_ops radio_ioctl_ops = {

	.vidioc_querycap      = radio_querycap,

	.vidioc_querycap      = vidioc_querycap,

	.vidioc_g_tuner       = radio_g_tuner,

	.vidioc_enum_input    = radio_enum_input,

	.vidioc_g_audio       = radio_g_audio,

	.vidioc_s_tuner       = radio_s_tuner,

	.vidioc_s_audio       = radio_s_audio,

	.vidioc_s_input       = radio_s_input,

	.vidioc_queryctrl     = radio_queryctrl,

	.vidioc_g_ctrl        = vidioc_g_ctrl,

	.vidioc_s_ctrl        = vidioc_s_ctrl,

drivers/media/video/cx88/cx88.h

+2 −0
Original line number Diff line number Diff line
@@ -730,3 +730,5 @@ int cx88_set_freq (struct cx88_core *core,struct v4l2_frequency *f); 
int cx88_get_control(struct cx88_core *core, struct v4l2_control *ctl);

int cx88_set_control(struct cx88_core *core, struct v4l2_control *ctl);

int cx88_video_mux(struct cx88_core *core, unsigned int input);

void cx88_querycap(struct file *file, struct cx88_core *core,

		struct v4l2_capability *cap);