[PATCH] dvb: flexcop: add BCM3510 ATSC frontend support for Air2PC card

Added support for the Broadcom BCM3510 ATSC (8VSB/16VSB & ITU J83 AnnexB FEC
QAM64/256) demodulator used in the first generation of Air2PC ATSC
PCI-cards/USB-boxes made by B2C2.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

9 files changed, 1389 insertions, 14 deletions

diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index 99bd675df955..fafd0ab3a28f 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -6,6 +6,7 @@ config DVB_B2C2_FLEXCOP
         select DVB_MT312
         select DVB_NXT2002
         select DVB_STV0297
+        select DVB_BCM3510
         help
           Support for the digital TV receiver chip made by B2C2 Inc. included in
           Technisats PCI cards and USB boxes.
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 71be400e9aeb..0410cc96a48e 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -10,6 +10,7 @@
 #include "stv0299.h"
 #include "mt352.h"
 #include "nxt2002.h"
+#include "bcm3510.h"
 #include "stv0297.h"
 #include "mt312.h"
 
@@ -285,21 +286,25 @@ static int samsung_tdtc9251dh0_pll_set(struct dvb_frontend* fe, struct dvb_front
 }
 
 static struct mt352_config samsung_tdtc9251dh0_config = {
-
         .demod_address = 0x0f,
-        .demod_init = samsung_tdtc9251dh0_demod_init,
-        .pll_set = samsung_tdtc9251dh0_pll_set,
+        .demod_init    = samsung_tdtc9251dh0_demod_init,
+        .pll_set       = samsung_tdtc9251dh0_pll_set,
 };
 
-static int nxt2002_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
+static int flexcop_fe_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
 {
         struct flexcop_device *fc = fe->dvb->priv;
         return request_firmware(fw, name, fc->dev);
 }
 
 static struct nxt2002_config samsung_tbmv_config = {
-        .demod_address = 0x0a,
-        .request_firmware = nxt2002_request_firmware,
+        .demod_address    = 0x0a,
+        .request_firmware = flexcop_fe_request_firmware,
+};
+
+static struct bcm3510_config air2pc_atsc_first_gen_config = {
+        .demod_address    = 0x0f,
+        .request_firmware = flexcop_fe_request_firmware,
 };
 
 static int skystar23_samsung_tbdu18132_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
@@ -354,11 +359,16 @@ int flexcop_frontend_init(struct flexcop_device *fc)
                 fc->dev_type          = FC_AIR_DVB;
                 info("found the mt352 at i2c address: 0x%02x",samsung_tdtc9251dh0_config.demod_address);
         } else
-        /* try the air atsc (nxt2002) */
+        /* try the air atsc 2nd generation (nxt2002) */
         if ((fc->fe = nxt2002_attach(&samsung_tbmv_config, &fc->i2c_adap)) != NULL) {
-                fc->dev_type          = FC_AIR_ATSC;
+                fc->dev_type          = FC_AIR_ATSC2;
                 info("found the nxt2002 at i2c address: 0x%02x",samsung_tbmv_config.demod_address);
         } else
