---

yaml --- r: 124048 b: refs/heads/master c: ecdec31 h: refs/heads/master v: v3
git-mirror · Dec 29, 2008 · 3edabf9 · 3edabf9
1 parent 9926ae8
commit 3edabf9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db1d3b80b3d077b6d5936f2afef3e5a84d302c1a
+refs/heads/master: ecdec311806220d6e88e3ac52936cc30e1580810
diff --git a/trunk/drivers/media/dvb/frontends/stb0899_drv.h b/trunk/drivers/media/dvb/frontends/stb0899_drv.h
@@ -44,13 +44,21 @@ 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;
 	const struct stb0899_s1_reg	*init_s1_demod;
 	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;

diff --git a/trunk/drivers/media/dvb/frontends/stb0899_priv.h b/trunk/drivers/media/dvb/frontends/stb0899_priv.h
@@ -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,

diff --git a/trunk/drivers/media/dvb/ttpci/budget-av.c b/trunk/drivers/media/dvb/ttpci/budget-av.c
@@ -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,

diff --git a/trunk/drivers/media/dvb/ttpci/budget-ci.c b/trunk/drivers/media/dvb/ttpci/budget-ci.c
@@ -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,