PATCH 44/44 multiproto + backward compatibility [B2C2]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




diff -Naurp v4l-dvb/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c mp-bc1/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
--- v4l-dvb/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c	2006-06-30 19:59:10.000000000 +0400
+++ mp-bc1/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c	2006-07-23 11:42:14.000000000 +0400
@@ -171,7 +171,7 @@ static int samsung_tbmu24112_set_symbol_
 	return 0;
 }
 
-static int samsung_tbmu24112_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static int samsung_tbmu24112_tuner_set_params_compat(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
 {
 	u8 buf[4];
 	u32 div;
@@ -195,6 +195,32 @@ static int samsung_tbmu24112_tuner_set_p
 	return 0;
 }
 
+static int samsung_tbmu24112_tuner_set_params(struct dvb_frontend* fe, struct dvbfe_params *params)
+{
+	u8 buf[4];
+	u32 div;
+	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
+	struct flexcop_device *fc = fe->dvb->priv;
+
+	printk(KERN_ERR "%s: Frequency=[%d]\n", __func__, params->frequency);
+	div = params->frequency / 125;
+
+	buf[0] = (div >> 8) & 0x7f;
+	buf[1] = div & 0xff;
+	buf[2] = 0x84;  /* 0xC4 */
+	buf[3] = 0x08;
+
+	if (params->frequency < 1500000)
+		buf[3] |= 0x10;
+
+	if (fe->ops.i2c_gate_ctrl)
+		fe->ops.i2c_gate_ctrl(fe, 1);
+	if (i2c_transfer(&fc->i2c_adap, &msg, 1) != 1)
+		return -EIO;
+
+	return 0;
+}
+
 static u8 samsung_tbmu24112_inittab[] = {
 	     0x01, 0x15,
 	     0x02, 0x30,
@@ -272,7 +298,35 @@ static int samsung_tdtc9251dh0_demod_ini
 	return 0;
 }
 
-static int samsung_tdtc9251dh0_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters *params, u8* pllbuf, int buf_len)
+static int samsung_tdtc9251dh0_calc_regs_compat(struct dvb_frontend* fe,
+						struct dvb_frontend_parameters *params,
+						u8* pllbuf, int buf_len)
+{
+	u32 div;
+	unsigned char bs = 0;
+
+	if (buf_len < 5)
+		return -EINVAL;
+
+	#define IF_FREQUENCYx6 217    /* 6 * 36.16666666667MHz */
+	div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
+
+	if (params->frequency >= 48000000 && params->frequency <= 154000000) bs = 0x09;
+	if (params->frequency >= 161000000 && params->frequency <= 439000000) bs = 0x0a;
+	if (params->frequency >= 447000000 && params->frequency <= 863000000) bs = 0x08;
+
+	pllbuf[0] = 0x61;
+	pllbuf[1] = div >> 8;
+	pllbuf[2] = div & 0xff;
+	pllbuf[3] = 0xcc;
+	pllbuf[4] = bs;
+
+	return 5;
+}
+
+static int samsung_tdtc9251dh0_calc_regs(struct dvb_frontend* fe,
+					 struct dvbfe_params *params,
+					 u8* pllbuf, int buf_len)
 {
 	u32 div;
 	unsigned char bs = 0;
@@ -307,7 +361,15 @@ static int flexcop_fe_request_firmware(s
 	return request_firmware(fw, name, fc->dev);
 }
 
-static int lgdt3303_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static int lgdt3303_tuner_set_params_compat(struct dvb_frontend* fe,
+					    struct dvb_frontend_parameters *params)
+{
+	struct flexcop_device *fc = fe->dvb->priv;
+	return lg_h06xf_pll_set_compat(fe, &fc->i2c_adap, params);
+}
+
+static int lgdt3303_tuner_set_params(struct dvb_frontend* fe,
+				     struct dvbfe_params *params)
 {
 	struct flexcop_device *fc = fe->dvb->priv;
 	return lg_h06xf_pll_set(fe, &fc->i2c_adap, params);
@@ -329,7 +391,33 @@ static struct bcm3510_config air2pc_atsc
 	.request_firmware = flexcop_fe_request_firmware,
 };
 
-static int skystar23_samsung_tbdu18132_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static int skystar23_samsung_tbdu18132_tuner_set_params_compat(struct dvb_frontend* fe,
+							       struct dvb_frontend_parameters *params)
+{
+	u8 buf[4];
+	u32 div;
+	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
+	struct flexcop_device *fc = fe->dvb->priv;
+
+	div = (params->frequency + (125/2)) / 125;
+
+	buf[0] = (div >> 8) & 0x7f;
+	buf[1] = (div >> 0) & 0xff;
+	buf[2] = 0x84 | ((div >> 10) & 0x60);
+	buf[3] = 0x80;
+
+	if (params->frequency < 1550000)
+		buf[3] |= 0x02;
+
+	if (fe->ops.i2c_gate_ctrl)
+		fe->ops.i2c_gate_ctrl(fe, 1);
+	if (i2c_transfer(&fc->i2c_adap, &msg, 1) != 1)
+		return -EIO;
+	return 0;
+}
+
+static int skystar23_samsung_tbdu18132_tuner_set_params(struct dvb_frontend* fe,
+							struct dvbfe_params *params)
 {
 	u8 buf[4];
 	u32 div;
@@ -358,7 +446,7 @@ static struct mt312_config skystar23_sam
 	.demod_address = 0x0e,
 };
 
-static int alps_tdee4_stv0297_tuner_set_params(struct dvb_frontend* fe,
+static int alps_tdee4_stv0297_tuner_set_params_compat(struct dvb_frontend* fe,
 					       struct dvb_frontend_parameters *fep)
 {
 	struct flexcop_device *fc = fe->dvb->priv;
@@ -403,6 +491,51 @@ static int alps_tdee4_stv0297_tuner_set_
 	return 0;
 }
 
+static int alps_tdee4_stv0297_tuner_set_params(struct dvb_frontend *fe,
+					       struct dvbfe_params *fep)
+{
+	struct flexcop_device *fc = fe->dvb->priv;
+	u8 buf[4];
+	u16 div;
+	int ret;
+
+/*  62.5 kHz * 10 */
+#define REF_FREQ    625
+#define FREQ_OFFSET 36125
+
+	div = ((fep->frequency/1000 + FREQ_OFFSET ) * 10)  / REF_FREQ; // 4 MHz = 4000 KHz
+
+	buf[0] = (u8)( div >> 8) & 0x7f;
+	buf[1] = (u8)        div & 0xff;
+
+/* F(osc) = N * Reference Freq. (62.5 kHz)
+ * byte 2 :  0 N14 N13 N12 N11 N10 N9  N8
+ * byte 3 : N7 N6  N5  N4  N3  N2  N1  N0
+ * byte 4 : 1  *   *   AGD R3  R2  R1  R0
+ * byte 5 : C1 *   RE  RTS BS4 BS3 BS2 BS1
+ * AGD = 1, R3 R2 R1 R0 = 0 1 0 1 => byte 4 = 1**10101 = 0x95 */
+	buf[2] = 0x95;
+
+// Range(MHz)  C1 *  RE RTS BS4 BS3 BS2 BS1  Byte 5
+//  47 - 153   0  *  0   0   0   0   0   1   0x01
+// 153 - 430   0  *  0   0   0   0   1   0   0x02
+// 430 - 822   0  *  0   0   1   0   0   0   0x08
+// 822 - 862   1  *  0   0   1   0   0   0   0x88
+
+	     if (fep->frequency <= 153000000) buf[3] = 0x01;
+	else if (fep->frequency <= 430000000) buf[3] = 0x02;
+	else if (fep->frequency <= 822000000) buf[3] = 0x08;
+	else buf[3] = 0x88;
+
+	if (fe->ops.i2c_gate_ctrl)
+		fe->ops.i2c_gate_ctrl(fe, 1);
+	deb_tuner("tuner buffer for %d Hz: %x %x %x %x\n",fep->frequency, buf[0],buf[1],buf[2],buf[3]);
+	ret = fc->i2c_request(fc,FC_WRITE,FC_I2C_PORT_TUNER,0x61,buf[0],&buf[1],3);
+	deb_tuner("tuner write returned: %d\n",ret);
+
+	return 0;
+}
+
 #ifndef STV0297_CS2
 static u8 alps_tdee4_stv0297_inittab[] = {
 	0x80, 0x01,
@@ -518,9 +651,8 @@ int flexcop_frontend_init(struct flexcop
 	/* try the sky v2.6 (stv0299/Samsung tbmu24112(sl1935)) */
 	if ((fc->fe = stv0299_attach(&samsung_tbmu24112_config, &fc->i2c_adap)) != NULL) {
 		ops = &fc->fe->ops;
-
+		ops->tuner_ops.set_params_compat = samsung_tbmu24112_tuner_set_params_compat;
 		ops->tuner_ops.set_params = samsung_tbmu24112_tuner_set_params;
-
 		ops->set_voltage = flexcop_set_voltage;
 
 		fc->fe_sleep             = ops->sleep;
@@ -532,6 +664,7 @@ int flexcop_frontend_init(struct flexcop
 	/* try the air dvb-t (mt352/Samsung tdtc9251dh0(??)) */
 	if ((fc->fe = mt352_attach(&samsung_tdtc9251dh0_config, &fc->i2c_adap)) != NULL ) {
 		fc->dev_type          = FC_AIR_DVB;
+		fc->fe->ops.tuner_ops.calc_regs_compat = samsung_tdtc9251dh0_calc_regs_compat;
 		fc->fe->ops.tuner_ops.calc_regs = samsung_tdtc9251dh0_calc_regs;
 		info("found the mt352 at i2c address: 0x%02x",samsung_tdtc9251dh0_config.demod_address);
 	} else
@@ -544,6 +677,7 @@ int flexcop_frontend_init(struct flexcop
 	/* try the air atsc 3nd generation (lgdt3303) */
 	if ((fc->fe = lgdt330x_attach(&air2pc_atsc_hd5000_config, &fc->i2c_adap)) != NULL) {
 		fc->dev_type          = FC_AIR_ATSC3;
+		fc->fe->ops.tuner_ops.set_params_compat = lgdt3303_tuner_set_params_compat;
 		fc->fe->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
 		info("found the lgdt3303 at i2c address: 0x%02x",air2pc_atsc_hd5000_config.demod_address);
 	} else
@@ -559,6 +693,7 @@ int flexcop_frontend_init(struct flexcop
 	if ((fc->fe = stv0297_attach(&alps_tdee4_stv0297_config, &fc->i2c_adap)) != NULL) {
 #endif
 		fc->dev_type                        = FC_CABLE;
+		fc->fe->ops.tuner_ops.set_params_compat = alps_tdee4_stv0297_tuner_set_params_compat;
 		fc->fe->ops.tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params;
 		info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address);
 	} else
@@ -566,6 +701,7 @@ int flexcop_frontend_init(struct flexcop
 	if ((fc->fe = vp310_mt312_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
 		ops = &fc->fe->ops;
 
+		ops->tuner_ops.set_params_compat = skystar23_samsung_tbdu18132_tuner_set_params_compat;
 		ops->tuner_ops.set_params = skystar23_samsung_tbdu18132_tuner_set_params;
 
 		ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;

_______________________________________________

linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb

[Index of Archives]     [Linux Media]     [Video 4 Linux]     [Asterisk]     [Samba]     [Xorg]     [Xfree86]     [Linux USB]

  Powered by Linux