UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] rtl2832_sdr: put complex U16 format behind module parameter 

Move emulated format behind module parameter as those are not
supported. Format conversions will be on library eventually.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Antti Palosaari 2014-07-14 21:11:12 -03:00 committed by Mauro Carvalho Chehab
parent 77bbb2b049
commit 2970c0d572
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/dvb-frontends/rtl2832_sdr.c
View File

@ -35,6 +35,10 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/math64.h> #include <linux/math64.h>
static bool rtl2832_sdr_emulated_fmt;
module_param_named(emulated_formats, rtl2832_sdr_emulated_fmt, bool, 0644);
MODULE_PARM_DESC(emulated_formats, "enable emulated formats (disappears in future)");
#define MAX_BULK_BUFS (10) #define MAX_BULK_BUFS (10)
#define BULK_BUFFER_SIZE (128 * 512) #define BULK_BUFFER_SIZE (128 * 512)
@ -84,10 +88,10 @@ struct rtl2832_sdr_format {
static struct rtl2832_sdr_format formats[] = { static struct rtl2832_sdr_format formats[] = {
{ {
.name = "IQ U8", .name = "Complex U8",
.pixelformat = V4L2_SDR_FMT_CU8, .pixelformat = V4L2_SDR_FMT_CU8,
}, { }, {
.name = "IQ U16LE (emulated)", .name = "Complex U16LE (emulated)",
.pixelformat = V4L2_SDR_FMT_CU16LE, .pixelformat = V4L2_SDR_FMT_CU16LE,
}, },
}; };
@ -139,6 +143,7 @@ struct rtl2832_sdr_state {
unsigned int f_adc, f_tuner; unsigned int f_adc, f_tuner;
u32 pixelformat; u32 pixelformat;
unsigned int num_formats;
/* Controls */ /* Controls */
struct v4l2_ctrl_handler hdl; struct v4l2_ctrl_handler hdl;
@ -1211,7 +1216,7 @@ static int rtl2832_sdr_enum_fmt_sdr_cap(struct file *file, void *priv,
dev_dbg(&s->udev->dev, "%s:\n", __func__); dev_dbg(&s->udev->dev, "%s:\n", __func__);
if (f->index >= NUM_FORMATS) if (f->index >= s->num_formats)
return -EINVAL; return -EINVAL;
strlcpy(f->description, formats[f->index].name, sizeof(f->description)); strlcpy(f->description, formats[f->index].name, sizeof(f->description));
@ -1247,7 +1252,7 @@ static int rtl2832_sdr_s_fmt_sdr_cap(struct file *file, void *priv,
return -EBUSY; return -EBUSY;
memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved)); memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved));
for (i = 0; i < NUM_FORMATS; i++) { for (i = 0; i < s->num_formats; i++) {
if (formats[i].pixelformat == f->fmt.sdr.pixelformat) { if (formats[i].pixelformat == f->fmt.sdr.pixelformat) {
s->pixelformat = f->fmt.sdr.pixelformat; s->pixelformat = f->fmt.sdr.pixelformat;
return 0; return 0;
@ -1270,7 +1275,7 @@ static int rtl2832_sdr_try_fmt_sdr_cap(struct file *file, void *priv,
(char *)&f->fmt.sdr.pixelformat); (char *)&f->fmt.sdr.pixelformat);
memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved)); memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved));
for (i = 0; i < NUM_FORMATS; i++) { for (i = 0; i < s->num_formats; i++) {
if (formats[i].pixelformat == f->fmt.sdr.pixelformat) if (formats[i].pixelformat == f->fmt.sdr.pixelformat)
return 0; return 0;
} }
@ -1414,6 +1419,9 @@ struct dvb_frontend *rtl2832_sdr_attach(struct dvb_frontend *fe,
s->f_adc = bands_adc[0].rangelow; s->f_adc = bands_adc[0].rangelow;
s->f_tuner = bands_fm[0].rangelow; s->f_tuner = bands_fm[0].rangelow;
s->pixelformat = V4L2_SDR_FMT_CU8; s->pixelformat = V4L2_SDR_FMT_CU8;
s->num_formats = NUM_FORMATS;
if (rtl2832_sdr_emulated_fmt == false)
s->num_formats -= 1;
mutex_init(&s->v4l2_lock); mutex_init(&s->v4l2_lock);
mutex_init(&s->vb_queue_lock); mutex_init(&s->vb_queue_lock);