summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends/tda1004x.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/frontends/tda1004x.c')
-rw-r--r--linux/drivers/media/dvb/frontends/tda1004x.c1188
1 files changed, 422 insertions, 766 deletions
diff --git a/linux/drivers/media/dvb/frontends/tda1004x.c b/linux/drivers/media/dvb/frontends/tda1004x.c
index a5672b35b..39ea5adc6 100644
--- a/linux/drivers/media/dvb/frontends/tda1004x.c
+++ b/linux/drivers/media/dvb/frontends/tda1004x.c
@@ -1,5 +1,5 @@
/*
- Driver for Philips tda1004xh OFDM Frontend
+ Driver for Philips tda1004xh OFDM Demodulator
(c) 2003, 2004 Andrew de Quincey & Robert Schlabbach
@@ -32,23 +32,35 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/device.h>
-#include <linux/firmware.h>
-
#include "dvb_frontend.h"
+#include "tda1004x.h"
-#define FRONTEND_NAME "dvbfe_tda1004x"
+#define TDA1004X_DEMOD_TDA10045 0
+#define TDA1004X_DEMOD_TDA10046 1
-#define dprintk(args...) \
- do { \
- if (debug) printk(KERN_DEBUG FRONTEND_NAME ": " args); \
- } while (0)
-static int debug;
+struct tda1004x_state
+{
+ struct i2c_adapter* i2c;
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
+ struct dvb_frontend_ops ops;
-#define MC44BC374_ADDRESS 0x65
+ const struct tda1004x_config* config;
+
+ struct dvb_frontend frontend;
+
+ /* private demod data */
+ u8 initialised:1;
+
+ u8 demod_type;
+};
+
+
+static int debug;
+#define dprintk(args...) \
+ do { \
+ if (debug) printk(KERN_DEBUG "tda1004x: " args); \
+ } while (0)
#define TDA1004X_CHIPID 0x00
#define TDA1004X_AUTO 0x01
@@ -128,53 +140,7 @@ MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
#define TDA10046H_CODE_IN 0x58
-#define FE_TYPE_TDA10045H 0
-#define FE_TYPE_TDA10046H 1
-
-#define TUNER_TYPE_TD1344 0
-#define TUNER_TYPE_TD1316 1
-
-static struct dvb_frontend_info tda10045h_info = {
- .name = "Philips TDA10045H",
- .type = FE_OFDM,
- .frequency_min = 51000000,
- .frequency_max = 858000000,
- .frequency_stepsize = 166667,
- .caps =
- FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
- FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
- FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
- FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO
-};
-
-static struct dvb_frontend_info tda10046h_info = {
- .name = "Philips TDA10046H",
- .type = FE_OFDM,
- .frequency_min = 51000000,
- .frequency_max = 858000000,
- .frequency_stepsize = 166667,
- .caps =
- FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
- FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
- FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
- FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO
-};
-
-struct tda1004x_state {
- u8 tda1004x_address;
- u8 tuner_address;
- u8 initialised;
- u8 tuner_type;
- u8 fe_type;
- struct i2c_adapter *i2c;
- struct dvb_adapter *dvb;
-
- int dspCodeCounterReg;
- int dspCodeInReg;
- int dspVersion;
-};
-
-static int tda1004x_write_byte(struct i2c_adapter *i2c, struct tda1004x_state *tda_state, int reg, int data)
+static int tda1004x_write_byteI(struct tda1004x_state *state, int reg, int data)
{
int ret;
u8 buf[] = { reg, data };
@@ -182,8 +148,8 @@ static int tda1004x_write_byte(struct i2c_adapter *i2c, struct tda1004x_state *t
dprintk("%s: reg=0x%x, data=0x%x\n", __FUNCTION__, reg, data);
- msg.addr = tda_state->tda1004x_address;
- ret = i2c_transfer(i2c, &msg, 1);
+ msg.addr = state->config->demod_address;
+ ret = i2c_transfer(state->i2c, &msg, 1);
if (ret != 1)
dprintk("%s: error reg=0x%x, data=0x%x, ret=%i\n",
@@ -194,7 +160,7 @@ static int tda1004x_write_byte(struct i2c_adapter *i2c, struct tda1004x_state *t
return (ret != 1) ? -1 : 0;
}
-static int tda1004x_read_byte(struct i2c_adapter *i2c, struct tda1004x_state *tda_state, int reg)
+static int tda1004x_read_byte(struct tda1004x_state *state, int reg)
{
int ret;
u8 b0[] = { reg };
@@ -204,9 +170,9 @@ static int tda1004x_read_byte(struct i2c_adapter *i2c, struct tda1004x_state *td
dprintk("%s: reg=0x%x\n", __FUNCTION__, reg);
- msg[0].addr = tda_state->tda1004x_address;
- msg[1].addr = tda_state->tda1004x_address;
- ret = i2c_transfer(i2c, msg, 2);
+ msg[0].addr = state->config->demod_address;
+ msg[1].addr = state->config->demod_address;
+ ret = i2c_transfer(state->i2c, msg, 2);
if (ret != 2) {
dprintk("%s: error reg=0x%x, ret=%i\n", __FUNCTION__, reg,
@@ -219,14 +185,14 @@ static int tda1004x_read_byte(struct i2c_adapter *i2c, struct tda1004x_state *td
return b1[0];
}
-static int tda1004x_write_mask(struct i2c_adapter *i2c, struct tda1004x_state *tda_state, int reg, int mask, int data)
+static int tda1004x_write_mask(struct tda1004x_state *state, int reg, int mask, int data)
{
int val;
dprintk("%s: reg=0x%x, mask=0x%x, data=0x%x\n", __FUNCTION__, reg,
mask, data);
// read a byte and check
- val = tda1004x_read_byte(i2c, tda_state, reg);
+ val = tda1004x_read_byte(state, reg);
if (val < 0)
return val;
@@ -235,10 +201,10 @@ static int tda1004x_write_mask(struct i2c_adapter *i2c, struct tda1004x_state *t
val |= data & 0xff;
// write it out again
- return tda1004x_write_byte(i2c, tda_state, reg, val);
+ return tda1004x_write_byteI(state, reg, val);
}
-static int tda1004x_write_buf(struct i2c_adapter *i2c, struct tda1004x_state *tda_state, int reg, unsigned char *buf, int len)
+static int tda1004x_write_buf(struct tda1004x_state *state, int reg, unsigned char *buf, int len)
{
int i;
int result;
@@ -247,7 +213,7 @@ static int tda1004x_write_buf(struct i2c_adapter *i2c, struct tda1004x_state *td
result = 0;
for (i = 0; i < len; i++) {
- result = tda1004x_write_byte(i2c, tda_state, reg + i, buf[i]);
+ result = tda1004x_write_byteI(state, reg + i, buf[i]);
if (result != 0)
break;
}
@@ -255,25 +221,24 @@ static int tda1004x_write_buf(struct i2c_adapter *i2c, struct tda1004x_state *td
return result;
}
-static int tda1004x_enable_tuner_i2c(struct i2c_adapter *i2c, struct tda1004x_state *tda_state)
+static int tda1004x_enable_tuner_i2c(struct tda1004x_state *state)
{
int result;
dprintk("%s\n", __FUNCTION__);
- result = tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 2, 2);
+ result = tda1004x_write_mask(state, TDA1004X_CONFC4, 2, 2);
msleep(1);
return result;
}
-static int tda1004x_disable_tuner_i2c(struct i2c_adapter *i2c, struct tda1004x_state *tda_state)
+static int tda1004x_disable_tuner_i2c(struct tda1004x_state *state)
{
dprintk("%s\n", __FUNCTION__);
- return tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 2, 0);
+ return tda1004x_write_mask(state, TDA1004X_CONFC4, 2, 0);
}
-static int tda10045h_set_bandwidth(struct i2c_adapter *i2c,
- struct tda1004x_state *tda_state,
+static int tda10045h_set_bandwidth(struct tda1004x_state *state,
fe_bandwidth_t bandwidth)
{
static u8 bandwidth_6mhz[] = { 0x02, 0x00, 0x3d, 0x00, 0x60, 0x1e, 0xa7, 0x45, 0x4f };
@@ -282,31 +247,27 @@ static int tda10045h_set_bandwidth(struct i2c_adapter *i2c,
switch (bandwidth) {
case BANDWIDTH_6_MHZ:
- tda1004x_write_byte(i2c, tda_state, TDA1004X_DSSPARE2, 0x14);
- tda1004x_write_buf(i2c, tda_state, TDA10045H_CONFPLL_P, bandwidth_6mhz, sizeof(bandwidth_6mhz));
+ tda1004x_write_buf(state, TDA10045H_CONFPLL_P, bandwidth_6mhz, sizeof(bandwidth_6mhz));
break;
case BANDWIDTH_7_MHZ:
- tda1004x_write_byte(i2c, tda_state, TDA1004X_DSSPARE2, 0x80);
- tda1004x_write_buf(i2c, tda_state, TDA10045H_CONFPLL_P, bandwidth_7mhz, sizeof(bandwidth_7mhz));
+ tda1004x_write_buf(state, TDA10045H_CONFPLL_P, bandwidth_7mhz, sizeof(bandwidth_7mhz));
break;
case BANDWIDTH_8_MHZ:
- tda1004x_write_byte(i2c, tda_state, TDA1004X_DSSPARE2, 0x14);
- tda1004x_write_buf(i2c, tda_state, TDA10045H_CONFPLL_P, bandwidth_8mhz, sizeof(bandwidth_8mhz));
+ tda1004x_write_buf(state, TDA10045H_CONFPLL_P, bandwidth_8mhz, sizeof(bandwidth_8mhz));
break;
default:
return -EINVAL;
}
- tda1004x_write_byte(i2c, tda_state, TDA10045H_IOFFSET, 0);
+ tda1004x_write_byteI(state, TDA10045H_IOFFSET, 0);
return 0;
}
-static int tda10046h_set_bandwidth(struct i2c_adapter *i2c,
- struct tda1004x_state *tda_state,
+static int tda10046h_set_bandwidth(struct tda1004x_state *state,
fe_bandwidth_t bandwidth)
{
static u8 bandwidth_6mhz[] = { 0x80, 0x15, 0xfe, 0xab, 0x8e };
@@ -315,18 +276,15 @@ static int tda10046h_set_bandwidth(struct i2c_adapter *i2c,
switch (bandwidth) {
case BANDWIDTH_6_MHZ:
- tda1004x_write_buf(i2c, tda_state, TDA10046H_TIME_WREF1, bandwidth_6mhz, sizeof(bandwidth_6mhz));
- tda1004x_write_byte(i2c, tda_state, TDA1004X_DSSPARE2, 0);
+ tda1004x_write_buf(state, TDA10046H_TIME_WREF1, bandwidth_6mhz, sizeof(bandwidth_6mhz));
break;
case BANDWIDTH_7_MHZ:
- tda1004x_write_buf(i2c, tda_state, TDA10046H_TIME_WREF1, bandwidth_7mhz, sizeof(bandwidth_7mhz));
- tda1004x_write_byte(i2c, tda_state, TDA1004X_DSSPARE2, 0);
+ tda1004x_write_buf(state, TDA10046H_TIME_WREF1, bandwidth_7mhz, sizeof(bandwidth_7mhz));
break;
case BANDWIDTH_8_MHZ:
- tda1004x_write_buf(i2c, tda_state, TDA10046H_TIME_WREF1, bandwidth_8mhz, sizeof(bandwidth_8mhz));
- tda1004x_write_byte(i2c, tda_state, TDA1004X_DSSPARE2, 0xFF);
+ tda1004x_write_buf(state, TDA10046H_TIME_WREF1, bandwidth_8mhz, sizeof(bandwidth_8mhz));
break;
default:
@@ -336,7 +294,9 @@ static int tda10046h_set_bandwidth(struct i2c_adapter *i2c,
return 0;
}
-static int tda1004x_do_upload(struct i2c_adapter *i2c, struct tda1004x_state *state, unsigned char *mem, unsigned int len)
+static int tda1004x_do_upload(struct tda1004x_state *state,
+ unsigned char *mem, unsigned int len,
+ u8 dspCodeCounterReg, u8 dspCodeInReg)
{
u8 buf[65];
struct i2c_msg fw_msg = {.addr = 0,.flags = 0,.buf = buf,.len = 0 };
@@ -344,10 +304,10 @@ static int tda1004x_do_upload(struct i2c_adapter *i2c, struct tda1004x_state *st
int pos = 0;
/* clear code counter */
- tda1004x_write_byte(i2c, state, state->dspCodeCounterReg, 0);
- fw_msg.addr = state->tda1004x_address;
+ tda1004x_write_byteI(state, dspCodeCounterReg, 0);
+ fw_msg.addr = state->config->demod_address;
- buf[0] = state->dspCodeInReg;
+ buf[0] = dspCodeInReg;
while (pos != len) {
// work out how much to send this time
@@ -359,7 +319,7 @@ static int tda1004x_do_upload(struct i2c_adapter *i2c, struct tda1004x_state *st
// send the chunk
memcpy(buf + 1, mem + pos, tx_size);
fw_msg.len = tx_size + 1;
- if (i2c_transfer(i2c, &fw_msg, 1) != 1) {
+ if (i2c_transfer(state->i2c, &fw_msg, 1) != 1) {
printk("tda1004x: Error during firmware upload\n");
return -EIO;
}
@@ -370,18 +330,17 @@ static int tda1004x_do_upload(struct i2c_adapter *i2c, struct tda1004x_state *st
return 0;
}
-static int tda1004x_check_upload_ok(struct i2c_adapter *i2c, struct tda1004x_state *state)
+static int tda1004x_check_upload_ok(struct tda1004x_state *state, u8 dspVersion)
{
u8 data1, data2;
// check upload was OK
- tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 0x10, 0); // we want to read from the DSP
- tda1004x_write_byte(i2c, state, TDA1004X_DSP_CMD, 0x67);
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 0x10, 0); // we want to read from the DSP
+ tda1004x_write_byteI(state, TDA1004X_DSP_CMD, 0x67);
- data1 = tda1004x_read_byte(i2c, state, TDA1004X_DSP_DATA1);
- data2 = tda1004x_read_byte(i2c, state, TDA1004X_DSP_DATA2);
- if (data1 != 0x67 || data2 != state->dspVersion) {
- printk("tda1004x: firmware upload failed!\n");
+ data1 = tda1004x_read_byte(state, TDA1004X_DSP_DATA1);
+ data2 = tda1004x_read_byte(state, TDA1004X_DSP_DATA2);
+ if (data1 != 0x67 || data2 != dspVersion) {
return -EIO;
}
@@ -389,31 +348,34 @@ static int tda1004x_check_upload_ok(struct i2c_adapter *i2c, struct tda1004x_sta
}
-static int tda10045_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *state, struct i2c_client *client)
+static int tda10045_fwupload(struct dvb_frontend* fe)
{
+ struct tda1004x_state* state = fe->demodulator_priv;
int ret;
const struct firmware *fw;
+
+ /* don't re-upload unless necessary */
+ if (tda1004x_check_upload_ok(state, 0x2c) == 0) return 0;
+
/* request the firmware, this will block until someone uploads it */
printk("tda1004x: waiting for firmware upload...\n");
- ret = request_firmware(&fw, TDA10045_DEFAULT_FIRMWARE, &client->dev);
+ ret = state->config->request_firmware(fe, &fw, TDA10045_DEFAULT_FIRMWARE);
if (ret) {
printk("tda1004x: no firmware upload (timeout or file not found?)\n");
return ret;
}
-
- /* set some valid bandwith parameters before uploading */
/* reset chip */
- tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 0x10, 0);
- tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 8, 8);
- tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 8, 0);
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 0x10, 0);
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 8);
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 0);
msleep(10);
/* set parameters */
- tda10045h_set_bandwidth(i2c, state, BANDWIDTH_8_MHZ);
+ tda10045h_set_bandwidth(state, BANDWIDTH_8_MHZ);
- ret = tda1004x_do_upload(i2c, state, fw->data, fw->size);
+ ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10045H_FWPAGE, TDA10045H_CODE_IN);
if (ret)
return ret;
@@ -421,49 +383,47 @@ static int tda10045_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *sta
/* DSPREADY doesn't seem to work on the TDA10045H */
msleep(100);
- ret = tda1004x_check_upload_ok(i2c, state);
- if (ret)
- return ret;
-
- return 0;
+ return tda1004x_check_upload_ok(state, 0x2c);
}
-static int tda10046_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *state, struct i2c_client *client)
+static int tda10046_fwupload(struct dvb_frontend* fe)
{
+ struct tda1004x_state* state = fe->demodulator_priv;
unsigned long timeout;
int ret;
const struct firmware *fw;
+ /* don't re-upload unless necessary */
+ if (tda1004x_check_upload_ok(state, 0x20) == 0) return 0;
+
/* request the firmware, this will block until someone uploads it */
printk("tda1004x: waiting for firmware upload...\n");
- ret = request_firmware(&fw, TDA10046_DEFAULT_FIRMWARE, &client->dev);
+ ret = state->config->request_firmware(fe, &fw, TDA10046_DEFAULT_FIRMWARE);
if (ret) {
printk("tda1004x: no firmware upload (timeout or file not found?)\n");
return ret;
}
- /* set some valid bandwith parameters before uploading */
-
/* reset chip */
- tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 1, 0);
- tda1004x_write_mask(i2c, state, TDA10046H_CONF_TRISTATE1, 1, 0);
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 1, 0);
+ tda1004x_write_mask(state, TDA10046H_CONF_TRISTATE1, 1, 0);
msleep(10);
/* set parameters */
- tda1004x_write_byte(i2c, state, TDA10046H_CONFPLL2, 10);
- tda1004x_write_byte(i2c, state, TDA10046H_CONFPLL3, 0);
- tda1004x_write_byte(i2c, state, TDA10046H_FREQ_OFFSET, 99);
- tda1004x_write_byte(i2c, state, TDA10046H_FREQ_PHY2_MSB, 0xd4);
- tda1004x_write_byte(i2c, state, TDA10046H_FREQ_PHY2_LSB, 0x2c);
- tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 8, 8); // going to boot from HOST
-
- ret = tda1004x_do_upload(i2c, state, fw->data, fw->size);
+ tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 10);
+ tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 0);
+ tda1004x_write_byteI(state, TDA10046H_FREQ_OFFSET, 99);
+ tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0xd4);
+ tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x2c);
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 8); // going to boot from HOST
+
+ ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10046H_CODE_CPT, TDA10046H_CODE_IN);
if (ret)
return ret;
/* wait for DSP to initialise */
timeout = jiffies + HZ;
- while(!(tda1004x_read_byte(i2c, state, TDA1004X_STATUS_CD) & 0x20)) {
+ while(!(tda1004x_read_byte(state, TDA1004X_STATUS_CD) & 0x20)) {
if (time_after(jiffies, timeout)) {
printk("tda1004x: DSP failed to initialised.\n");
return -EIO;
@@ -471,95 +431,7 @@ static int tda10046_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *sta
msleep(1);
}
- ret = tda1004x_check_upload_ok(i2c, state);
- if (ret)
- return ret;
-
- return 0;
-}
-
-static int tda10045h_init(struct i2c_adapter *i2c, struct tda1004x_state *tda_state)
-{
- struct i2c_msg tuner_msg = {.addr = 0,.flags = 0,.buf = NULL,.len = 0 };
- static u8 disable_mc44BC374c[] = { 0x1d, 0x74, 0xa0, 0x68 };
-
- dprintk("%s\n", __FUNCTION__);
-
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFADC1, 0x10, 0); // wake up the ADC
-
- // Disable the MC44BC374C
- tda1004x_enable_tuner_i2c(i2c, tda_state);
- tuner_msg.addr = MC44BC374_ADDRESS;
- tuner_msg.buf = disable_mc44BC374c;
- tuner_msg.len = sizeof(disable_mc44BC374c);
- if (i2c_transfer(i2c, &tuner_msg, 1) != 1) {
- i2c_transfer(i2c, &tuner_msg, 1);
- }
- tda1004x_disable_tuner_i2c(i2c, tda_state);
-
- // tda setup
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 0x20, 0); // disable DSP watchdog timer
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 8, 0); // select HP stream
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC1, 0x40, 0); // no frequency inversion
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC1, 0x80, 0x80); // enable pulse killer
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 0x10, 0x10); // enable auto offset
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF2, 0xC0, 0x0); // no frequency offset
- tda1004x_write_byte(i2c, tda_state, TDA1004X_CONF_TS1, 0); // setup MPEG2 TS interface
- tda1004x_write_byte(i2c, tda_state, TDA1004X_CONF_TS2, 0); // setup MPEG2 TS interface
- tda1004x_write_mask(i2c, tda_state, TDA1004X_VBER_MSB, 0xe0, 0xa0); // 10^6 VBER measurement bits
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC1, 0x10, 0); // VAGC polarity
- tda1004x_write_byte(i2c, tda_state, TDA1004X_CONFADC1, 0x2e);
-
- return 0;
-}
-
-static int tda10046h_init(struct i2c_adapter *i2c, struct tda1004x_state *tda_state)
-{
- struct i2c_msg tuner_msg = {.addr = 0,.flags = 0,.buf = NULL,.len = 0 };
- static u8 disable_mc44BC374c[] = { 0x1d, 0x74, 0xa0, 0x68 };
-
- dprintk("%s\n", __FUNCTION__);
-
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 1, 0); // wake up the chip
-
- // Disable the MC44BC374C
- tda1004x_enable_tuner_i2c(i2c, tda_state);
- tuner_msg.addr = MC44BC374_ADDRESS;
- tuner_msg.buf = disable_mc44BC374c;
- tuner_msg.len = sizeof(disable_mc44BC374c);
- if (i2c_transfer(i2c, &tuner_msg, 1) != 1) {
- i2c_transfer(i2c, &tuner_msg, 1);
- }
- tda1004x_disable_tuner_i2c(i2c, tda_state);
-
- // tda setup
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 0x20, 0); // disable DSP watchdog timer
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC1, 0x40, 0x40); // TT TDA10046H needs inversion ON
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 8, 0); // select HP stream
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC1, 0x80, 0); // disable pulse killer
- tda1004x_write_byte(i2c, tda_state, TDA10046H_CONFPLL2, 10); // PLL M = 10
- tda1004x_write_byte(i2c, tda_state, TDA10046H_CONFPLL3, 0); // PLL P = N = 0
- tda1004x_write_byte(i2c, tda_state, TDA10046H_FREQ_OFFSET, 99); // FREQOFFS = 99
- tda1004x_write_byte(i2c, tda_state, TDA10046H_FREQ_PHY2_MSB, 0xd4); // } PHY2 = -11221
- tda1004x_write_byte(i2c, tda_state, TDA10046H_FREQ_PHY2_LSB, 0x2c); // }
- tda1004x_write_byte(i2c, tda_state, TDA10046H_AGC_CONF, 0); // AGC setup
- tda1004x_write_mask(i2c, tda_state, TDA10046H_CONF_POLARITY, 0x60, 0x60); // set AGC polarities
- tda1004x_write_byte(i2c, tda_state, TDA10046H_AGC_TUN_MIN, 0); // }
- tda1004x_write_byte(i2c, tda_state, TDA10046H_AGC_TUN_MAX, 0xff); // } AGC min/max values
- tda1004x_write_byte(i2c, tda_state, TDA10046H_AGC_IF_MIN, 0); // }
- tda1004x_write_byte(i2c, tda_state, TDA10046H_AGC_IF_MAX, 0xff); // }
- tda1004x_write_mask(i2c, tda_state, TDA10046H_CVBER_CTRL, 0x30, 0x10); // 10^6 VBER measurement bits
- tda1004x_write_byte(i2c, tda_state, TDA10046H_AGC_GAINS, 1); // IF gain 2, TUN gain 1
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 0x80, 0); // crystal is 50ppm
- tda1004x_write_byte(i2c, tda_state, TDA1004X_CONF_TS1, 7); // MPEG2 interface config
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONF_TS2, 0x31, 0); // MPEG2 interface config
- tda1004x_write_mask(i2c, tda_state, TDA10046H_CONF_TRISTATE1, 0x9e, 0); // disable AGC_TUN
- tda1004x_write_byte(i2c, tda_state, TDA10046H_CONF_TRISTATE2, 0xe1); // tristate setup
- tda1004x_write_byte(i2c, tda_state, TDA10046H_GPIO_OUT_SEL, 0xcc); // GPIO output config
- tda1004x_write_mask(i2c, tda_state, TDA10046H_GPIO_SELECT, 8, 8); // GPIO select
- tda10046h_set_bandwidth(i2c, tda_state, BANDWIDTH_8_MHZ); // default bandwidth 8 MHz
-
- return 0;
+ return tda1004x_check_upload_ok(state, 0x20);
}
static int tda1004x_encode_fec(int fec)
@@ -602,174 +474,147 @@ static int tda1004x_decode_fec(int tdafec)
return -1;
}
-static int tda1004x_set_frequency(struct i2c_adapter *i2c,
- struct tda1004x_state *tda_state,
- struct dvb_frontend_parameters *fe_params)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+int tda1004x_write_byte(struct dvb_frontend* fe, int reg, int data)
{
- u8 tuner_buf[4];
- struct i2c_msg tuner_msg = {.addr=0, .flags=0, .buf=tuner_buf, .len=sizeof(tuner_buf) };
- int tuner_frequency = 0;
- u8 band, cp, filter;
- int counter, counter2;
+ struct tda1004x_state* state = fe->demodulator_priv;
- dprintk("%s\n", __FUNCTION__);
+ return tda1004x_write_byteI(state, reg, data);
+}
- // setup the frequency buffer
- switch (tda_state->tuner_type) {
- case TUNER_TYPE_TD1344:
-
- // setup tuner buffer
- // ((Fif+((1000000/6)/2)) + Finput)/(1000000/6)
- tuner_frequency =
- (((fe_params->frequency / 1000) * 6) + 217502) / 1000;
- tuner_buf[0] = tuner_frequency >> 8;
- tuner_buf[1] = tuner_frequency & 0xff;
- tuner_buf[2] = 0x88;
- if (fe_params->frequency < 550000000) {
- tuner_buf[3] = 0xab;
- } else {
- tuner_buf[3] = 0xeb;
- }
+static int tda10045_init(struct dvb_frontend* fe)
+{
+ struct tda1004x_state* state = fe->demodulator_priv;
- // tune it
- tda1004x_enable_tuner_i2c(i2c, tda_state);
- tuner_msg.addr = tda_state->tuner_address;
- tuner_msg.len = 4;
- i2c_transfer(i2c, &tuner_msg, 1);
-
- // wait for it to finish
- tuner_msg.len = 1;
- tuner_msg.flags = I2C_M_RD;
- counter = 0;
- counter2 = 0;
- while (counter++ < 100) {
- if (i2c_transfer(i2c, &tuner_msg, 1) == 1) {
- if (tuner_buf[0] & 0x40) {
- counter2++;
- } else {
- counter2 = 0;
- }
- }
-
- if (counter2 > 10) {
- break;
- }
- }
- tda1004x_disable_tuner_i2c(i2c, tda_state);
- break;
+ dprintk("%s\n", __FUNCTION__);
- case TUNER_TYPE_TD1316:
- // determine charge pump
- tuner_frequency = fe_params->frequency + 36130000;
- if (tuner_frequency < 87000000) {
- return -EINVAL;
- } else if (tuner_frequency < 130000000) {
- cp = 3;
- } else if (tuner_frequency < 160000000) {
- cp = 5;
- } else if (tuner_frequency < 200000000) {
- cp = 6;
- } else if (tuner_frequency < 290000000) {
- cp = 3;
- } else if (tuner_frequency < 420000000) {
- cp = 5;
- } else if (tuner_frequency < 480000000) {
- cp = 6;
- } else if (tuner_frequency < 620000000) {
- cp = 3;
- } else if (tuner_frequency < 830000000) {
- cp = 5;
- } else if (tuner_frequency < 895000000) {
- cp = 7;
- } else {
- return -EINVAL;
- }
+ if (state->initialised) return 0;
- // determine band
- if (fe_params->frequency < 49000000) {
- return -EINVAL;
- } else if (fe_params->frequency < 159000000) {
- band = 1;
- } else if (fe_params->frequency < 444000000) {
- band = 2;
- } else if (fe_params->frequency < 861000000) {
- band = 4;
- } else {
- return -EINVAL;
- }
+ if (tda10045_fwupload(fe)) {
+ printk("tda1004x: firmware upload failed\n");
+ return -EIO;
+ }
- // work out filter
- switch (fe_params->u.ofdm.bandwidth) {
- case BANDWIDTH_6_MHZ:
- filter = 0;
- break;
+ tda1004x_write_mask(state, TDA1004X_CONFADC1, 0x10, 0); // wake up the ADC
- case BANDWIDTH_7_MHZ:
- filter = 0;
- break;
+ // Init the PLL
+ if (state->config->pll_init) {
+ tda1004x_enable_tuner_i2c(state);
+ state->config->pll_init(fe);
+ tda1004x_disable_tuner_i2c(state);
+ }
- case BANDWIDTH_8_MHZ:
- filter = 1;
- break;
+ // tda setup
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 0x20, 0); // disable DSP watchdog timer
+ tda1004x_write_mask(state, TDA1004X_AUTO, 8, 0); // select HP stream
+ tda1004x_write_mask(state, TDA1004X_CONFC1, 0x40, 0); // set polarity of VAGC signal
+ tda1004x_write_mask(state, TDA1004X_CONFC1, 0x80, 0x80); // enable pulse killer
+ tda1004x_write_mask(state, TDA1004X_AUTO, 0x10, 0x10); // enable auto offset
+ tda1004x_write_mask(state, TDA1004X_IN_CONF2, 0xC0, 0x0); // no frequency offset
+ tda1004x_write_byteI(state, TDA1004X_CONF_TS1, 0); // setup MPEG2 TS interface
+ tda1004x_write_byteI(state, TDA1004X_CONF_TS2, 0); // setup MPEG2 TS interface
+ tda1004x_write_mask(state, TDA1004X_VBER_MSB, 0xe0, 0xa0); // 10^6 VBER measurement bits
+ tda1004x_write_mask(state, TDA1004X_CONFC1, 0x10, 0); // VAGC polarity
+ tda1004x_write_byteI(state, TDA1004X_CONFADC1, 0x2e);
+
+ state->initialised = 1;
+ return 0;
+}
- default:
- return -EINVAL;
- }
+static int tda10046_init(struct dvb_frontend* fe)
+{
+ struct tda1004x_state* state = fe->demodulator_priv;
+ dprintk("%s\n", __FUNCTION__);
- // calculate divisor
- // ((36130000+((1000000/6)/2)) + Finput)/(1000000/6)
- tuner_frequency =
- (((fe_params->frequency / 1000) * 6) + 217280) / 1000;
-
- // setup tuner buffer
- tuner_buf[0] = tuner_frequency >> 8;
- tuner_buf[1] = tuner_frequency & 0xff;
- tuner_buf[2] = 0xca;
- tuner_buf[3] = (cp << 5) | (filter << 3) | band;
-
- // tune it
- if (tda_state->fe_type == FE_TYPE_TDA10046H) {
- // setup auto offset
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 0x10, 0x10);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x80, 0);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF2, 0xC0, 0);
-
- // disable agc_conf[2]
- tda1004x_write_mask(i2c, tda_state, TDA10046H_AGC_CONF, 4, 0);
- }
- tda1004x_enable_tuner_i2c(i2c, tda_state);
- tuner_msg.addr = tda_state->tuner_address;
- tuner_msg.len = 4;
- if (i2c_transfer(i2c, &tuner_msg, 1) != 1) {
- return -EIO;
- }
- msleep(1);
- tda1004x_disable_tuner_i2c(i2c, tda_state);
- if (tda_state->fe_type == FE_TYPE_TDA10046H)
- tda1004x_write_mask(i2c, tda_state, TDA10046H_AGC_CONF, 4, 4);
- break;
+ if (state->initialised) return 0;
- default:
- return -EINVAL;
+ if (tda10046_fwupload(fe)) {
+ printk("tda1004x: firmware upload failed\n");
+ return -EIO;
}
- dprintk("%s: success\n", __FUNCTION__);
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 1, 0); // wake up the chip
+ // Init the PLL
+ if (state->config->pll_init) {
+ tda1004x_enable_tuner_i2c(state);
+ state->config->pll_init(fe);
+ tda1004x_disable_tuner_i2c(state);
+ }
+
+ // tda setup
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 0x20, 0); // disable DSP watchdog timer
+ tda1004x_write_mask(state, TDA1004X_CONFC1, 0x40, 0x40);
+ tda1004x_write_mask(state, TDA1004X_AUTO, 8, 0); // select HP stream
+ tda1004x_write_mask(state, TDA1004X_CONFC1, 0x80, 0); // disable pulse killer
+ tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 10); // PLL M = 10
+ tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 0); // PLL P = N = 0
+ tda1004x_write_byteI(state, TDA10046H_FREQ_OFFSET, 99); // FREQOFFS = 99
+ tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0xd4); // } PHY2 = -11221
+ tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x2c); // }
+ tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0); // AGC setup
+ tda1004x_write_mask(state, TDA10046H_CONF_POLARITY, 0x60, 0x60); // set AGC polarities
+ tda1004x_write_byteI(state, TDA10046H_AGC_TUN_MIN, 0); // }
+ tda1004x_write_byteI(state, TDA10046H_AGC_TUN_MAX, 0xff); // } AGC min/max values
+ tda1004x_write_byteI(state, TDA10046H_AGC_IF_MIN, 0); // }
+ tda1004x_write_byteI(state, TDA10046H_AGC_IF_MAX, 0xff); // }
+ tda1004x_write_mask(state, TDA10046H_CVBER_CTRL, 0x30, 0x10); // 10^6 VBER measurement bits
+ tda1004x_write_byteI(state, TDA10046H_AGC_GAINS, 1); // IF gain 2, TUN gain 1
+ tda1004x_write_mask(state, TDA1004X_AUTO, 0x80, 0); // crystal is 50ppm
+ tda1004x_write_byteI(state, TDA1004X_CONF_TS1, 7); // MPEG2 interface config
+ tda1004x_write_mask(state, TDA1004X_CONF_TS2, 0x31, 0); // MPEG2 interface config
+ tda1004x_write_mask(state, TDA10046H_CONF_TRISTATE1, 0x9e, 0); // disable AGC_TUN
+ tda1004x_write_byteI(state, TDA10046H_CONF_TRISTATE2, 0xe1); // tristate setup
+ tda1004x_write_byteI(state, TDA10046H_GPIO_OUT_SEL, 0xcc); // GPIO output config
+ tda1004x_write_mask(state, TDA10046H_GPIO_SELECT, 8, 8); // GPIO select
+ tda10046h_set_bandwidth(state, BANDWIDTH_8_MHZ); // default bandwidth 8 MHz
+
+ state->initialised = 1;
return 0;
}
-static int tda1004x_set_fe(struct i2c_adapter *i2c,
- struct tda1004x_state *tda_state,
+static int tda1004x_set_fe(struct dvb_frontend* fe,
struct dvb_frontend_parameters *fe_params)
{
+ struct tda1004x_state* state = fe->demodulator_priv;
int tmp;
int inversion;
dprintk("%s\n", __FUNCTION__);
+ if (state->demod_type == TDA1004X_DEMOD_TDA10046) {
+ // setup auto offset
+ tda1004x_write_mask(state, TDA1004X_AUTO, 0x10, 0x10);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x80, 0);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF2, 0xC0, 0);
+
+ // disable agc_conf[2]
+ tda1004x_write_mask(state, TDA10046H_AGC_CONF, 4, 0);
+ }
+
// set frequency
- if ((tmp = tda1004x_set_frequency(i2c, tda_state, fe_params)) < 0)
- return tmp;
+ tda1004x_enable_tuner_i2c(state);
+ state->config->pll_set(fe, fe_params);
+ tda1004x_disable_tuner_i2c(state);
+
+ if (state->demod_type == TDA1004X_DEMOD_TDA10046)
+ tda1004x_write_mask(state, TDA10046H_AGC_CONF, 4, 4);
// Hardcoded to use auto as much as possible
// The TDA10045 is very unreliable if AUTO mode is _not_ used. I have not
@@ -783,35 +628,35 @@ static int tda1004x_set_fe(struct i2c_adapter *i2c,
(fe_params->u.ofdm.code_rate_LP == FEC_AUTO) ||
(fe_params->u.ofdm.constellation == QAM_AUTO) ||
(fe_params->u.ofdm.hierarchy_information == HIERARCHY_AUTO)) {
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 1, 1); // enable auto
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x03, 0); // turn off constellation bits
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x60, 0); // turn off hierarchy bits
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF2, 0x3f, 0); // turn off FEC bits
+ tda1004x_write_mask(state, TDA1004X_AUTO, 1, 1); // enable auto
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x03, 0); // turn off constellation bits
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x60, 0); // turn off hierarchy bits
+ tda1004x_write_mask(state, TDA1004X_IN_CONF2, 0x3f, 0); // turn off FEC bits
} else {
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 1, 0); // disable auto
+ tda1004x_write_mask(state, TDA1004X_AUTO, 1, 0); // disable auto
// set HP FEC
tmp = tda1004x_encode_fec(fe_params->u.ofdm.code_rate_HP);
if (tmp < 0) return tmp;
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF2, 7, tmp);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF2, 7, tmp);
// set LP FEC
tmp = tda1004x_encode_fec(fe_params->u.ofdm.code_rate_LP);
if (tmp < 0) return tmp;
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF2, 0x38, tmp << 3);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF2, 0x38, tmp << 3);
// set constellation
switch (fe_params->u.ofdm.constellation) {
case QPSK:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 3, 0);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 3, 0);
break;
case QAM_16:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 3, 1);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 3, 1);
break;
case QAM_64:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 3, 2);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 3, 2);
break;
default:
@@ -821,19 +666,19 @@ static int tda1004x_set_fe(struct i2c_adapter *i2c,
// set hierarchy
switch (fe_params->u.ofdm.hierarchy_information) {
case HIERARCHY_NONE:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x60, 0 << 5);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x60, 0 << 5);
break;
case HIERARCHY_1:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x60, 1 << 5);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x60, 1 << 5);
break;
case HIERARCHY_2:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x60, 2 << 5);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x60, 2 << 5);
break;
case HIERARCHY_4:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x60, 3 << 5);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x60, 3 << 5);
break;
default:
@@ -842,30 +687,26 @@ static int tda1004x_set_fe(struct i2c_adapter *i2c,
}
// set bandwidth
- switch(tda_state->fe_type) {
- case FE_TYPE_TDA10045H:
- tda10045h_set_bandwidth(i2c, tda_state, fe_params->u.ofdm.bandwidth);
+ switch(state->demod_type) {
+ case TDA1004X_DEMOD_TDA10045:
+ tda10045h_set_bandwidth(state, fe_params->u.ofdm.bandwidth);
break;
- case FE_TYPE_TDA10046H:
- tda10046h_set_bandwidth(i2c, tda_state, fe_params->u.ofdm.bandwidth);
+ case TDA1004X_DEMOD_TDA10046:
+ tda10046h_set_bandwidth(state, fe_params->u.ofdm.bandwidth);
break;
}
- // need to invert the inversion for TT TDA10046H
- inversion = fe_params->inversion;
- if (tda_state->fe_type == FE_TYPE_TDA10046H) {
- inversion = inversion ? INVERSION_OFF : INVERSION_ON;
- }
-
// set inversion
+ inversion = fe_params->inversion;
+ if (state->config->invert) inversion = inversion ? INVERSION_OFF : INVERSION_ON;
switch (inversion) {
case INVERSION_OFF:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC1, 0x20, 0);
+ tda1004x_write_mask(state, TDA1004X_CONFC1, 0x20, 0);
break;
case INVERSION_ON:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC1, 0x20, 0x20);
+ tda1004x_write_mask(state, TDA1004X_CONFC1, 0x20, 0x20);
break;
default:
@@ -875,28 +716,28 @@ static int tda1004x_set_fe(struct i2c_adapter *i2c,
// set guard interval
switch (fe_params->u.ofdm.guard_interval) {
case GUARD_INTERVAL_1_32:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 2, 0);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x0c, 0 << 2);
+ tda1004x_write_mask(state, TDA1004X_AUTO, 2, 0);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x0c, 0 << 2);
break;
case GUARD_INTERVAL_1_16:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 2, 0);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x0c, 1 << 2);
+ tda1004x_write_mask(state, TDA1004X_AUTO, 2, 0);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x0c, 1 << 2);
break;
case GUARD_INTERVAL_1_8:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 2, 0);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x0c, 2 << 2);
+ tda1004x_write_mask(state, TDA1004X_AUTO, 2, 0);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x0c, 2 << 2);
break;
case GUARD_INTERVAL_1_4:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 2, 0);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x0c, 3 << 2);
+ tda1004x_write_mask(state, TDA1004X_AUTO, 2, 0);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x0c, 3 << 2);
break;
case GUARD_INTERVAL_AUTO:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 2, 2);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x0c, 0 << 2);
+ tda1004x_write_mask(state, TDA1004X_AUTO, 2, 2);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x0c, 0 << 2);
break;
default:
@@ -906,18 +747,18 @@ static int tda1004x_set_fe(struct i2c_adapter *i2c,
// set transmission mode
switch (fe_params->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_2K:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 4, 0);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x10, 0 << 4);
+ tda1004x_write_mask(state, TDA1004X_AUTO, 4, 0);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x10, 0 << 4);
break;
case TRANSMISSION_MODE_8K:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 4, 0);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x10, 1 << 4);
+ tda1004x_write_mask(state, TDA1004X_AUTO, 4, 0);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x10, 1 << 4);
break;
case TRANSMISSION_MODE_AUTO:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 4, 4);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_IN_CONF1, 0x10, 0);
+ tda1004x_write_mask(state, TDA1004X_AUTO, 4, 4);
+ tda1004x_write_mask(state, TDA1004X_IN_CONF1, 0x10, 0);
break;
default:
@@ -925,15 +766,15 @@ static int tda1004x_set_fe(struct i2c_adapter *i2c,
}
// start the lock
- switch(tda_state->fe_type) {
- case FE_TYPE_TDA10045H:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 8, 8);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 8, 0);
+ switch(state->demod_type) {
+ case TDA1004X_DEMOD_TDA10045:
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 8);
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 0);
msleep(10);
break;
- case FE_TYPE_TDA10046H:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 0x40, 0x40);
+ case TDA1004X_DEMOD_TDA10046:
+ tda1004x_write_mask(state, TDA1004X_AUTO, 0x40, 0x40);
msleep(10);
break;
}
@@ -941,25 +782,22 @@ static int tda1004x_set_fe(struct i2c_adapter *i2c,
return 0;
}
-static int tda1004x_get_fe(struct i2c_adapter *i2c, struct tda1004x_state* tda_state, struct dvb_frontend_parameters *fe_params)
+static int tda1004x_get_fe(struct dvb_frontend* fe, struct dvb_frontend_parameters *fe_params)
{
+ struct tda1004x_state* state = fe->demodulator_priv;
dprintk("%s\n", __FUNCTION__);
// inversion status
fe_params->inversion = INVERSION_OFF;
- if (tda1004x_read_byte(i2c, tda_state, TDA1004X_CONFC1) & 0x20) {
+ if (tda1004x_read_byte(state, TDA1004X_CONFC1) & 0x20) {
fe_params->inversion = INVERSION_ON;
}
-
- // need to invert the inversion for TT TDA10046H
- if (tda_state->fe_type == FE_TYPE_TDA10046H) {
- fe_params->inversion = fe_params->inversion ? INVERSION_OFF : INVERSION_ON;
- }
+ if (state->config->invert) fe_params->inversion = fe_params->inversion ? INVERSION_OFF : INVERSION_ON;
// bandwidth
- switch(tda_state->fe_type) {
- case FE_TYPE_TDA10045H:
- switch (tda1004x_read_byte(i2c, tda_state, TDA10045H_WREF_LSB)) {
+ switch(state->demod_type) {
+ case TDA1004X_DEMOD_TDA10045:
+ switch (tda1004x_read_byte(state, TDA10045H_WREF_LSB)) {
case 0x14:
fe_params->u.ofdm.bandwidth = BANDWIDTH_8_MHZ;
break;
@@ -972,8 +810,8 @@ static int tda1004x_get_fe(struct i2c_adapter *i2c, struct tda1004x_state* tda_s
}
break;
- case FE_TYPE_TDA10046H:
- switch (tda1004x_read_byte(i2c, tda_state, TDA10046H_TIME_WREF1)) {
+ case TDA1004X_DEMOD_TDA10046:
+ switch (tda1004x_read_byte(state, TDA10046H_TIME_WREF1)) {
case 0x60:
fe_params->u.ofdm.bandwidth = BANDWIDTH_8_MHZ;
break;
@@ -989,12 +827,12 @@ static int tda1004x_get_fe(struct i2c_adapter *i2c, struct tda1004x_state* tda_s
// FEC
fe_params->u.ofdm.code_rate_HP =
- tda1004x_decode_fec(tda1004x_read_byte(i2c, tda_state, TDA1004X_OUT_CONF2) & 7);
+ tda1004x_decode_fec(tda1004x_read_byte(state, TDA1004X_OUT_CONF2) & 7);
fe_params->u.ofdm.code_rate_LP =
- tda1004x_decode_fec((tda1004x_read_byte(i2c, tda_state, TDA1004X_OUT_CONF2) >> 3) & 7);
+ tda1004x_decode_fec((tda1004x_read_byte(state, TDA1004X_OUT_CONF2) >> 3) & 7);
// constellation
- switch (tda1004x_read_byte(i2c, tda_state, TDA1004X_OUT_CONF1) & 3) {
+ switch (tda1004x_read_byte(state, TDA1004X_OUT_CONF1) & 3) {
case 0:
fe_params->u.ofdm.constellation = QPSK;
break;
@@ -1008,12 +846,12 @@ static int tda1004x_get_fe(struct i2c_adapter *i2c, struct tda1004x_state* tda_s
// transmission mode
fe_params->u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;
- if (tda1004x_read_byte(i2c, tda_state, TDA1004X_OUT_CONF1) & 0x10) {
+ if (tda1004x_read_byte(state, TDA1004X_OUT_CONF1) & 0x10) {
fe_params->u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;
}
// guard interval
- switch ((tda1004x_read_byte(i2c, tda_state, TDA1004X_OUT_CONF1) & 0x0c) >> 2) {
+ switch ((tda1004x_read_byte(state, TDA1004X_OUT_CONF1) & 0x0c) >> 2) {
case 0:
fe_params->u.ofdm.guard_interval = GUARD_INTERVAL_1_32;
break;
@@ -1029,7 +867,7 @@ static int tda1004x_get_fe(struct i2c_adapter *i2c, struct tda1004x_state* tda_s
}
// hierarchy
- switch ((tda1004x_read_byte(i2c, tda_state, TDA1004X_OUT_CONF1) & 0x60) >> 5) {
+ switch ((tda1004x_read_byte(state, TDA1004X_OUT_CONF1) & 0x60) >> 5) {
case 0:
fe_params->u.ofdm.hierarchy_information = HIERARCHY_NONE;
break;
@@ -1047,8 +885,9 @@ static int tda1004x_get_fe(struct i2c_adapter *i2c, struct tda1004x_state* tda_s
return 0;
}
-static int tda1004x_read_status(struct i2c_adapter *i2c, struct tda1004x_state* tda_state, fe_status_t * fe_status)
+static int tda1004x_read_status(struct dvb_frontend* fe, fe_status_t * fe_status)
{
+ struct tda1004x_state* state = fe->demodulator_priv;
int status;
int cber;
int vber;
@@ -1056,7 +895,7 @@ static int tda1004x_read_status(struct i2c_adapter *i2c, struct tda1004x_state*
dprintk("%s\n", __FUNCTION__);
// read status
- status = tda1004x_read_byte(i2c, tda_state, TDA1004X_STATUS_CD);
+ status = tda1004x_read_byte(state, TDA1004X_STATUS_CD);
if (status == -1) {
return -EIO;
}
@@ -1071,12 +910,12 @@ static int tda1004x_read_status(struct i2c_adapter *i2c, struct tda1004x_state*
// is getting anything valid
if (!(*fe_status & FE_HAS_VITERBI)) {
// read the CBER
- cber = tda1004x_read_byte(i2c, tda_state, TDA1004X_CBER_LSB);
+ cber = tda1004x_read_byte(state, TDA1004X_CBER_LSB);
if (cber == -1) return -EIO;
- status = tda1004x_read_byte(i2c, tda_state, TDA1004X_CBER_MSB);
+ status = tda1004x_read_byte(state, TDA1004X_CBER_MSB);
if (status == -1) return -EIO;
cber |= (status << 8);
- tda1004x_read_byte(i2c, tda_state, TDA1004X_CBER_RESET);
+ tda1004x_read_byte(state, TDA1004X_CBER_RESET);
if (cber != 65535) {
*fe_status |= FE_HAS_VITERBI;
@@ -1087,15 +926,15 @@ static int tda1004x_read_status(struct i2c_adapter *i2c, struct tda1004x_state*
// bytes (i.e. not LOCKED), see if the RS decoder is getting anything valid.
if ((*fe_status & FE_HAS_VITERBI) && (!(*fe_status & FE_HAS_SYNC))) {
// read the VBER
- vber = tda1004x_read_byte(i2c, tda_state, TDA1004X_VBER_LSB);
+ vber = tda1004x_read_byte(state, TDA1004X_VBER_LSB);
if (vber == -1) return -EIO;
- status = tda1004x_read_byte(i2c, tda_state, TDA1004X_VBER_MID);
+ status = tda1004x_read_byte(state, TDA1004X_VBER_MID);
if (status == -1) return -EIO;
vber |= (status << 8);
- status = tda1004x_read_byte(i2c, tda_state, TDA1004X_VBER_MSB);
+ status = tda1004x_read_byte(state, TDA1004X_VBER_MSB);
if (status == -1) return -EIO;
vber |= ((status << 16) & 0x0f);
- tda1004x_read_byte(i2c, tda_state, TDA1004X_CVBER_LUT);
+ tda1004x_read_byte(state, TDA1004X_CVBER_LUT);
// if RS has passed some valid TS packets, then we must be
// getting some SYNC bytes
@@ -1109,26 +948,27 @@ static int tda1004x_read_status(struct i2c_adapter *i2c, struct tda1004x_state*
return 0;
}
-static int tda1004x_read_signal_strength(struct i2c_adapter *i2c, struct tda1004x_state* tda_state, u16 * signal)
+static int tda1004x_read_signal_strength(struct dvb_frontend* fe, u16 * signal)
{
+ struct tda1004x_state* state = fe->demodulator_priv;
int tmp;
int reg = 0;
dprintk("%s\n", __FUNCTION__);
// determine the register to use
- switch(tda_state->fe_type) {
- case FE_TYPE_TDA10045H:
+ switch(state->demod_type) {
+ case TDA1004X_DEMOD_TDA10045:
reg = TDA10045H_S_AGC;
break;
- case FE_TYPE_TDA10046H:
+ case TDA1004X_DEMOD_TDA10046:
reg = TDA10046H_AGC_IF_LEVEL;
break;
}
// read it
- tmp = tda1004x_read_byte(i2c, tda_state, reg);
+ tmp = tda1004x_read_byte(state, reg);
if (tmp < 0)
return -EIO;
@@ -1137,14 +977,15 @@ static int tda1004x_read_signal_strength(struct i2c_adapter *i2c, struct tda1004
return 0;
}
-static int tda1004x_read_snr(struct i2c_adapter *i2c, struct tda1004x_state* tda_state, u16 * snr)
+static int tda1004x_read_snr(struct dvb_frontend* fe, u16 * snr)
{
+ struct tda1004x_state* state = fe->demodulator_priv;
int tmp;
dprintk("%s\n", __FUNCTION__);
// read it
- tmp = tda1004x_read_byte(i2c, tda_state, TDA1004X_SNR);
+ tmp = tda1004x_read_byte(state, TDA1004X_SNR);
if (tmp < 0)
return -EIO;
if (tmp) {
@@ -1156,8 +997,9 @@ static int tda1004x_read_snr(struct i2c_adapter *i2c, struct tda1004x_state* tda
return 0;
}
-static int tda1004x_read_ucblocks(struct i2c_adapter *i2c, struct tda1004x_state* tda_state, u32* ucblocks)
+static int tda1004x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
{
+ struct tda1004x_state* state = fe->demodulator_priv;
int tmp;
int tmp2;
int counter;
@@ -1166,16 +1008,16 @@ static int tda1004x_read_ucblocks(struct i2c_adapter *i2c, struct tda1004x_state
// read the UCBLOCKS and reset
counter = 0;
- tmp = tda1004x_read_byte(i2c, tda_state, TDA1004X_UNCOR);
+ tmp = tda1004x_read_byte(state, TDA1004X_UNCOR);
if (tmp < 0)
return -EIO;
tmp &= 0x7f;
while (counter++ < 5) {
- tda1004x_write_mask(i2c, tda_state, TDA1004X_UNCOR, 0x80, 0);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_UNCOR, 0x80, 0);
- tda1004x_write_mask(i2c, tda_state, TDA1004X_UNCOR, 0x80, 0);
+ tda1004x_write_mask(state, TDA1004X_UNCOR, 0x80, 0);
+ tda1004x_write_mask(state, TDA1004X_UNCOR, 0x80, 0);
+ tda1004x_write_mask(state, TDA1004X_UNCOR, 0x80, 0);
- tmp2 = tda1004x_read_byte(i2c, tda_state, TDA1004X_UNCOR);
+ tmp2 = tda1004x_read_byte(state, TDA1004X_UNCOR);
if (tmp2 < 0)
return -EIO;
tmp2 &= 0x7f;
@@ -1192,373 +1034,187 @@ static int tda1004x_read_ucblocks(struct i2c_adapter *i2c, struct tda1004x_state
return 0;
}
-static int tda1004x_read_ber(struct i2c_adapter *i2c, struct tda1004x_state* tda_state, u32* ber)
+static int tda1004x_read_ber(struct dvb_frontend* fe, u32* ber)
{
+ struct tda1004x_state* state = fe->demodulator_priv;
int tmp;
dprintk("%s\n", __FUNCTION__);
// read it in
- tmp = tda1004x_read_byte(i2c, tda_state, TDA1004X_CBER_LSB);
+ tmp = tda1004x_read_byte(state, TDA1004X_CBER_LSB);
if (tmp < 0) return -EIO;
*ber = tmp << 1;
- tmp = tda1004x_read_byte(i2c, tda_state, TDA1004X_CBER_MSB);
+ tmp = tda1004x_read_byte(state, TDA1004X_CBER_MSB);
if (tmp < 0) return -EIO;
*ber |= (tmp << 9);
- tda1004x_read_byte(i2c, tda_state, TDA1004X_CBER_RESET);
+ tda1004x_read_byte(state, TDA1004X_CBER_RESET);
dprintk("%s: ber=0x%x\n", __FUNCTION__, *ber);
return 0;
}
-static int tda1004x_sleep(struct i2c_adapter *i2c, struct tda1004x_state* tda_state)
+static int tda1004x_sleep(struct dvb_frontend* fe)
{
- switch(tda_state->fe_type) {
- case FE_TYPE_TDA10045H:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFADC1, 0x10, 0x10);
+ struct tda1004x_state* state = fe->demodulator_priv;
+
+ switch(state->demod_type) {
+ case TDA1004X_DEMOD_TDA10045:
+ tda1004x_write_mask(state, TDA1004X_CONFADC1, 0x10, 0x10);
break;
- case FE_TYPE_TDA10046H:
- tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 1, 1);
+ case TDA1004X_DEMOD_TDA10046:
+ tda1004x_write_mask(state, TDA1004X_CONFC4, 1, 1);
break;
}
return 0;
}
-static int tda1004x_ioctl(struct dvb_frontend *fe, unsigned int cmd, void *arg)
+static int tda1004x_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
{
- struct tda1004x_state *tda_state = (struct tda1004x_state *) fe->data;
- struct i2c_adapter *i2c = tda_state->i2c;
- int status = 0;
-
- dprintk("%s: cmd=0x%x\n", __FUNCTION__, cmd);
-
- switch (cmd) {
- case FE_GET_INFO:
- switch(tda_state->fe_type) {
- case FE_TYPE_TDA10045H:
- memcpy(arg, &tda10045h_info, sizeof(struct dvb_frontend_info));
- break;
-
- case FE_TYPE_TDA10046H:
- memcpy(arg, &tda10046h_info, sizeof(struct dvb_frontend_info));
- break;
- }
- break;
-
- case FE_READ_STATUS:
- return tda1004x_read_status(i2c, tda_state, (fe_status_t *) arg);
-
- case FE_READ_BER:
- return tda1004x_read_ber(i2c, tda_state, (u32 *) arg);
-
- case FE_READ_SIGNAL_STRENGTH:
- return tda1004x_read_signal_strength(i2c, tda_state, (u16 *) arg);
-
- case FE_READ_SNR:
- return tda1004x_read_snr(i2c, tda_state, (u16 *) arg);
-
- case FE_READ_UNCORRECTED_BLOCKS:
- return tda1004x_read_ucblocks(i2c, tda_state, (u32 *) arg);
-
- case FE_SET_FRONTEND:
- return tda1004x_set_fe(i2c, tda_state, (struct dvb_frontend_parameters*) arg);
-
- case FE_GET_FRONTEND:
- return tda1004x_get_fe(i2c, tda_state, (struct dvb_frontend_parameters*) arg);
-
- case FE_SLEEP:
- tda_state->initialised = 0;
- return tda1004x_sleep(i2c, tda_state);
-
- case FE_INIT:
-
- // don't bother reinitialising
- if (tda_state->initialised)
- return 0;
-
- // OK, perform initialisation
- switch(tda_state->fe_type) {
- case FE_TYPE_TDA10045H:
- status = tda10045h_init(i2c, tda_state);
- break;
-
- case FE_TYPE_TDA10046H:
- status = tda10046h_init(i2c, tda_state);
- break;
- }
- if (status == 0)
- tda_state->initialised = 1;
- return status;
-
- case FE_GET_TUNE_SETTINGS:
- {
- struct dvb_frontend_tune_settings* fesettings = (struct dvb_frontend_tune_settings*) arg;
- fesettings->min_delay_ms = 800;
- fesettings->step_size = 166667;
- fesettings->max_drift = 166667*2;
- return 0;
- }
-
- default:
- return -EOPNOTSUPP;
- }
-
+ fesettings->min_delay_ms = 800;
+ fesettings->step_size = 166667;
+ fesettings->max_drift = 166667*2;
return 0;
}
-static int tda1004x_attach(struct i2c_adapter *i2c, struct tda1004x_state* state)
+static void tda1004x_release(struct dvb_frontend* fe)
{
- int tda1004x_address = -1;
- int tuner_address = -1;
- int fe_type = -1;
- int tuner_type = -1;
- struct i2c_msg tuner_msg = {.addr=0, .flags=0, .buf=NULL, .len=0 };
- static u8 td1344_init[] = { 0x0b, 0xf5, 0x88, 0xab };
- static u8 td1316_init[] = { 0x0b, 0xf5, 0x85, 0xab };
- static u8 td1316_init_tda10046h[] = { 0x0b, 0xf5, 0x80, 0xab };
-
- dprintk("%s\n", __FUNCTION__);
-
- // probe for tda10045h
- if (tda1004x_address == -1) {
- state->tda1004x_address = 0x08;
- if (tda1004x_read_byte(i2c, state, TDA1004X_CHIPID) == 0x25) {
- tda1004x_address = 0x08;
- fe_type = FE_TYPE_TDA10045H;
- printk("tda1004x: Detected Philips TDA10045H.\n");
- }
- }
-
- // probe for tda10046h
- if (tda1004x_address == -1) {
- state->tda1004x_address = 0x08;
- if (tda1004x_read_byte(i2c, state, TDA1004X_CHIPID) == 0x46) {
- tda1004x_address = 0x08;
- fe_type = FE_TYPE_TDA10046H;
- printk("tda1004x: Detected Philips TDA10046H.\n");
- }
- }
-
- // did we find a frontend?
- if (tda1004x_address == -1) {
- return -ENODEV;
- }
-
- // enable access to the tuner
- tda1004x_enable_tuner_i2c(i2c, state);
-
- // check for a TD1344 first
- if (tuner_address == -1) {
- tuner_msg.addr = 0x61;
- tuner_msg.buf = td1344_init;
- tuner_msg.len = sizeof(td1344_init);
- if (i2c_transfer(i2c, &tuner_msg, 1) == 1) {
- msleep(1);
- tuner_address = 0x61;
- tuner_type = TUNER_TYPE_TD1344;
- printk("tda1004x: Detected Philips TD1344 tuner.\n");
- }
- }
-
- // OK, try a TD1316 on address 0x63
- if (tuner_address == -1) {
- tuner_msg.addr = 0x63;
- tuner_msg.buf = td1316_init;
- tuner_msg.len = sizeof(td1316_init);
- if (i2c_transfer(i2c, &tuner_msg, 1) == 1) {
- msleep(1);
- tuner_address = 0x63;
- tuner_type = TUNER_TYPE_TD1316;
- printk("tda1004x: Detected Philips TD1316 tuner.\n");
- }
- }
-
- // OK, TD1316 again, on address 0x60 (TDA10046H)
- if (tuner_address == -1) {
- tuner_msg.addr = 0x60;
- tuner_msg.buf = td1316_init_tda10046h;
- tuner_msg.len = sizeof(td1316_init_tda10046h);
- if (i2c_transfer(i2c, &tuner_msg, 1) == 1) {
- msleep(1);
- tuner_address = 0x60;
- tuner_type = TUNER_TYPE_TD1316;
- printk("tda1004x: Detected Philips TD1316 tuner.\n");
- }
- }
- tda1004x_disable_tuner_i2c(i2c, state);
-
- // did we find a tuner?
- if (tuner_address == -1) {
- printk("tda1004x: Detected, but with unknown tuner.\n");
- return -ENODEV;
- }
-
- // create state
- state->tda1004x_address = tda1004x_address;
- state->fe_type = fe_type;
- state->tuner_address = tuner_address;
- state->tuner_type = tuner_type;
- state->initialised = 0;
-
- return 0;
+ struct tda1004x_state* state = (struct tda1004x_state*) fe->demodulator_priv;
+ kfree(state);
}
-static struct i2c_client client_template;
+static struct dvb_frontend_ops tda10045_ops;
-static int attach_adapter(struct i2c_adapter *adapter)
+struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
+ struct i2c_adapter* i2c)
{
- struct i2c_client *client;
- struct tda1004x_state *state;
- int ret;
+ struct tda1004x_state* state = NULL;
- dprintk ("%s\n", __FUNCTION__);
+ /* allocate memory for the internal state */
+ state = (struct tda1004x_state*) kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL);
+ if (state == NULL) goto error;
- if (NULL == (client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
- return -ENOMEM;
- }
-
- if (NULL == (state = kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL))) {
- kfree(client);
- return -ENOMEM;
- }
- state->i2c = adapter;
-
- ret = tda1004x_attach(adapter, state);
- if (ret) {
- kfree(state);
- kfree(client);
- return -ENODEV;
- }
-
- memcpy(client, &client_template, sizeof(struct i2c_client));
- client->adapter = adapter;
- client->addr = state->tda1004x_address;
- i2c_set_clientdata(client, (void*)state);
-
- ret = i2c_attach_client(client);
- if (ret) {
- kfree(client);
- kfree(state);
- return ret;
- }
-
- // upload firmware
- BUG_ON(!state->dvb);
-
- switch(state->fe_type) {
- case FE_TYPE_TDA10045H:
- state->dspCodeCounterReg = TDA10045H_FWPAGE;
- state->dspCodeInReg = TDA10045H_CODE_IN;
- state->dspVersion = 0x2c;
-
- ret = tda10045_fwupload(adapter, state, client);
- if (ret) {
- printk("tda1004x: firmware upload failed\n");
- goto out;
- }
-
- ret = dvb_register_frontend(tda1004x_ioctl, state->dvb,
- state, &tda10045h_info,
- THIS_MODULE);
- break;
- case FE_TYPE_TDA10046H:
- state->dspCodeCounterReg = TDA10046H_CODE_CPT;
- state->dspCodeInReg = TDA10046H_CODE_IN;
- state->dspVersion = 0x20;
-
- ret = tda10046_fwupload(adapter, state, client);
- if (ret) {
- printk("tda1004x: firmware upload failed\n");
- goto out;
- }
+ /* setup the state */
+ state->config = config;
+ state->i2c = i2c;
+ memcpy(&state->ops, &tda10045_ops, sizeof(struct dvb_frontend_ops));
+ state->initialised = 0;
+ state->demod_type = TDA1004X_DEMOD_TDA10045;
- ret = dvb_register_frontend(tda1004x_ioctl, state->dvb,
- state, &tda10046h_info,
- THIS_MODULE);
- break;
- default:
- BUG_ON(1);
- }
+ /* check if the demod is there */
+ if (tda1004x_read_byte(state, TDA1004X_CHIPID) != 0x25) goto error;
- if (ret) {
- printk("tda1004x: registering frontend failed\n");
- goto out;
- }
+ /* create dvb_frontend */
+ state->frontend.ops = &state->ops;
+ state->frontend.demodulator_priv = state;
+ return &state->frontend;
- return 0;
-out:
- i2c_detach_client(client);
- kfree(client);
- kfree(state);
- return ret;
+error:
+ if (state) kfree(state);
+ return NULL;
}
-static int detach_client(struct i2c_client *client)
+static struct dvb_frontend_ops tda10046_ops;
+
+struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
+ struct i2c_adapter* i2c)
{
- struct tda1004x_state *state = (struct tda1004x_state*)i2c_get_clientdata(client);
+ struct tda1004x_state* state = NULL;
- dprintk ("%s\n", __FUNCTION__);
+ /* allocate memory for the internal state */
+ state = (struct tda1004x_state*) kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL);
+ if (state == NULL) goto error;
- dvb_unregister_frontend (tda1004x_ioctl, state->dvb);
- i2c_detach_client(client);
- BUG_ON(state->dvb);
- kfree(client);
- kfree(state);
- return 0;
-}
+ /* setup the state */
+ state->config = config;
+ state->i2c = i2c;
+ memcpy(&state->ops, &tda10046_ops, sizeof(struct dvb_frontend_ops));
+ state->initialised = 0;
+ state->demod_type = TDA1004X_DEMOD_TDA10046;
-static int command (struct i2c_client *client, unsigned int cmd, void *arg)
-{
- struct tda1004x_state *state = (struct tda1004x_state*)i2c_get_clientdata(client);
+ /* check if the demod is there */
+ if (tda1004x_read_byte(state, TDA1004X_CHIPID) != 0x25) goto error;
- dprintk ("%s\n", __FUNCTION__);
+ /* create dvb_frontend */
+ state->frontend.ops = &state->ops;
+ state->frontend.demodulator_priv = state;
+ return &state->frontend;
- switch (cmd) {
- case FE_REGISTER:
- state->dvb = (struct dvb_adapter*)arg;
- break;
- case FE_UNREGISTER:
- state->dvb = NULL;
- break;
- default:
- return -EOPNOTSUPP;
- }
- return 0;
+error:
+ if (state) kfree(state);
+ return NULL;
}
-static struct i2c_driver driver = {
- .owner = THIS_MODULE,
- .name = FRONTEND_NAME,
- .id = I2C_DRIVERID_DVBFE_TDA1004X,
- .flags = I2C_DF_NOTIFY,
- .attach_adapter = attach_adapter,
- .detach_client = detach_client,
- .command = command,
+static struct dvb_frontend_ops tda10045_ops = {
+
+ .info = {
+ .name = "Philips TDA10045H DVB-T",
+ .type = FE_OFDM,
+ .frequency_min = 51000000,
+ .frequency_max = 858000000,
+ .frequency_stepsize = 166667,
+ .caps =
+ FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
+ FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+ FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO
+ },
+
+ .release = tda1004x_release,
+
+ .init = tda10045_init,
+ .sleep = tda1004x_sleep,
+
+ .set_frontend = tda1004x_set_fe,
+ .get_frontend = tda1004x_get_fe,
+
+ .read_status = tda1004x_read_status,
+ .read_ber = tda1004x_read_ber,
+ .read_signal_strength = tda1004x_read_signal_strength,
+ .read_snr = tda1004x_read_snr,
+ .read_ucblocks = tda1004x_read_ucblocks,
};
-static struct i2c_client client_template = {
- .name = FRONTEND_NAME,
- .flags = I2C_CLIENT_ALLOW_USE,
- .driver = &driver,
+static struct dvb_frontend_ops tda10046_ops = {
+
+ .info = {
+ .name = "Philips TDA10046H DVB-T",
+ .type = FE_OFDM,
+ .frequency_min = 51000000,
+ .frequency_max = 858000000,
+ .frequency_stepsize = 166667,
+ .caps =
+ FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
+ FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+ FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO
+ },
+
+ .release = tda1004x_release,
+
+ .init = tda10046_init,
+ .sleep = tda1004x_sleep,
+
+ .set_frontend = tda1004x_set_fe,
+ .get_frontend = tda1004x_get_fe,
+ .get_tune_settings = tda1004x_get_tune_settings,
+
+ .read_status = tda1004x_read_status,
+ .read_ber = tda1004x_read_ber,
+ .read_signal_strength = tda1004x_read_signal_strength,
+ .read_snr = tda1004x_read_snr,
+ .read_ucblocks = tda1004x_read_ucblocks,
};
-static int __init init_tda1004x(void)
-{
- return i2c_add_driver(&driver);
-}
-
-static void __exit exit_tda1004x(void)
-{
- if (i2c_del_driver(&driver))
- printk("tda1004x: driver deregistration failed\n");
-}
-
-module_init(init_tda1004x);
-module_exit(exit_tda1004x);
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
-MODULE_DESCRIPTION("Philips TDA10045H & TDA10046H DVB-T Frontend");
+MODULE_DESCRIPTION("Philips TDA10045H & TDA10046H DVB-T Demodulator");
MODULE_AUTHOR("Andrew de Quincey & Robert Schlabbach");
MODULE_LICENSE("GPL");
+EXPORT_SYMBOL(tda10045_attach);
+EXPORT_SYMBOL(tda10046_attach);
+EXPORT_SYMBOL(tda1004x_write_byte);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-31 07:51:52 +0000