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

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

[media] saa7134: cleanup radio/video/empress ioctl handling 



The video and empress nodes can share various ioctls.

Drop the input/std ioctls from the radio node (out of spec).

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 718bde1a

drivers/media/pci/saa7134/saa7134-empress.c

+10 −69
Original line number Diff line number Diff line
@@ -156,54 +156,6 @@ ts_mmap(struct file *file, struct vm_area_struct * vma) 
	return videobuf_mmap_mapper(&dev->empress_tsq, vma);

}



/*

 * This function is _not_ called directly, but from

 * video_generic_ioctl (and maybe others).  userspace

 * copying is done already, arg is a kernel pointer.

 */



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

					struct v4l2_capability *cap)

{

	struct saa7134_dev *dev = file->private_data;



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

	strlcpy(cap->card, saa7134_boards[dev->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;

	return 0;

}



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

					struct v4l2_input *i)

{

	if (i->index != 0)

		return -EINVAL;



	i->type = V4L2_INPUT_TYPE_CAMERA;

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



	return 0;

}



static int empress_g_input(struct file *file, void *priv, unsigned int *i)

{

	*i = 0;

	return 0;

}



static int empress_s_input(struct file *file, void *priv, unsigned int i)

{

	if (i != 0)

		return -EINVAL;



	return 0;

}



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

					struct v4l2_fmtdesc *f)

