mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 13:55:32 +00:00
Code Issues Releases Wiki Activity

V4L/DVB (5549): Radio-sf16fmr2.c Replace fmr2_do_ioctl to use video_ioctl2

Browse source 
Convert radio-sf16fmr2 to use video_ioctl2

Signed-off-by:  Douglas Schilling Landgraf <dougsland@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Douglas Landgraf 2007-04-23 17:51:37 -03:00 committed by Mauro Carvalho Chehab
parent 288bb0e790
commit 34ab962db8
1 changed files with 203 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

188
drivers/media/radio/radio-sf16fmr2.c
View file

@ -226,68 +226,56 @@ static int fmr2_setvolume(struct fmr2_device *dev)
return 0; return 0;
} }
static int fmr2_do_ioctl(struct inode *inode, struct file *file, static int vidioc_querycap(struct file *file, void *priv,
unsigned int cmd, void *arg) struct v4l2_capability *v)
{ {
struct video_device *dev = video_devdata(file); strlcpy(v->driver, "radio-sf16fmr2", sizeof(v->driver));
struct fmr2_device *fmr2 = dev->priv; strlcpy(v->card, "SF16-FMR2 radio", sizeof(v->card));
debug_print((KERN_DEBUG "freq %ld flags %d vol %d mute %d " sprintf(v->bus_info, "ISA");
"stereo %d type %d\n",
fmr2->curfreq, fmr2->flags, fmr2->curvol, fmr2->mute,
fmr2->stereo, fmr2->card_type));
switch(cmd)
{
case VIDIOC_QUERYCAP:
{
struct v4l2_capability *v = arg;
memset(v,0,sizeof(*v));
strlcpy(v->driver, "radio-sf16fmr2", sizeof (v->driver));
strlcpy(v->card, "SF16-FMR2 radio", sizeof (v->card));
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 = arg; struct v4l2_tuner *v)
{
int mult; int mult;
struct video_device *dev = video_devdata(file);
struct fmr2_device *fmr2 = 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;
mult = (fmr2->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000; mult = (fmr2->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000;
v->rangelow = RSF16_MINFREQ/mult; v->rangelow = RSF16_MINFREQ/mult;
v->rangehigh = RSF16_MAXFREQ/mult; v->rangehigh = RSF16_MAXFREQ/mult;
v->rxsubchans =V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO; v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO;
v->capability=fmr2->flags&V4L2_TUNER_CAP_LOW; v->capability = fmr2->flags&V4L2_TUNER_CAP_LOW;
v->audmode = fmr2->stereo ? V4L2_TUNER_MODE_STEREO: v->audmode = fmr2->stereo ? V4L2_TUNER_MODE_STEREO:
V4L2_TUNER_MODE_MONO; V4L2_TUNER_MODE_MONO;
mutex_lock(&lock); mutex_lock(&lock);
v->signal = fmr2_getsigstr(fmr2); v->signal = fmr2_getsigstr(fmr2);
mutex_unlock(&lock); mutex_unlock(&lock);
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 = arg; struct v4l2_frequency *f)
{
struct video_device *dev = video_devdata(file);
struct fmr2_device *fmr2 = dev->priv;
if (!(fmr2->flags & V4L2_TUNER_CAP_LOW)) if (!(fmr2->flags & V4L2_TUNER_CAP_LOW))
f->frequency *= 1000; f->frequency *= 1000;
@ -299,71 +287,79 @@ static int fmr2_do_ioctl(struct inode *inode, struct file *file,
fmr2->curfreq = (f->frequency/200)*200; fmr2->curfreq = (f->frequency/200)*200;
/* set card freq (if not muted) */ /* set card freq (if not muted) */
if (fmr2->curvol && !fmr2->mute) if (fmr2->curvol && !fmr2->mute) {
{
mutex_lock(&lock); mutex_lock(&lock);
fmr2_setfreq(fmr2); fmr2_setfreq(fmr2);
mutex_unlock(&lock); mutex_unlock(&lock);
} }
return 0; return 0;
} }
case VIDIOC_G_FREQUENCY:
{ static int vidioc_g_frequency(struct file *file, void *priv,
struct v4l2_frequency *f = arg; struct v4l2_frequency *f)
{
struct video_device *dev = video_devdata(file);
struct fmr2_device *fmr2 = dev->priv;
f->type = V4L2_TUNER_RADIO; f->type = V4L2_TUNER_RADIO;
f->frequency = fmr2->curfreq; f->frequency = fmr2->curfreq;
if (!(fmr2->flags & V4L2_TUNER_CAP_LOW)) if (!(fmr2->flags & V4L2_TUNER_CAP_LOW))
f->frequency /= 1000; f->frequency /= 1000;
return 0; return 0;
} }
case VIDIOC_QUERYCTRL:
{ static int vidioc_queryctrl(struct file *file, void *priv,
struct v4l2_queryctrl *qc = arg; struct v4l2_queryctrl *qc)
{
int i; int i;
struct video_device *dev = video_devdata(file);
struct fmr2_device *fmr2 = dev->priv;
for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) { for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
if ((fmr2->card_type != 11) if ((fmr2->card_type != 11)
&& V4L2_CID_AUDIO_VOLUME) && V4L2_CID_AUDIO_VOLUME)
radio_qctrl[i].step=65535; radio_qctrl[i].step = 65535;
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= arg; struct v4l2_control *ctrl)
{
struct video_device *dev = video_devdata(file);
struct fmr2_device *fmr2 = dev->priv;
switch (ctrl->id) { switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE: case V4L2_CID_AUDIO_MUTE:
ctrl->value=fmr2->mute; ctrl->value = fmr2->mute;
return (0); return 0;
case V4L2_CID_AUDIO_VOLUME: case V4L2_CID_AUDIO_VOLUME:
ctrl->value=fmr2->curvol; ctrl->value = fmr2->curvol;
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= arg; struct v4l2_control *ctrl)
{
struct video_device *dev = video_devdata(file);
struct fmr2_device *fmr2 = dev->priv;
switch (ctrl->id) { switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE: case V4L2_CID_AUDIO_MUTE:
fmr2->mute=ctrl->value; fmr2->mute = ctrl->value;
if (fmr2->card_type != 11) { if (fmr2->card_type != 11) {
if (!fmr2->mute) { if (!fmr2->mute)
fmr2->curvol = 65535; fmr2->curvol = 65535;
} else { else
fmr2->curvol = 0; fmr2->curvol = 0;
} }
}
break; break;
case V4L2_CID_AUDIO_VOLUME: case V4L2_CID_AUDIO_VOLUME:
fmr2->curvol = ctrl->value; fmr2->curvol = ctrl->value;
@ -380,12 +376,14 @@ static int fmr2_do_ioctl(struct inode *inode, struct file *file,
default: default:
return -EINVAL; return -EINVAL;
} }
#ifdef DEBUG #ifdef DEBUG
if (fmr2->curvol && !fmr2->mute) if (fmr2->curvol && !fmr2->mute)
printk(KERN_DEBUG "unmute\n"); printk(KERN_DEBUG "unmute\n");
else else
printk(KERN_DEBUG "mute\n"); printk(KERN_DEBUG "mute\n");
#endif #endif
mutex_lock(&lock); mutex_lock(&lock);
if (fmr2->curvol && !fmr2->mute) { if (fmr2->curvol && !fmr2->mute) {
fmr2_setvolume(fmr2); fmr2_setvolume(fmr2);
@ -393,19 +391,39 @@ static int fmr2_do_ioctl(struct inode *inode, struct file *file,
} else } else
fmr2_mute(fmr2->port); fmr2_mute(fmr2->port);
mutex_unlock(&lock); mutex_unlock(&lock);
return (0); return 0;
}
default:
return v4l_compat_translate_ioctl(inode,file,cmd,arg,
fmr2_do_ioctl);
}
} }
static int fmr2_ioctl(struct inode *inode, struct file *file, static int vidioc_g_audio(struct file *file, void *priv,
unsigned int cmd, unsigned long arg) struct v4l2_audio *a)
{ {
return video_usercopy(inode, file, cmd, arg, fmr2_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 vidioc_s_audio(struct file *file, void *priv,
struct v4l2_audio *a)
{
if (a->index != 0)
return -EINVAL;
return 0;
} }
static struct fmr2_device fmr2_unit; static struct fmr2_device fmr2_unit;
@ -414,7 +432,7 @@ static const struct file_operations fmr2_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = video_exclusive_open, .open = video_exclusive_open,
.release = video_exclusive_release, .release = video_exclusive_release,
.ioctl = fmr2_ioctl, .ioctl = video_ioctl2,
.compat_ioctl = v4l_compat_ioctl32, .compat_ioctl = v4l_compat_ioctl32,
.llseek = no_llseek, .llseek = no_llseek,
}; };
@ -426,6 +444,18 @@ static struct video_device fmr2_radio=
. type = VID_TYPE_TUNER, . type = VID_TYPE_TUNER,
.hardware = 0, .hardware = 0,
.fops = &fmr2_fops, .fops = &fmr2_fops,
.vidioc_querycap = vidioc_querycap,
.vidioc_g_tuner = vidioc_g_tuner,
.vidioc_s_tuner = vidioc_s_tuner,
.vidioc_g_audio = vidioc_g_audio,
.vidioc_s_audio = vidioc_s_audio,
.vidioc_g_input = vidioc_g_input,
.vidioc_s_input = vidioc_s_input,
.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 fmr2_init(void) static int __init fmr2_init(void)