Skip to content

Commit

Permalink
[media] tea575x: convert to control framework
Browse files Browse the repository at this point in the history 
Convert tea575x-tuner to use the new V4L2 control framework. Also add
ext_init() callback that can be used by a card driver for additional
initialization right before registering the video device (for SF16-FMR2).

Also embed struct video_device to struct snd_tea575x to simplify the code.

Signed-off-by: Ondrej Zary <[email protected]>
Acked-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
Ondrej Zary authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent 2ef4037 commit 4522e82
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 73 deletions.
6 changes: 4 additions & 2 deletions include/sound/tea575x-tuner.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
*/

#include <linux/videodev2.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-dev.h>
#include <media/v4l2-ioctl.h>

#define TEA575X_FMIF 10700

Expand All @@ -42,7 +42,7 @@ struct snd_tea575x_ops {
};

struct snd_tea575x {
struct video_device *vd; /* video device */
struct video_device vd; /* video device */
bool tea5759; /* 5759 chip is present */
bool mute; /* Device is muted? */
bool stereo; /* receiving stereo */
Expand All @@ -54,6 +54,8 @@ struct snd_tea575x {
void *private_data;
u8 card[32];
u8 bus_info[32];
struct v4l2_ctrl_handler ctrl_handler;
int (*ext_init)(struct snd_tea575x *tea);
};

int snd_tea575x_init(struct snd_tea575x *tea);
Expand Down
106 changes: 35 additions & 71 deletions sound/i2c/other/tea575x-tuner.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@

#include <asm/io.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/version.h>
#include <sound/core.h>
#include <media/v4l2-dev.h>
#include <media/v4l2-ioctl.h>
#include <sound/tea575x-tuner.h>

MODULE_AUTHOR("Jaroslav Kysela <[email protected]>");
Expand Down Expand Up @@ -62,17 +62,6 @@ module_param(radio_nr, int, 0);
#define TEA575X_BIT_DUMMY (1<<15) /* buffer */
#define TEA575X_BIT_FREQ_MASK 0x7fff

static struct v4l2_queryctrl radio_qctrl[] = {
{
.id = V4L2_CID_AUDIO_MUTE,
.name = "Mute",
.minimum = 0,
.maximum = 1,
.default_value = 1,
.type = V4L2_CTRL_TYPE_BOOLEAN,
}
};

/*
* lowlevel part
*/
Expand Down Expand Up @@ -266,47 +255,17 @@ static int vidioc_s_audio(struct file *file, void *priv,
return 0;
}

static int vidioc_queryctrl(struct file *file, void *priv,
struct v4l2_queryctrl *qc)
static int tea575x_s_ctrl(struct v4l2_ctrl *ctrl)
{
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 -EINVAL;
}

static int vidioc_g_ctrl(struct file *file, void *priv,
struct v4l2_control *ctrl)
{
struct snd_tea575x *tea = video_drvdata(file);
struct snd_tea575x *tea = container_of(ctrl->handler, struct snd_tea575x, ctrl_handler);

switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE:
ctrl->value = tea->mute;
tea->mute = ctrl->val;
snd_tea575x_set_freq(tea);
return 0;
}
return -EINVAL;
}

static int vidioc_s_ctrl(struct file *file, void *priv,
struct v4l2_control *ctrl)
{
struct snd_tea575x *tea = video_drvdata(file);

switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE:
if (tea->mute != ctrl->value) {
tea->mute = ctrl->value;
snd_tea575x_set_freq(tea);
}
return 0;
}
return -EINVAL;
}

Expand Down Expand Up @@ -355,16 +314,17 @@ static const struct v4l2_ioctl_ops tea575x_ioctl_ops = {
.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 struct video_device tea575x_radio = {
.name = "tea575x-tuner",
.fops = &tea575x_fops,
.ioctl_ops = &tea575x_ioctl_ops,
.release = video_device_release,
.release = video_device_release_empty,
};

static const struct v4l2_ctrl_ops tea575x_ctrl_ops = {
.s_ctrl = tea575x_s_ctrl,
};

/*
Expand All @@ -373,7 +333,6 @@ static struct video_device tea575x_radio = {
int snd_tea575x_init(struct snd_tea575x *tea)
{
int retval;
struct video_device *tea575x_radio_inst;

tea->mute = 1;

Expand All @@ -384,40 +343,45 @@ int snd_tea575x_init(struct snd_tea575x *tea)
tea->in_use = 0;
tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_10_40;
tea->freq = 90500 * 16; /* 90.5Mhz default */
snd_tea575x_set_freq(tea);

tea575x_radio_inst = video_device_alloc();
if (tea575x_radio_inst == NULL) {
printk(KERN_ERR "tea575x-tuner: not enough memory\n");
return -ENOMEM;
}
tea->vd = tea575x_radio;
video_set_drvdata(&tea->vd, tea);

memcpy(tea575x_radio_inst, &tea575x_radio, sizeof(tea575x_radio));
v4l2_ctrl_handler_init(&tea->ctrl_handler, 1);
tea->vd.ctrl_handler = &tea->ctrl_handler;
v4l2_ctrl_new_std(&tea->ctrl_handler, &tea575x_ctrl_ops, V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
retval = tea->ctrl_handler.error;
if (retval) {
printk(KERN_ERR "tea575x-tuner: can't initialize controls\n");
v4l2_ctrl_handler_free(&tea->ctrl_handler);
return retval;
}

strcpy(tea575x_radio.name, tea->tea5759 ?
"TEA5759 radio" : "TEA5757 radio");
if (tea->ext_init) {
retval = tea->ext_init(tea);
if (retval) {
v4l2_ctrl_handler_free(&tea->ctrl_handler);
return retval;
}
}

video_set_drvdata(tea575x_radio_inst, tea);
v4l2_ctrl_handler_setup(&tea->ctrl_handler);

retval = video_register_device(tea575x_radio_inst,
VFL_TYPE_RADIO, radio_nr);
retval = video_register_device(&tea->vd, VFL_TYPE_RADIO, radio_nr);
if (retval) {
printk(KERN_ERR "tea575x-tuner: can't register video device!\n");
kfree(tea575x_radio_inst);
v4l2_ctrl_handler_free(&tea->ctrl_handler);
return retval;
}

snd_tea575x_set_freq(tea);
tea->vd = tea575x_radio_inst;

return 0;
}

void snd_tea575x_exit(struct snd_tea575x *tea)
{
if (tea->vd) {
video_unregister_device(tea->vd);
tea->vd = NULL;
}
video_unregister_device(&tea->vd);
v4l2_ctrl_handler_free(&tea->ctrl_handler);
}

static int __init alsa_tea575x_module_init(void)
Expand Down

0 comments on commit 4522e82

Please sign in to comment.