{
@@ -316,21 +268,6 @@ static int empress_streamoff(struct file *file, void *priv, 
	return videobuf_streamoff(&dev->empress_tsq);

}



static int empress_s_std(struct file *file, void *priv, v4l2_std_id id)

{

	struct saa7134_dev *dev = file->private_data;



	return saa7134_s_std_internal(dev, NULL, id);

}



static int empress_g_std(struct file *file, void *priv, v4l2_std_id *id)

{

	struct saa7134_dev *dev = file->private_data;



	*id = dev->tvnorm->id;

	return 0;

}



static const struct v4l2_file_operations ts_fops =

{

	.owner	  = THIS_MODULE,
@@ -343,7 +280,7 @@ static const struct v4l2_file_operations ts_fops = 
};



static const struct v4l2_ioctl_ops ts_ioctl_ops = {

	.vidioc_querycap		= empress_querycap,

	.vidioc_querycap		= saa7134_querycap,

	.vidioc_enum_fmt_vid_cap	= empress_enum_fmt_vid_cap,

	.vidioc_try_fmt_vid_cap		= empress_try_fmt_vid_cap,

	.vidioc_s_fmt_vid_cap		= empress_s_fmt_vid_cap,
@@ -354,11 +291,15 @@ static const struct v4l2_ioctl_ops ts_ioctl_ops = { 
	.vidioc_dqbuf			= empress_dqbuf,

	.vidioc_streamon		= empress_streamon,

	.vidioc_streamoff		= empress_streamoff,

	.vidioc_enum_input		= empress_enum_input,

	.vidioc_g_input			= empress_g_input,

	.vidioc_s_input			= empress_s_input,

	.vidioc_s_std			= empress_s_std,

	.vidioc_g_std			= empress_g_std,

	.vidioc_g_frequency		= saa7134_g_frequency,

	.vidioc_s_frequency		= saa7134_s_frequency,

	.vidioc_g_tuner			= saa7134_g_tuner,

	.vidioc_s_tuner			= saa7134_s_tuner,

	.vidioc_enum_input		= saa7134_enum_input,

	.vidioc_g_input			= saa7134_g_input,

	.vidioc_s_input			= saa7134_s_input,

	.vidioc_s_std			= saa7134_s_std,

	.vidioc_g_std			= saa7134_g_std,

};



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

drivers/media/pci/saa7134/saa7134-video.c

+36 −72
Original line number Diff line number Diff line
@@ -1512,11 +1512,9 @@ static int saa7134_s_fmt_vid_overlay(struct file *file, void *priv, 
	return 0;

}



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

					struct v4l2_input *i)

int saa7134_enum_input(struct file *file, void *priv, struct v4l2_input *i)

{

	struct saa7134_fh *fh = priv;

	struct saa7134_dev *dev = fh->dev;

	struct saa7134_dev *dev = video_drvdata(file);

	unsigned int n;



	n = i->index;
@@ -1543,20 +1541,20 @@ static int saa7134_enum_input(struct file *file, void *priv, 
	i->std = SAA7134_NORMS;

	return 0;

}

EXPORT_SYMBOL_GPL(saa7134_enum_input);



static int saa7134_g_input(struct file *file, void *priv, unsigned int *i)

int saa7134_g_input(struct file *file, void *priv, unsigned int *i)

{

	struct saa7134_fh *fh = priv;

	struct saa7134_dev *dev = fh->dev;

	struct saa7134_dev *dev = video_drvdata(file);



	*i = dev->ctl_input;

	return 0;

}

EXPORT_SYMBOL_GPL(saa7134_g_input);



static int saa7134_s_input(struct file *file, void *priv, unsigned int i)

int saa7134_s_input(struct file *file, void *priv, unsigned int i)

{

	struct saa7134_fh *fh = priv;

	struct saa7134_dev *dev = fh->dev;

	struct saa7134_dev *dev = video_drvdata(file);



	if (i >= SAA7134_INPUT_MAX)

		return -EINVAL;
@@ -1567,12 +1565,12 @@ static int saa7134_s_input(struct file *file, void *priv, unsigned int i) 
	mutex_unlock(&dev->lock);

	return 0;

}

EXPORT_SYMBOL_GPL(saa7134_s_input);



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

int saa7134_querycap(struct file *file, void *priv,

					struct v4l2_capability *cap)

{

	struct saa7134_fh *fh = priv;

	struct saa7134_dev *dev = fh->dev;

	struct saa7134_dev *dev = video_drvdata(file);

	struct video_device *vdev = video_devdata(file);

	u32 radio_caps, video_caps, vbi_caps;
@@ -1592,7 +1590,8 @@ static int saa7134_querycap(struct file *file, void *priv, 
		radio_caps |= V4L2_CAP_RDS_CAPTURE;



	video_caps = V4L2_CAP_VIDEO_CAPTURE;

	if (saa7134_no_overlay <= 0)

	/* For the empress video node priv == dev */

	if (saa7134_no_overlay <= 0 && priv != dev)

		video_caps |= V4L2_CAP_VIDEO_OVERLAY;



	vbi_caps = V4L2_CAP_VBI_CAPTURE;
@@ -1618,14 +1617,18 @@ static int saa7134_querycap(struct file *file, void *priv, 


	return 0;

}

EXPORT_SYMBOL_GPL(saa7134_querycap);



int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id id)

int saa7134_s_std(struct file *file, void *priv, v4l2_std_id id)

{

	struct saa7134_dev *dev = video_drvdata(file);

	/* For the empress video node priv == dev */

	bool is_empress = priv == dev;

	unsigned long flags;

	unsigned int i;

	v4l2_std_id fixup;



	if (!fh && res_locked(dev, RESOURCE_OVERLAY)) {

	if (is_empress && res_locked(dev, RESOURCE_OVERLAY)) {

		/* Don't change the std from the mpeg device

		   if overlay is active. */

		return -EBUSY;
@@ -1665,7 +1668,7 @@ int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_ 
	id = tvnorms[i].id;



	mutex_lock(&dev->lock);

	if (fh && res_check(fh, RESOURCE_OVERLAY)) {

	if (!is_empress && res_check(priv, RESOURCE_OVERLAY)) {

		spin_lock_irqsave(&dev->slock, flags);

		stop_preview(dev);

		spin_unlock_irqrestore(&dev->slock, flags);
@@ -1682,23 +1685,16 @@ int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_ 
	mutex_unlock(&dev->lock);

	return 0;

}

EXPORT_SYMBOL_GPL(saa7134_s_std_internal);

EXPORT_SYMBOL_GPL(saa7134_s_std);



static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id id)

int saa7134_g_std(struct file *file, void *priv, v4l2_std_id *id)

{

	struct saa7134_fh *fh = priv;



	return saa7134_s_std_internal(fh->dev, fh, id);

}



static int saa7134_g_std(struct file *file, void *priv, v4l2_std_id *id)

{

	struct saa7134_fh *fh = priv;

	struct saa7134_dev *dev = fh->dev;

	struct saa7134_dev *dev = video_drvdata(file);



	*id = dev->tvnorm->id;

	return 0;

}

EXPORT_SYMBOL_GPL(saa7134_g_std);



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

					struct v4l2_cropcap *cap)
@@ -1773,11 +1769,10 @@ static int saa7134_s_crop(struct file *file, void *f, const struct v4l2_crop *cr 
	return 0;

}



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

int saa7134_g_tuner(struct file *file, void *priv,

					struct v4l2_tuner *t)

{

	struct saa7134_fh *fh = priv;

	struct saa7134_dev *dev = fh->dev;

	struct saa7134_dev *dev = video_drvdata(file);

	int n;



	if (0 != t->index)
@@ -1804,12 +1799,12 @@ static int saa7134_g_tuner(struct file *file, void *priv, 
		t->signal = 0xffff;

	return 0;

}

EXPORT_SYMBOL_GPL(saa7134_g_tuner);



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

int saa7134_s_tuner(struct file *file, void *priv,

					const struct v4l2_tuner *t)

{

	struct saa7134_fh *fh = priv;

	struct saa7134_dev *dev = fh->dev;

	struct saa7134_dev *dev = video_drvdata(file);

	int rx, mode;



	if (0 != t->index)
@@ -1825,12 +1820,12 @@ static int saa7134_s_tuner(struct file *file, void *priv, 


	return 0;

}

EXPORT_SYMBOL_GPL(saa7134_s_tuner);



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

int saa7134_g_frequency(struct file *file, void *priv,

					struct v4l2_frequency *f)

{

	struct saa7134_fh *fh = priv;

	struct saa7134_dev *dev = fh->dev;

	struct saa7134_dev *dev = video_drvdata(file);



	if (0 != f->tuner)

		return -EINVAL;
@@ -1839,12 +1834,12 @@ static int saa7134_g_frequency(struct file *file, void *priv, 


	return 0;

}

EXPORT_SYMBOL_GPL(saa7134_g_frequency);



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

int saa7134_s_frequency(struct file *file, void *priv,

					const struct v4l2_frequency *f)

{

	struct saa7134_fh *fh = priv;

	struct saa7134_dev *dev = fh->dev;

	struct saa7134_dev *dev = video_drvdata(file);



	if (0 != f->tuner)

		return -EINVAL;
@@ -1856,6 +1851,7 @@ static int saa7134_s_frequency(struct file *file, void *priv, 
	mutex_unlock(&dev->lock);

	return 0;

}

EXPORT_SYMBOL_GPL(saa7134_s_frequency);



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

					struct v4l2_fmtdesc *f)
@@ -2076,34 +2072,6 @@ static int radio_s_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_input(struct file *filp, void *priv, unsigned int *i)

{

	*i = 0;

	return 0;

}



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

{

	return 0;

}



static int radio_s_std(struct file *file, void *fh, v4l2_std_id norm)

{

	return 0;

}



static const struct v4l2_file_operations video_fops =

{

	.owner	  = THIS_MODULE,
@@ -2167,11 +2135,7 @@ static const struct v4l2_file_operations radio_fops = { 
static const struct v4l2_ioctl_ops radio_ioctl_ops = {

	.vidioc_querycap	= saa7134_querycap,

	.vidioc_g_tuner		= radio_g_tuner,

	.vidioc_enum_input	= radio_enum_input,

	.vidioc_s_tuner		= radio_s_tuner,

	.vidioc_s_input		= radio_s_input,

	.vidioc_s_std		= radio_s_std,

	.vidioc_g_input		= radio_g_input,

	.vidioc_g_frequency	= saa7134_g_frequency,

	.vidioc_s_frequency	= saa7134_s_frequency,

};

drivers/media/pci/saa7134/saa7134.h

+15 −1
Original line number Diff line number Diff line
@@ -767,7 +767,21 @@ extern unsigned int video_debug; 
extern struct video_device saa7134_video_template;

extern struct video_device saa7134_radio_template;



int saa7134_s_std_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, v4l2_std_id id);

int saa7134_s_std(struct file *file, void *priv, v4l2_std_id id);

int saa7134_g_std(struct file *file, void *priv, v4l2_std_id *id);

int saa7134_enum_input(struct file *file, void *priv, struct v4l2_input *i);

int saa7134_g_input(struct file *file, void *priv, unsigned int *i);

int saa7134_s_input(struct file *file, void *priv, unsigned int i);

int saa7134_querycap(struct file *file, void  *priv,

					struct v4l2_capability *cap);

int saa7134_g_tuner(struct file *file, void *priv,

					struct v4l2_tuner *t);

int saa7134_s_tuner(struct file *file, void *priv,

					const struct v4l2_tuner *t);

int saa7134_g_frequency(struct file *file, void *priv,

					struct v4l2_frequency *f);

int saa7134_s_frequency(struct file *file, void *priv,

					const struct v4l2_frequency *f);



int saa7134_videoport_init(struct saa7134_dev *dev);

void saa7134_set_tvnorm_hw(struct saa7134_dev *dev);