--- v4l-dvb/linux/drivers/media/dvb/frontends/zl10353.c 2006-06-30 19:59:10.000000000 +0400
+++ mp-bc1/linux/drivers/media/dvb/frontends/zl10353.c 2006-07-23 11:41:33.000000000 +0400
@@ -149,15 +149,75 @@ static int zl10353_set_parameters(struct
// if there is no attached secondary tuner, we call set_params to program
// a potential tuner attached somewhere else
if (state->config.no_tuner) {
+ if (fe->ops.tuner_ops.set_params_compat) {
+ fe->ops.tuner_ops.set_params_compat(fe, param);
+ if (fe->ops.i2c_gate_ctrl)
+ fe->ops.i2c_gate_ctrl(fe, 0);
+ }
+ }
+
+ // if pllbuf is defined, retrieve the settings
+ if (fe->ops.tuner_ops.calc_regs_compat) {
+ fe->ops.tuner_ops.calc_regs_compat(fe, param, pllbuf+1, 5);
+ pllbuf[1] <<= 1;
+ } else {
+ // fake pllbuf settings
+ pllbuf[1] = 0x61 << 1;
+ pllbuf[2] = 0;
+ pllbuf[3] = 0;
+ pllbuf[3] = 0;
+ pllbuf[4] = 0;
+ }
+
+ // there is no call to _just_ start decoding, so we send the pllbuf anyway
+ // even if there isn't a PLL attached to the secondary bus
+ zl10353_write(fe, pllbuf, sizeof (pllbuf));
+
+ zl10353_single_write(fe, 0x70, 0x01);
+ udelay(250);
+ zl10353_single_write(fe, 0xE4, 0x00);
+ zl10353_single_write(fe, 0xE5, 0x2A);
+ zl10353_single_write(fe, 0xE9, 0x02);
+ zl10353_single_write(fe, 0xE7, 0x40);
+ zl10353_single_write(fe, 0xE8, 0x10);
+
+ return 0;
+}
+
+static int zl10353_set_params(struct dvb_frontend *fe,
+ struct dvbfe_params *param)
+{
+ struct zl10353_state *state = fe->demodulator_priv;
+
+ u8 pllbuf[6] = { 0x67 };
+
+ /* These settings set "auto-everything" and start the FSM. */
+ zl10353_single_write(fe, 0x55, 0x80);
+ udelay(200);
+ zl10353_single_write(fe, 0xEA, 0x01);
+ udelay(200);
+ zl10353_single_write(fe, 0xEA, 0x00);
+
+ zl10353_single_write(fe, 0x56, 0x28);
+ zl10353_single_write(fe, 0x89, 0x20);
+ zl10353_single_write(fe, 0x5E, 0x00);
+ zl10353_single_write(fe, 0x65, 0x5A);
+ zl10353_single_write(fe, 0x66, 0xE9);
+ zl10353_single_write(fe, 0x62, 0x0A);
+
+ // if there is no attached secondary tuner, we call set_params to program
+ // a potential tuner attached somewhere else
+ if (state->config.no_tuner) {
if (fe->ops.tuner_ops.set_params) {
fe->ops.tuner_ops.set_params(fe, param);
- if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
+ if (fe->ops.i2c_gate_ctrl)
+ fe->ops.i2c_gate_ctrl(fe, 0);
}
}
// if pllbuf is defined, retrieve the settings
if (fe->ops.tuner_ops.calc_regs) {
- fe->ops.tuner_ops.calc_regs(fe, param, pllbuf+1, 5);
+ fe->ops.tuner_ops.calc_regs(fe, param, pllbuf + 1, 5);
pllbuf[1] <<= 1;
} else {
// fake pllbuf settings
@@ -170,7 +230,7 @@ static int zl10353_set_parameters(struct
// there is no call to _just_ start decoding, so we send the pllbuf anyway
// even if there isn't a PLL attached to the secondary bus
- zl10353_write(fe, pllbuf, sizeof(pllbuf));
+ zl10353_write(fe, pllbuf, sizeof (pllbuf));
zl10353_single_write(fe, 0x70, 0x01);
udelay(250);
@@ -302,6 +362,40 @@ error:
return NULL;
}
+static struct dvbfe_info dvbt_info = {
+ .name = "Zarlink ZL10353 DVB-T",
+ .delivery = DVBFE_DELSYS_DVBT,
+ .delsys = {
+ .dvbt.modulation = DVBFE_MOD_OFDM,
+ .dvbt.stream_priority = DVBFE_STREAM_PRIORITY_HP |
+ DVBFE_STREAM_PRIORITY_LP,
+ },
+
+ .frequency_min = 174000000,
+ .frequency_max = 862000000,
+ .frequency_step = 166667,
+ .frequency_tolerance = 0,
+};
+
+static int zl10353_get_info(struct dvb_frontend *fe, struct dvbfe_info *fe_info)
+{
+ memcpy(fe_info, &dvbt_info, sizeof (dvbt_info));
+
+ return 0;
+}
+
+static int zl10353_get_delsys(struct dvb_frontend *fe, enum dvbfe_delsys *fe_delsys)
+{
+ *fe_delsys = DVBFE_DELSYS_DVBT;
+
+ return 0;
+}
+
+static enum dvbfe_algo zl10353_get_algo(struct dvb_frontend *fe)
+{
+ return DVBFE_ALGO_RECOVERY;
+}
+
static struct dvb_frontend_ops zl10353_ops = {
.info = {
@@ -330,6 +424,11 @@ static struct dvb_frontend_ops zl10353_o
.read_status = zl10353_read_status,
.read_snr = zl10353_read_snr,
+
+ .set_params = zl10353_set_params,
+ .get_info = zl10353_get_info,
+ .get_delsys = zl10353_get_delsys,
+ .get_frontend_algo = zl10353_get_algo,
};
#if 1
_______________________________________________
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
