Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2970c0d5 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 77bbb2b0

drivers/media/dvb-frontends/rtl2832_sdr.c

+13 −5
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ 
#include <linux/jiffies.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 BULK_BUFFER_SIZE         (128 * 512)
@@ -84,10 +88,10 @@ struct rtl2832_sdr_format { 


static struct rtl2832_sdr_format formats[] = {

	{

		.name		= "IQ U8",

		.name		= "Complex U8",

		.pixelformat	=  V4L2_SDR_FMT_CU8,

	}, {

		.name		= "IQ U16LE (emulated)",

		.name		= "Complex U16LE (emulated)",

		.pixelformat	= V4L2_SDR_FMT_CU16LE,

	},

};
@@ -139,6 +143,7 @@ struct rtl2832_sdr_state { 


	unsigned int f_adc, f_tuner;

	u32 pixelformat;

	unsigned int num_formats;



	/* Controls */

	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__);



	if (f->index >= NUM_FORMATS)

	if (f->index >= s->num_formats)

		return -EINVAL;



	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;



	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) {

			s->pixelformat = f->fmt.sdr.pixelformat;

			return 0;
@@ -1270,7 +1275,7 @@ static int rtl2832_sdr_try_fmt_sdr_cap(struct file *file, void *priv, 
			(char *)&f->fmt.sdr.pixelformat);



	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)

			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_tuner = bands_fm[0].rangelow;

	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->vb_queue_lock);