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

Commit e3b152bc authored by Johannes Stezenbach's avatar Johannes Stezenbach Committed by Mauro Carvalho Chehab
Browse files

DVB (2446): Minor cleanups. 




- Minor cleanups.

Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
parent b79cb653

drivers/media/dvb/frontends/cx24123.c

+192 −46
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ static int debug; 
		if (debug) printk (KERN_DEBUG "cx24123: " args); \

	} while (0)



struct cx24123_state {



struct cx24123_state

{

	struct i2c_adapter* i2c;

	struct dvb_frontend_ops ops;

	const struct cx24123_config* config;
@@ -56,6 +56,148 @@ struct cx24123_state { 
	u32 currentsymbolrate;

};



/* Various tuner defaults need to be established for a given symbol rate Sps */

static struct

{

	u32 symbolrate_low;

	u32 symbolrate_high;

	u32 VCAslope;

	u32 VCAoffset;

	u32 VGA1offset;

	u32 VGA2offset;

	u32 VCAprogdata;

	u32 VGAprogdata;

} cx24123_AGC_vals[] =

{

	{

		.symbolrate_low		= 1000000,

		.symbolrate_high	= 4999999,

		.VCAslope		= 0x07,

		.VCAoffset		= 0x0f,

		.VGA1offset		= 0x1f8,

		.VGA2offset		= 0x1f8,

		.VGAprogdata		= (2 << 18) | (0x1f8 << 9) | 0x1f8,

		.VCAprogdata		= (4 << 18) | (0x07 << 9) | 0x07,

	},

	{

		.symbolrate_low		=  5000000,

		.symbolrate_high	= 14999999,

		.VCAslope		= 0x1f,

		.VCAoffset		= 0x1f,

		.VGA1offset		= 0x1e0,

		.VGA2offset		= 0x180,

		.VGAprogdata		= (2 << 18) | (0x180 << 9) | 0x1e0,

		.VCAprogdata		= (4 << 18) | (0x07 << 9) | 0x1f,

	},

	{

		.symbolrate_low		= 15000000,

		.symbolrate_high	= 45000000,

		.VCAslope		= 0x3f,

		.VCAoffset		= 0x3f,

		.VGA1offset		= 0x180,

		.VGA2offset		= 0x100,

		.VGAprogdata		= (2 << 18) | (0x100 << 9) | 0x180,

		.VCAprogdata		= (4 << 18) | (0x07 << 9) | 0x3f,

	},

};



/*

 * Various tuner defaults need to be established for a given frequency kHz.

 * fixme: The bounds on the bands do not match the doc in real life.

 * fixme: Some of them have been moved, other might need adjustment.

 */

static struct

{

	u32 freq_low;

	u32 freq_high;

	u32 bandselect;

	u32 VCOdivider;

	u32 VCOnumber;

	u32 progdata;

} cx24123_bandselect_vals[] =

{

	{

		.freq_low	= 950000,

		.freq_high	= 1018999,

		.bandselect	= 0x40,

		.VCOdivider	= 4,

		.VCOnumber	= 7,

		.progdata	= (0 << 18) | (0 << 9) | 0x40,

	},

	{

		.freq_low	= 1019000,

		.freq_high	= 1074999,

		.bandselect	= 0x80,

		.VCOdivider	= 4,

		.VCOnumber	= 8,

		.progdata	= (0 << 18) | (0 << 9) | 0x80,

	},

	{

		.freq_low	= 1075000,

		.freq_high	= 1227999,

		.bandselect	= 0x01,

		.VCOdivider	= 2,

		.VCOnumber	= 1,

		.progdata	= (0 << 18) | (1 << 9) | 0x01,

	},

	{

		.freq_low	= 1228000,

		.freq_high	= 1349999,

		.bandselect	= 0x02,

		.VCOdivider	= 2,

		.VCOnumber	= 2,

		.progdata	= (0 << 18) | (1 << 9) | 0x02,

	},

	{

		.freq_low	= 1350000,

		.freq_high	= 1481999,

		.bandselect	= 0x04,

		.VCOdivider	= 2,

		.VCOnumber	= 3,

		.progdata	= (0 << 18) | (1 << 9) | 0x04,

	},

	{

		.freq_low	= 1482000,

		.freq_high	= 1595999,

		.bandselect	= 0x08,

		.VCOdivider	= 2,

		.VCOnumber	= 4,

		.progdata	= (0 << 18) | (1 << 9) | 0x08,

	},

	{

		.freq_low	= 1596000,

		.freq_high	= 1717999,

		.bandselect	= 0x10,

		.VCOdivider	= 2,

		.VCOnumber	= 5,

		.progdata	= (0 << 18) | (1 << 9) | 0x10,

	},

	{

		.freq_low	= 1718000,

		.freq_high	= 1855999,

		.bandselect	= 0x20,

		.VCOdivider	= 2,

		.VCOnumber	= 6,

		.progdata	= (0 << 18) | (1 << 9) | 0x20,

	},

	{

		.freq_low	= 1856000,

		.freq_high	= 2035999,

		.bandselect	= 0x40,

		.VCOdivider	= 2,

		.VCOnumber	= 7,

		.progdata	= (0 << 18) | (1 << 9) | 0x40,

	},

	{

		.freq_low	= 2036000,

		.freq_high	= 2149999,

		.bandselect	= 0x80,

		.VCOdivider	= 2,

		.VCOnumber	= 8,

		.progdata	= (0 << 18) | (1 << 9) | 0x80,

	},

};



static struct {