+        /* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */
+        if ((fc->fe = bcm3510_attach(&air2pc_atsc_first_gen_config, &fc->i2c_adap)) != NULL) {
+                fc->dev_type          = FC_AIR_ATSC1;
+                info("found the bcm3510 at i2c address: 0x%02x",air2pc_atsc_first_gen_config.demod_address);
+        } else
         /* try the cable dvb (stv0297) */
         if ((fc->fe = stv0297_attach(&alps_tdee4_stv0297_config, &fc->i2c_adap, 0xf8)) != NULL) {
                 fc->dev_type                        = FC_CABLE;
diff --git a/drivers/media/dvb/b2c2/flexcop-misc.c b/drivers/media/dvb/b2c2/flexcop-misc.c
index 19e06da46774..23082545651f 100644
--- a/drivers/media/dvb/b2c2/flexcop-misc.c
+++ b/drivers/media/dvb/b2c2/flexcop-misc.c
@@ -45,11 +45,12 @@ const char *flexcop_revision_names[] = {
 
 const char *flexcop_device_names[] = {
         "Unkown device",
-        "AirStar 2 DVB-T",
-        "AirStar 2 ATSC",
-        "SkyStar 2 DVB-S",
-        "SkyStar 2 DVB-S (old version)",
-        "CableStar 2 DVB-C",
+        "Air2PC/AirStar 2 DVB-T",
+        "Air2PC/AirStar 2 ATSC 1st generation",
+        "Air2PC/AirStar 2 ATSC 2nd generation",
+        "Sky2PC/SkyStar 2 DVB-S",
+        "Sky2PC/SkyStar 2 DVB-S (old version)",
+        "Cable2PC/CableStar 2 DVB-C",
 };
 
 const char *flexcop_bus_names[] = {
diff --git a/drivers/media/dvb/b2c2/flexcop-reg.h b/drivers/media/dvb/b2c2/flexcop-reg.h
index 5e131be55cb3..75b50f21afe6 100644
--- a/drivers/media/dvb/b2c2/flexcop-reg.h
+++ b/drivers/media/dvb/b2c2/flexcop-reg.h
@@ -21,7 +21,8 @@ extern const char *flexcop_revision_names[];
 typedef enum {
         FC_UNK = 0,
         FC_AIR_DVB,
-        FC_AIR_ATSC,
+        FC_AIR_ATSC1,
+        FC_AIR_ATSC2,
         FC_SKY,
         FC_SKY_OLD,
         FC_CABLE,
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 75fb556ec01f..b4fddf513ebe 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -173,4 +173,12 @@ config DVB_OR51132
           An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
           to support this frontend.
 
+config DVB_BCM3510
+        tristate "Broadcom BCM3510"
+        depends on DVB_CORE
+        select FW_LOADER
+        help
+          An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to
+          support this frontend.
+
 endmenu
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index 7f8784870eab..91d6d3576d3d 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -28,3 +28,4 @@ obj-$(CONFIG_DVB_STV0297) += stv0297.o
 obj-$(CONFIG_DVB_NXT2002) += nxt2002.o
 obj-$(CONFIG_DVB_OR51211) += or51211.o
 obj-$(CONFIG_DVB_OR51132) += or51132.o
+obj-$(CONFIG_DVB_BCM3510) += bcm3510.o
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
new file mode 100644
index 000000000000..f5fdc5c3e605
--- /dev/null
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -0,0 +1,853 @@
+/*
+ * Support for the Broadcom BCM3510 ATSC demodulator (1st generation Air2PC)
+ *
+ *  Copyright (C) 2001-5, B2C2 inc.
+ *
+ *  GPL/Linux driver written by Patrick Boettcher <patrick.boettcher@desy.de>
+ *
+ *  This driver is "hard-coded" to be used with the 1st generation of
+ *  Technisat/B2C2's Air2PC ATSC PCI/USB cards/boxes. The pll-programming
+ *  (Panasonic CT10S) is located here, which is actually wrong. Unless there is
+ *  another device with a BCM3510, this is no problem.
+ *
+ *  The driver works also with QAM64 DVB-C, but had an unreasonable high
+ *  UNC. (Tested with the Air2PC ATSC 1st generation)
+ *
+ *  You'll need a firmware for this driver in order to get it running. It is
+ *  called "dvb-fe-bcm3510-01.fw".
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 675 Mass
+ * Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/device.h>
+#include <linux/firmware.h>
+
+#include "dvb_frontend.h"
+#include "bcm3510.h"
+#include "bcm3510_priv.h"
+
+struct bcm3510_state {
+
+        struct i2c_adapter* i2c;
+        struct dvb_frontend_ops ops;
+        const struct bcm3510_config* config;
+        struct dvb_frontend frontend;
+
+        /* demodulator private data */
+        struct semaphore hab_sem;
+        u8 firmware_loaded:1;
+
+        unsigned long next_status_check;
+        unsigned long status_check_interval;
+        struct bcm3510_hab_cmd_status1 status1;
+        struct bcm3510_hab_cmd_status2 status2;
+};
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c (|-able)).");
+
+#define dprintk(level,x...) if (level & debug) printk(x)
+#define dbufout(b,l,m) {\
+            int i; \
+            for (i = 0; i < l; i++) \
+                m("%02x ",b[i]); \
+}
+#define deb_info(args...) dprintk(0x01,args)
+#define deb_i2c(args...)  dprintk(0x02,args)
+#define deb_hab(args...)  dprintk(0x04,args)
+
+/* transfer functions */
+static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 len)
+{
+        u8 b[256];
+        int err;
+        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = b, .len = len + 1 };
+
+        b[0] = reg;
+        memcpy(&b[1],buf,len);
+
+        deb_i2c("i2c wr %02x: ",reg);
+        dbufout(buf,len,deb_i2c);
+        deb_i2c("\n");
+
+        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
+
+                deb_info("%s: i2c write error (addr %02x, reg %02x, err == %i)\n",
+                        __FUNCTION__, state->config->demod_address, reg,  err);
+                return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+static int bcm3510_readbytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 len)
+{
+        struct i2c_msg msg[] = {
+                { .addr = state->config->demod_address, .flags = 0,        .buf = &reg, .len = 1 },
+                { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = buf,  .len = len }
+        };
+        int err;
+
+        memset(buf,0,len);
+
+        if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) {
+                deb_info("%s: i2c read error (addr %02x, reg %02x, err == %i)\n",
+                        __FUNCTION__, state->config->demod_address, reg,  err);
+                return -EREMOTEIO;
+        }
+        deb_i2c("i2c rd %02x: ",reg);
+        dbufout(buf,len,deb_i2c);
+        deb_i2c("\n");
+
+        return 0;
+}
+
+static int bcm3510_writeB(struct bcm3510_state *state, u8 reg, bcm3510_register_value v)
+{
+        return bcm3510_writebytes(state,reg,&v.raw,1);
+}
+
+static int bcm3510_readB(struct bcm3510_state *state, u8 reg, bcm3510_register_value *v)
+{
+        return bcm3510_readbytes(state,reg,&v->raw,1);
+}
+
+/* Host Access Buffer transfers */
+static int bcm3510_hab_get_response(struct bcm3510_state *st, u8 *buf, int len)
+{
+        bcm3510_register_value v;
+        int ret,i;
+
+        v.HABADR_a6.HABADR = 0;
+        if ((ret = bcm3510_writeB(st,0xa6,v)) < 0)
+                return ret;
+
+        for (i = 0; i < len; i++) {
+                if ((ret = bcm3510_readB(st,0xa7,&v)) < 0)
+                        return ret;
+                buf[i] = v.HABDATA_a7;
+        }
+        return 0;
+}
+
+static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len)
+{
+        bcm3510_register_value v,hab;
+        int ret,i;
+        unsigned long t;
+
+/* Check if any previous HAB request still needs to be serviced by the
+ * Aquisition Processor before sending new request */
+        if ((ret = bcm3510_readB(st,0xa8,&v)) < 0)
+                return ret;
+        if (v.HABSTAT_a8.HABR) {
+                deb_info("HAB is running already - clearing it.\n");
+                v.HABSTAT_a8.HABR = 0;
+                bcm3510_writeB(st,0xa8,v);
+//              return -EBUSY;
+        }
+
+/* Send the start HAB Address (automatically incremented after write of
+ * HABDATA) and write the HAB Data */
+        hab.HABADR_a6.HABADR = 0;
+        if ((ret = bcm3510_writeB(st,0xa6,hab)) < 0)
+                return ret;
+
+        for (i = 0; i < len; i++) {
+                hab.HABDATA_a7 = buf[i];
+                if ((ret = bcm3510_writeB(st,0xa7,hab)) < 0)
+                        return ret;
+        }
+
+/* Set the HABR bit to indicate AP request in progress (LBHABR allows HABR to
+ * be written) */
+        v.raw = 0; v.HABSTAT_a8.HABR = 1; v.HABSTAT_a8.LDHABR = 1;
+        if ((ret = bcm3510_writeB(st,0xa8,v)) < 0)
+                return ret;
+
+/* Polling method: Wait until the AP finishes processing the HAB request */
+        t = jiffies + 1*HZ;
+        while (time_before(jiffies, t)) {
+                deb_info("waiting for HAB to complete\n");
+                msleep(10);
+                if ((ret = bcm3510_readB(st,0xa8,&v)) < 0)
+                        return ret;
+
+                if (!v.HABSTAT_a8.HABR)
+                        return 0;
+        }
+
+        deb_info("send_request execution timed out.\n");
+        return -ETIMEDOUT;
+}
+
+static int bcm3510_do_hab_cmd(struct bcm3510_state *st, u8 cmd, u8 msgid, u8 *obuf, u8 olen, u8 *ibuf, u8 ilen)
+{
+        u8 ob[olen+2],ib[ilen+2];
+        int ret = 0;
+
+        ob[0] = cmd;
+        ob[1] = msgid;
+        memcpy(&ob[2],obuf,olen);
+
+        deb_hab("hab snd: ");
+        dbufout(ob,olen+2,deb_hab);
+        deb_hab("\n");
+
+        if (down_interruptible(&st->hab_sem) < 0)
+                return -EAGAIN;
+
+        if ((ret = bcm3510_hab_send_request(st, ob, olen+2)) < 0 ||
+                (ret = bcm3510_hab_get_response(st, ib, ilen+2)) < 0)
+                goto error;
+
+        deb_hab("hab get: ");
+        dbufout(ib,ilen+2,deb_hab);
+        deb_hab("\n");
+
+        memcpy(ibuf,&ib[2],ilen);
+error:
+        up(&st->hab_sem);
+        return ret;
+}
+
+#if 0
+/* not needed, we use a semaphore to prevent HAB races */
+static int bcm3510_is_ap_ready(struct bcm3510_state *st)
+{
+        bcm3510_register_value ap,hab;
+        int ret;
+
+        if ((ret = bcm3510_readB(st,0xa8,&hab)) < 0 ||
+                (ret = bcm3510_readB(st,0xa2,&ap) < 0))
+                return ret;
+
+        if (ap.APSTAT1_a2.RESET || ap.APSTAT1_a2.IDLE || ap.APSTAT1_a2.STOP || hab.HABSTAT_a8.HABR) {
+                deb_info("AP is busy\n");
+                return -EBUSY;
+        }
+
+        return 0;
+}
+#endif
+
+static int bcm3510_bert_reset(struct bcm3510_state *st)
+{
+        bcm3510_register_value b;
+        int ret;
+
+        if ((ret < bcm3510_readB(st,0xfa,&b)) < 0)
+                return ret;
+
+        b.BERCTL_fa.RESYNC = 0; bcm3510_writeB(st,0xfa,b);
+        b.BERCTL_fa.RESYNC = 1; bcm3510_writeB(st,0xfa,b);
+        b.BERCTL_fa.RESYNC = 0; bcm3510_writeB(st,0xfa,b);
+        b.BERCTL_fa.CNTCTL = 1; b.BERCTL_fa.BITCNT = 1; bcm3510_writeB(st,0xfa,b);
+
+        /* clear residual bit counter TODO  */
+        return 0;
+}
+
+static int bcm3510_refresh_state(struct bcm3510_state *st)
+{
+        if (time_after(jiffies,st->next_status_check)) {
+                bcm3510_do_hab_cmd(st, CMD_STATUS, MSGID_STATUS1, NULL,0, (u8 *)&st->status1, sizeof(st->status1));
+                bcm3510_do_hab_cmd(st, CMD_STATUS, MSGID_STATUS2, NULL,0, (u8 *)&st->status2, sizeof(st->status2));
+                st->next_status_check = jiffies + (st->status_check_interval*HZ)/1000;
+        }
+        return 0;
+}
+
+static int bcm3510_read_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+        struct bcm3510_state* st = fe->demodulator_priv;
+        bcm3510_refresh_state(st);
+
+        *status = 0;
+        if (st->status1.STATUS1.RECEIVER_LOCK)
+                *status |= FE_HAS_LOCK | FE_HAS_SYNC;
+
+        if (st->status1.STATUS1.FEC_LOCK)
+                *status |= FE_HAS_VITERBI;
+
+        if (st->status1.STATUS1.OUT_PLL_LOCK)
+                *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
+
+        if (*status & FE_HAS_LOCK)
+                st->status_check_interval = 1500;
+        else /* more frequently checks if no lock has been achieved yet */
+                st->status_check_interval = 500;
+
+        deb_info("real_status: %02x\n",*status);
+        return 0;
+}
+
+static int bcm3510_read_ber(struct dvb_frontend* fe, u32* ber)
+{
+        struct bcm3510_state* st = fe->demodulator_priv;
+        bcm3510_refresh_state(st);
+
+        *ber = (st->status2.LDBER0 << 16) | (st->status2.LDBER1 << 8) | st->status2.LDBER2;
+        return 0;
+}
+
+static int bcm3510_read_unc(struct dvb_frontend* fe, u32* unc)
+{
+        struct bcm3510_state* st = fe->demodulator_priv;
+        bcm3510_refresh_state(st);
+        *unc = (st->status2.LDUERC0 << 8) | st->status2.LDUERC1;
+        return 0;
+}
+
+static int bcm3510_read_signal_strength(struct dvb_frontend* fe, u16* strength)
+{
+        struct bcm3510_state* st = fe->demodulator_priv;
+        s32 t;
+
+        bcm3510_refresh_state(st);
+        t = st->status2.SIGNAL;
+
+        if (t > 190)
+                t = 190;
+        if (t < 90)
+                t = 90;
+
+        t -= 90;
+        t = t * 0xff / 100;
+        /* normalize if necessary */
+        *strength = (t << 8) | t;
+        return 0;
+}
+
+static int bcm3510_read_snr(struct dvb_frontend* fe, u16* snr)
+{
+        struct bcm3510_state* st = fe->demodulator_priv;
+        bcm3510_refresh_state(st);
+
+        *snr = st->status1.SNR_EST0*1000 + ((st->status1.SNR_EST1*1000) >> 8);
+        return 0;
+}
+
+/* tuner frontend programming */
+static int bcm3510_tuner_cmd(struct bcm3510_state* st,u8 bc, u16 n, u8 a)
+{
+        struct bcm3510_hab_cmd_tune c;
+        memset(&c,0,sizeof(struct bcm3510_hab_cmd_tune));
+
+/* I2C Mode disabled,  set 16 control / Data pairs */
+        c.length = 0x10;
+        c.clock_width = 0;
+/* CS1, CS0, DATA, CLK bits control the tuner RF_AGC_SEL pin is set to
+ * logic high (as Configuration) */
+        c.misc = 0x10;
+/* Set duration of the initial state of TUNCTL = 3.34 micro Sec */
+        c.TUNCTL_state = 0x40;
+
+/* PRESCALER DEVIDE RATIO | BC1_2_3_4; (band switch), 1stosc REFERENCE COUNTER REF_S12 and REF_S11 */
+        c.ctl_dat[0].ctrl.size = BITS_8;
+        c.ctl_dat[0].data      = 0x80 | bc;
+
+/* Control DATA pin, 1stosc REFERENCE COUNTER REF_S10 to REF_S3 */
+        c.ctl_dat[1].ctrl.size = BITS_8;
+        c.ctl_dat[1].data      = 4;
+
+/* set CONTROL BIT 1 to 1, 1stosc REFERENCE COUNTER REF_S2 to REF_S1 */
+        c.ctl_dat[2].ctrl.size = BITS_3;
+        c.ctl_dat[2].data      = 0x20;
+
+/* control CS0 pin, pulse byte ? */
+        c.ctl_dat[3].ctrl.size = BITS_3;
+        c.ctl_dat[3].ctrl.clk_off = 1;
+        c.ctl_dat[3].ctrl.cs0  = 1;
+        c.ctl_dat[3].data      = 0x40;
+
+/* PGM_S18 to PGM_S11 */
+        c.ctl_dat[4].ctrl.size = BITS_8;
+        c.ctl_dat[4].data      = n >> 3;
+
+/* PGM_S10 to PGM_S8, SWL_S7 to SWL_S3 */
+        c.ctl_dat[5].ctrl.size = BITS_8;
+        c.ctl_dat[5].data      = ((n & 0x7) << 5) | (a >> 2);
+
+/* SWL_S2 and SWL_S1, set CONTROL BIT 2 to 0 */
+        c.ctl_dat[6].ctrl.size = BITS_3;
+        c.ctl_dat[6].data      = (a << 6) & 0xdf;
+
+/* control CS0 pin, pulse byte ? */
+        c.ctl_dat[7].ctrl.size = BITS_3;
+        c.ctl_dat[7].ctrl.clk_off = 1;
+        c.ctl_dat[7].ctrl.cs0  = 1;
+        c.ctl_dat[7].data      = 0x40;
+
+/* PRESCALER DEVIDE RATIO, 2ndosc REFERENCE COUNTER REF_S12 and REF_S11 */
+        c.ctl_dat[8].ctrl.size = BITS_8;
+        c.ctl_dat[8].data      = 0x80;
+
+/* 2ndosc REFERENCE COUNTER REF_S10 to REF_S3 */
+        c.ctl_dat[9].ctrl.size = BITS_8;
+        c.ctl_dat[9].data      = 0x10;
+
+/* set CONTROL BIT 1 to 1, 2ndosc REFERENCE COUNTER REF_S2 to REF_S1 */
+        c.ctl_dat[10].ctrl.size = BITS_3;
+        c.ctl_dat[10].data      = 0x20;
+
+/* pulse byte */
+        c.ctl_dat[11].ctrl.size = BITS_3;
+        c.ctl_dat[11].ctrl.clk_off = 1;
+        c.ctl_dat[11].ctrl.cs1  = 1;
+        c.ctl_dat[11].data      = 0x40;
+
+/* PGM_S18 to PGM_S11 */
+        c.ctl_dat[12].ctrl.size = BITS_8;
+        c.ctl_dat[12].data      = 0x2a;
+
+/* PGM_S10 to PGM_S8 and SWL_S7 to SWL_S3 */
+        c.ctl_dat[13].ctrl.size = BITS_8;
+        c.ctl_dat[13].data      = 0x8e;
+
+/* SWL_S2 and SWL_S1 and set CONTROL BIT 2 to 0 */
+        c.ctl_dat[14].ctrl.size = BITS_3;
+        c.ctl_dat[14].data      = 0;
+
+/* Pulse Byte */
+        c.ctl_dat[15].ctrl.size = BITS_3;
+        c.ctl_dat[15].ctrl.clk_off = 1;
+        c.ctl_dat[15].ctrl.cs1  = 1;
+        c.ctl_dat[15].data      = 0x40;
+
+        return bcm3510_do_hab_cmd(st,CMD_TUNE, MSGID_TUNE,(u8 *) &c,sizeof(c), NULL, 0);
+}
+
+static int bcm3510_set_freq(struct bcm3510_state* st,u32 freq)
+{
+        u8 bc,a;
+        u16 n;
+        s32 YIntercept,Tfvco1;
+
+        freq /= 1000;
+
+        deb_info("%dkHz:",freq);
+        /* set Band Switch */
+        if (freq <= 168000)
+                bc = 0x1c;
+        else if (freq <= 378000)
+                bc = 0x2c;
+        else
+                bc = 0x30;
+
+        if (freq >= 470000) {
+                freq -= 470001;
+                YIntercept = 18805;
+        } else if (freq >= 90000) {
+                freq -= 90001;
+                YIntercept = 15005;
+        } else if (freq >= 76000){
+                freq -= 76001;
+                YIntercept = 14865;
+        } else {
+                freq -= 54001;
+                YIntercept = 14645;
+        }
+
+        Tfvco1 = (((freq/6000)*60 + YIntercept)*4)/10;
+
+        n = Tfvco1 >> 6;
+        a = Tfvco1 & 0x3f;
+
+        deb_info(" BC1_2_3_4: %x, N: %x A: %x\n", bc, n, a);
+        if (n >= 16 && n <= 2047)
+                return bcm3510_tuner_cmd(st,bc,n,a);
+
+        return -EINVAL;
+}
+
+static int bcm3510_set_frontend(struct dvb_frontend* fe,
+                                             struct dvb_frontend_parameters *p)
+{
+        struct bcm3510_state* st = fe->demodulator_priv;
+        struct bcm3510_hab_cmd_ext_acquire cmd;
+        struct bcm3510_hab_cmd_bert_control bert;
+        int ret;
+
+        memset(&cmd,0,sizeof(cmd));
+        switch (p->u.vsb.modulation) {
+                case QAM_256:
+                        cmd.ACQUIRE0.MODE = 0x1;
+                        cmd.ACQUIRE1.SYM_RATE = 0x1;
+                        cmd.ACQUIRE1.IF_FREQ = 0x1;
+                        break;
+                case QAM_64:
+                        cmd.ACQUIRE0.MODE = 0x2;
+                        cmd.ACQUIRE1.SYM_RATE = 0x2;
+                        cmd.ACQUIRE1.IF_FREQ = 0x1;
+                        break;
+/*              case QAM_256:
+                        cmd.ACQUIRE0.MODE = 0x3;
+                        break;
+                case QAM_128:
+                        cmd.ACQUIRE0.MODE = 0x4;
+                        break;
+                case QAM_64:
+                        cmd.ACQUIRE0.MODE = 0x5;
+                        break;
+                case QAM_32:
+                        cmd.ACQUIRE0.MODE = 0x6;
+                        break;
+                case QAM_16:
+                        cmd.ACQUIRE0.MODE = 0x7;
+                        break;*/
+                case VSB_8:
+                        cmd.ACQUIRE0.MODE = 0x8;
+                        cmd.ACQUIRE1.SYM_RATE = 0x0;
+                        cmd.ACQUIRE1.IF_FREQ = 0x0;
+                        break;
+                case VSB_16:
+                        cmd.ACQUIRE0.MODE = 0x9;
+                        cmd.ACQUIRE1.SYM_RATE = 0x0;
+                        cmd.ACQUIRE1.IF_FREQ = 0x0;
+                default:
+                        return -EINVAL;
+        };
+        cmd.ACQUIRE0.OFFSET = 0;
+        cmd.ACQUIRE0.NTSCSWEEP = 1;
+        cmd.ACQUIRE0.FA = 1;
+        cmd.ACQUIRE0.BW = 0;
+
+/*      if (enableOffset) {
+                cmd.IF_OFFSET0 = xx;
+                cmd.IF_OFFSET1 = xx;
+
+                cmd.SYM_OFFSET0 = xx;
+                cmd.SYM_OFFSET1 = xx;
+                if (enableNtscSweep) {
+                        cmd.NTSC_OFFSET0;
+                        cmd.NTSC_OFFSET1;
+                }
+        } */
+        bcm3510_do_hab_cmd(st, CMD_ACQUIRE, MSGID_EXT_TUNER_ACQUIRE, (u8 *) &cmd, sizeof(cmd), NULL, 0);
+
+/* doing it with different MSGIDs, data book and source differs */
+        bert.BE = 0;
+        bert.unused = 0;
+        bcm3510_do_hab_cmd(st, CMD_STATE_CONTROL, MSGID_BERT_CONTROL, (u8 *) &bert, sizeof(bert), NULL, 0);
+        bcm3510_do_hab_cmd(st, CMD_STATE_CONTROL, MSGID_BERT_SET, (u8 *) &bert, sizeof(bert), NULL, 0);
+
+        bcm3510_bert_reset(st);
+
+        if ((ret = bcm3510_set_freq(st,p->frequency)) < 0)
+                return ret;
+
+        memset(&st->status1,0,sizeof(st->status1));
+        memset(&st->status2,0,sizeof(st->status2));
+        st->status_check_interval = 500;
+
+/* Give the AP some time */
+        msleep(200);
+
+        return 0;
+}
+
+static int bcm3510_sleep(struct dvb_frontend* fe)
+{
+        return 0;
+}
+
+static int bcm3510_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings *s)
+{
+        s->min_delay_ms = 1000;
+        s->step_size = 0;
+        s->max_drift = 0;
+        return 0;
+}
+
+static void bcm3510_release(struct dvb_frontend* fe)
+{
+        struct bcm3510_state* state = fe->demodulator_priv;
+        kfree(state);
+}
+
+/* firmware download:
+ * firmware file is build up like this:
+ * 16bit addr, 16bit length, 8byte of length
+ */
+#define BCM3510_DEFAULT_FIRMWARE "dvb-fe-bcm3510-01.fw"
+
+static int bcm3510_write_ram(struct bcm3510_state *st, u16 addr, u8 *b, u16 len)
+{
+        int ret = 0,i;
+        bcm3510_register_value vH, vL,vD;
+
+        vH.MADRH_a9 = addr >> 8;
+        vL.MADRL_aa = addr;
+        if ((ret = bcm3510_writeB(st,0xa9,vH)) < 0) return ret;
+        if ((ret = bcm3510_writeB(st,0xaa,vL)) < 0) return ret;
+
+        for (i = 0; i < len; i++) {
+                vD.MDATA_ab = b[i];
+                if ((ret = bcm3510_writeB(st,0xab,vD)) < 0)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static int bcm3510_download_firmware(struct dvb_frontend* fe)
+{
+        struct bcm3510_state* st = fe->demodulator_priv;
+        const struct firmware *fw;
+        u16 addr,len;
+        u8  *b;
+        int ret,i;
+
+        deb_info("requesting firmware\n");
+        if ((ret = st->config->request_firmware(fe, &fw, BCM3510_DEFAULT_FIRMWARE)) < 0) {
+                err("could not load firmware (%s): %d",BCM3510_DEFAULT_FIRMWARE,ret);
+                return ret;
+        }
+        deb_info("got firmware: %d\n",fw->size);
+
+        b = fw->data;
+        for (i = 0; i < fw->size;) {
+                addr = le16_to_cpu( *( (u16 *)&b[i] ) );
+                len  = le16_to_cpu( *( (u16 *)&b[i+2] ) );
+                deb_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04x\n",addr,len,fw->size);
+                if ((ret = bcm3510_write_ram(st,addr,&b[i+4],len)) < 0) {
+                        err("firmware download failed: %d\n",ret);
+                        return ret;
+                }
+                i += 4 + len;
+        }
+        release_firmware(fw);
+        deb_info("firmware download successfully completed\n");
+        return 0;
+}
+
+static int bcm3510_check_firmware_version(struct bcm3510_state *st)
+{
+        struct bcm3510_hab_cmd_get_version_info ver;
+        bcm3510_do_hab_cmd(st,CMD_GET_VERSION_INFO,MSGID_GET_VERSION_INFO,NULL,0,(u8*)&ver,sizeof(ver));
+
+        deb_info("Version information: 0x%02x 0x%02x 0x%02x 0x%02x\n",
+                ver.microcode_version, ver.script_version, ver.config_version, ver.demod_version);
+
+        if (ver.script_version == BCM3510_DEF_SCRIPT_VERSION &&
+                ver.config_version == BCM3510_DEF_CONFIG_VERSION &&
+                ver.demod_version  == BCM3510_DEF_DEMOD_VERSION)
+                return 0;
+
+        deb_info("version check failed\n");
+        return -ENODEV;
+}
+
+/* (un)resetting the AP */
+static int bcm3510_reset(struct bcm3510_state *st)
+{
+        int ret;
+        unsigned long  t;
+        bcm3510_register_value v;
+
+        bcm3510_readB(st,0xa0,&v); v.HCTL1_a0.RESET = 1;
+        if ((ret = bcm3510_writeB(st,0xa0,v)) < 0)
+                return ret;
+
+    t = jiffies + 3*HZ;
+        while (time_before(jiffies, t)) {
+                msleep(10);
+                if ((ret = bcm3510_readB(st,0xa2,&v)) < 0)
+                        return ret;
+
+                if (v.APSTAT1_a2.RESET)
+                        return 0;
+        }
+        deb_info("reset timed out\n");
+        return -ETIMEDOUT;
+}
+
+static int bcm3510_clear_reset(struct bcm3510_state *st)
+{
+        bcm3510_register_value v;
+        int ret;
+        unsigned long t;
+
+        v.raw = 0;
+        if ((ret = bcm3510_writeB(st,0xa0,v)) < 0)
+                return ret;
+
+    t = jiffies + 3*HZ;
+        while (time_before(jiffies, t)) {
+                msleep(10);
+                if ((ret = bcm3510_readB(st,0xa2,&v)) < 0)
+                        return ret;
+
+                /* verify that reset is cleared */
+                if (!v.APSTAT1_a2.RESET)
+                        return 0;
+        }
+        deb_info("reset clear timed out\n");
+        return -ETIMEDOUT;
+}
+
+static int bcm3510_init_cold(struct bcm3510_state *st)
+{
+        int ret;
+        bcm3510_register_value v;
+
+        /* read Acquisation Processor status register and check it is not in RUN mode */
+        if ((ret = bcm3510_readB(st,0xa2,&v)) < 0)
+                return ret;
+        if (v.APSTAT1_a2.RUN) {
+                deb_info("AP is already running - firmware already loaded.\n");
+                return 0;
+        }
+
+        deb_info("reset?\n");
+        if ((ret = bcm3510_reset(st)) < 0)
+                return ret;
+
+        deb_info("tristate?\n");
+        /* tri-state */
+        v.TSTCTL_2e.CTL = 0;
+        if ((ret = bcm3510_writeB(st,0x2e,v)) < 0)
+                return ret;
+
+        deb_info("firmware?\n");
+        if ((ret = bcm3510_download_firmware(&st->frontend)) < 0 ||
+                (ret = bcm3510_clear_reset(st)) < 0)
+                return ret;
+
+        /* anything left here to Let the acquisition processor begin execution at program counter 0000 ??? */
+
+        return 0;
+}
+
+static int bcm3510_init(struct dvb_frontend* fe)
+{
+        struct bcm3510_state* st = fe->demodulator_priv;
+        bcm3510_register_value j;
+        struct bcm3510_hab_cmd_set_agc c;
+        int ret;
+
+        if ((ret = bcm3510_readB(st,0xca,&j)) < 0)
+                return ret;
+
+        deb_info("JDEC: %02x\n",j.raw);
+
+        switch (j.JDEC_ca.JDEC) {
+                case JDEC_WAIT_AT_RAM:
+                        deb_info("attempting to download firmware\n");
+                        if ((ret = bcm3510_init_cold(st)) < 0)
+                                return ret;
+                case JDEC_EEPROM_LOAD_WAIT: /* fall-through is wanted */
+                        deb_info("firmware is loaded\n");
+                        bcm3510_check_firmware_version(st);
+                        break;
+                default:
+                        return -ENODEV;
+        }
+
+        memset(&c,0,1);
+        c.SEL = 1;
+        bcm3510_do_hab_cmd(st,CMD_AUTO_PARAM,MSGID_SET_RF_AGC_SEL,(u8 *)&c,sizeof(c),NULL,0);
+
+        return 0;
+}
+
+
+static struct dvb_frontend_ops bcm3510_ops;
+
+struct dvb_frontend* bcm3510_attach(const struct bcm3510_config *config,
+                                   struct i2c_adapter *i2c)
+{
+        struct bcm3510_state* state = NULL;
+        int ret;
+        bcm3510_register_value v;
+
+        /* allocate memory for the internal state */
+        state = kmalloc(sizeof(struct bcm3510_state), GFP_KERNEL);
+        if (state == NULL)
+                goto error;
+        memset(state,0,sizeof(struct bcm3510_state));
+
+        /* setup the state */
+
+        state->config = config;
+        state->i2c = i2c;
+        memcpy(&state->ops, &bcm3510_ops, sizeof(struct dvb_frontend_ops));
+
+        /* create dvb_frontend */
+        state->frontend.ops = &state->ops;
+        state->frontend.demodulator_priv = state;
+
+        sema_init(&state->hab_sem, 1);
+
+        if ((ret = bcm3510_readB(state,0xe0,&v)) < 0)
+                goto error;
+
+        deb_info("Revision: 0x%1x, Layer: 0x%1x.\n",v.REVID_e0.REV,v.REVID_e0.LAYER);
+
+        if ((v.REVID_e0.REV != 0x1 && v.REVID_e0.LAYER != 0xb) && /* cold */
+                (v.REVID_e0.REV != 0x8 && v.REVID_e0.LAYER != 0x0))   /* warm */
+                goto error;
+
+        info("Revision: 0x%1x, Layer: 0x%1x.",v.REVID_e0.REV,v.REVID_e0.LAYER);
+
+        bcm3510_reset(state);
+
+        return &state->frontend;
+
+error:
+        kfree(state);
+        return NULL;
+}
+EXPORT_SYMBOL(bcm3510_attach);
+
+static struct dvb_frontend_ops bcm3510_ops = {
+
+        .info = {
+                .name = "Broadcom BCM3510 VSB/QAM frontend",
+                .type = FE_ATSC,
+                .frequency_min =  54000000,
+                .frequency_max = 803000000,
+                /* stepsize is just a guess */
+                .frequency_stepsize = 0,
+                .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_8VSB | FE_CAN_16VSB |
+                        FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_128 | FE_CAN_QAM_256
+        },
+
+        .release = bcm3510_release,
+
+        .init = bcm3510_init,
+        .sleep = bcm3510_sleep,
+
+        .set_frontend = bcm3510_set_frontend,
+        .get_tune_settings = bcm3510_get_tune_settings,
+
+        .read_status = bcm3510_read_status,
+        .read_ber = bcm3510_read_ber,
+        .read_signal_strength = bcm3510_read_signal_strength,
+        .read_snr = bcm3510_read_snr,
+        .read_ucblocks = bcm3510_read_unc,
+};
+
+MODULE_DESCRIPTION("Broadcom BCM3510 ATSC (8VSB/16VSB & ITU J83 AnnexB FEC QAM64/256) demodulator driver");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/bcm3510.h b/drivers/media/dvb/frontends/bcm3510.h
new file mode 100644
index 000000000000..80f5d0953d02
--- /dev/null
+++ b/drivers/media/dvb/frontends/bcm3510.h
@@ -0,0 +1,40 @@
+/*
+ * Support for the Broadcom BCM3510 ATSC demodulator (1st generation Air2PC)
+ *
+ *  Copyright (C) 2001-5, B2C2 inc.
+ *
+ *  GPL/Linux driver written by Patrick Boettcher <patrick.boettcher@desy.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef BCM3510_H
+#define BCM3510_H
+
+#include <linux/dvb/frontend.h>
+#include <linux/firmware.h>
+
+struct bcm3510_config
+{
+        /* the demodulator's i2c address */
+        u8 demod_address;
+
+        /* request firmware for device */
+        int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name);
+};
+
+extern struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config,
+                                           struct i2c_adapter* i2c);
+
+#endif
diff --git a/drivers/media/dvb/frontends/bcm3510_priv.h b/drivers/media/dvb/frontends/bcm3510_priv.h
new file mode 100644
index 000000000000..3bb1bc2a04f0
--- /dev/null
+++ b/drivers/media/dvb/frontends/bcm3510_priv.h
@@ -0,0 +1,460 @@
+/*
+ * Support for the Broadcom BCM3510 ATSC demodulator (1st generation Air2PC)
+ *
+ *  Copyright (C) 2001-5, B2C2 inc.
+ *
+ *  GPL/Linux driver written by Patrick Boettcher <patrick.boettcher@desy.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef __BCM3510_PRIV_H__
+#define __BCM3510_PRIV_H__
+
+#define PACKED __attribute__((packed))
+
+#undef err
+#define err(format, arg...)  printk(KERN_ERR     "bcm3510: " format "\n" , ## arg)
+#undef info
+#define info(format, arg...) printk(KERN_INFO    "bcm3510: " format "\n" , ## arg)
+#undef warn
+#define warn(format, arg...) printk(KERN_WARNING "bcm3510: " format "\n" , ## arg)
+
+
+#define PANASONIC_FIRST_IF_BASE_IN_KHz  1407500
+#define BCM3510_SYMBOL_RATE             5381000
+
+typedef union {
+        u8 raw;
+
+        struct {
+                u8 CTL   :8;
+        } TSTCTL_2e;
+
+        u8 LDCERC_4e;
+        u8 LDUERC_4f;
+        u8 LD_BER0_65;
+        u8 LD_BER1_66;
+        u8 LD_BER2_67;
+        u8 LD_BER3_68;
+
+        struct {
+                u8 RESET :1;
+                u8 IDLE  :1;
+                u8 STOP  :1;
+                u8 HIRQ0 :1;
+                u8 HIRQ1 :1;
+                u8 na0   :1;
+                u8 HABAV :1;
+                u8 na1   :1;
+        } HCTL1_a0;
+
+        struct {
+                u8 na0    :1;
+                u8 IDLMSK :1;
+                u8 STMSK  :1;
+                u8 I0MSK  :1;
+                u8 I1MSK  :1;
+                u8 na1    :1;
+                u8 HABMSK :1;
+                u8 na2    :1;
+        } HCTLMSK_a1;
+
+        struct {
+                u8 RESET  :1;
+                u8 IDLE   :1;
+                u8 STOP   :1;
+                u8 RUN    :1;
+                u8 HABAV  :1;
+                u8 MEMAV  :1;
+                u8 ALDONE :1;
+                u8 REIRQ  :1;
+        } APSTAT1_a2;
+
+        struct {
+                u8 RSTMSK :1;
+                u8 IMSK   :1;
+                u8 SMSK   :1;
+                u8 RMSK   :1;
+                u8 HABMSK :1;
+                u8 MAVMSK :1;
+                u8 ALDMSK :1;
+                u8 REMSK  :1;
+        } APMSK1_a3;
+
+        u8 APSTAT2_a4;
+        u8 APMSK2_a5;
+
+        struct {
+                u8 HABADR :7;
+                u8 na     :1;
+        } HABADR_a6;
+
+        u8 HABDATA_a7;
+
+        struct {
+                u8 HABR   :1;
+                u8 LDHABR :1;
+                u8 APMSK  :1;
+                u8 HMSK   :1;
+                u8 LDMSK  :1;
+                u8 na     :3;
+        } HABSTAT_a8;
+
+        u8 MADRH_a9;
+        u8 MADRL_aa;
+        u8 MDATA_ab;
+
+        struct {
+#define JDEC_WAIT_AT_RAM      0x7
+#define JDEC_EEPROM_LOAD_WAIT 0x4
+                u8 JDEC   :3;
+                u8 na     :5;
+        } JDEC_ca;
+
+        struct {
+                u8 REV   :4;
+                u8 LAYER :4;
+        } REVID_e0;
+
+        struct {
+                u8 unk0   :1;
+                u8 CNTCTL :1;
+                u8 BITCNT :1;
+                u8 unk1   :1;
+                u8 RESYNC :1;
+                u8 unk2   :3;
+        } BERCTL_fa;
+
+        struct {
+                u8 CSEL0  :1;
+                u8 CLKED0 :1;
+                u8 CSEL1  :1;
+                u8 CLKED1 :1;
+                u8 CLKLEV :1;
+                u8 SPIVAR :1;
+                u8 na     :2;
+        } TUNSET_fc;
+
+        struct {
+                u8 CLK    :1;
+                u8 DATA   :1;
+                u8 CS0    :1;
+                u8 CS1    :1;
+                u8 AGCSEL :1;
+                u8 na0    :1;
+                u8 TUNSEL :1;
+                u8 na1    :1;
+        } TUNCTL_fd;
+
+        u8 TUNSEL0_fe;
+        u8 TUNSEL1_ff;
+
+} bcm3510_register_value;
+
+/* HAB commands */
+
+/* version */
+#define CMD_GET_VERSION_INFO   0x3D
+#define MSGID_GET_VERSION_INFO 0x15
+struct bcm3510_hab_cmd_get_version_info {
+        u8 microcode_version;
+        u8 script_version;
+        u8 config_version;
+        u8 demod_version;
+} PACKED;
+
+#define BCM3510_DEF_MICROCODE_VERSION 0x0E
+#define BCM3510_DEF_SCRIPT_VERSION    0x06
+#define BCM3510_DEF_CONFIG_VERSION    0x01
+#define BCM3510_DEF_DEMOD_VERSION     0xB1
+
+/* acquire */
+#define CMD_ACQUIRE            0x38
+
+#define MSGID_EXT_TUNER_ACQUIRE 0x0A
+struct bcm3510_hab_cmd_ext_acquire {
+        struct {
+                u8 MODE      :4;
+                u8 BW        :1;
+                u8 FA        :1;
+                u8 NTSCSWEEP :1;
+                u8 OFFSET    :1;
+        } PACKED ACQUIRE0; /* control_byte */
+
+        struct {
+                u8 IF_FREQ  :3;
+                u8 zero0    :1;
+                u8 SYM_RATE :3;
+                u8 zero1    :1;
+        } PACKED ACQUIRE1; /* sym_if */
+
+        u8 IF_OFFSET0;   /* IF_Offset_10hz */
+        u8 IF_OFFSET1;
+        u8 SYM_OFFSET0;  /* SymbolRateOffset */
+        u8 SYM_OFFSET1;
+        u8 NTSC_OFFSET0; /* NTSC_Offset_10hz */
+        u8 NTSC_OFFSET1;
+} PACKED;
+
+#define MSGID_INT_TUNER_ACQUIRE 0x0B
+struct bcm3510_hab_cmd_int_acquire {
+        struct {
+                u8 MODE      :4;
+                u8 BW        :1;
+                u8 FA        :1;
+                u8 NTSCSWEEP :1;
+                u8 OFFSET    :1;
+        } PACKED ACQUIRE0; /* control_byte */
+
+        struct {
+                u8 IF_FREQ  :3;
+                u8 zero0    :1;
+                u8 SYM_RATE :3;
+                u8 zero1    :1;
+        } PACKED ACQUIRE1; /* sym_if */
+
+        u8 TUNER_FREQ0;
+        u8 TUNER_FREQ1;
+        u8 TUNER_FREQ2;
+        u8 TUNER_FREQ3;
+        u8 IF_OFFSET0;   /* IF_Offset_10hz */
+        u8 IF_OFFSET1;
+        u8 SYM_OFFSET0;  /* SymbolRateOffset */
+        u8 SYM_OFFSET1;
+        u8 NTSC_OFFSET0; /* NTSC_Offset_10hz */
+        u8 NTSC_OFFSET1;
+} PACKED;
+
+/* modes */
+#define BCM3510_QAM16           =   0x01
+#define BCM3510_QAM32           =   0x02
+#define BCM3510_QAM64           =   0x03
+#define BCM3510_QAM128          =   0x04
+#define BCM3510_QAM256          =   0x05
+#define BCM3510_8VSB            =   0x0B
+#define BCM3510_16VSB           =   0x0D
+
+/* IF_FREQS */
+#define BCM3510_IF_TERRESTRIAL 0x0
+#define BCM3510_IF_CABLE       0x1
+#define BCM3510_IF_USE_CMD     0x7
+
+/* SYM_RATE */
+#define BCM3510_SR_8VSB        0x0 /* 5381119 s/sec */
+#define BCM3510_SR_256QAM      0x1 /* 5360537 s/sec */
+#define BCM3510_SR_16QAM       0x2 /* 5056971 s/sec */
+#define BCM3510_SR_MISC        0x3 /* 5000000 s/sec */
+#define BCM3510_SR_USE_CMD     0x7
+
+/* special symbol rate */
+#define CMD_SET_VALUE_NOT_LISTED  0x2d
+#define MSGID_SET_SYMBOL_RATE_NOT_LISTED 0x0c
+struct bcm3510_hab_cmd_set_sr_not_listed {
+        u8 HOST_SYM_RATE0;
+        u8 HOST_SYM_RATE1;
+        u8 HOST_SYM_RATE2;
+        u8 HOST_SYM_RATE3;
+} PACKED;
+
+/* special IF */
+#define MSGID_SET_IF_FREQ_NOT_LISTED 0x0d
+struct bcm3510_hab_cmd_set_if_freq_not_listed {
+        u8 HOST_IF_FREQ0;
+        u8 HOST_IF_FREQ1;
+        u8 HOST_IF_FREQ2;
+        u8 HOST_IF_FREQ3;
+} PACKED;
+
+/* auto reacquire */
+#define CMD_AUTO_PARAM       0x2a
+#define MSGID_AUTO_REACQUIRE 0x0e
+struct bcm3510_hab_cmd_auto_reacquire {
+        u8 ACQ    :1; /* on/off*/
+        u8 unused :7;
+} PACKED;
+
+#define MSGID_SET_RF_AGC_SEL 0x12
+struct bcm3510_hab_cmd_set_agc {
+        u8 LVL    :1;
+        u8 unused :6;
+        u8 SEL    :1;
+} PACKED;
+
+#define MSGID_SET_AUTO_INVERSION 0x14
+struct bcm3510_hab_cmd_auto_inversion {
+        u8 AI     :1;
+        u8 unused :7;
+} PACKED;
+
+
+/* bert control */
+#define CMD_STATE_CONTROL  0x12
+#define MSGID_BERT_CONTROL 0x0e
+#define MSGID_BERT_SET     0xfa
+struct bcm3510_hab_cmd_bert_control {
+        u8 BE     :1;
+        u8 unused :7;
+} PACKED;
+
+#define MSGID_TRI_STATE 0x2e
+struct bcm3510_hab_cmd_tri_state {
+        u8 RE :1; /* a/d ram port pins */
+        u8 PE :1; /* baud clock pin */
+        u8 AC :1; /* a/d clock pin */
+        u8 BE :1; /* baud clock pin */
+        u8 unused :4;
+} PACKED;
+
+
+/* tune */
+#define CMD_TUNE   0x38
+#define MSGID_TUNE 0x16
+struct bcm3510_hab_cmd_tune_ctrl_data_pair {
+        struct {
+#define BITS_8 0x07
+#define BITS_7 0x06
+#define BITS_6 0x05
+#define BITS_5 0x04
+#define BITS_4 0x03
+#define BITS_3 0x02
+#define BITS_2 0x01
+#define BITS_1 0x00
+                u8 size    :3;
+                u8 unk     :2;
+                u8 clk_off :1;
+                u8 cs0     :1;
+                u8 cs1     :1;
+
+        } PACKED ctrl;
+
+        u8 data;
+} PACKED;
+
+struct bcm3510_hab_cmd_tune {
+        u8 length;
+        u8 clock_width;
+        u8 misc;
+        u8 TUNCTL_state;
+
+        struct bcm3510_hab_cmd_tune_ctrl_data_pair ctl_dat[16];
+} PACKED;
+
+#define CMD_STATUS    0x38
+#define MSGID_STATUS1 0x08
+struct bcm3510_hab_cmd_status1 {
+        struct {
+                u8 EQ_MODE       :4;
+                u8 reserved      :2;
+                u8 QRE           :1; /* if QSE and the spectrum is inversed */
+                u8 QSE           :1; /* automatic spectral inversion */
+        } PACKED STATUS0;
+
+        struct {
+                u8 RECEIVER_LOCK :1;
+                u8 FEC_LOCK      :1;
+                u8 OUT_PLL_LOCK  :1;
+                u8 reserved      :5;
+        } PACKED STATUS1;
+
+        struct {
+                u8 reserved      :2;
+                u8 BW            :1;
+                u8 NTE           :1; /* NTSC filter sweep enabled */
+                u8 AQI           :1; /* currently acquiring */
+                u8 FA            :1; /* fast acquisition */
+                u8 ARI           :1; /* auto reacquire */
+                u8 TI            :1; /* programming the tuner */
+        } PACKED STATUS2;
+        u8 STATUS3;
+        u8 SNR_EST0;
+        u8 SNR_EST1;
+        u8 TUNER_FREQ0;
+        u8 TUNER_FREQ1;
+        u8 TUNER_FREQ2;
+        u8 TUNER_FREQ3;
+        u8 SYM_RATE0;
+        u8 SYM_RATE1;
+        u8 SYM_RATE2;
+        u8 SYM_RATE3;
+        u8 SYM_OFFSET0;
+        u8 SYM_OFFSET1;
+        u8 SYM_ERROR0;
+        u8 SYM_ERROR1;
+        u8 IF_FREQ0;
+        u8 IF_FREQ1;
+        u8 IF_FREQ2;
+        u8 IF_FREQ3;
+        u8 IF_OFFSET0;
+        u8 IF_OFFSET1;
+        u8 IF_ERROR0;
+        u8 IF_ERROR1;
+        u8 NTSC_FILTER0;
+        u8 NTSC_FILTER1;
+        u8 NTSC_FILTER2;
+        u8 NTSC_FILTER3;
+        u8 NTSC_OFFSET0;
+        u8 NTSC_OFFSET1;
+        u8 NTSC_ERROR0;
+        u8 NTSC_ERROR1;
+        u8 INT_AGC_LEVEL0;
+        u8 INT_AGC_LEVEL1;
+        u8 EXT_AGC_LEVEL0;
+        u8 EXT_AGC_LEVEL1;
+} PACKED;
+
+#define MSGID_STATUS2 0x14
+struct bcm3510_hab_cmd_status2 {
+        struct {
+                u8 EQ_MODE  :4;
+                u8 reserved :2;
+                u8 QRE      :1;
+                u8 QSR      :1;
+        } PACKED STATUS0;
+        struct {
+                u8 RL       :1;
+                u8 FL       :1;
+                u8 OL       :1;
+                u8 reserved :5;
+        } PACKED STATUS1;
+        u8 SYMBOL_RATE0;
+        u8 SYMBOL_RATE1;
+        u8 SYMBOL_RATE2;
+        u8 SYMBOL_RATE3;
+        u8 LDCERC0;
+        u8 LDCERC1;
+        u8 LDCERC2;
+        u8 LDCERC3;
+        u8 LDUERC0;
+        u8 LDUERC1;
+        u8 LDUERC2;
+        u8 LDUERC3;
+        u8 LDBER0;
+        u8 LDBER1;
+        u8 LDBER2;
+        u8 LDBER3;
+        struct {
+                u8 MODE_TYPE :4; /* acquire mode 0 */
+                u8 reservd   :4;
+        } MODE_TYPE;
+        u8 SNR_EST0;
+        u8 SNR_EST1;
+        u8 SIGNAL;
+} PACKED;
+
+#define CMD_SET_RF_BW_NOT_LISTED   0x3f
+#define MSGID_SET_RF_BW_NOT_LISTED 0x11
+/* TODO */
+
+#endif