Commit 25f30389 authored by Douglas Landgraf's avatar Douglas Landgraf Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5534): Radio-rtrack2.c Replace rt_ioctl to use video_ioctl2 



Convert radio-rtrack2 to use video_ioctl2

Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 941491f3

drivers/media/radio/radio-rtrack2.c

+109 −112
Original line number Diff line number Diff line
@@ -122,143 +122,132 @@ static int rt_setfreq(struct rt_device *dev, unsigned long freq) 
	return 0;

}



static int rt_getsigstr(struct rt_device *dev)

{

	if (inb(io) & 2)	/* bit set = no signal present	*/

		return 0;

	return 1;		/* signal present		*/

}



static int rt_do_ioctl(struct inode *inode, struct file *file,

		       unsigned int cmd, void *arg)

{

	struct video_device *dev = video_devdata(file);

	struct rt_device *rt=dev->priv;



	switch(cmd)

	{

		case VIDIOC_QUERYCAP:

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

				struct v4l2_capability *v)

{

			struct v4l2_capability *v = arg;

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

	strlcpy(v->driver, "radio-rtrack2", sizeof(v->driver));

	strlcpy(v->card, "RadioTrack II", sizeof(v->card));

	sprintf(v->bus_info, "ISA");

	v->version = RADIO_VERSION;

	v->capabilities = V4L2_CAP_TUNER;

	return 0;

}



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

				struct v4l2_tuner *v)

{

	if (v->index > 0)

		return -EINVAL;



	return 0;

}



static int rt_getsigstr(struct rt_device *dev)

{

	if (inb(io) & 2)	/* bit set = no signal present	*/

		return 0;

	return 1;		/* signal present		*/

}

		case VIDIOC_G_TUNER:



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

				struct v4l2_tuner *v)

{

			struct v4l2_tuner *v = arg;

	struct video_device *dev = video_devdata(file);

	struct rt_device *rt = dev->priv;



	if (v->index > 0)

		return -EINVAL;



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

	strcpy(v->name, "FM");

	v->type = V4L2_TUNER_RADIO;



	v->rangelow = (88*16000);

	v->rangehigh = (108*16000);

	v->rxsubchans = V4L2_TUNER_SUB_MONO;

	v->capability = V4L2_TUNER_CAP_LOW;

	v->audmode = V4L2_TUNER_MODE_MONO;

	v->signal = 0xFFFF*rt_getsigstr(rt);



	return 0;

}

		case VIDIOC_S_TUNER:

		{

			struct v4l2_tuner *v = arg;



			if (v->index > 0)

				return -EINVAL;



			return 0;

		}

		case VIDIOC_S_FREQUENCY:

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

				struct v4l2_frequency *f)

{

			struct v4l2_frequency *f = arg;

	struct video_device *dev = video_devdata(file);

	struct rt_device *rt = dev->priv;



	rt->curfreq = f->frequency;

	rt_setfreq(rt, rt->curfreq);

	return 0;

}

		case VIDIOC_G_FREQUENCY:



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

				struct v4l2_frequency *f)

{

			struct v4l2_frequency *f = arg;

	struct video_device *dev = video_devdata(file);

	struct rt_device *rt = dev->priv;



	f->type = V4L2_TUNER_RADIO;

	f->frequency = rt->curfreq;



	return 0;

}

		case VIDIOC_QUERYCTRL:



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

				struct v4l2_queryctrl *qc)

{

			struct v4l2_queryctrl *qc = arg;

	int i;



	for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {

		if (qc->id && qc->id == radio_qctrl[i].id) {

			memcpy(qc, &(radio_qctrl[i]),

						sizeof(*qc));

					return (0);

			return 0;

		}

	}

	return -EINVAL;

}

		case VIDIOC_G_CTRL:



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

				struct v4l2_control *ctrl)

{

			struct v4l2_control *ctrl= arg;

	struct video_device *dev = video_devdata(file);

	struct rt_device *rt = dev->priv;



	switch (ctrl->id) {

	case V4L2_CID_AUDIO_MUTE:

		ctrl->value = rt->muted;

					return (0);

		return 0;

	case V4L2_CID_AUDIO_VOLUME:

		if (rt->muted)

			ctrl->value = 0;

		else

			ctrl->value = 65535;

					return (0);

		return 0;

	}

	return -EINVAL;

}

		case VIDIOC_S_CTRL:



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

				struct v4l2_control *ctrl)

{

			struct v4l2_control *ctrl= arg;

	struct video_device *dev = video_devdata(file);

	struct rt_device *rt = dev->priv;



	switch (ctrl->id) {

	case V4L2_CID_AUDIO_MUTE:

					if (ctrl->value) {

		if (ctrl->value)

			rt_mute(rt);

					} else {

		else

			rt_unmute(rt);

					}

					return (0);

		return 0;

	case V4L2_CID_AUDIO_VOLUME:

					if (ctrl->value) {

		if (ctrl->value)

			rt_unmute(rt);

					} else {

		else

			rt_mute(rt);

					}

					return (0);

		return 0;

	}

	return -EINVAL;

}

		default:

			return v4l_compat_translate_ioctl(inode,file,cmd,arg,

							  rt_do_ioctl);

	}

}



static int rt_ioctl(struct inode *inode, struct file *file,

		    unsigned int cmd, unsigned long arg)

{

	return video_usercopy(inode, file, cmd, arg, rt_do_ioctl);

}



static struct rt_device rtrack2_unit;
@@ -266,7 +255,7 @@ static const struct file_operations rtrack2_fops = { 
	.owner		= THIS_MODULE,

	.open           = video_exclusive_open,

	.release        = video_exclusive_release,

	.ioctl		= rt_ioctl,

	.ioctl		= video_ioctl2,

	.compat_ioctl	= v4l_compat_ioctl32,

	.llseek         = no_llseek,

};
@@ -278,6 +267,14 @@ static struct video_device rtrack2_radio= 
	.type		= VID_TYPE_TUNER,

	.hardware	= 0,

	.fops           = &rtrack2_fops,

	.vidioc_querycap    = vidioc_querycap,

	.vidioc_g_tuner     = vidioc_g_tuner,

	.vidioc_s_tuner     = vidioc_s_tuner,

	.vidioc_g_frequency = vidioc_g_frequency,

	.vidioc_s_frequency = vidioc_s_frequency,

	.vidioc_queryctrl   = vidioc_queryctrl,

	.vidioc_g_ctrl      = vidioc_g_ctrl,

	.vidioc_s_ctrl      = vidioc_s_ctrl,

};



static int __init rtrack2_init(void)