	u8 reg;

	u8 data;
@@ -230,37 +372,41 @@ static int cx24123_set_fec(struct cx24123_state* state, fe_code_rate_t fec) 


static int cx24123_get_fec(struct cx24123_state* state, fe_code_rate_t *fec)

{

	int ret;

	u8 val;



	val = cx24123_readreg (state, 0x1b) & 0x07;

	ret = cx24123_readreg (state, 0x1b);

	if (ret < 0)

		return ret;

	val = ret & 0x07;

	switch (val) {

	case 1:

		*fec = FEC_1_2;

		return 0;

		break;

	case 3:

		*fec = FEC_2_3;

		return 0;

		break;

	case 4:

		*fec = FEC_3_4;

		return 0;

		break;

	case 5:

		*fec = FEC_4_5;

		return 0;

		break;

	case 6:

		*fec = FEC_5_6;

		return 0;

		break;

	case 7:

		*fec = FEC_7_8;

		return 0;

	case 2:	/* *fec=FEC_3_5; return 0; */

	case 0:	/* *fec=FEC_5_11; return 0; */

		break;

	case 2:	/* *fec = FEC_3_5; break; */

	case 0:	/* *fec = FEC_5_11; break; */

		*fec = FEC_AUTO;

		return 0;

		break;

	default:

		*fec=FEC_NONE; return 0;

		*fec = FEC_NONE; // can't happen

	}



	return -EREMOTEIO;

	return 0;

}



/* fixme: Symbol rates < 3MSps may not work because of precision loss */
@@ -605,7 +751,8 @@ static void cx24123_release(struct dvb_frontend* fe) 


static struct dvb_frontend_ops cx24123_ops;



struct dvb_frontend* cx24123_attach(const struct cx24123_config* config, struct i2c_adapter* i2c)

struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,

				    struct i2c_adapter* i2c)

{

	struct cx24123_state* state = NULL;

	int ret;
@@ -691,4 +838,3 @@ MODULE_AUTHOR("Steven Toth"); 
MODULE_LICENSE("GPL");



EXPORT_SYMBOL(cx24123_attach);

drivers/media/dvb/frontends/cx24123.h

+0 −143
Original line number Diff line number Diff line
@@ -36,150 +36,7 @@ struct cx24123_config 
	int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);

};



/* Various tuner defaults need to be established for a given symbol rate Sps */

struct

{

	u32 symbolrate_low;

	u32 symbolrate_high;

	u32 VCAslope;

	u32 VCAoffset;

	u32 VGA1offset;

	u32 VGA2offset;

	u32 VCAprogdata;

