V4L/DVB (5546): Radio-terratec.c Replace tt_do_ioctl to use video_ioctl2 (1de69238) · Commits · e / devices / android_kernel_teracube_mt6765

drivers/media/radio/radio-terratec.c

+138 −109

Original line number	Original line	Diff line number	Diff line
	@@ -205,92 +205,87 @@ static int tt_getsigstr(struct tt_device dev) / TODO */
	return 1; /* signal present */		return 1; /* signal present */
	}		}

			static int vidioc_querycap(struct file file, void priv,
	/* implement the video4linux api */		struct v4l2_capability *v)

	static int tt_do_ioctl(struct inode inode, struct file file,
	unsigned int cmd, void *arg)
	{
	struct video_device *dev = video_devdata(file);
	struct tt_device *tt=dev->priv;

	switch(cmd)
	{
	case VIDIOC_QUERYCAP:
	{		{
	struct v4l2_capability *v = arg;
	memset(v,0,sizeof(*v));
	strlcpy(v->driver, "radio-terratec", sizeof(v->driver));		strlcpy(v->driver, "radio-terratec", sizeof(v->driver));
	strlcpy(v->card, "ActiveRadio", sizeof(v->card));		strlcpy(v->card, "ActiveRadio", sizeof(v->card));
	sprintf(v->bus_info, "ISA");		sprintf(v->bus_info, "ISA");
	v->version = RADIO_VERSION;		v->version = RADIO_VERSION;
	v->capabilities = V4L2_CAP_TUNER;		v->capabilities = V4L2_CAP_TUNER;

	return 0;		return 0;
	}		}
	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 tt_device *tt = dev->priv;

	if (v->index > 0)		if (v->index > 0)
	return -EINVAL;		return -EINVAL;

	memset(v,0,sizeof(*v));
	strcpy(v->name, "FM");		strcpy(v->name, "FM");
	v->type = V4L2_TUNER_RADIO;		v->type = V4L2_TUNER_RADIO;

	v->rangelow = (87*16000);		v->rangelow = (87*16000);
	v->rangehigh = (108*16000);		v->rangehigh = (108*16000);
	v->rxsubchans = V4L2_TUNER_SUB_MONO;		v->rxsubchans = V4L2_TUNER_SUB_MONO;
	v->capability = V4L2_TUNER_CAP_LOW;		v->capability = V4L2_TUNER_CAP_LOW;
	v->audmode = V4L2_TUNER_MODE_MONO;		v->audmode = V4L2_TUNER_MODE_MONO;
	v->signal = 0xFFFF*tt_getsigstr(tt);		v->signal = 0xFFFF*tt_getsigstr(tt);

	return 0;		return 0;
	}		}
	case VIDIOC_S_TUNER:
	{
	struct v4l2_tuner *v = arg;

			static int vidioc_s_tuner(struct file file, void priv,
			struct v4l2_tuner *v)
			{
	if (v->index > 0)		if (v->index > 0)
	return -EINVAL;		return -EINVAL;

	return 0;		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 tt_device *tt = dev->priv;

	tt->curfreq = f->frequency;		tt->curfreq = f->frequency;
	tt_setfreq(tt, tt->curfreq);		tt_setfreq(tt, tt->curfreq);
	return 0;		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 tt_device *tt = dev->priv;

	f->type = V4L2_TUNER_RADIO;		f->type = V4L2_TUNER_RADIO;
	f->frequency = tt->curfreq;		f->frequency = tt->curfreq;

	return 0;		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;		int i;

	for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {		for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
	if (qc->id && qc->id == radio_qctrl[i].id) {		if (qc->id && qc->id == radio_qctrl[i].id) {
	memcpy(qc, &(radio_qctrl[i]),		memcpy(qc, &(radio_qctrl[i]),
	sizeof(*qc));		sizeof(*qc));
	return (0);		return 0;
	}		}
	}		}
	return -EINVAL;		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 tt_device *tt = dev->priv;

	switch (ctrl->id) {		switch (ctrl->id) {
	case V4L2_CID_AUDIO_MUTE:		case V4L2_CID_AUDIO_MUTE:
	@@ -298,42 +293,64 @@ static int tt_do_ioctl(struct inode inode, struct file file,
	ctrl->value = 1;		ctrl->value = 1;
	else		else
	ctrl->value = 0;		ctrl->value = 0;
	return (0);		return 0;
	case V4L2_CID_AUDIO_VOLUME:		case V4L2_CID_AUDIO_VOLUME:
	ctrl->value = tt->curvol * 6554;		ctrl->value = tt->curvol * 6554;
	return (0);		return 0;
	}		}
	return -EINVAL;		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 tt_device *tt = dev->priv;

	switch (ctrl->id) {		switch (ctrl->id) {
	case V4L2_CID_AUDIO_MUTE:		case V4L2_CID_AUDIO_MUTE:
	if (ctrl->value) {		if (ctrl->value)
	tt_mute(tt);		tt_mute(tt);
	} else {		else
	tt_setvol(tt,tt->curvol);		tt_setvol(tt,tt->curvol);
	}		return 0;
	return (0);
	case V4L2_CID_AUDIO_VOLUME:		case V4L2_CID_AUDIO_VOLUME:
	tt_setvol(tt,ctrl->value);		tt_setvol(tt,ctrl->value);
	return (0);		return 0;
	}		}
	return -EINVAL;		return -EINVAL;
	}		}

	default:		static int vidioc_g_audio(struct file file, void priv,
	return v4l_compat_translate_ioctl(inode,file,cmd,arg,		struct v4l2_audio *a)
	tt_do_ioctl);		{
			if (a->index > 1)
			return -EINVAL;

			strcpy(a->name, "Radio");
			a->capability = V4L2_AUDCAP_STEREO;
			return 0;
			}

			static int vidioc_g_input(struct file filp, void priv, unsigned int *i)
			{
			*i = 0;
			return 0;
	}		}

			static int vidioc_s_input(struct file filp, void priv, unsigned int i)
			{
			if (i != 0)
			return -EINVAL;
			return 0;
	}		}

	static int tt_ioctl(struct inode inode, struct file file,		static int vidioc_s_audio(struct file file, void priv,
	unsigned int cmd, unsigned long arg)		struct v4l2_audio *a)
	{		{
	return video_usercopy(inode, file, cmd, arg, tt_do_ioctl);		if (a->index != 0)
			return -EINVAL;
			return 0;
	}		}

	static struct tt_device terratec_unit;		static struct tt_device terratec_unit;
	@@ -342,7 +359,7 @@ static const struct file_operations terratec_fops = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.open = video_exclusive_open,		.open = video_exclusive_open,
	.release = video_exclusive_release,		.release = video_exclusive_release,
	.ioctl = tt_ioctl,		.ioctl = video_ioctl2,
	.compat_ioctl = v4l_compat_ioctl32,		.compat_ioctl = v4l_compat_ioctl32,
	.llseek = no_llseek,		.llseek = no_llseek,
	};		};
	@@ -354,6 +371,18 @@ static struct video_device terratec_radio=
	.type = VID_TYPE_TUNER,		.type = VID_TYPE_TUNER,
	.hardware = 0,		.hardware = 0,
	.fops = &terratec_fops,		.fops = &terratec_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,
			.vidioc_g_audio = vidioc_g_audio,
			.vidioc_s_audio = vidioc_s_audio,
			.vidioc_g_input = vidioc_g_input,
			.vidioc_s_input = vidioc_s_input,
	};		};

	static int __init terratec_init(void)		static int __init terratec_init(void)