Commit ecdec311 authored by Manu Abraham's avatar Manu Abraham Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9401): Code Simplification



Use an enumeration for I/Q Swap rather than an int,
easier to spot the nasty ones

Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent db1d3b80
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ struct stb0899_s2_reg {
	u32	data;
};

enum stb0899_inversion {
	IQ_SWAP_OFF	= 0,
	IQ_SWAP_ON,
	IQ_SWAP_AUTO
};

struct stb0899_config {
	const struct stb0899_s1_reg	*init_dev;
	const struct stb0899_s2_reg	*init_s2_demod;
@@ -51,6 +57,8 @@ struct stb0899_config {
	const struct stb0899_s2_reg	*init_s2_fec;
	const struct stb0899_s1_reg	*init_tst;

	enum stb0899_inversion		inversion;

	u32	xtal_freq;

	u8	demod_address;
@@ -65,7 +73,7 @@ struct stb0899_config {
	u8	data_fifo_mode;
	u8	out_rate_comp;
	u8	i2c_repeater;
	int	inversion;
//	int	inversion;

	u32	esno_ave;
	u32	esno_quant;
+0 −6
Original line number Diff line number Diff line
@@ -137,12 +137,6 @@ enum stb0899_frame {
	STB0899_SHORT_FRAME
};

enum stb0899_inversion {
	IQ_SWAP_OFF	= 0,
	IQ_SWAP_ON,
	IQ_SWAP_AUTO
};

enum stb0899_alpha {
	RRC_20,
	RRC_25,
+1 −1
Original line number Diff line number Diff line
@@ -1451,7 +1451,7 @@ static struct stb0899_config knc1_dvbs2_config = {
//	.ts_pfbit_toggle	= STB0899_MPEG_NORMAL,	/* DirecTV, MPEG toggling seq	*/

	.xtal_freq		= 27000000,
	.inversion		= 1,
	.inversion		= IQ_SWAP_ON, /* 1 */

	.esno_ave		= KNC1_DVBS2_ESNO_AVE,
	.esno_quant		= KNC1_DVBS2_ESNO_QUANT,
+1 −1
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ static struct stb0899_config tt3200_config = {
	.demod_address 		= 0x68,

	.xtal_freq		= 27000000,
	.inversion		= 1,
	.inversion		= IQ_SWAP_ON, /* 1 */

	.esno_ave		= TT3200_DVBS2_ESNO_AVE,
	.esno_quant		= TT3200_DVBS2_ESNO_QUANT,