	u32 VGAprogdata;

} cx24123_AGC_vals[] =

{

	{

		.symbolrate_low		= 1000000,

		.symbolrate_high	= 4999999,

		.VCAslope		= 0x07,

		.VCAoffset		= 0x0f,

		.VGA1offset		= 0x1f8,

		.VGA2offset		= 0x1f8,

		.VGAprogdata		= (2 << 18) | (0x1f8 << 9) | 0x1f8,

		.VCAprogdata		= (4 << 18) | (0x07 << 9) | 0x07,

	},

	{

		.symbolrate_low		=  5000000,

		.symbolrate_high	= 14999999,

		.VCAslope		= 0x1f,

		.VCAoffset		= 0x1f,

		.VGA1offset		= 0x1e0,

		.VGA2offset		= 0x180,

		.VGAprogdata		= (2 << 18) | (0x180 << 9) | 0x1e0,

		.VCAprogdata		= (4 << 18) | (0x07 << 9) | 0x1f,

	},

	{

		.symbolrate_low		= 15000000,

		.symbolrate_high	= 45000000,

		.VCAslope		= 0x3f,

		.VCAoffset		= 0x3f,

		.VGA1offset		= 0x180,

		.VGA2offset		= 0x100,

		.VGAprogdata		= (2 << 18) | (0x100 << 9) | 0x180,

		.VCAprogdata		= (4 << 18) | (0x07 << 9) | 0x3f,

	},

};



/*

 * Various tuner defaults need to be established for a given frequency kHz.

 * fixme: The bounds on the bands do not match the doc in real life.

 * fixme: Some of them have been moved, other might need adjustment.

 */

struct

{

	u32 freq_low;

	u32 freq_high;

	u32 bandselect;

	u32 VCOdivider;

	u32 VCOnumber;

	u32 progdata;

} cx24123_bandselect_vals[] =

{

	{

		.freq_low	= 950000,

		.freq_high	= 1018999,

		.bandselect	= 0x40,

		.VCOdivider	= 4,

		.VCOnumber	= 7,

		.progdata	= (0 << 18) | (0 << 9) | 0x40,

	},

	{

		.freq_low	= 1019000,

		.freq_high	= 1074999,

		.bandselect	= 0x80,

		.VCOdivider	= 4,

		.VCOnumber	= 8,

		.progdata	= (0 << 18) | (0 << 9) | 0x80,

	},

	{

		.freq_low	= 1075000,

		.freq_high	= 1227999,

		.bandselect	= 0x01,

		.VCOdivider	= 2,

		.VCOnumber	= 1,

		.progdata	= (0 << 18) | (1 << 9) | 0x01,

	},

	{

		.freq_low	= 1228000,

		.freq_high	= 1349999,

		.bandselect	= 0x02,

		.VCOdivider	= 2,

		.VCOnumber	= 2,

		.progdata	= (0 << 18) | (1 << 9) | 0x02,

	},

	{

		.freq_low	= 1350000,

		.freq_high	= 1481999,

		.bandselect	= 0x04,

		.VCOdivider	= 2,

		.VCOnumber	= 3,

		.progdata	= (0 << 18) | (1 << 9) | 0x04,

	},

	{

		.freq_low	= 1482000,

		.freq_high	= 1595999,

		.bandselect	= 0x08,

		.VCOdivider	= 2,

		.VCOnumber	= 4,

		.progdata	= (0 << 18) | (1 << 9) | 0x08,

	},

	{

		.freq_low	= 1596000,

		.freq_high	= 1717999,

		.bandselect	= 0x10,

		.VCOdivider	= 2,

		.VCOnumber	= 5,

		.progdata	= (0 << 18) | (1 << 9) | 0x10,

	},

	{

		.freq_low	= 1718000,

		.freq_high	= 1855999,

		.bandselect	= 0x20,

		.VCOdivider	= 2,

		.VCOnumber	= 6,

		.progdata	= (0 << 18) | (1 << 9) | 0x20,

	},

	{

		.freq_low	= 1856000,

		.freq_high	= 2035999,

		.bandselect	= 0x40,

		.VCOdivider	= 2,

		.VCOnumber	= 7,

		.progdata	= (0 << 18) | (1 << 9) | 0x40,

	},

	{

		.freq_low	= 2036000,

		.freq_high	= 2149999,

		.bandselect	= 0x80,

		.VCOdivider	= 2,

		.VCOnumber	= 8,

		.progdata	= (0 << 18) | (1 << 9) | 0x80,

	},

};



extern struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,

					   struct i2c_adapter* i2c);



#endif /* CX24123_H */