Skip to content

L
linux-davinci
Commit 99218fe4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (5148): Convert radio-aztech to use video_ioctl2 

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent b50e7fe9
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 118 deletions
drivers/media/radio/radio-aztech.c
View file @ 99218fe4
...@@ -180,136 +180,129 @@ static int az_setfreq(struct az_device *dev, unsigned long frequency) ...@@ -180,136 +180,129 @@ static int az_setfreq(struct az_device *dev, unsigned long frequency)
return 0; return 0;
} }
static int az_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)
{
strlcpy(v->driver, "radio-aztech", sizeof (v->driver));
strlcpy(v->card, "Aztech Radio", sizeof (v->card));
sprintf(v->bus_info,"ISA");
v->version = RADIO_VERSION;
v->capabilities = V4L2_CAP_TUNER;
return 0;
}
static int vidioc_g_tuner (struct file *file, void *priv,
struct v4l2_tuner *v)
{ {
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
struct az_device *az = dev->priv; struct az_device *az = dev->priv;
switch(cmd) if (v->index > 0)
{ return -EINVAL;
case VIDIOC_QUERYCAP:
{
struct v4l2_capability *v = arg;
memset(v,0,sizeof(*v));
strlcpy(v->driver, "radio-aztech", sizeof (v->driver));
strlcpy(v->card, "Aztech Radio", sizeof (v->card));
sprintf(v->bus_info,"ISA");
v->version = RADIO_VERSION;
v->capabilities = V4L2_CAP_TUNER;
return 0; strcpy(v->name, "FM");
} v->type = V4L2_TUNER_RADIO;
case VIDIOC_G_TUNER:
{
struct v4l2_tuner *v = arg;
if (v->index > 0)
return -EINVAL;
memset(v,0,sizeof(*v));
strcpy(v->name, "FM");
v->type = V4L2_TUNER_RADIO;
v->rangelow=(87*16000);
v->rangehigh=(108*16000);
v->rxsubchans =V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;
v->capability=V4L2_TUNER_CAP_LOW;
if(az_getstereo(az))
v->audmode = V4L2_TUNER_MODE_STEREO;
else
v->audmode = V4L2_TUNER_MODE_MONO;
v->signal=0xFFFF*az_getsigstr(az);
return 0; v->rangelow=(87*16000);
} v->rangehigh=(108*16000);
case VIDIOC_S_TUNER: v->rxsubchans =V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;
{ v->capability=V4L2_TUNER_CAP_LOW;
struct v4l2_tuner *v = arg; if(az_getstereo(az))
v->audmode = V4L2_TUNER_MODE_STEREO;
else
v->audmode = V4L2_TUNER_MODE_MONO;
v->signal=0xFFFF*az_getsigstr(az);
if (v->index > 0) return 0;
return -EINVAL; }
return 0;
}
case VIDIOC_S_FREQUENCY:
{
struct v4l2_frequency *f = arg;
az->curfreq = f->frequency; static int vidioc_s_tuner (struct file *file, void *priv,
az_setfreq(az, az->curfreq); struct v4l2_tuner *v)
return 0; {
} if (v->index > 0)
case VIDIOC_G_FREQUENCY: return -EINVAL;
{
struct v4l2_frequency *f = arg;
f->type = V4L2_TUNER_RADIO; return 0;
f->frequency = az->curfreq; }
return 0; static int vidioc_s_frequency (struct file *file, void *priv,
} struct v4l2_frequency *f)
{
struct video_device *dev = video_devdata(file);
struct az_device *az = dev->priv;
case VIDIOC_QUERYCTRL: az->curfreq = f->frequency;
{ az_setfreq(az, az->curfreq);
struct v4l2_queryctrl *qc = arg; return 0;
int i; }
for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) { static int vidioc_g_frequency (struct file *file, void *priv,
if (qc->id && qc->id == radio_qctrl[i].id) { struct v4l2_frequency *f)
memcpy(qc, &(radio_qctrl[i]), {
sizeof(*qc)); struct video_device *dev = video_devdata(file);
return (0); struct az_device *az = dev->priv;
}
} f->type = V4L2_TUNER_RADIO;
return -EINVAL; f->frequency = az->curfreq;
}
case VIDIOC_G_CTRL: return 0;
{ }
struct v4l2_control *ctrl= arg;
static int vidioc_queryctrl (struct file *file, void *priv,
switch (ctrl->id) { struct v4l2_queryctrl *qc)
case V4L2_CID_AUDIO_MUTE: {
if (az->curvol==0) int i;
ctrl->value=1;
else for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
ctrl->value=0; if (qc->id && qc->id == radio_qctrl[i].id) {
return (0); memcpy(qc, &(radio_qctrl[i]),
case V4L2_CID_AUDIO_VOLUME: sizeof(*qc));
ctrl->value=az->curvol * 6554; return (0);
return (0);
}
return -EINVAL;
}
case VIDIOC_S_CTRL:
{
struct v4l2_control *ctrl= arg;
switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE:
if (ctrl->value) {
az_setvol(az,0);
} else {
az_setvol(az,az->curvol);
}
return (0);
case V4L2_CID_AUDIO_VOLUME:
az_setvol(az,ctrl->value);
return (0);
}
return -EINVAL;
} }
}
return -EINVAL;
}
default: static int vidioc_g_ctrl (struct file *file, void *priv,
return v4l_compat_translate_ioctl(inode,file,cmd,arg, struct v4l2_control *ctrl)
az_do_ioctl); {
struct video_device *dev = video_devdata(file);
struct az_device *az = dev->priv;
switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE:
if (az->curvol==0)
ctrl->value=1;
else
ctrl->value=0;
return (0);
case V4L2_CID_AUDIO_VOLUME:
ctrl->value=az->curvol * 6554;
return (0);
} }
return -EINVAL;
} }
static int az_ioctl(struct inode *inode, struct file *file, static int vidioc_s_ctrl (struct file *file, void *priv,
unsigned int cmd, unsigned long arg) struct v4l2_control *ctrl)
{ {
return video_usercopy(inode, file, cmd, arg, az_do_ioctl); struct video_device *dev = video_devdata(file);
struct az_device *az = dev->priv;
switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE:
if (ctrl->value) {
az_setvol(az,0);
} else {
az_setvol(az,az->curvol);
}
return (0);
case V4L2_CID_AUDIO_VOLUME:
az_setvol(az,ctrl->value);
return (0);
}
return -EINVAL;
} }
static struct az_device aztech_unit; static struct az_device aztech_unit;
...@@ -318,20 +311,31 @@ static const struct file_operations aztech_fops = { ...@@ -318,20 +311,31 @@ static const struct file_operations aztech_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = video_exclusive_open, .open = video_exclusive_open,
.release = video_exclusive_release, .release = video_exclusive_release,
.ioctl = az_ioctl, .ioctl = video_ioctl2,
.compat_ioctl = v4l_compat_ioctl32, .compat_ioctl = v4l_compat_ioctl32,
.llseek = no_llseek, .llseek = no_llseek,
}; };
static struct video_device aztech_radio= static struct video_device aztech_radio=
{ {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "Aztech radio", .name = "Aztech radio",
.type = VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
.hardware = 0, .hardware = 0,
.fops = &aztech_fops, .fops = &aztech_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,
}; };
module_param_named(debug,aztech_radio.debug, int, 0644);
MODULE_PARM_DESC(debug,"activates debug info");
static int __init aztech_init(void) static int __init aztech_init(void)
{ {
if(io==-1) if(io==-1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment