summaryrefslogtreecommitdiff
path: root/drivers/staging/ti-st/fmdrv_v4l2.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/ti-st/fmdrv_v4l2.c')
-rw-r--r--drivers/staging/ti-st/fmdrv_v4l2.c387
1 files changed, 264 insertions, 123 deletions
diff --git a/drivers/staging/ti-st/fmdrv_v4l2.c b/drivers/staging/ti-st/fmdrv_v4l2.c
index 643794d13e87..40f77fbba6a3 100644
--- a/drivers/staging/ti-st/fmdrv_v4l2.c
+++ b/drivers/staging/ti-st/fmdrv_v4l2.c
@@ -4,12 +4,13 @@
*
* This module registers with V4L2 subsystem as Radio
* data system interface (/dev/radio). During the registration,
- * it will expose two set of function pointers to V4L2 subsystem.
+ * it will expose two set of function pointers.
*
* 1) File operation related API (open, close, read, write, poll...etc).
* 2) Set of V4L2 IOCTL complaint API.
*
* Copyright (C) 2010 Texas Instruments
+ * Author: Raja Mani <raja_mani@ti.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -30,15 +31,7 @@
#include "fmdrv_v4l2.h"
#include "fmdrv_common.h"
#include "fmdrv_rx.h"
-/* TODO: Enable when FM TX is supported */
-/* #include "fmdrv_tx.h" */
-
-#ifndef DEBUG
-#ifdef pr_info
-#undef pr_info
-#define pr_info(fmt, arg...)
-#endif
-#endif
+#include "fmdrv_tx.h"
static struct video_device *gradio_dev;
static unsigned char radio_disconnected;
@@ -82,6 +75,7 @@ static struct v4l2_queryctrl fmdrv_v4l2_queryctrl[] = {
};
/* -- V4L2 RADIO (/dev/radioX) device file operation interfaces --- */
+
/* Read RX RDS data */
static ssize_t fm_v4l2_fops_read(struct file *file, char __user * buf,
size_t count, loff_t *ppos)
@@ -94,34 +88,31 @@ static ssize_t fm_v4l2_fops_read(struct file *file, char __user * buf,
if (!radio_disconnected) {
pr_err("(fmdrv): FM device is already disconnected\n");
- ret = -EIO;
- goto exit;
+ return -EIO;
}
/* Turn on RDS mode , if it is disabled */
ret = fm_rx_get_rds_mode(fmdev, &rds_mode);
if (ret < 0) {
- pr_err("(fmdrv): Unable to read current rds mode");
- goto exit;
+ pr_err("(fmdrv): Unable to read current rds mode\n");
+ return ret;
}
+
if (rds_mode == FM_RDS_DISABLE) {
ret = fmc_set_rds_mode(fmdev, FM_RDS_ENABLE);
if (ret < 0) {
- pr_err("(fmdrv): Failed to enable rds mode");
- goto exit;
+ pr_err("(fmdrv): Failed to enable rds mode\n");
+ return ret;
}
}
+
/* Copy RDS data from internal buffer to user buffer */
ret = fmc_transfer_rds_from_internal_buff(fmdev, file, buf, count);
-exit:
return ret;
}
-/* Write RDS data.
- * TODO: When FM TX support is added, use "V4L2_CID_RDS_TX_XXXX" codes,
- * instead of write operation.
- */
+/* Write TX RDS data */
static ssize_t fm_v4l2_fops_write(struct file *file, const char __user * buf,
size_t count, loff_t *ppos)
{
@@ -130,13 +121,12 @@ static ssize_t fm_v4l2_fops_write(struct file *file, const char __user * buf,
struct fmdrv_ops *fmdev;
ret = copy_from_user(&rds, buf, sizeof(rds));
- pr_info("(fmdrv): (%d)type: %d, text %s, af %d",
+ pr_debug("(fmdrv): (%d)type: %d, text %s, af %d\n",
ret, rds.text_type, rds.text, rds.af_freq);
fmdev = video_drvdata(file);
- /* TODO: Enable when FM TX is supported */
- /* fm_tx_set_radio_text(fmdev, rds.text, rds.text_type); */
- /* fm_tx_set_af(fmdev, rds.af_freq); */
+ fm_tx_set_radio_text(fmdev, rds.text, rds.text_type);
+ fm_tx_set_af(fmdev, rds.af_freq);
return 0;
}
@@ -149,12 +139,14 @@ static unsigned int fm_v4l2_fops_poll(struct file *file,
fmdev = video_drvdata(file);
ret = fmc_is_rds_data_available(fmdev, file, pts);
- if (!ret)
+ if (ret < 0)
return POLLIN | POLLRDNORM;
+
return 0;
}
-/* Handle open request for "/dev/radioX" device.
+/*
+ * Handle open request for "/dev/radioX" device.
* Start with FM RX mode as default.
*/
static int fm_v4l2_fops_open(struct file *file)
@@ -165,26 +157,26 @@ static int fm_v4l2_fops_open(struct file *file)
/* Don't allow multiple open */
if (radio_disconnected) {
pr_err("(fmdrv): FM device is already opened\n");
- ret = -EBUSY;
- goto exit;
+ return -EBUSY;
}
fmdev = video_drvdata(file);
+
ret = fmc_prepare(fmdev);
if (ret < 0) {
- pr_err("(fmdrv): Unable to prepare FM CORE");
- goto exit;
+ pr_err("(fmdrv): Unable to prepare FM CORE\n");
+ return ret;
}
- pr_info("(fmdrv): Load FM RX firmware..");
+ pr_debug("(fmdrv): Load FM RX firmware..\n");
+
ret = fmc_set_mode(fmdev, FM_MODE_RX);
if (ret < 0) {
- pr_err("(fmdrv): Unable to load FM RX firmware");
- goto exit;
+ pr_err("(fmdrv): Unable to load FM RX firmware\n");
+ return ret;
}
radio_disconnected = 1;
-exit:
return ret;
}
@@ -195,22 +187,23 @@ static int fm_v4l2_fops_release(struct file *file)
fmdev = video_drvdata(file);
if (!radio_disconnected) {
- pr_info("(fmdrv):FM dev already closed, close called again?");
- goto exit;
+ pr_debug("(fmdrv): FM device is already closed\n");
+ return ret;
}
+
ret = fmc_set_mode(fmdev, FM_MODE_OFF);
if (ret < 0) {
- pr_err("(fmdrv): Unable to turn off the chip");
- goto exit;
+ pr_err("(fmdrv): Unable to turn off the chip\n");
+ return ret;
}
+
ret = fmc_release(fmdev);
if (ret < 0) {
- pr_err("(fmdrv): FM CORE release failed");
- goto exit;
+ pr_err("(fmdrv): FM CORE release failed\n");
+ return ret;
}
radio_disconnected = 0;
-exit:
return ret;
}
@@ -227,6 +220,7 @@ static int fm_v4l2_vidioc_querycap(struct file *file, void *priv,
V4L2_CAP_RADIO | V4L2_CAP_MODULATOR |
V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |
V4L2_CAP_RDS_CAPTURE;
+
return 0;
}
@@ -257,8 +251,9 @@ static int fm_v4l2_vidioc_g_ctrl(struct file *file, void *priv,
int ret = -EINVAL;
unsigned short curr_vol;
unsigned char curr_mute_mode;
+ unsigned char afreq;
+ short threshold;
struct fmdrv_ops *fmdev;
- unsigned char chanl_spacing;
fmdev = video_drvdata(file);
@@ -266,51 +261,101 @@ static int fm_v4l2_vidioc_g_ctrl(struct file *file, void *priv,
case V4L2_CID_AUDIO_MUTE: /* get mute mode */
ret = fm_rx_get_mute_mode(fmdev, &curr_mute_mode);
if (ret < 0)
- goto exit;
+ return ret;
ctrl->value = curr_mute_mode;
break;
case V4L2_CID_AUDIO_VOLUME: /* get volume */
ret = fm_rx_get_volume(fmdev, &curr_vol);
if (ret < 0)
- goto exit;
+ return ret;
ctrl->value = curr_vol;
break;
- case V4L2_CID_CHANNEL_SPACING: /* channel spacing */
- ret = fm_rx_get_chanl_spacing(fmdev, &chanl_spacing);
- ctrl->value = chanl_spacing;
+ case V4L2_CID_RSSI_THRESHOLD:
+ ret = fm_rx_get_rssi_threshold(fmdev, &threshold);
+ if (ret == 0)
+ ctrl->value = threshold;
+ break;
+
+ case V4L2_CID_TUNE_AF:
+ ret = fm_rx_get_af_switch(fmdev, &afreq);
+ if (ret == 0)
+ ctrl->value = afreq;
+ break;
+
+ case V4L2_CID_TUNE_PREEMPHASIS:
+ ctrl->value = fmdev->tx_data.preemph;
break;
}
-exit:
return ret;
}
+/*
+ * Change the value of specified control.
+ * V4L2_CID_TUNE_POWER_LEVEL: Application will specify power level value in
+ * units of dB/uV, whereas range and step are specific to FM chip. For TI's WL
+ * chips, convert application specified power level value to chip specific
+ * value by subtracting 122 from it. Refer to TI FM data sheet for details.
+ */
static int fm_v4l2_vidioc_s_ctrl(struct file *file, void *priv,
struct v4l2_control *ctrl)
{
+ struct fmdrv_ops *fmdev = video_drvdata(file);
+ unsigned int emph_filter;
int ret = -EINVAL;
- struct fmdrv_ops *fmdev;
-
- fmdev = video_drvdata(file);
switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE: /* set mute */
ret = fmc_set_mute_mode(fmdev, (unsigned char)ctrl->value);
- if (ret < 0)
- goto exit;
break;
+
case V4L2_CID_AUDIO_VOLUME: /* set volume */
ret = fm_rx_set_volume(fmdev, (unsigned short)ctrl->value);
- if (ret < 0)
- goto exit;
break;
- case V4L2_CID_CHANNEL_SPACING: /* channel spacing */
- ret = fm_rx_set_chanl_spacing(fmdev, (unsigned int)ctrl->value);
+ case V4L2_CID_TUNE_POWER_LEVEL: /* set TX power level - ext control */
+ if (ctrl->value >= FM_PWR_LVL_LOW &&
+ ctrl->value <= FM_PWR_LVL_HIGH) {
+ ctrl->value = FM_PWR_LVL_HIGH - ctrl->value;
+ ret = fm_tx_set_pwr_lvl(fmdev,
+ (unsigned char)ctrl->value);
+ } else
+ ret = -ERANGE;
+ break;
+
+ case V4L2_CID_RSSI_THRESHOLD:
+ ret = fm_rx_set_rssi_threshold(fmdev, (short)ctrl->value);
+ break;
+
+ case V4L2_CID_TUNE_AF:
+ ret = fm_rx_set_af_switch(fmdev, (unsigned char)ctrl->value);
+ break;
+
+ case V4L2_CID_TUNE_PREEMPHASIS:
+ if (ctrl->value < V4L2_PREEMPHASIS_DISABLED ||
+ ctrl->value > V4L2_PREEMPHASIS_75_uS) {
+ ret = -EINVAL;
+ break;
+ }
+ if (ctrl->value == V4L2_PREEMPHASIS_DISABLED)
+ emph_filter = FM_TX_PREEMPH_OFF;
+ else if (ctrl->value == V4L2_PREEMPHASIS_50_uS)
+ emph_filter = FM_TX_PREEMPH_50US;
+ else
+ emph_filter = FM_TX_PREEMPH_75US;
+ ret = fm_tx_set_preemph_filter(fmdev, emph_filter);
+ break;
+
+ case V4L2_CID_TUNE_ANTENNA_CAPACITOR:
+ if (ctrl->value == FM_TX_ANT_IMP_50 ||
+ ctrl->value == FM_TX_ANT_IMP_200 ||
+ ctrl->value == FM_TX_ANT_IMP_500)
+ ret = fm_tx_set_ant_imp(fmdev, ctrl->value);
+ else
+ ret = -EINVAL;
break;
}
-exit:
return ret;
}
@@ -330,45 +375,39 @@ static int fm_v4l2_vidioc_s_audio(struct file *file, void *priv,
{
if (audio->index != 0)
return -EINVAL;
+
return 0;
}
-/* Get tuner attributes. If current mode is NOT RX, set to RX */
+/* Get tuner attributes. If current mode is NOT RX, return error */
static int fm_v4l2_vidioc_g_tuner(struct file *file, void *priv,
struct v4l2_tuner *tuner)
{
+ struct fmdrv_ops *fmdev = video_drvdata(file);
unsigned int bottom_frequency;
unsigned int top_frequency;
unsigned short stereo_mono_mode;
unsigned short rssilvl;
int ret = -EINVAL;
- struct fmdrv_ops *fmdev;
if (tuner->index != 0)
- goto exit;
+ return ret;
- fmdev = video_drvdata(file);
- if (fmdev->curr_fmmode != FM_MODE_RX) {
- ret = fmc_set_mode(fmdev, FM_MODE_RX);
- if (ret < 0) {
- pr_err("(fmdrv): Failed to set RX mode; unable to " \
- "read tuner attributes\n");
- goto exit;
- }
- }
+ if (fmdev->curr_fmmode != FM_MODE_RX)
+ return -EPERM;
- ret = fm_rx_get_currband_lowhigh_freq(fmdev, &bottom_frequency,
+ ret = fm_rx_get_currband_freq_range(fmdev, &bottom_frequency,
&top_frequency);
- if (ret < 0)
- goto exit;
+ if (ret != 0)
+ return ret;
ret = fm_rx_get_stereo_mono(fmdev, &stereo_mono_mode);
- if (ret < 0)
- goto exit;
+ if (ret != 0)
+ return ret;
ret = fm_rx_get_rssi_level(fmdev, &rssilvl);
- if (ret < 0)
- goto exit;
+ if (ret != 0)
+ return ret;
strcpy(tuner->name, "FM");
tuner->type = V4L2_TUNER_RADIO;
@@ -378,64 +417,66 @@ static int fm_v4l2_vidioc_g_tuner(struct file *file, void *priv,
tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO |
((fmdev->rx.rds.flag == FM_RDS_ENABLE) ? V4L2_TUNER_SUB_RDS : 0);
tuner->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS |
- V4L2_TUNER_CAP_LOW;
+ V4L2_TUNER_CAP_LOW;
tuner->audmode = (stereo_mono_mode ?
V4L2_TUNER_MODE_MONO : V4L2_TUNER_MODE_STEREO);
- /* Actual rssi value lies in between -128 to +127.
+ /*
+ * Actual rssi value lies in between -128 to +127.
* Convert this range from 0 to 255 by adding +128
*/
rssilvl += 128;
- /* Return signal strength value should be within 0 to 65535.
+ /*
+ * Return signal strength value should be within 0 to 65535.
* Find out correct signal radio by multiplying (65535/255) = 257
*/
tuner->signal = rssilvl * 257;
tuner->afc = 0;
-exit:
return ret;
}
-/* Set tuner attributes. If current mode is NOT RX, set to RX.
+/*
+ * Set tuner attributes. If current mode is NOT RX, set to RX.
* Currently, we set only audio mode (mono/stereo) and RDS state (on/off).
* Should we set other tuner attributes, too?
*/
static int fm_v4l2_vidioc_s_tuner(struct file *file, void *priv,
struct v4l2_tuner *tuner)
{
+ struct fmdrv_ops *fmdev = video_drvdata(file);
unsigned short aud_mode;
unsigned char rds_mode;
int ret = -EINVAL;
- struct fmdrv_ops *fmdev;
if (tuner->index != 0)
- goto exit;
+ return ret;
aud_mode = (tuner->audmode == V4L2_TUNER_MODE_STEREO) ?
- FM_STEREO_MODE : FM_MONO_MODE;
+ FM_STEREO_MODE : FM_MONO_MODE;
rds_mode = (tuner->rxsubchans & V4L2_TUNER_SUB_RDS) ?
FM_RDS_ENABLE : FM_RDS_DISABLE;
- fmdev = video_drvdata(file);
if (fmdev->curr_fmmode != FM_MODE_RX) {
ret = fmc_set_mode(fmdev, FM_MODE_RX);
if (ret < 0) {
- pr_err("(fmdrv): Failed to set RX mode; unable to" \
+ pr_err("(fmdrv): Failed to set RX mode; unable to "
"write tuner attributes\n");
- goto exit;
+ return ret;
}
}
ret = fmc_set_stereo_mono(fmdev, aud_mode);
- if (ret < 0)
- goto exit;
+ if (ret < 0) {
+ pr_err("(fmdrv): Failed to set RX stereo/mono mode\n");
+ return ret;
+ }
ret = fmc_set_rds_mode(fmdev, rds_mode);
if (ret < 0)
- goto exit;
+ pr_err("(fmdrv): Failed to set RX RDS mode\n");
-exit:
return ret;
}
@@ -444,14 +485,15 @@ static int fm_v4l2_vidioc_g_frequency(struct file *file, void *priv,
struct v4l2_frequency *freq)
{
int ret;
- struct fmdrv_ops *fmdev;
+ struct fmdrv_ops *fmdev = video_drvdata(file);
- fmdev = video_drvdata(file);
ret = fmc_get_frequency(fmdev, &freq->frequency);
- if (ret < 0)
+ if (ret < 0) {
+ pr_err("(fmdrv): Failed to get frequency\n");
return ret;
+ }
- /* Convert the frequency from Khz to 62.5 Hz */
+ /* Frequency unit of 62.5 Hz*/
freq->frequency = (unsigned int) freq->frequency * 16;
return 0;
@@ -461,45 +503,144 @@ static int fm_v4l2_vidioc_g_frequency(struct file *file, void *priv,
static int fm_v4l2_vidioc_s_frequency(struct file *file, void *priv,
struct v4l2_frequency *freq)
{
+ struct fmdrv_ops *fmdev = video_drvdata(file);
int ret;
- struct fmdrv_ops *fmdev;
- fmdev = video_drvdata(file);
-
- /* As tuner->capability is set to V4L2_TUNER_CAP_LOW, application sends
- * the frequency in units of 62.5 Hz but as FM chip accepts the frequency
- * in units of KHz convert the frequency from units of 62.5 Hz to KHz.
- */
+ /*
+ * As V4L2_TUNER_CAP_LOW is set 1 user sends the frequency
+ * in units of 62.5 Hz.
+ */
freq->frequency = (unsigned int)(freq->frequency / 16);
ret = fmc_set_frequency(fmdev, freq->frequency);
- if (ret < 0)
- return ret;
- return 0;
+
+ return ret;
}
/* Set hardware frequency seek. If current mode is NOT RX, set it RX. */
static int fm_v4l2_vidioc_s_hw_freq_seek(struct file *file, void *priv,
struct v4l2_hw_freq_seek *seek)
{
+ struct fmdrv_ops *fmdev = video_drvdata(file);
int ret;
- struct fmdrv_ops *fmdev;
- fmdev = video_drvdata(file);
if (fmdev->curr_fmmode != FM_MODE_RX) {
ret = fmc_set_mode(fmdev, FM_MODE_RX);
if (ret != 0) {
- pr_err("(fmdrv): Failed to set RX mode; unable to " \
+ pr_err("(fmdrv): Failed to set RX mode; unable to "
"start HW frequency seek\n");
- goto exit;
+ return ret;
}
}
ret = fm_rx_seek(fmdev, seek->seek_upward, seek->wrap_around);
if (ret < 0)
- goto exit;
+ pr_err("(fmdrv): RX seek failed - %d\n", ret);
+
+ return ret;
+}
+
+static int fm_v4l2_vidioc_g_ext_ctrls(struct file *file, void *priv,
+ struct v4l2_ext_controls *ext_ctrls)
+{
+ struct v4l2_control ctrl;
+ int index;
+ int ret = -EINVAL;
+
+ if (V4L2_CTRL_CLASS_FM_TX == ext_ctrls->ctrl_class) {
+ for (index = 0; index < ext_ctrls->count; index++) {
+ ctrl.id = ext_ctrls->controls[index].id;
+ ctrl.value = ext_ctrls->controls[index].value;
+ ret = fm_v4l2_vidioc_g_ctrl(file, priv, &ctrl);
+ if (ret < 0) {
+ ext_ctrls->error_idx = index;
+ break;
+ }
+ ext_ctrls->controls[index].value = ctrl.value;
+ }
+ }
+
+ return ret;
+}
+
+static int fm_v4l2_vidioc_s_ext_ctrls(struct file *file, void *priv,
+ struct v4l2_ext_controls *ext_ctrls)
+{
+ struct v4l2_control ctrl;
+ int index;
+ int ret = -EINVAL;
+
+ if (V4L2_CTRL_CLASS_FM_TX == ext_ctrls->ctrl_class) {
+ for (index = 0; index < ext_ctrls->count; index++) {
+ ctrl.id = ext_ctrls->controls[index].id;
+ ctrl.value = ext_ctrls->controls[index].value;
+ ret = fm_v4l2_vidioc_s_ctrl(file, priv, &ctrl);
+ if (ret < 0) {
+ ext_ctrls->error_idx = index;
+ break;
+ }
+ ext_ctrls->controls[index].value = ctrl.value;
+ }
+ }
+
+ return ret;
+}
+
+/* Get modulator attributes. If mode is not TX, return no attributes. */
+static int fm_v4l2_vidioc_g_modulator(struct file *file, void *priv,
+ struct v4l2_modulator *mod)
+{
+ struct fmdrv_ops *fmdev = video_drvdata(file);;
+
+ if (mod->index != 0)
+ return -EINVAL;
+
+ if (fmdev->curr_fmmode != FM_MODE_TX)
+ return -EPERM;
+
+ mod->txsubchans = ((fmdev->tx_data.aud_mode == FM_STEREO_MODE) ?
+ V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_MONO) |
+ ((fmdev->tx_data.rds.flag == FM_RDS_ENABLE) ? V4L2_TUNER_SUB_RDS : 0);
+
+ mod->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS;
+
+ return 0;
+}
+
+/* Set modulator attributes. If mode is not TX, set to TX. */
+static int fm_v4l2_vidioc_s_modulator(struct file *file, void *priv,
+ struct v4l2_modulator *mod)
+{
+ struct fmdrv_ops *fmdev = video_drvdata(file);
+ unsigned char rds_mode;
+ unsigned short aud_mode;
+ int ret;
+
+ if (mod->index != 0)
+ return -EINVAL;
+
+ if (fmdev->curr_fmmode != FM_MODE_TX) {
+ ret = fmc_set_mode(fmdev, FM_MODE_TX);
+ if (ret != 0) {
+ pr_err("(fmdrv): Failed to set TX mode; unable to "
+ "set modulator attributes\n");
+ return ret;
+ }
+ }
+
+ aud_mode = (mod->txsubchans & V4L2_TUNER_SUB_STEREO) ?
+ FM_STEREO_MODE : FM_MONO_MODE;
+ rds_mode = (mod->txsubchans & V4L2_TUNER_SUB_RDS) ?
+ FM_RDS_ENABLE : FM_RDS_DISABLE;
+ ret = fm_tx_set_stereo_mono(fmdev, aud_mode);
+ if (ret < 0) {
+ pr_err("(fmdrv): Failed to set mono/stereo mode for TX\n");
+ return ret;
+ }
+ ret = fm_tx_set_rds_mode(fmdev, rds_mode);
+ if (ret < 0)
+ pr_err("(fmdrv): Failed to set rds mode for TX\n");
-exit:
return ret;
}
@@ -518,13 +659,17 @@ static const struct v4l2_ioctl_ops fm_drv_ioctl_ops = {
.vidioc_queryctrl = fm_v4l2_vidioc_queryctrl,
.vidioc_g_ctrl = fm_v4l2_vidioc_g_ctrl,
.vidioc_s_ctrl = fm_v4l2_vidioc_s_ctrl,
+ .vidioc_g_ext_ctrls = fm_v4l2_vidioc_g_ext_ctrls,
+ .vidioc_s_ext_ctrls = fm_v4l2_vidioc_s_ext_ctrls,
.vidioc_g_audio = fm_v4l2_vidioc_g_audio,
.vidioc_s_audio = fm_v4l2_vidioc_s_audio,
.vidioc_g_tuner = fm_v4l2_vidioc_g_tuner,
.vidioc_s_tuner = fm_v4l2_vidioc_s_tuner,
.vidioc_g_frequency = fm_v4l2_vidioc_g_frequency,
.vidioc_s_frequency = fm_v4l2_vidioc_s_frequency,
- .vidioc_s_hw_freq_seek = fm_v4l2_vidioc_s_hw_freq_seek
+ .vidioc_s_hw_freq_seek = fm_v4l2_vidioc_s_hw_freq_seek,
+ .vidioc_g_modulator = fm_v4l2_vidioc_g_modulator,
+ .vidioc_s_modulator = fm_v4l2_vidioc_s_modulator
};
/* V4L2 RADIO device parent structure */
@@ -537,14 +682,12 @@ static struct video_device fm_viddev_template = {
int fm_v4l2_init_video_device(struct fmdrv_ops *fmdev, int radio_nr)
{
- int ret = -ENOMEM;
- gradio_dev = NULL;
/* Allocate new video device */
gradio_dev = video_device_alloc();
if (NULL == gradio_dev) {
- pr_err("(fmdrv): Can't allocate video device");
- goto exit;
+ pr_err("(fmdrv): Can't allocate video device\n");
+ return -ENOMEM;
}
/* Setup FM driver's V4L2 properties */
@@ -555,15 +698,13 @@ int fm_v4l2_init_video_device(struct fmdrv_ops *fmdev, int radio_nr)
/* Register with V4L2 subsystem as RADIO device */
if (video_register_device(gradio_dev, VFL_TYPE_RADIO, radio_nr)) {
video_device_release(gradio_dev);
- pr_err("(fmdrv): Could not register video device");
- goto exit;
+ pr_err("(fmdrv): Could not register video device\n");
+ return -ENOMEM;
}
fmdev->radio_dev = gradio_dev;
- ret = 0;
-exit:
- return ret;
+ return 0;
}
void *fm_v4l2_deinit_video_device(void)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 23:21:34 +0000