Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.

190 files changed, 14093 insertions, 5170 deletions

diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c
index 84a49d2ec919..4adb2843f8be 100644
--- a/drivers/media/common/ir-common.c
+++ b/drivers/media/common/ir-common.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ir-common.c,v 1.8 2005/02/22 12:28:40 kraxel Exp $
+ * $Id: ir-common.c,v 1.10 2005/05/22 19:23:39 nsh Exp $
  *
  * some common structs and functions to handle infrared remotes via
  * input layer ...
@@ -131,10 +131,10 @@ IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE] = {
         [ 18 ] = KEY_KP0,
 
         [  0 ] = KEY_POWER,
-        [ 27 ] = KEY_LANGUAGE,  //MTS button
+//      [ 27 ] = MTS button
         [  2 ] = KEY_TUNER,     // TV/FM
         [ 30 ] = KEY_VIDEO,
-        [ 22 ] = KEY_INFO,      //display button
+//      [ 22 ] = display button
         [  4 ] = KEY_VOLUMEUP,
         [  8 ] = KEY_VOLUMEDOWN,
         [ 12 ] = KEY_CHANNELUP,
@@ -142,7 +142,7 @@ IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE] = {
         [  3 ] = KEY_ZOOM,      // fullscreen
         [ 31 ] = KEY_SUBTITLE,  // closed caption/teletext
         [ 32 ] = KEY_SLEEP,
-        [ 41 ] = KEY_SEARCH,    //boss key
+//      [ 41 ] = boss key
         [ 20 ] = KEY_MUTE,
         [ 43 ] = KEY_RED,
         [ 44 ] = KEY_GREEN,
@@ -150,17 +150,17 @@ IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE] = {
         [ 46 ] = KEY_BLUE,
         [ 24 ] = KEY_KPPLUS,    //fine tune +
         [ 25 ] = KEY_KPMINUS,   //fine tune -
-        [ 42 ] = KEY_ANGLE,     //picture in picture
-        [ 33 ] = KEY_KPDOT,
+//      [ 42 ] = picture in picture
+        [ 33 ] = KEY_KPDOT,
         [ 19 ] = KEY_KPENTER,
-        [ 17 ] = KEY_AGAIN,     //recall
+//      [ 17 ] = recall
         [ 34 ] = KEY_BACK,
         [ 35 ] = KEY_PLAYPAUSE,
         [ 36 ] = KEY_NEXT,
-        [ 37 ] = KEY_T,         //time shifting
+//      [ 37 ] = time shifting
         [ 38 ] = KEY_STOP,
-        [ 39 ] = KEY_RECORD,
-        [ 40 ] = KEY_SHUFFLE    //snapshot
+        [ 39 ] = KEY_RECORD
+//      [ 40 ] = snapshot
 };
 EXPORT_SYMBOL_GPL(ir_codes_winfast);
 
@@ -184,18 +184,30 @@ IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE] = {
         [ 0x07 ] = KEY_KP7,             // 7
         [ 0x08 ] = KEY_KP8,             // 8
         [ 0x09 ] = KEY_KP9,             // 9
+        [ 0x0a ] = KEY_TEXT,            // keypad asterisk as well
         [ 0x0b ] = KEY_RED,             // red button
-        [ 0x0c ] = KEY_OPTION,          // black key without text
+        [ 0x0c ] = KEY_RADIO,           // radio
         [ 0x0d ] = KEY_MENU,            // menu
+        [ 0x0e ] = KEY_SUBTITLE,        // also the # key
         [ 0x0f ] = KEY_MUTE,            // mute
         [ 0x10 ] = KEY_VOLUMEUP,        // volume +
         [ 0x11 ] = KEY_VOLUMEDOWN,      // volume -
-        [ 0x1e ] = KEY_NEXT,            // skip >|
+        [ 0x12 ] = KEY_PREVIOUS,        // previous channel
+        [ 0x14 ] = KEY_UP,              // up
+        [ 0x15 ] = KEY_DOWN,            // down
+        [ 0x16 ] = KEY_LEFT,            // left
+        [ 0x17 ] = KEY_RIGHT,           // right
+        [ 0x18 ] = KEY_VIDEO,           // Videos
+        [ 0x19 ] = KEY_AUDIO,           // Music
+        [ 0x1a ] = KEY_MHP,             // Pictures - presume this means "Multimedia Home Platform"- no "PICTURES" key in input.h
+        [ 0x1b ] = KEY_EPG,             // Guide
+        [ 0x1c ] = KEY_TV,              // TV
+        [ 0x1e ] = KEY_NEXTSONG,        // skip >|
         [ 0x1f ] = KEY_EXIT,            // back/exit
         [ 0x20 ] = KEY_CHANNELUP,       // channel / program +
         [ 0x21 ] = KEY_CHANNELDOWN,     // channel / program -
         [ 0x22 ] = KEY_CHANNEL,         // source (old black remote)
-        [ 0x24 ] = KEY_PREVIOUS,        // replay |<
+        [ 0x24 ] = KEY_PREVIOUSSONG,    // replay |<
         [ 0x25 ] = KEY_ENTER,           // OK
         [ 0x26 ] = KEY_SLEEP,           // minimize (old black remote)
         [ 0x29 ] = KEY_BLUE,            // blue key
@@ -213,6 +225,39 @@ IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE] = {
 };
 EXPORT_SYMBOL(ir_codes_hauppauge_new);
 
+IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE] = {
+        [  2 ] = KEY_KP0,
+        [  1 ] = KEY_KP1,
+        [ 11 ] = KEY_KP2,
+        [ 27 ] = KEY_KP3,
+        [  5 ] = KEY_KP4,
+        [  9 ] = KEY_KP5,
+        [ 21 ] = KEY_KP6,
+        [  6 ] = KEY_KP7,
+        [ 10 ] = KEY_KP8,
+        [ 18 ] = KEY_KP9,
+
+        [  3 ] = KEY_TUNER,       // TV/FM
+        [  7 ] = KEY_SEARCH,      // scan
+        [ 28 ] = KEY_ZOOM,        // full screen
+        [ 30 ] = KEY_POWER,
+        [ 23 ] = KEY_VOLUMEDOWN,
+        [ 31 ] = KEY_VOLUMEUP,
+        [ 20 ] = KEY_CHANNELDOWN,
+        [ 22 ] = KEY_CHANNELUP,
+        [ 24 ] = KEY_MUTE,
+
+        [  0 ] = KEY_LIST,        // source
+        [ 19 ] = KEY_INFO,        // loop
+        [ 16 ] = KEY_LAST,        // +100
+        [ 13 ] = KEY_CLEAR,       // reset
+        [ 12 ] = BTN_RIGHT,       // fun++
+        [  4 ] = BTN_LEFT,        // fun--
+        [ 14 ] = KEY_GOTO,        // function
+        [ 15 ] = KEY_STOP,         // freeze
+};
+EXPORT_SYMBOL(ir_codes_pixelview);
+
 /* -------------------------------------------------------------------------- */
 
 static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)
@@ -379,3 +424,4 @@ EXPORT_SYMBOL_GPL(ir_decode_biphase);
  * c-basic-offset: 8
  * End:
  */
+
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 9f6c19ac1285..50e8b8654018 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -23,9 +23,9 @@
 LIST_HEAD(saa7146_devices);
 DECLARE_MUTEX(saa7146_devices_lock);
 
-static int saa7146_num = 0;
+static int saa7146_num;
 
-unsigned int saa7146_debug = 0;
+unsigned int saa7146_debug;
 
 module_param(saa7146_debug, int, 0644);
 MODULE_PARM_DESC(saa7146_debug, "debug level (default: 0)");
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index cb826c9adfe7..c04fd11526e0 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -403,7 +403,7 @@ static struct file_operations video_fops =
         .llseek         = no_llseek,
 };
 
-void vv_callback(struct saa7146_dev *dev, unsigned long status)
+static void vv_callback(struct saa7146_dev *dev, unsigned long status)
 {
         u32 isr = status;
         
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index 883ec08490f4..01387f883cdf 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -27,13 +27,13 @@ source "drivers/media/dvb/ttpci/Kconfig"
 
 comment "Supported USB Adapters"
         depends on DVB_CORE && USB
+source "drivers/media/dvb/dvb-usb/Kconfig"
 source "drivers/media/dvb/ttusb-budget/Kconfig"
 source "drivers/media/dvb/ttusb-dec/Kconfig"
-source "drivers/media/dvb/dibusb/Kconfig"
 source "drivers/media/dvb/cinergyT2/Kconfig"
 
 comment "Supported FlexCopII (B2C2) Adapters"
-        depends on DVB_CORE && PCI
+        depends on DVB_CORE && (PCI || USB)
 source "drivers/media/dvb/b2c2/Kconfig"
 
 comment "Supported BT878 Adapters"
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index 520fc3902819..3c6ff1619103 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dibusb/ cinergyT2/
+obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ cinergyT2/ dvb-usb/
diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index 52596907a0be..fafd0ab3a28f 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -1,26 +1,51 @@
-config DVB_B2C2_SKYSTAR
-        tristate "B2C2/Technisat Air/Sky/CableStar 2 PCI"
-        depends on DVB_CORE && PCI
+config DVB_B2C2_FLEXCOP
+        tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
+        depends on DVB_CORE
         select DVB_STV0299
         select DVB_MT352
         select DVB_MT312
         select DVB_NXT2002
+        select DVB_STV0297
+        select DVB_BCM3510
         help
-          Support for the Skystar2 PCI DVB card by Technisat, which
-          is equipped with the FlexCopII chipset by B2C2, and
-          for the B2C2/BBTI Air2PC-ATSC card.
+          Support for the digital TV receiver chip made by B2C2 Inc. included in
+          Technisats PCI cards and USB boxes.
 
           Say Y if you own such a device and want to use it.
 
-config DVB_B2C2_USB
-        tristate "B2C2/Technisat Air/Sky/Cable2PC USB"
-        depends on DVB_CORE && USB && EXPERIMENTAL
+config DVB_B2C2_FLEXCOP_PCI
+        tristate "Technisat/B2C2 Air/Sky/Cable2PC PCI"
+        depends on DVB_B2C2_FLEXCOP && PCI
+        help
+          Support for the Air/Sky/CableStar2 PCI card (DVB/ATSC) by Technisat/B2C2.
+
+          Say Y if you own such a device and want to use it.
+
+config DVB_B2C2_FLEXCOP_USB
+        tristate "Technisat/B2C2 Air/Sky/Cable2PC USB"
+        depends on DVB_B2C2_FLEXCOP && USB
+        help
+          Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,
+
+          Say Y if you own such a device and want to use it.
+
+config DVB_B2C2_FLEXCOP_DEBUG
+        bool "Enable debug for the B2C2 FlexCop drivers"
+        depends on DVB_B2C2_FLEXCOP
+        help
+          Say Y if you want to enable the module option to control debug messages
+          of all B2C2 FlexCop drivers.
+
+config DVB_B2C2_SKYSTAR
+        tristate "B2C2/Technisat Air/Sky/CableStar 2 PCI"
+        depends on DVB_CORE && PCI
         select DVB_STV0299
         select DVB_MT352
+        select DVB_MT312
+        select DVB_NXT2002
         help
-          Support for the Air/Sky/Cable2PC USB DVB device by B2C2. Currently
-          the does nothing, but providing basic function for the used usb 
-          protocol.
+          Support for the Skystar2 PCI DVB card by Technisat, which
+          is equipped with the FlexCopII chipset by B2C2, and
+          for the B2C2/BBTI Air2PC-ATSC card.
 
           Say Y if you own such a device and want to use it.
-
diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/dvb/b2c2/Makefile
index 9fb1247bfab8..7703812af34f 100644
--- a/drivers/media/dvb/b2c2/Makefile
+++ b/drivers/media/dvb/b2c2/Makefile
@@ -1,6 +1,14 @@
-obj-b2c2-usb = b2c2-usb-core.o b2c2-common.o
+b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \
+        flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o \
+        flexcop-dma.o
+obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
+
+b2c2-flexcop-pci-objs = flexcop-pci.o
+obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
+
+b2c2-flexcop-usb-objs = flexcop-usb.o
+obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
 
 obj-$(CONFIG_DVB_B2C2_SKYSTAR) += skystar2.o
-obj-$(CONFIG_DVB_B2C2_USB) + = b2c2-usb.o
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/b2c2/b2c2-common.c b/drivers/media/dvb/b2c2/b2c2-common.c
deleted file mode 100644
index 000d60c405e3..000000000000
--- a/drivers/media/dvb/b2c2/b2c2-common.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * b2c2-common.c - common methods for the B2C2/Technisat SkyStar2 PCI DVB card and
- *                 for the B2C2/Technisat Sky/Cable/AirStar USB devices
- *                 based on the FlexCopII/FlexCopIII by B2C2, Inc.
- *
- * Copyright (C) 2003  Vadim Catana, skystar@moldova.cc
- *
- * FIX: DISEQC Tone Burst in flexcop_diseqc_ioctl()
- * FIX: FULL soft DiSEqC for skystar2 (FlexCopII rev 130) VP310 equipped
- *     Vincenzo Di Massa, hawk.it at tiscalinet.it
- *
- * Converted to Linux coding style
- * Misc reorganization, polishing, restyling
- *     Roberto Ragusa, r.ragusa at libero.it
- *
- * Added hardware filtering support,
- *     Niklas Peinecke, peinecke at gdv.uni-hannover.de
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * 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 Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-#include "stv0299.h"
-#include "mt352.h"
-#include "mt312.h"
-
-static int samsung_tbmu24112_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ratio)
-{
-        u8 aclk = 0;
-        u8 bclk = 0;
-
-        if (srate < 1500000) { aclk = 0xb7; bclk = 0x47; }
-        else if (srate < 3000000) { aclk = 0xb7; bclk = 0x4b; }
-        else if (srate < 7000000) { aclk = 0xb7; bclk = 0x4f; }
-        else if (srate < 14000000) { aclk = 0xb7; bclk = 0x53; }
-        else if (srate < 30000000) { aclk = 0xb6; bclk = 0x53; }
-        else if (srate < 45000000) { aclk = 0xb4; bclk = 0x51; }
-
-        stv0299_writereg (fe, 0x13, aclk);
-        stv0299_writereg (fe, 0x14, bclk);
-        stv0299_writereg (fe, 0x1f, (ratio >> 16) & 0xff);
-        stv0299_writereg (fe, 0x20, (ratio >>  8) & 0xff);
-        stv0299_writereg (fe, 0x21, (ratio      ) & 0xf0);
-
-        return 0;
-}
-
-static int samsung_tbmu24112_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
-{
-        u8 buf[4];
-        u32 div;
-        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
-//      struct adapter* adapter = (struct adapter*) fe->dvb->priv;
-
-        div = params->frequency / 125;
-
-        buf[0] = (div >> 8) & 0x7f;
-        buf[1] = div & 0xff;
-        buf[2] = 0x84;  // 0xC4
-        buf[3] = 0x08;
-
-        if (params->frequency < 1500000) buf[3] |= 0x10;
-
-//      if (i2c_transfer (&adapter->i2c_adap, &msg, 1) != 1) return -EIO;
-        return 0;
-}
-
-static u8 samsung_tbmu24112_inittab[] = {
-             0x01, 0x15,
-             0x02, 0x30,
-             0x03, 0x00,
-             0x04, 0x7D,
-             0x05, 0x35,
-             0x06, 0x02,
-             0x07, 0x00,
-             0x08, 0xC3,
-             0x0C, 0x00,
-             0x0D, 0x81,
-             0x0E, 0x23,
-             0x0F, 0x12,
-             0x10, 0x7E,
-             0x11, 0x84,
-             0x12, 0xB9,
-             0x13, 0x88,
-             0x14, 0x89,
-             0x15, 0xC9,
-             0x16, 0x00,
-             0x17, 0x5C,
-             0x18, 0x00,
-             0x19, 0x00,
-             0x1A, 0x00,
-             0x1C, 0x00,
-             0x1D, 0x00,
-             0x1E, 0x00,
-             0x1F, 0x3A,
-             0x20, 0x2E,
-             0x21, 0x80,
-             0x22, 0xFF,
-             0x23, 0xC1,
-             0x28, 0x00,
-             0x29, 0x1E,
-             0x2A, 0x14,
-             0x2B, 0x0F,
-             0x2C, 0x09,
-             0x2D, 0x05,
-             0x31, 0x1F,
-             0x32, 0x19,
-             0x33, 0xFE,
-             0x34, 0x93,
-             0xff, 0xff,
-};
-
-static struct stv0299_config samsung_tbmu24112_config = {
-        .demod_address = 0x68,
-        .inittab = samsung_tbmu24112_inittab,
-        .mclk = 88000000UL,
-        .invert = 0,
-        .enhanced_tuning = 0,
-        .skip_reinit = 0,
-        .lock_output = STV0229_LOCKOUTPUT_LK,
-        .volt13_op0_op1 = STV0299_VOLT13_OP1,
-        .min_delay_ms = 100,
-        .set_symbol_rate = samsung_tbmu24112_set_symbol_rate,
-        .pll_set = samsung_tbmu24112_pll_set,
-};
-
-
-
-
-
-static int samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe)
-{
-        static u8 mt352_clock_config [] = { 0x89, 0x10, 0x2d };
-        static u8 mt352_reset [] = { 0x50, 0x80 };
-        static u8 mt352_adc_ctl_1_cfg [] = { 0x8E, 0x40 };
-        static u8 mt352_agc_cfg [] = { 0x67, 0x28, 0xa1 };
-        static u8 mt352_capt_range_cfg[] = { 0x75, 0x32 };
-
-        mt352_write(fe, mt352_clock_config, sizeof(mt352_clock_config));
-        udelay(2000);
-        mt352_write(fe, mt352_reset, sizeof(mt352_reset));
-        mt352_write(fe, mt352_adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg));
-
-        mt352_write(fe, mt352_agc_cfg, sizeof(mt352_agc_cfg));
-        mt352_write(fe, mt352_capt_range_cfg, sizeof(mt352_capt_range_cfg));
-
-        return 0;
-}
-
-static int samsung_tdtc9251dh0_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf)
-{
-        u32 div;
-        unsigned char bs = 0;
-
-        #define IF_FREQUENCYx6 217    /* 6 * 36.16666666667MHz */
-        div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
-
-        if (params->frequency >= 48000000 && params->frequency <= 154000000) bs = 0x09;
-        if (params->frequency >= 161000000 && params->frequency <= 439000000) bs = 0x0a;
-        if (params->frequency >= 447000000 && params->frequency <= 863000000) bs = 0x08;
-
-        pllbuf[0] = 0xc2; // Note: non-linux standard PLL i2c address
-        pllbuf[1] = div >> 8;
-        pllbuf[2] = div & 0xff;
-        pllbuf[3] = 0xcc;
-        pllbuf[4] = bs;
-
-        return 0;
-}
-
-static struct mt352_config samsung_tdtc9251dh0_config = {
-
-        .demod_address = 0x0f,
-        .demod_init = samsung_tdtc9251dh0_demod_init,
-        .pll_set = samsung_tdtc9251dh0_pll_set,
-};
-
-static int skystar23_samsung_tbdu18132_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
-{
-        u8 buf[4];
-        u32 div;
-        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
-//      struct adapter* adapter = (struct adapter*) fe->dvb->priv;
-
-        div = (params->frequency + (125/2)) / 125;
-
-        buf[0] = (div >> 8) & 0x7f;
-        buf[1] = (div >> 0) & 0xff;
-        buf[2] = 0x84 | ((div >> 10) & 0x60);
-        buf[3] = 0x80;
-
-        if (params->frequency < 1550000)
-                buf[3] |= 0x02;
-
-        //if (i2c_transfer (&adapter->i2c_adap, &msg, 1) != 1) return -EIO;
-        return 0;
-}
-
-static struct mt312_config skystar23_samsung_tbdu18132_config = {
-
-        .demod_address = 0x0e,
-        .pll_set = skystar23_samsung_tbdu18132_pll_set,
-};
diff --git a/drivers/media/dvb/b2c2/b2c2-usb-core.c b/drivers/media/dvb/b2c2/b2c2-usb-core.c
deleted file mode 100644
index 9306da046c91..000000000000
--- a/drivers/media/dvb/b2c2/b2c2-usb-core.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * Copyright (C) 2004 Patrick Boettcher <patrick.boettcher@desy.de>,
- *                    Luca Bertagnolio <>,
- *
- * based on information provided by John Jurrius from BBTI, Inc.
- *
- *      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, version 2.
- *
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/usb.h>
-#include <linux/moduleparam.h>
-#include <linux/pci.h>
-#include <linux/version.h>
-
-#include "dmxdev.h"
-#include "dvb_demux.h"
-#include "dvb_filter.h"
-#include "dvb_net.h"
-#include "dvb_frontend.h"
-
-/* debug */
-#define dprintk(level,args...) \
-            do { if ((debug & level)) { printk(args); } } while (0)
-#define debug_dump(b,l) if (debug) {\
-        int i; deb_xfer("%s: %d > ",__FUNCTION__,l); \
-        for (i = 0; i < l; i++) deb_xfer("%02x ", b[i]); \
-        deb_xfer("\n");\
-}
-
-static int debug;
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "set debugging level (1=info,ts=2,ctrl=4 (or-able)).");
-
-#define deb_info(args...) dprintk(0x01,args)
-#define deb_ts(args...)   dprintk(0x02,args)
-#define deb_ctrl(args...) dprintk(0x04,args)
-
-/* Version information */
-#define DRIVER_VERSION "0.0"
-#define DRIVER_DESC "Driver for B2C2/Technisat Air/Cable/Sky-2-PC USB devices"
-#define DRIVER_AUTHOR "Patrick Boettcher, patrick.boettcher@desy.de"
-
-/* transfer parameters */
-#define B2C2_USB_FRAMES_PER_ISO         4
-#define B2C2_USB_NUM_ISO_URB            4    /* TODO check out a good value */
-
-#define B2C2_USB_CTRL_PIPE_IN           usb_rcvctrlpipe(b2c2->udev,0)
-#define B2C2_USB_CTRL_PIPE_OUT          usb_sndctrlpipe(b2c2->udev,0)
-#define B2C2_USB_DATA_PIPE                      usb_rcvisocpipe(b2c2->udev,0x81)
-
-struct usb_b2c2_usb {
-        struct usb_device *udev;
-        struct usb_interface *uintf;
-
-        u8 *iso_buffer;
-        int buffer_size;
-        dma_addr_t iso_dma_handle;
-        struct urb *iso_urb[B2C2_USB_NUM_ISO_URB];
-};
-
-
-/*
- * USB
- * 10 90 34 12 78 56 04 00
- * usb_control_msg(udev, usb_sndctrlpipe(udev,0),
- * 0x90,
- * 0x10,
- * 0x1234,
- * 0x5678,
- * buf,
- * 4,
- * 5*HZ);
- *
- * extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
- * __u8 request,
- * __u8 requesttype,
- * __u16 value,
- * __u16 index,
- * void *data,
- * __u16 size,
- * int timeout);
- *
- */
-
-/* request types */
-typedef enum {
-
-/* something is wrong with this part
-        RTYPE_READ_DW         = (1 << 6),
-        RTYPE_WRITE_DW_1      = (3 << 6),
-        RTYPE_READ_V8_MEMORY  = (6 << 6),
-        RTYPE_WRITE_V8_MEMORY = (7 << 6),
-        RTYPE_WRITE_V8_FLASH  = (8 << 6),
-        RTYPE_GENERIC         = (9 << 6),
-*/
-        RTYPE_READ_DW = (3 << 6),
-        RTYPE_WRITE_DW_1 = (1 << 6),
-        
-        RTYPE_READ_V8_MEMORY  = (6 << 6),
-        RTYPE_WRITE_V8_MEMORY = (7 << 6),
-        RTYPE_WRITE_V8_FLASH  = (8 << 6),
-        RTYPE_GENERIC         = (9 << 6),
-} b2c2_usb_request_type_t;
-
-/* request */
-typedef enum {
-        B2C2_USB_WRITE_V8_MEM = 0x04,
-        B2C2_USB_READ_V8_MEM  = 0x05,
-        B2C2_USB_READ_REG     = 0x08,
-        B2C2_USB_WRITE_REG    = 0x0A,
-/*      B2C2_USB_WRITEREGLO   = 0x0A, */
-        B2C2_USB_WRITEREGHI   = 0x0B,
-        B2C2_USB_FLASH_BLOCK  = 0x10,
-        B2C2_USB_I2C_REQUEST  = 0x11,
-        B2C2_USB_UTILITY      = 0x12,
-} b2c2_usb_request_t;
-
-/* function definition for I2C_REQUEST */
-typedef enum {
-        USB_FUNC_I2C_WRITE       = 0x01,
-        USB_FUNC_I2C_MULTIWRITE  = 0x02,
-        USB_FUNC_I2C_READ        = 0x03,
-        USB_FUNC_I2C_REPEATWRITE = 0x04,
-        USB_FUNC_GET_DESCRIPTOR  = 0x05,
-        USB_FUNC_I2C_REPEATREAD  = 0x06,
-/* DKT 020208 - add this to support special case of DiSEqC */
-        USB_FUNC_I2C_CHECKWRITE  = 0x07,
-        USB_FUNC_I2C_CHECKRESULT = 0x08,
-} b2c2_usb_i2c_function_t;
-
-/*
- * function definition for UTILITY request 0x12
- * DKT 020304 - new utility function
- */
-typedef enum {
-        UTILITY_SET_FILTER          = 0x01,
-        UTILITY_DATA_ENABLE         = 0x02,
-        UTILITY_FLEX_MULTIWRITE     = 0x03,
-        UTILITY_SET_BUFFER_SIZE     = 0x04,
-        UTILITY_FLEX_OPERATOR       = 0x05,
-        UTILITY_FLEX_RESET300_START = 0x06,
-        UTILITY_FLEX_RESET300_STOP  = 0x07,
-        UTILITY_FLEX_RESET300       = 0x08,
-        UTILITY_SET_ISO_SIZE        = 0x09,
-        UTILITY_DATA_RESET          = 0x0A,
-        UTILITY_GET_DATA_STATUS     = 0x10,
-        UTILITY_GET_V8_REG          = 0x11,
-/* DKT 020326 - add function for v1.14 */
-        UTILITY_SRAM_WRITE          = 0x12,
-        UTILITY_SRAM_READ           = 0x13,
-        UTILITY_SRAM_TESTFILL       = 0x14,
-        UTILITY_SRAM_TESTSET        = 0x15,
-        UTILITY_SRAM_TESTVERIFY     = 0x16,
-} b2c2_usb_utility_function_t;
-
-#define B2C2_WAIT_FOR_OPERATION_RW  1  // 1 s
-#define B2C2_WAIT_FOR_OPERATION_RDW 3  // 3 s
-#define B2C2_WAIT_FOR_OPERATION_WDW 1  // 1 s
-
-#define B2C2_WAIT_FOR_OPERATION_V8READ   3  // 3 s
-#define B2C2_WAIT_FOR_OPERATION_V8WRITE  3  // 3 s
-#define B2C2_WAIT_FOR_OPERATION_V8FLASH  3  // 3 s
-
-/* JLP 111700: we will include the 1 bit gap between the upper and lower 3 bits
- * in the IBI address, to make the V8 code simpler.
- * PCI ADDRESS FORMAT: 0x71C -> 0000 0111 0001 1100 (these are the six bits used)
- *                  in general: 0000 0HHH 000L LL00
- * IBI ADDRESS FORMAT:                    RHHH BLLL
- *
- * where R is the read(1)/write(0) bit, B is the busy bit
- * and HHH and LLL are the two sets of three bits from the PCI address.
- */
-#define B2C2_FLEX_PCIOFFSET_TO_INTERNALADDR(usPCI) (u8) (((usPCI >> 2) & 0x07) + ((usPCI >> 4) & 0x70))
-#define B2C2_FLEX_INTERNALADDR_TO_PCIOFFSET(ucAddr) (u16) (((ucAddr & 0x07) << 2) + ((ucAddr & 0x70) << 4))
-
-/*
- * DKT 020228 - forget about this VENDOR_BUFFER_SIZE, read and write register
- * deal with DWORD or 4 bytes, that should be should from now on
- */
-static u32 b2c2_usb_read_dw(struct usb_b2c2_usb *b2c2, u16 wRegOffsPCI)
-{
-        u32 val;
-        u16 wAddress = B2C2_FLEX_PCIOFFSET_TO_INTERNALADDR(wRegOffsPCI) | 0x0080;
-        int len = usb_control_msg(b2c2->udev,
-                        B2C2_USB_CTRL_PIPE_IN,
-                        B2C2_USB_READ_REG,
-                        RTYPE_READ_DW,
-                        wAddress,
-                        0,
-                        &val,
-                        sizeof(u32),
-                        B2C2_WAIT_FOR_OPERATION_RDW * 1000);
-
-        if (len != sizeof(u32)) {
-                err("error while reading dword from %d (%d).",wAddress,wRegOffsPCI);
-                return -EIO;
-        } else
-                return val;
-}
-
-/*
- * DKT 020228 - from now on, we don't support anything older than firm 1.00
- * I eliminated the write register as a 2 trip of writing hi word and lo word
- * and force this to write only 4 bytes at a time.
- * NOTE: this should work with all the firmware from 1.00 and newer
- */
-static int b2c2_usb_write_dw(struct usb_b2c2_usb *b2c2, u16 wRegOffsPCI, u32 val)
-{
-        u16 wAddress = B2C2_FLEX_PCIOFFSET_TO_INTERNALADDR(wRegOffsPCI);
-        int len = usb_control_msg(b2c2->udev,
-                        B2C2_USB_CTRL_PIPE_OUT,
-                        B2C2_USB_WRITE_REG,
-                        RTYPE_WRITE_DW_1,
-                        wAddress,
-                        0,
-                        &val,
-                        sizeof(u32),
-                        B2C2_WAIT_FOR_OPERATION_RDW * 1000);
-
-        if (len != sizeof(u32)) {
-                err("error while reading dword from %d (%d).",wAddress,wRegOffsPCI);
-                return -EIO;
-        } else
-                return 0;
-}
-
-/*
- * DKT 010817 - add support for V8 memory read/write and flash update
- */
-static int b2c2_usb_v8_memory_req(struct usb_b2c2_usb *b2c2,
-                b2c2_usb_request_t req, u8 page, u16 wAddress,
-                u16 buflen, u8 *pbBuffer)
-{
-        u8 dwRequestType;
-        u16 wIndex;
-        int nWaitTime,pipe,len;
-
-        wIndex = page << 8;
-
-        switch (req) {
-                case B2C2_USB_READ_V8_MEM:
-                        nWaitTime = B2C2_WAIT_FOR_OPERATION_V8READ;
-                        dwRequestType = (u8) RTYPE_READ_V8_MEMORY;
-                        pipe = B2C2_USB_CTRL_PIPE_IN;
-                break;
-                case B2C2_USB_WRITE_V8_MEM:
-                        wIndex |= pbBuffer[0];
-                        nWaitTime = B2C2_WAIT_FOR_OPERATION_V8WRITE;
-                        dwRequestType = (u8) RTYPE_WRITE_V8_MEMORY;
-                        pipe = B2C2_USB_CTRL_PIPE_OUT;
-                break;
-                case B2C2_USB_FLASH_BLOCK:
-                        nWaitTime = B2C2_WAIT_FOR_OPERATION_V8FLASH;
-                        dwRequestType = (u8) RTYPE_WRITE_V8_FLASH;
-                        pipe = B2C2_USB_CTRL_PIPE_OUT;
-                break;
-                default:
-                        deb_info("unsupported request for v8_mem_req %x.\n",req);
-                return -EINVAL;
-        }
-        len = usb_control_msg(b2c2->udev,pipe,
-                        req,
-                        dwRequestType,
-                        wAddress,
-                        wIndex,
-                        pbBuffer,
-                        buflen,
-                        nWaitTime * 1000);
-        return len == buflen ? 0 : -EIO;
-}
-
-static int b2c2_usb_i2c_req(struct usb_b2c2_usb *b2c2,
-                b2c2_usb_request_t req, b2c2_usb_i2c_function_t func,
-                u8 port, u8 chipaddr, u8 addr, u8 buflen, u8 *buf)
-{
-        u16 wValue, wIndex;
-        int nWaitTime,pipe,len;
-        u8 dwRequestType;
-
-        switch (func) {
-                case USB_FUNC_I2C_WRITE:
-                case USB_FUNC_I2C_MULTIWRITE:
-                case USB_FUNC_I2C_REPEATWRITE:
-                /* DKT 020208 - add this to support special case of DiSEqC */
-                case USB_FUNC_I2C_CHECKWRITE:
-                        pipe = B2C2_USB_CTRL_PIPE_OUT;
-                        nWaitTime = 2;
-                        dwRequestType = (u8) RTYPE_GENERIC;
-                break;
-                case USB_FUNC_I2C_READ:
-                case USB_FUNC_I2C_REPEATREAD:
-                        pipe = B2C2_USB_CTRL_PIPE_IN;
-                        nWaitTime = 2;
-                        dwRequestType = (u8) RTYPE_GENERIC;
-                break;
-                default:
-                        deb_info("unsupported function for i2c_req %x\n",func);
-                        return -EINVAL;
-        }
-        wValue = (func << 8 ) | port;
-        wIndex = (chipaddr << 8 ) | addr;
-
-        len = usb_control_msg(b2c2->udev,pipe,
-                        req,
-                        dwRequestType,
-                        addr,
-                        wIndex,
-                        buf,
-                        buflen,
-                        nWaitTime * 1000);
-        return len == buflen ? 0 : -EIO;
-}
-
-int static b2c2_usb_utility_req(struct usb_b2c2_usb *b2c2, int set,
-                b2c2_usb_utility_function_t func, u8 extra, u16 wIndex,
-                u16 buflen, u8 *pvBuffer)
-{
-        u16 wValue;
-        int nWaitTime = 2,
-                pipe = set ? B2C2_USB_CTRL_PIPE_OUT : B2C2_USB_CTRL_PIPE_IN,
-                len;
-
-        wValue = (func << 8) | extra;
-
-        len = usb_control_msg(b2c2->udev,pipe,
-                        B2C2_USB_UTILITY,
-                        (u8) RTYPE_GENERIC,
-                        wValue,
-                        wIndex,
-                        pvBuffer,
-                        buflen,
-                        nWaitTime * 1000);
-        return len == buflen ? 0 : -EIO;
-}
-
-
-
-static void b2c2_dumpfourreg(struct usb_b2c2_usb *b2c2, u16 offs)
-{
-        u32 r0,r1,r2,r3;
-        r0 = r1 = r2 = r3 = 0;
-        r0 = b2c2_usb_read_dw(b2c2,offs);
-        r1 = b2c2_usb_read_dw(b2c2,offs + 0x04);
-        r2 = b2c2_usb_read_dw(b2c2,offs + 0x08);
-        r3 = b2c2_usb_read_dw(b2c2,offs + 0x0c);
-        deb_ctrl("dump: offset: %03x, %08x, %08x, %08x, %08x\n",offs,r0,r1,r2,r3);
-}
-
-static void b2c2_urb_complete(struct urb *urb, struct pt_regs *ptregs)
-{
-        struct usb_b2c2_usb *b2c2 = urb->context;
-        deb_ts("urb completed, bufsize: %d\n",urb->transfer_buffer_length);
-
-//      urb_submit_urb(urb,GFP_ATOMIC); enable for real action
-}
-
-static void b2c2_exit_usb(struct usb_b2c2_usb *b2c2)
-{
-        int i;
-        for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++)
-                if (b2c2->iso_urb[i] != NULL) { /* not sure about unlink_urb and iso-urbs TODO */
-                        deb_info("unlinking/killing urb no. %d\n",i);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,7)
-                        usb_unlink_urb(b2c2->iso_urb[i]);
-#else
-                        usb_kill_urb(b2c2->iso_urb[i]);
-#endif
-                        usb_free_urb(b2c2->iso_urb[i]);
-                }
-
-        if (b2c2->iso_buffer != NULL)
-                pci_free_consistent(NULL,b2c2->buffer_size, b2c2->iso_buffer, b2c2->iso_dma_handle);
-
-}
-
-static int b2c2_init_usb(struct usb_b2c2_usb *b2c2)
-{
-        u16 frame_size = le16_to_cpu(b2c2->uintf->cur_altsetting->endpoint[0].desc.wMaxPacketSize);
-        int bufsize = B2C2_USB_NUM_ISO_URB * B2C2_USB_FRAMES_PER_ISO * frame_size,i,j,ret;
-        int buffer_offset = 0;
-
-        deb_info("creating %d iso-urbs with %d frames each of %d bytes size = %d.\n",
-                        B2C2_USB_NUM_ISO_URB, B2C2_USB_FRAMES_PER_ISO, frame_size,bufsize);
-
-        b2c2->iso_buffer = pci_alloc_consistent(NULL,bufsize,&b2c2->iso_dma_handle);
-        if (b2c2->iso_buffer == NULL)
-                return -ENOMEM;
-        memset(b2c2->iso_buffer, 0, bufsize);
-        b2c2->buffer_size = bufsize;
-
-        /* creating iso urbs */
-        for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++)
-                if (!(b2c2->iso_urb[i] = usb_alloc_urb(B2C2_USB_FRAMES_PER_ISO,GFP_ATOMIC))) {
-                        ret = -ENOMEM;
-                        goto urb_error;
-                }
-        /* initialising and submitting iso urbs */
-        for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++) {
-                int frame_offset = 0;
-                struct urb *urb = b2c2->iso_urb[i];
-                deb_info("initializing and submitting urb no. %d (buf_offset: %d).\n",i,buffer_offset);
-
-                urb->dev = b2c2->udev;
-                urb->context = b2c2;
-                urb->complete = b2c2_urb_complete;
-                urb->pipe = B2C2_USB_DATA_PIPE;
-                urb->transfer_flags = URB_ISO_ASAP;
-                urb->interval = 1;
-                urb->number_of_packets = B2C2_USB_FRAMES_PER_ISO;
-                urb->transfer_buffer_length = frame_size * B2C2_USB_FRAMES_PER_ISO;
-                urb->transfer_buffer = b2c2->iso_buffer + buffer_offset;
-
-                buffer_offset += frame_size * B2C2_USB_FRAMES_PER_ISO;
-                for (j = 0; j < B2C2_USB_FRAMES_PER_ISO; j++) {
-                        deb_info("urb no: %d, frame: %d, frame_offset: %d\n",i,j,frame_offset);
-                        urb->iso_frame_desc[j].offset = frame_offset;
-                        urb->iso_frame_desc[j].length = frame_size;
-                        frame_offset += frame_size;
-                }
-
-                if ((ret = usb_submit_urb(b2c2->iso_urb[i],GFP_ATOMIC))) {
-                        err("submitting urb %d failed with %d.",i,ret);
-                        goto urb_error;
-                }
-                deb_info("submitted urb no. %d.\n",i);
-        }
-
-        ret = 0;
-        goto success;
-urb_error:
-        b2c2_exit_usb(b2c2);
-success:
-        return ret;
-}
-
-static int b2c2_usb_probe(struct usb_interface *intf,
-                const struct usb_device_id *id)
-{
-        struct usb_device *udev = interface_to_usbdev(intf);
-        struct usb_b2c2_usb *b2c2 = NULL;
-        int ret;
-
-        b2c2 = kmalloc(sizeof(struct usb_b2c2_usb),GFP_KERNEL);
-        if (b2c2 == NULL) {
-                err("no memory");
-                return -ENOMEM;
-        }
-        b2c2->udev = udev;
-        b2c2->uintf = intf;
-
-        /* use the alternate setting with the larges buffer */
-        usb_set_interface(udev,0,1);
-
-        if ((ret = b2c2_init_usb(b2c2)))
-                goto usb_init_error;
-
-        usb_set_intfdata(intf,b2c2);
-
-        switch (udev->speed) {
-                case USB_SPEED_LOW:
-                        err("cannot handle USB speed because it is to sLOW.");
-                        break;
-                case USB_SPEED_FULL:
-                        info("running at FULL speed.");
-                        break;
-                case USB_SPEED_HIGH:
-                        info("running at HIGH speed.");
-                        break;
-                case USB_SPEED_UNKNOWN: /* fall through */
-                default:
-                        err("cannot handle USB speed because it is unkown.");
-                break;
-        }
-
-        b2c2_dumpfourreg(b2c2,0x200);
-        b2c2_dumpfourreg(b2c2,0x300);
-        b2c2_dumpfourreg(b2c2,0x400);
-        b2c2_dumpfourreg(b2c2,0x700);
-
-
-        if (ret == 0)
-                info("%s successfully initialized and connected.",DRIVER_DESC);
-        else
-                info("%s error while loading driver (%d)",DRIVER_DESC,ret);
-
-        ret = 0;
-        goto success;
-
-usb_init_error:
-        kfree(b2c2);
-success:
-        return ret;
-}
-
-static void b2c2_usb_disconnect(struct usb_interface *intf)
-{
-        struct usb_b2c2_usb *b2c2 = usb_get_intfdata(intf);
-        usb_set_intfdata(intf,NULL);
-        if (b2c2 != NULL) {
-                b2c2_exit_usb(b2c2);
-                kfree(b2c2);
-        }
-        info("%s successfully deinitialized and disconnected.",DRIVER_DESC);
-
-}
-
-static struct usb_device_id b2c2_usb_table [] = {
-            { USB_DEVICE(0x0af7, 0x0101) }
-};
-
-/* usb specific object needed to register this driver with the usb subsystem */
-static struct usb_driver b2c2_usb_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "dvb_b2c2_usb",
-        .probe          = b2c2_usb_probe,
-        .disconnect = b2c2_usb_disconnect,
-        .id_table       = b2c2_usb_table,
-};
-
-/* module stuff */
-static int __init b2c2_usb_init(void)
-{
-        int result;
-        if ((result = usb_register(&b2c2_usb_driver))) {
-                err("usb_register failed. Error number %d",result);
-                return result;
-        }
-
-        return 0;
-}
-
-static void __exit b2c2_usb_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&b2c2_usb_driver);
-}
-
-module_init (b2c2_usb_init);
-module_exit (b2c2_usb_exit);
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
-MODULE_DEVICE_TABLE(usb, b2c2_usb_table);
diff --git a/drivers/media/dvb/b2c2/flexcop-common.h b/drivers/media/dvb/b2c2/flexcop-common.h
new file mode 100644
index 000000000000..773d158032df
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-common.h
@@ -0,0 +1,164 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop-common.h - common header file for device-specific source files also.
+ *
+ * see flexcop.c for copyright information.
+ */
+#ifndef __FLEXCOP_COMMON_H__
+#define __FLEXCOP_COMMON_H__
+
+#include <linux/config.h>
+#include <linux/pci.h>
+
+#include "flexcop-reg.h"
+
+#include "dmxdev.h"
+#include "dvb_demux.h"
+#include "dvb_filter.h"
+#include "dvb_net.h"
+#include "dvb_frontend.h"
+
+#define FC_MAX_FEED 256
+
+#ifndef FC_LOG_PREFIX
+#warning please define a log prefix for your file, using a default one
+#define FC_LOG_PREFIX "b2c2-undef"
+#endif
+
+/* Steal from usb.h */
+#undef err
+#define err(format,  arg...) printk(KERN_ERR     FC_LOG_PREFIX ": " format "\n" , ## arg)
+#undef info
+#define info(format, arg...) printk(KERN_INFO    FC_LOG_PREFIX ": " format "\n" , ## arg)
+#undef warn
+#define warn(format, arg...) printk(KERN_WARNING FC_LOG_PREFIX ": " format "\n" , ## arg)
+
+struct flexcop_dma {
+        struct pci_dev *pdev;
+
+        u8 *cpu_addr0;
+        dma_addr_t dma_addr0;
+        u8 *cpu_addr1;
+        dma_addr_t dma_addr1;
+        u32 size; /* size of each address in bytes */
+};
+
+/* Control structure for data definitions that are common to
+ * the B2C2-based PCI and USB devices.
+ */
+struct flexcop_device {
+        /* general */
+        struct device *dev; /* for firmware_class */
+
+#define FC_STATE_DVB_INIT 0x01
+#define FC_STATE_I2C_INIT 0x02
+#define FC_STATE_FE_INIT  0x04
+        int init_state;
+
+        /* device information */
+        int has_32_hw_pid_filter;
+        flexcop_revision_t rev;
+        flexcop_device_type_t dev_type;
+        flexcop_bus_t bus_type;
+
+        /* dvb stuff */
+        struct dvb_adapter dvb_adapter;
+        struct dvb_frontend *fe;
+        struct dvb_net dvbnet;
+        struct dvb_demux demux;
+        struct dmxdev dmxdev;
+        struct dmx_frontend hw_frontend;
+        struct dmx_frontend mem_frontend;
+        int (*fe_sleep) (struct dvb_frontend *);
+
+        struct i2c_adapter i2c_adap;
+        struct semaphore i2c_sem;
+
+        struct module *owner;
+
+        /* options and status */
+        int extra_feedcount;
+        int feedcount;
+        int pid_filtering;
+        int fullts_streaming_state;
+
+        /* bus specific callbacks */
+        flexcop_ibi_value (*read_ibi_reg)  (struct flexcop_device *, flexcop_ibi_register);
+        int               (*write_ibi_reg) (struct flexcop_device *, flexcop_ibi_register, flexcop_ibi_value);
+
+
+        int (*i2c_request) (struct flexcop_device*, flexcop_access_op_t, flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len);
+        int (*stream_control) (struct flexcop_device*, int);
+
+        int (*get_mac_addr) (struct flexcop_device *fc, int extended);
+
+        void *bus_specific;
+};
+
+/* exported prototypes */
+
+/* from flexcop.c */
+void flexcop_pass_dmx_data(struct flexcop_device *fc, u8 *buf, u32 len);
+void flexcop_pass_dmx_packets(struct flexcop_device *fc, u8 *buf, u32 no);
+
+struct flexcop_device *flexcop_device_kmalloc(size_t bus_specific_len);
+void flexcop_device_kfree(struct flexcop_device*);
+
+int  flexcop_device_initialize(struct flexcop_device*);
+void flexcop_device_exit(struct flexcop_device *fc);
+
+/* from flexcop-dma.c */
+int flexcop_dma_allocate(struct pci_dev *pdev, struct flexcop_dma *dma, u32 size);
+void flexcop_dma_free(struct flexcop_dma *dma);
+
+int flexcop_dma_control_timer_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff);
+int flexcop_dma_control_size_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff);
+int flexcop_dma_control_packet_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff);
+int flexcop_dma_config(struct flexcop_device *fc, struct flexcop_dma *dma, flexcop_dma_index_t dma_idx,flexcop_dma_addr_index_t index);
+int flexcop_dma_config_timer(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, u8 cycles);
+int flexcop_dma_config_packet_count(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, u8 packets);
+
+/* from flexcop-eeprom.c */
+/* the PCI part uses this call to get the MAC address, the USB part has its own */
+int flexcop_eeprom_check_mac_addr(struct flexcop_device *fc, int extended);
+
+/* from flexcop-i2c.c */
+/* the PCI part uses this a i2c_request callback, whereas the usb part has its own
+ * one. We have it in flexcop-i2c.c, because it is going via the actual
+ * I2C-channel of the flexcop.
+ */
+int flexcop_i2c_request(struct flexcop_device*, flexcop_access_op_t,
+                        flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len);
+
+/* from flexcop-sram.c */
+int flexcop_sram_set_dest(struct flexcop_device *fc, flexcop_sram_dest_t dest, flexcop_sram_dest_target_t target);
+void flexcop_wan_set_speed(struct flexcop_device *fc, flexcop_wan_speed_t s);
+void flexcop_sram_ctrl(struct flexcop_device *fc, int usb_wan, int sramdma, int maximumfill);
+
+/* global prototypes for the flexcop-chip */
+/* from flexcop-fe-tuner.c */
+int flexcop_frontend_init(struct flexcop_device *card);
+void flexcop_frontend_exit(struct flexcop_device *fc);
+
+/* from flexcop-i2c.c */
+int flexcop_i2c_init(struct flexcop_device *fc);
+void flexcop_i2c_exit(struct flexcop_device *fc);
+
+/* from flexcop-sram.c */
+int flexcop_sram_init(struct flexcop_device *fc);
+
+/* from flexcop-misc.c */
+void flexcop_determine_revision(struct flexcop_device *fc);
+void flexcop_device_name(struct flexcop_device *fc,const char *prefix,const char *suffix);
+
+/* from flexcop-hw-filter.c */
+int flexcop_pid_feed_control(struct flexcop_device *fc, struct dvb_demux_feed *dvbdmxfeed, int onoff);
+void flexcop_hw_filter_init(struct flexcop_device *fc);
+
+void flexcop_smc_ctrl(struct flexcop_device *fc, int onoff);
+
+void flexcop_set_mac_filter(struct flexcop_device *fc, u8 mac[6]);
+void flexcop_mac_filter_ctrl(struct flexcop_device *fc, int onoff);
+
+#endif
diff --git a/drivers/media/dvb/b2c2/flexcop-dma.c b/drivers/media/dvb/b2c2/flexcop-dma.c
new file mode 100644
index 000000000000..8d2706075360
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-dma.c
@@ -0,0 +1,149 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop-dma.c - methods for configuring and controlling the DMA of the FlexCop.
+ *
+ * see flexcop.c for copyright information.
+ */
+#include "flexcop.h"
+
+int flexcop_dma_allocate(struct pci_dev *pdev, struct flexcop_dma *dma, u32 size)
+{
+        u8 *tcpu;
+        dma_addr_t tdma;
+
+        if (size % 2) {
+                err("dma buffersize has to be even.");
+                return -EINVAL;
+        }
+
+        if ((tcpu = pci_alloc_consistent(pdev, size, &tdma)) != NULL) {
+                dma->pdev = pdev;
+                dma->cpu_addr0 = tcpu;
+                dma->dma_addr0 = tdma;
+                dma->cpu_addr1 = tcpu + size/2;
+                dma->dma_addr1 = tdma + size/2;
+                dma->size = size/2;
+                return 0;
+        }
+        return -ENOMEM;
+}
+EXPORT_SYMBOL(flexcop_dma_allocate);
+
+void flexcop_dma_free(struct flexcop_dma *dma)
+{
+        pci_free_consistent(dma->pdev, dma->size*2,dma->cpu_addr0, dma->dma_addr0);
+        memset(dma,0,sizeof(struct flexcop_dma));
+}
+EXPORT_SYMBOL(flexcop_dma_free);
+
+int flexcop_dma_control_timer_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff)
+{
+        flexcop_ibi_value v = fc->read_ibi_reg(fc,ctrl_208);
+
+        if (no & FC_DMA_1)
+                v.ctrl_208.DMA1_Timer_Enable_sig = onoff;
+
+        if (no & FC_DMA_2)
+                v.ctrl_208.DMA2_Timer_Enable_sig = onoff;
+
+        fc->write_ibi_reg(fc,ctrl_208,v);
+        return 0;
+}
+EXPORT_SYMBOL(flexcop_dma_control_timer_irq);
+
+int flexcop_dma_control_size_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff)
+{
+        flexcop_ibi_value v = fc->read_ibi_reg(fc,ctrl_208);
+
+        if (no & FC_DMA_1)
+                v.ctrl_208.DMA1_IRQ_Enable_sig = onoff;
+
+        if (no & FC_DMA_2)
+                v.ctrl_208.DMA2_IRQ_Enable_sig = onoff;
+
+        fc->write_ibi_reg(fc,ctrl_208,v);
+        return 0;
+}
+EXPORT_SYMBOL(flexcop_dma_control_size_irq);
+
+int flexcop_dma_control_packet_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff)
+{
+        flexcop_ibi_value v = fc->read_ibi_reg(fc,ctrl_208);
+
+        if (no & FC_DMA_1)
+                v.ctrl_208.DMA1_Size_IRQ_Enable_sig = onoff;
+
+        if (no & FC_DMA_2)
+                v.ctrl_208.DMA2_Size_IRQ_Enable_sig = onoff;
+
+        fc->write_ibi_reg(fc,ctrl_208,v);
+        return 0;
+}
+EXPORT_SYMBOL(flexcop_dma_control_packet_irq);
+
+int flexcop_dma_config(struct flexcop_device *fc, struct flexcop_dma *dma, flexcop_dma_index_t dma_idx,flexcop_dma_addr_index_t index)
+{
+
+        flexcop_ibi_value v0x0,v0x4,v0xc;
+        v0x0.raw = v0x4.raw = v0xc.raw = 0;
+
+        v0x0.dma_0x0.dma_address0        = dma->dma_addr0 >> 2;
+        v0xc.dma_0xc.dma_address1        = dma->dma_addr1 >> 2;
+        v0x4.dma_0x4_write.dma_addr_size = dma->size / 4;
+
+        if (index & FC_DMA_SUBADDR_0)
+                v0x0.dma_0x0.dma_0start = 1;
+
+        if (index & FC_DMA_SUBADDR_1)
+                v0xc.dma_0xc.dma_1start = 1;
+
+        if (dma_idx & FC_DMA_1) {
+                fc->write_ibi_reg(fc,dma1_000,v0x0);
+                fc->write_ibi_reg(fc,dma1_004,v0x4);
+                fc->write_ibi_reg(fc,dma1_00c,v0xc);
+        } else { /* (dma_idx & FC_DMA_2) */
+                fc->write_ibi_reg(fc,dma2_010,v0x0);
+                fc->write_ibi_reg(fc,dma2_014,v0x4);
+                fc->write_ibi_reg(fc,dma2_01c,v0xc);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(flexcop_dma_config);
+
+static int flexcop_dma_remap(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, int onoff)
+{
+        flexcop_ibi_register r = (dma_idx & FC_DMA_1) ? dma1_00c : dma2_01c;
+        flexcop_ibi_value v = fc->read_ibi_reg(fc,r);
+        v.dma_0xc.remap_enable = onoff;
+        fc->write_ibi_reg(fc,r,v);
+        return 0;
+}
+
+/* 1 cycles = 1.97 msec */
+int flexcop_dma_config_timer(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, u8 cycles)
+{
+        flexcop_ibi_register r = (dma_idx & FC_DMA_1) ? dma1_004 : dma2_014;
+        flexcop_ibi_value v = fc->read_ibi_reg(fc,r);
+
+        flexcop_dma_remap(fc,dma_idx,0);
+
+        v.dma_0x4_write.dmatimer = cycles >> 1;
+        fc->write_ibi_reg(fc,r,v);
+        return 0;
+}
+EXPORT_SYMBOL(flexcop_dma_config_timer);
+
+int flexcop_dma_config_packet_count(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, u8 packets)
+{
+        flexcop_ibi_register r = (dma_idx & FC_DMA_1) ? dma1_004 : dma2_014;
+        flexcop_ibi_value v = fc->read_ibi_reg(fc,r);
+
+        flexcop_dma_remap(fc,dma_idx,1);
+
+        v.dma_0x4_remap.DMA_maxpackets = packets;
+        fc->write_ibi_reg(fc,r,v);
+        return 0;
+}
+EXPORT_SYMBOL(flexcop_dma_config_packet_count);
diff --git a/drivers/media/dvb/b2c2/flexcop-eeprom.c b/drivers/media/dvb/b2c2/flexcop-eeprom.c
new file mode 100644
index 000000000000..bbcf070a178d
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-eeprom.c
@@ -0,0 +1,153 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop-eeprom.c - eeprom access methods (currently only MAC address reading is used)
+ *
+ * see flexcop.c for copyright information.
+ */
+#include "flexcop.h"
+
+#if 0
+/*EEPROM (Skystar2 has one "24LC08B" chip on board) */
+static int eeprom_write(struct adapter *adapter, u16 addr, u8 *buf, u16 len)
+{
+        return flex_i2c_write(adapter, 0x20000000, 0x50, addr, buf, len);
+}
+
+static int eeprom_lrc_write(struct adapter *adapter, u32 addr, u32 len, u8 *wbuf, u8 *rbuf, int retries)
+{
+        int i;
+
+        for (i = 0; i < retries; i++) {
+                if (eeprom_write(adapter, addr, wbuf, len) == len) {
+                        if (eeprom_lrc_read(adapter, addr, len, rbuf, retries) == 1)
+                                return 1;
+                }
+        }
+
+        return 0;
+}
+
+/* These functions could be used to unlock SkyStar2 cards. */
+
+static int eeprom_writeKey(struct adapter *adapter, u8 *key, u32 len)
+{
+        u8 rbuf[20];
+        u8 wbuf[20];
+
+        if (len != 16)
+                return 0;
+
+        memcpy(wbuf, key, len);
+
+        wbuf[16] = 0;
+        wbuf[17] = 0;
+        wbuf[18] = 0;
+        wbuf[19] = calc_lrc(wbuf, 19);
+
+        return eeprom_lrc_write(adapter, 0x3e4, 20, wbuf, rbuf, 4);
+}
+
+static int eeprom_readKey(struct adapter *adapter, u8 *key, u32 len)
+{
+        u8 buf[20];
+
+        if (len != 16)
+                return 0;
+
+        if (eeprom_lrc_read(adapter, 0x3e4, 20, buf, 4) == 0)
+                return 0;
+
+        memcpy(key, buf, len);
+
+        return 1;
+}
+
+static char eeprom_set_mac_addr(struct adapter *adapter, char type, u8 *mac)
+{
+        u8 tmp[8];
+
+        if (type != 0) {
+                tmp[0] = mac[0];
+                tmp[1] = mac[1];
+                tmp[2] = mac[2];
+                tmp[3] = mac[5];
+                tmp[4] = mac[6];
+                tmp[5] = mac[7];
+
+        } else {
+
+                tmp[0] = mac[0];
+                tmp[1] = mac[1];
+                tmp[2] = mac[2];
+                tmp[3] = mac[3];
+                tmp[4] = mac[4];
+                tmp[5] = mac[5];
+        }
+
+        tmp[6] = 0;
+        tmp[7] = calc_lrc(tmp, 7);
+
+        if (eeprom_write(adapter, 0x3f8, tmp, 8) == 8)
+                return 1;
+
+        return 0;
+}
+
+static int flexcop_eeprom_read(struct flexcop_device *fc, u16 addr, u8 *buf, u16 len)
+{
+        return fc->i2c_request(fc,FC_READ,FC_I2C_PORT_EEPROM,0x50,addr,buf,len);
+}
+
+#endif
+
+static u8 calc_lrc(u8 *buf, int len)
+{
+        int i;
+        u8 sum = 0;
+        for (i = 0; i < len; i++)
+                sum = sum ^ buf[i];
+        return sum;
+}
+
+static int flexcop_eeprom_request(struct flexcop_device *fc, flexcop_access_op_t op, u16 addr, u8 *buf, u16 len, int retries)
+{
+        int i,ret = 0;
+        u8 chipaddr =  0x50 | ((addr >> 8) & 3);
+        for (i = 0; i < retries; i++)
+                if ((ret = fc->i2c_request(fc,op,FC_I2C_PORT_EEPROM,chipaddr,addr & 0xff,buf,len)) == 0)
+                        break;
+        return ret;
+}
+
+static int flexcop_eeprom_lrc_read(struct flexcop_device *fc, u16 addr, u8 *buf, u16 len, int retries)
+{
+        int ret = flexcop_eeprom_request(fc,FC_READ,addr,buf,len,retries);
+        if (ret == 0)
+                if (calc_lrc(buf, len - 1) != buf[len - 1])
+                        ret = -EINVAL;
+        return ret;
+}
+
+/* JJ's comment about extended == 1: it is not presently used anywhere but was
+ * added to the low-level functions for possible support of EUI64
+ */
+int flexcop_eeprom_check_mac_addr(struct flexcop_device *fc, int extended)
+{
+        u8 buf[8];
+        int ret = 0;
+
+        if ((ret = flexcop_eeprom_lrc_read(fc,0x3f8,buf,8,4)) == 0) {
+                if (extended != 0) {
+                        err("TODO: extended (EUI64) MAC addresses aren't completely supported yet");
+                        ret = -EINVAL;
+/*                      memcpy(fc->dvb_adapter.proposed_mac,buf,3);
+                        mac[3] = 0xfe;
+                        mac[4] = 0xff;
+                        memcpy(&fc->dvb_adapter.proposed_mac[3],&buf[5],3); */
+                } else
+                        memcpy(fc->dvb_adapter.proposed_mac,buf,6);
+        }
+        return ret;
+}
+EXPORT_SYMBOL(flexcop_eeprom_check_mac_addr);
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
new file mode 100644
index 000000000000..0410cc96a48e
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -0,0 +1,413 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop-fe-tuner.c - methods for attaching a frontend and controlling DiSEqC.
+ *
+ * see flexcop.c for copyright information.
+ */
+#include "flexcop.h"
+
+#include "stv0299.h"
+#include "mt352.h"
+#include "nxt2002.h"
+#include "bcm3510.h"
+#include "stv0297.h"
+#include "mt312.h"
+
+/* lnb control */
+
+static int flexcop_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+{
+        struct flexcop_device *fc = fe->dvb->priv;
+        flexcop_ibi_value v;
+        deb_tuner("polarity/voltage = %u\n", voltage);
+
+        v = fc->read_ibi_reg(fc, misc_204);
+        switch (voltage) {
+                case SEC_VOLTAGE_OFF:
+                        v.misc_204.ACPI1_sig = 1;
+                        break;
+                case SEC_VOLTAGE_13:
+                        v.misc_204.ACPI1_sig = 0;
+                        v.misc_204.LNB_L_H_sig = 0;
+                        break;
+                case SEC_VOLTAGE_18:
+                        v.misc_204.ACPI1_sig = 0;
+                        v.misc_204.LNB_L_H_sig = 1;
+                        break;
+                default:
+                        err("unknown SEC_VOLTAGE value");
+                        return -EINVAL;
+        }
+        return fc->write_ibi_reg(fc, misc_204, v);
+}
+
+static int flexcop_sleep(struct dvb_frontend* fe)
+{
+        struct flexcop_device *fc = fe->dvb->priv;
+/*      flexcop_ibi_value v = fc->read_ibi_reg(fc,misc_204); */
+
+        if (fc->fe_sleep)
+                return fc->fe_sleep(fe);
+
+/*      v.misc_204.ACPI3_sig = 1;
+        fc->write_ibi_reg(fc,misc_204,v);*/
+
+        return 0;
+}
+
+static int flexcop_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
+{
+        /* u16 wz_half_period_for_45_mhz[] = { 0x01ff, 0x0154, 0x00ff, 0x00cc }; */
+        struct flexcop_device *fc = fe->dvb->priv;
+        flexcop_ibi_value v;
+        u16 ax;
+        v.raw = 0;
+
+        deb_tuner("tone = %u\n",tone);
+
+        switch (tone) {
+                case SEC_TONE_ON:
+                        ax = 0x01ff;
+                        break;
+                case SEC_TONE_OFF:
+                        ax = 0;
+                        break;
+                default:
+                        err("unknown SEC_TONE value");
+                        return -EINVAL;
+        }
+
+        v.lnb_switch_freq_200.LNB_CTLPrescaler_sig = 1; /* divide by 2 */
+
+        v.lnb_switch_freq_200.LNB_CTLHighCount_sig = ax;
+        v.lnb_switch_freq_200.LNB_CTLLowCount_sig  = ax == 0 ? 0x1ff : ax;
+
+        return fc->write_ibi_reg(fc,lnb_switch_freq_200,v);
+}
+
+static void flexcop_diseqc_send_bit(struct dvb_frontend* fe, int data)
+{
+        flexcop_set_tone(fe, SEC_TONE_ON);
+        udelay(data ? 500 : 1000);
+        flexcop_set_tone(fe, SEC_TONE_OFF);
+        udelay(data ? 1000 : 500);
+}
+
+static void flexcop_diseqc_send_byte(struct dvb_frontend* fe, int data)
+{
+        int i, par = 1, d;
+
+        for (i = 7; i >= 0; i--) {
+                d = (data >> i) & 1;
+                par ^= d;
+                flexcop_diseqc_send_bit(fe, d);
+        }
+
+        flexcop_diseqc_send_bit(fe, par);
+}
+
+static int flexcop_send_diseqc_msg(struct dvb_frontend* fe, int len, u8 *msg, unsigned long burst)
+{
+        int i;
+
+        flexcop_set_tone(fe, SEC_TONE_OFF);
+        mdelay(16);
+
+        for (i = 0; i < len; i++)
+                flexcop_diseqc_send_byte(fe,msg[i]);
+
+        mdelay(16);
+
+        if (burst != -1) {
+                if (burst)
+                        flexcop_diseqc_send_byte(fe, 0xff);
+                else {
+                        flexcop_set_tone(fe, SEC_TONE_ON);
+                        udelay(12500);
+                        flexcop_set_tone(fe, SEC_TONE_OFF);
+                }
+                msleep(20);
+        }
+        return 0;
+}
+
+static int flexcop_diseqc_send_master_cmd(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd)
+{
+        return flexcop_send_diseqc_msg(fe, cmd->msg_len, cmd->msg, 0);
+}
+
+static int flexcop_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd)
+{
+        return flexcop_send_diseqc_msg(fe, 0, NULL, minicmd);
+}
+
+/* dvb-s stv0299 */
+static int samsung_tbmu24112_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ratio)
+{
+        u8 aclk = 0;
+        u8 bclk = 0;
+
+        if (srate < 1500000) { aclk = 0xb7; bclk = 0x47; }
+        else if (srate < 3000000) { aclk = 0xb7; bclk = 0x4b; }
+        else if (srate < 7000000) { aclk = 0xb7; bclk = 0x4f; }
+        else if (srate < 14000000) { aclk = 0xb7; bclk = 0x53; }
+        else if (srate < 30000000) { aclk = 0xb6; bclk = 0x53; }
+        else if (srate < 45000000) { aclk = 0xb4; bclk = 0x51; }
+
+        stv0299_writereg (fe, 0x13, aclk);
+        stv0299_writereg (fe, 0x14, bclk);
+        stv0299_writereg (fe, 0x1f, (ratio >> 16) & 0xff);
+        stv0299_writereg (fe, 0x20, (ratio >>  8) & 0xff);
+        stv0299_writereg (fe, 0x21, (ratio      ) & 0xf0);
+
+        return 0;
+}
+
+static int samsung_tbmu24112_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+{
+        u8 buf[4];
+        u32 div;
+        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
+        struct flexcop_device *fc = fe->dvb->priv;
+
+        div = params->frequency / 125;
+
+        buf[0] = (div >> 8) & 0x7f;
+        buf[1] = div & 0xff;
+        buf[2] = 0x84;  /* 0xC4 */
+        buf[3] = 0x08;
+
+        if (params->frequency < 1500000) buf[3] |= 0x10;
+
+        if (i2c_transfer(&fc->i2c_adap, &msg, 1) != 1)
+                return -EIO;
+        return 0;
+}
+
+static u8 samsung_tbmu24112_inittab[] = {
+             0x01, 0x15,
+             0x02, 0x30,
+             0x03, 0x00,
+             0x04, 0x7D,
+             0x05, 0x35,
+             0x06, 0x02,
+             0x07, 0x00,
+             0x08, 0xC3,
+             0x0C, 0x00,
+             0x0D, 0x81,
+             0x0E, 0x23,
+             0x0F, 0x12,
+             0x10, 0x7E,
+             0x11, 0x84,
+             0x12, 0xB9,
+             0x13, 0x88,
+             0x14, 0x89,
+             0x15, 0xC9,
+             0x16, 0x00,
+             0x17, 0x5C,
+             0x18, 0x00,
+             0x19, 0x00,
+             0x1A, 0x00,
+             0x1C, 0x00,
+             0x1D, 0x00,
+             0x1E, 0x00,
+             0x1F, 0x3A,
+             0x20, 0x2E,
+             0x21, 0x80,
+             0x22, 0xFF,
+             0x23, 0xC1,
+             0x28, 0x00,
+             0x29, 0x1E,
+             0x2A, 0x14,
+             0x2B, 0x0F,
+             0x2C, 0x09,
+             0x2D, 0x05,
+             0x31, 0x1F,
+             0x32, 0x19,
+             0x33, 0xFE,
+             0x34, 0x93,
+             0xff, 0xff,
+};
+
+static struct stv0299_config samsung_tbmu24112_config = {
+        .demod_address = 0x68,
+        .inittab = samsung_tbmu24112_inittab,
+        .mclk = 88000000UL,
+        .invert = 0,
+        .enhanced_tuning = 0,
+        .skip_reinit = 0,
+        .lock_output = STV0229_LOCKOUTPUT_LK,
+        .volt13_op0_op1 = STV0299_VOLT13_OP1,
+        .min_delay_ms = 100,
+        .set_symbol_rate = samsung_tbmu24112_set_symbol_rate,
+        .pll_set = samsung_tbmu24112_pll_set,
+};
+
+/* dvb-t mt352 */
+static int samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe)
+{
+        static u8 mt352_clock_config [] = { 0x89, 0x18, 0x2d };
+        static u8 mt352_reset [] = { 0x50, 0x80 };
+        static u8 mt352_adc_ctl_1_cfg [] = { 0x8E, 0x40 };
+        static u8 mt352_agc_cfg [] = { 0x67, 0x28, 0xa1 };
+        static u8 mt352_capt_range_cfg[] = { 0x75, 0x32 };
+
+        mt352_write(fe, mt352_clock_config, sizeof(mt352_clock_config));
+        udelay(2000);
+        mt352_write(fe, mt352_reset, sizeof(mt352_reset));
+        mt352_write(fe, mt352_adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg));
+
+        mt352_write(fe, mt352_agc_cfg, sizeof(mt352_agc_cfg));
+        mt352_write(fe, mt352_capt_range_cfg, sizeof(mt352_capt_range_cfg));
+
+        return 0;
+}
+
+static int samsung_tdtc9251dh0_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf)
+{
+        u32 div;
+        unsigned char bs = 0;
+
+        #define IF_FREQUENCYx6 217    /* 6 * 36.16666666667MHz */
+        div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
+
+        if (params->frequency >= 48000000 && params->frequency <= 154000000) bs = 0x09;
+        if (params->frequency >= 161000000 && params->frequency <= 439000000) bs = 0x0a;
+        if (params->frequency >= 447000000 && params->frequency <= 863000000) bs = 0x08;
+
+        pllbuf[0] = 0xc2; /* Note: non-linux standard PLL i2c address */
+        pllbuf[1] = div >> 8;
+        pllbuf[2] = div & 0xff;
+        pllbuf[3] = 0xcc;
+        pllbuf[4] = bs;
+
+        return 0;
+}
+
+static struct mt352_config samsung_tdtc9251dh0_config = {
+        .demod_address = 0x0f,
+        .demod_init    = samsung_tdtc9251dh0_demod_init,
+        .pll_set       = samsung_tdtc9251dh0_pll_set,
+};
+
+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 = 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)
+{
+        u8 buf[4];
+        u32 div;
+        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
+        struct flexcop_device *fc = fe->dvb->priv;
+
+        div = (params->frequency + (125/2)) / 125;
+
+        buf[0] = (div >> 8) & 0x7f;
+        buf[1] = (div >> 0) & 0xff;
+        buf[2] = 0x84 | ((div >> 10) & 0x60);
+        buf[3] = 0x80;
+
+        if (params->frequency < 1550000)
+                buf[3] |= 0x02;
+
+        if (i2c_transfer(&fc->i2c_adap, &msg, 1) != 1)
+                return -EIO;
+        return 0;
+}
+
+static struct mt312_config skystar23_samsung_tbdu18132_config = {
+
+        .demod_address = 0x0e,
+        .pll_set = skystar23_samsung_tbdu18132_pll_set,
+};
+
+static struct stv0297_config alps_tdee4_stv0297_config = {
+        .demod_address = 0x1c,
+//      .invert = 1,
+//      .pll_set = alps_tdee4_stv0297_pll_set,
+};
+
+/* try to figure out the frontend, each card/box can have on of the following list */
+int flexcop_frontend_init(struct flexcop_device *fc)
+{
+        /* try the sky v2.6 (stv0299/Samsung tbmu24112(sl1935)) */
+        if ((fc->fe = stv0299_attach(&samsung_tbmu24112_config, &fc->i2c_adap)) != NULL) {
+                fc->fe->ops->set_voltage = flexcop_set_voltage;
+
+                fc->fe_sleep             = fc->fe->ops->sleep;
+                fc->fe->ops->sleep       = flexcop_sleep;
+
+                fc->dev_type          = FC_SKY;
+                info("found the stv0299 at i2c address: 0x%02x",samsung_tbmu24112_config.demod_address);
+        } else
+        /* try the air dvb-t (mt352/Samsung tdtc9251dh0(??)) */
+        if ((fc->fe = mt352_attach(&samsung_tdtc9251dh0_config, &fc->i2c_adap)) != NULL ) {
+                fc->dev_type          = FC_AIR_DVB;
+                info("found the mt352 at i2c address: 0x%02x",samsung_tdtc9251dh0_config.demod_address);
+        } else
+        /* try the air atsc 2nd generation (nxt2002) */
+        if ((fc->fe = nxt2002_attach(&samsung_tbmv_config, &fc->i2c_adap)) != NULL) {
+                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;
+                info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address);
+        } else
+        /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
+        if ((fc->fe = vp310_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
+                fc->fe->ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;
+                fc->fe->ops->diseqc_send_burst      = flexcop_diseqc_send_burst;
+                fc->fe->ops->set_tone               = flexcop_set_tone;
+                fc->fe->ops->set_voltage            = flexcop_set_voltage;
+
+                fc->fe_sleep                        = fc->fe->ops->sleep;
+                fc->fe->ops->sleep                  = flexcop_sleep;
+
+                fc->dev_type                        = FC_SKY_OLD;
+                info("found the vp310 (aka mt312) at i2c address: 0x%02x",skystar23_samsung_tbdu18132_config.demod_address);
+        }
+
+        if (fc->fe == NULL) {
+                err("no frontend driver found for this B2C2/FlexCop adapter");
+                return -ENODEV;
+        } else {
+                if (dvb_register_frontend(&fc->dvb_adapter, fc->fe)) {
+                        err("frontend registration failed!");
+                        if (fc->fe->ops->release != NULL)
+                                fc->fe->ops->release(fc->fe);
+                        fc->fe = NULL;
+                        return -EINVAL;
+                }
+        }
+        fc->init_state |= FC_STATE_FE_INIT;
+        return 0;
+}
+
+void flexcop_frontend_exit(struct flexcop_device *fc)
+{
+        if (fc->init_state & FC_STATE_FE_INIT)
+                dvb_unregister_frontend(fc->fe);
+
+        fc->init_state &= ~FC_STATE_FE_INIT;
+}
diff --git a/drivers/media/dvb/b2c2/flexcop-hw-filter.c b/drivers/media/dvb/b2c2/flexcop-hw-filter.c
new file mode 100644
index 000000000000..2baf43d3ce8f
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-hw-filter.c
@@ -0,0 +1,204 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop-hw-filter.c - pid and mac address filtering and corresponding control functions.
+ *
+ * see flexcop.c for copyright information.
+ */
+#include "flexcop.h"
+
+static void flexcop_rcv_data_ctrl(struct flexcop_device *fc, int onoff)
+{
+        flexcop_set_ibi_value(ctrl_208,Rcv_Data_sig,onoff);
+}
+
+void flexcop_smc_ctrl(struct flexcop_device *fc, int onoff)
+{
+        flexcop_set_ibi_value(ctrl_208,SMC_Enable_sig,onoff);
+}
+
+void flexcop_null_filter_ctrl(struct flexcop_device *fc, int onoff)
+{
+        flexcop_set_ibi_value(ctrl_208,Null_filter_sig,onoff);
+}
+
+void flexcop_set_mac_filter(struct flexcop_device *fc, u8 mac[6])
+{
+        flexcop_ibi_value v418,v41c;
+        v41c = fc->read_ibi_reg(fc,mac_address_41c);
+
+        v418.mac_address_418.MAC1 = mac[0];
+        v418.mac_address_418.MAC2 = mac[1];
+        v418.mac_address_418.MAC3 = mac[2];
+        v418.mac_address_418.MAC6 = mac[3];
+        v41c.mac_address_41c.MAC7 = mac[4];
+        v41c.mac_address_41c.MAC8 = mac[5];
+
+        fc->write_ibi_reg(fc,mac_address_418,v418);
+        fc->write_ibi_reg(fc,mac_address_41c,v41c);
+}
+
+void flexcop_mac_filter_ctrl(struct flexcop_device *fc, int onoff)
+{
+        flexcop_set_ibi_value(ctrl_208,MAC_filter_Mode_sig,onoff);
+}
+
+static void flexcop_pid_group_filter(struct flexcop_device *fc, u16 pid, u16 mask)
+{
+        /* index_reg_310.extra_index_reg need to 0 or 7 to work */
+        flexcop_ibi_value v30c;
+        v30c.pid_filter_30c_ext_ind_0_7.Group_PID = pid;
+        v30c.pid_filter_30c_ext_ind_0_7.Group_mask = mask;
+        fc->write_ibi_reg(fc,pid_filter_30c,v30c);
+}
+
+static void flexcop_pid_group_filter_ctrl(struct flexcop_device *fc, int onoff)
+{
+        flexcop_set_ibi_value(ctrl_208,Mask_filter_sig,onoff);
+}
+
+/* this fancy define reduces the code size of the quite similar PID controlling of
+ * the first 6 PIDs
+ */
+
+#define pid_ctrl(vregname,field,enablefield,trans_field,transval) \
+        flexcop_ibi_value vpid = fc->read_ibi_reg(fc, vregname), \
+                                          v208 = fc->read_ibi_reg(fc, ctrl_208); \
+\
+        vpid.vregname.field = onoff ? pid : 0x1fff; \
+        vpid.vregname.trans_field = transval; \
+        v208.ctrl_208.enablefield = onoff; \
+\
+        fc->write_ibi_reg(fc,vregname,vpid); \
+        fc->write_ibi_reg(fc,ctrl_208,v208);
+
+static void flexcop_pid_Stream1_PID_ctrl(struct flexcop_device *fc, u16 pid, int onoff)
+{
+        pid_ctrl(pid_filter_300,Stream1_PID,Stream1_filter_sig,Stream1_trans,0);
+}
+
+static void flexcop_pid_Stream2_PID_ctrl(struct flexcop_device *fc, u16 pid, int onoff)
+{
+        pid_ctrl(pid_filter_300,Stream2_PID,Stream2_filter_sig,Stream2_trans,0);
+}
+
+static void flexcop_pid_PCR_PID_ctrl(struct flexcop_device *fc, u16 pid, int onoff)
+{
+        pid_ctrl(pid_filter_304,PCR_PID,PCR_filter_sig,PCR_trans,0);
+}
+
+static void flexcop_pid_PMT_PID_ctrl(struct flexcop_device *fc, u16 pid, int onoff)
+{
+        pid_ctrl(pid_filter_304,PMT_PID,PMT_filter_sig,PMT_trans,0);
+}
+
+static void flexcop_pid_EMM_PID_ctrl(struct flexcop_device *fc, u16 pid, int onoff)
+{
+        pid_ctrl(pid_filter_308,EMM_PID,EMM_filter_sig,EMM_trans,0);
+}
+
+static void flexcop_pid_ECM_PID_ctrl(struct flexcop_device *fc, u16 pid, int onoff)
+{
+        pid_ctrl(pid_filter_308,ECM_PID,ECM_filter_sig,ECM_trans,0);
+}
+
+static void flexcop_pid_control(struct flexcop_device *fc, int index, u16 pid,int onoff)
+{
+        if (pid == 0x2000)
+                return;
+
+        deb_ts("setting pid: %5d %04x at index %d '%s'\n",pid,pid,index,onoff ? "on" : "off");
+
+        /* We could use bit magic here to reduce source code size.
+         * I decided against it, but to use the real register names */
+        switch (index) {
+                case 0: flexcop_pid_Stream1_PID_ctrl(fc,pid,onoff); break;
+                case 1: flexcop_pid_Stream2_PID_ctrl(fc,pid,onoff); break;
+                case 2: flexcop_pid_PCR_PID_ctrl(fc,pid,onoff); break;
+                case 3: flexcop_pid_PMT_PID_ctrl(fc,pid,onoff); break;
+                case 4: flexcop_pid_EMM_PID_ctrl(fc,pid,onoff); break;
+                case 5: flexcop_pid_ECM_PID_ctrl(fc,pid,onoff); break;
+                default:
+                        if (fc->has_32_hw_pid_filter && index < 38) {
+                                flexcop_ibi_value vpid,vid;
+
+                                /* set the index */
+                                vid = fc->read_ibi_reg(fc,index_reg_310);
+                                vid.index_reg_310.index_reg = index - 6;
+                                fc->write_ibi_reg(fc,index_reg_310, vid);
+
+                                vpid = fc->read_ibi_reg(fc,pid_n_reg_314);
+                                vpid.pid_n_reg_314.PID = onoff ? pid : 0x1fff;
+                                vpid.pid_n_reg_314.PID_enable_bit = onoff;
+                                fc->write_ibi_reg(fc,pid_n_reg_314, vpid);
+                        }
+                        break;
+        }
+}
+
+static int flexcop_toggle_fullts_streaming(struct flexcop_device *fc,int onoff)
+{
+        if (fc->fullts_streaming_state != onoff) {
+                deb_ts("%s full TS transfer\n",onoff ? "enabling" : "disabling");
+                flexcop_pid_group_filter(fc, 0, 0x1fe0 * (!onoff));
+                flexcop_pid_group_filter_ctrl(fc,onoff);
+                fc->fullts_streaming_state = onoff;
+        }
+        return 0;
+}
+
+int flexcop_pid_feed_control(struct flexcop_device *fc, struct dvb_demux_feed *dvbdmxfeed, int onoff)
+{
+        int max_pid_filter = 6 + fc->has_32_hw_pid_filter*32;
+
+        fc->feedcount += onoff ? 1 : -1;
+        if (dvbdmxfeed->index >= max_pid_filter)
+                fc->extra_feedcount += onoff ? 1 : -1;
+
+        /* toggle complete-TS-streaming when:
+         * - pid_filtering is not enabled and it is the first or last feed requested
+         * - pid_filtering is enabled,
+         *   - but the number of requested feeds is exceeded
+         *   - or the requested pid is 0x2000 */
+
+        if (!fc->pid_filtering && fc->feedcount == onoff)
+                flexcop_toggle_fullts_streaming(fc,onoff);
+
+        if (fc->pid_filtering) {
+                flexcop_pid_control(fc,dvbdmxfeed->index,dvbdmxfeed->pid,onoff);
+
+                if (fc->extra_feedcount > 0)
+                        flexcop_toggle_fullts_streaming(fc,1);
+                else if (dvbdmxfeed->pid == 0x2000)
+                        flexcop_toggle_fullts_streaming(fc,onoff);
+                else
+                        flexcop_toggle_fullts_streaming(fc,0);
+        }
+
+        /* if it was the first or last feed request change the stream-status */
+        if (fc->feedcount == onoff) {
+                flexcop_rcv_data_ctrl(fc,onoff);
+                if (fc->stream_control)
+                        fc->stream_control(fc,onoff);
+        }
+
+        return 0;
+}
+
+void flexcop_hw_filter_init(struct flexcop_device *fc)
+{
+        int i;
+        flexcop_ibi_value v;
+        for (i = 0; i < 6 + 32*fc->has_32_hw_pid_filter; i++)
+                flexcop_pid_control(fc,i,0x1fff,0);
+
+        flexcop_pid_group_filter(fc, 0, 0x1fe0);
+        flexcop_pid_group_filter_ctrl(fc,0);
+
+        v = fc->read_ibi_reg(fc,pid_filter_308);
+        v.pid_filter_308.EMM_filter_4 = 1;
+        v.pid_filter_308.EMM_filter_6 = 0;
+        fc->write_ibi_reg(fc,pid_filter_308,v);
+
+        flexcop_null_filter_ctrl(fc, 1);
+}
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c
new file mode 100644
index 000000000000..be4266d4ae91
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -0,0 +1,210 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop-i2c.c - flexcop internal 2Wire bus (I2C) and dvb i2c initialization
+ *
+ * see flexcop.c for copyright information.
+ */
+#include "flexcop.h"
+
+#define FC_MAX_I2C_RETRIES 100000
+
+static int flexcop_i2c_operation(struct flexcop_device *fc, flexcop_ibi_value *r100)
+{
+        int i;
+        flexcop_ibi_value r;
+
+        r100->tw_sm_c_100.working_start = 1;
+        deb_i2c("r100 before: %08x\n",r100->raw);
+
+        fc->write_ibi_reg(fc, tw_sm_c_100, ibi_zero);
+        fc->write_ibi_reg(fc, tw_sm_c_100, *r100); /* initiating i2c operation */
+
+        for (i = 0; i < FC_MAX_I2C_RETRIES; i++) {
+                r = fc->read_ibi_reg(fc, tw_sm_c_100);
+
+                if (!r.tw_sm_c_100.no_base_addr_ack_error) {
+                        if (r.tw_sm_c_100.st_done) {  /* && !r.tw_sm_c_100.working_start */
+                                *r100 = r;
+                                deb_i2c("i2c success\n");
+                                return 0;
+                        }
+                } else {
+                        deb_i2c("suffering from an i2c ack_error\n");
+                        return -EREMOTEIO;
+                }
+        }
+        deb_i2c("tried %d times i2c operation, never finished or too many ack errors.\n",i);
+        return -EREMOTEIO;
+}
+
+static int flexcop_i2c_read4(struct flexcop_device *fc, flexcop_ibi_value r100, u8 *buf)
+{
+        flexcop_ibi_value r104;
+        int len = r100.tw_sm_c_100.total_bytes, /* remember total_bytes is buflen-1 */
+                ret;
+
+        if ((ret = flexcop_i2c_operation(fc,&r100)) != 0) {
+                /* The Cablestar needs a different kind of i2c-transfer (does not
+                 * support "Repeat Start"):
+                 * wait for the ACK failure,
+                 * and do a subsequent read with the Bit 30 enabled
+                 */
+                r100.tw_sm_c_100.no_base_addr_ack_error = 1;
+                if ((ret = flexcop_i2c_operation(fc,&r100)) != 0) {
+                        deb_i2c("no_base_addr read failed. %d\n",ret);
+                        return ret;
+                }
+        }
+
+        buf[0] = r100.tw_sm_c_100.data1_reg;
+
+        if (len > 0) {
+                r104 = fc->read_ibi_reg(fc,tw_sm_c_104);
+                deb_i2c("read: r100: %08x, r104: %08x\n",r100.raw,r104.raw);
+
+                /* there is at least one more byte, otherwise we wouldn't be here */
+                buf[1] = r104.tw_sm_c_104.data2_reg;
+                if (len > 1) buf[2] = r104.tw_sm_c_104.data3_reg;
+                if (len > 2) buf[3] = r104.tw_sm_c_104.data4_reg;
+        }
+
+        return 0;
+}
+
+static int flexcop_i2c_write4(struct flexcop_device *fc, flexcop_ibi_value r100, u8 *buf)
+{
+        flexcop_ibi_value r104;
+        int len = r100.tw_sm_c_100.total_bytes; /* remember total_bytes is buflen-1 */
+        r104.raw = 0;
+
+        /* there is at least one byte, otherwise we wouldn't be here */
+        r100.tw_sm_c_100.data1_reg = buf[0];
+
+        r104.tw_sm_c_104.data2_reg = len > 0 ? buf[1] : 0;
+        r104.tw_sm_c_104.data3_reg = len > 1 ? buf[2] : 0;
+        r104.tw_sm_c_104.data4_reg = len > 2 ? buf[3] : 0;
+
+        deb_i2c("write: r100: %08x, r104: %08x\n",r100.raw,r104.raw);
+
+        /* write the additional i2c data before doing the actual i2c operation */
+        fc->write_ibi_reg(fc,tw_sm_c_104,r104);
+        return flexcop_i2c_operation(fc,&r100);
+}
+
+int flexcop_i2c_request(struct flexcop_device *fc, flexcop_access_op_t op,
+                flexcop_i2c_port_t port, u8 chipaddr, u8 addr, u8 *buf, u16 len)
+{
+        int ret;
+        u16 bytes_to_transfer;
+        flexcop_ibi_value r100;
+
+        deb_i2c("op = %d\n",op);
+        r100.raw = 0;
+        r100.tw_sm_c_100.chipaddr = chipaddr;
+        r100.tw_sm_c_100.twoWS_rw = op;
+        r100.tw_sm_c_100.twoWS_port_reg = port;
+
+        while (len != 0) {
+                bytes_to_transfer = len > 4 ? 4 : len;
+
+                r100.tw_sm_c_100.total_bytes = bytes_to_transfer - 1;
+                r100.tw_sm_c_100.baseaddr = addr;
+
+                if (op == FC_READ)
+                        ret = flexcop_i2c_read4(fc, r100, buf);
+                else
+                        ret = flexcop_i2c_write4(fc,r100, buf);
+
+                if (ret < 0)
+                        return ret;
+
+                buf  += bytes_to_transfer;
+                addr += bytes_to_transfer;
+                len  -= bytes_to_transfer;
+        };
+
+        return 0;
+}
+/* exported for PCI i2c */
+EXPORT_SYMBOL(flexcop_i2c_request);
+
+/* master xfer callback for demodulator */
+static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
+{
+        struct flexcop_device *fc = i2c_get_adapdata(i2c_adap);
+        int i, ret = 0;
+
+        if (down_interruptible(&fc->i2c_sem))
+                return -ERESTARTSYS;
+
+        /* reading */
+        if (num == 2 &&
+                msgs[0].flags == 0 &&
+                msgs[1].flags == I2C_M_RD &&
+                msgs[0].buf != NULL &&
+                msgs[1].buf != NULL) {
+
+                ret = fc->i2c_request(fc, FC_READ, FC_I2C_PORT_DEMOD, msgs[0].addr, msgs[0].buf[0], msgs[1].buf, msgs[1].len);
+
+        } else for (i = 0; i < num; i++) { /* writing command */
+                if (msgs[i].flags != 0 || msgs[i].buf == NULL || msgs[i].len < 2) {
+                        ret = -EINVAL;
+                        break;
+                }
+
+                ret = fc->i2c_request(fc, FC_WRITE, FC_I2C_PORT_DEMOD, msgs[i].addr, msgs[i].buf[0], &msgs[i].buf[1], msgs[i].len - 1);
+        }
+
+        if (ret < 0)
+                err("i2c master_xfer failed");
+        else
+                ret = num;
+
+        up(&fc->i2c_sem);
+
+        return ret;
+}
+
+static u32 flexcop_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm flexcop_algo = {
+        .name                   = "FlexCop I2C algorithm",
+        .id                             = I2C_ALGO_BIT,
+        .master_xfer    = flexcop_master_xfer,
+        .functionality  = flexcop_i2c_func,
+};
+
+int flexcop_i2c_init(struct flexcop_device *fc)
+{
+        int ret;
+
+        sema_init(&fc->i2c_sem,1);
+
+        memset(&fc->i2c_adap, 0, sizeof(struct i2c_adapter));
+        strncpy(fc->i2c_adap.name, "B2C2 FlexCop device",I2C_NAME_SIZE);
+
+        i2c_set_adapdata(&fc->i2c_adap,fc);
+
+        fc->i2c_adap.class          = I2C_CLASS_TV_DIGITAL;
+        fc->i2c_adap.algo       = &flexcop_algo;
+        fc->i2c_adap.algo_data  = NULL;
+        fc->i2c_adap.id         = I2C_ALGO_BIT;
+
+        if ((ret = i2c_add_adapter(&fc->i2c_adap)) < 0)
+                return ret;
+
+        fc->init_state |= FC_STATE_I2C_INIT;
+        return 0;
+}
+
+void flexcop_i2c_exit(struct flexcop_device *fc)
+{
+        if (fc->init_state & FC_STATE_I2C_INIT)
+                i2c_del_adapter(&fc->i2c_adap);
+
+        fc->init_state &= ~FC_STATE_I2C_INIT;
+}
diff --git a/drivers/media/dvb/b2c2/flexcop-misc.c b/drivers/media/dvb/b2c2/flexcop-misc.c
new file mode 100644
index 000000000000..23082545651f
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-misc.c
@@ -0,0 +1,67 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop-misc.c - miscellaneous functions.
+ *
+ * see flexcop.c for copyright information.
+ */
+#include "flexcop.h"
+
+void flexcop_determine_revision(struct flexcop_device *fc)
+{
+        flexcop_ibi_value v = fc->read_ibi_reg(fc,misc_204);
+
+        switch (v.misc_204.Rev_N_sig_revision_hi) {
+                case 0x2:
+                        deb_info("found a FlexCopII.\n");
+                        fc->rev = FLEXCOP_II;
+                        break;
+                case 0x3:
+                        deb_info("found a FlexCopIIb.\n");
+                        fc->rev = FLEXCOP_IIB;
+                        break;
+                case 0x0:
+                        deb_info("found a FlexCopIII.\n");
+                        fc->rev = FLEXCOP_III;
+                        break;
+                default:
+                        err("unkown FlexCop Revision: %x. Please report the linux-dvb@linuxtv.org.",v.misc_204.Rev_N_sig_revision_hi);
+                        break;
+        }
+
+        if ((fc->has_32_hw_pid_filter = v.misc_204.Rev_N_sig_caps))
+                deb_info("this FlexCop has the additional 32 hardware pid filter.\n");
+        else
+                deb_info("this FlexCop has only the 6 basic main hardware pid filter.\n");
+        /* bus parts have to decide if hw pid filtering is used or not. */
+}
+
+const char *flexcop_revision_names[] = {
+        "Unkown chip",
+        "FlexCopII",
+        "FlexCopIIb",
+        "FlexCopIII",
+};
+
+const char *flexcop_device_names[] = {
+        "Unkown device",
+        "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[] = {
+        "USB",
+        "PCI",
+};
+
+void flexcop_device_name(struct flexcop_device *fc,const char *prefix,const
+                char *suffix)
+{
+        info("%s '%s' at the '%s' bus controlled by a '%s' %s",prefix,
+                        flexcop_device_names[fc->dev_type],flexcop_bus_names[fc->bus_type],
+                        flexcop_revision_names[fc->rev],suffix);
+}
diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c
new file mode 100644
index 000000000000..ed717c0073d5
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-pci.c
@@ -0,0 +1,381 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop-pci.c - covers the PCI part including DMA transfers.
+ *
+ * see flexcop.c for copyright information.
+ */
+
+#define FC_LOG_PREFIX "flexcop-pci"
+#include "flexcop-common.h"
+
+static int enable_pid_filtering = 1;
+module_param(enable_pid_filtering, int, 0444);
+MODULE_PARM_DESC(enable_pid_filtering, "enable hardware pid filtering: supported values: 0 (fullts), 1");
+
+#ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG
+#define dprintk(level,args...) \
+        do { if ((debug & level)) printk(args); } while (0)
+#define DEBSTATUS ""
+#else
+#define dprintk(level,args...)
+#define DEBSTATUS " (debugging is not enabled)"
+#endif
+
+#define deb_info(args...)  dprintk(0x01,args)
+#define deb_reg(args...)   dprintk(0x02,args)
+#define deb_ts(args...)    dprintk(0x04,args)
+#define deb_irq(args...)   dprintk(0x08,args)
+
+static int debug = 0;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debug level (1=info,2=regs,4=TS,8=irqdma (|-able))." DEBSTATUS);
+
+#define DRIVER_VERSION "0.1"
+#define DRIVER_NAME "Technisat/B2C2 FlexCop II/IIb/III Digital TV PCI Driver"
+#define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@desy.de>"
+
+struct flexcop_pci {
+        struct pci_dev *pdev;
+
+#define FC_PCI_INIT     0x01
+#define FC_PCI_DMA_INIT 0x02
+        int init_state;
+
+        void __iomem *io_mem;
+        u32 irq;
+/* buffersize (at least for DMA1, need to be % 188 == 0,
+ * this logic is required */
+#define FC_DEFAULT_DMA1_BUFSIZE (1280 * 188)
+#define FC_DEFAULT_DMA2_BUFSIZE (10 * 188)
+        struct flexcop_dma dma[2];
+
+        int active_dma1_addr; /* 0 = addr0 of dma1; 1 = addr1 of dma1 */
+        u32 last_dma1_cur_pos; /* position of the pointer last time the timer/packet irq occured */
+        int count;
+
+        spinlock_t irq_lock;
+
+        struct flexcop_device *fc_dev;
+};
+
+static int lastwreg,lastwval,lastrreg,lastrval;
+
+static flexcop_ibi_value flexcop_pci_read_ibi_reg (struct flexcop_device *fc, flexcop_ibi_register r)
+{
+        struct flexcop_pci *fc_pci = fc->bus_specific;
+        flexcop_ibi_value v;
+        v.raw = readl(fc_pci->io_mem + r);
+
+        if (lastrreg != r || lastrval != v.raw) {
+                lastrreg = r; lastrval = v.raw;
+                deb_reg("new rd: %3x: %08x\n",r,v.raw);
+        }
+
+        return v;
+}
+
+static int flexcop_pci_write_ibi_reg(struct flexcop_device *fc, flexcop_ibi_register r, flexcop_ibi_value v)
+{
+        struct flexcop_pci *fc_pci = fc->bus_specific;
+
+        if (lastwreg != r || lastwval != v.raw) {
+                lastwreg = r; lastwval = v.raw;
+                deb_reg("new wr: %3x: %08x\n",r,v.raw);
+        }
+
+        writel(v.raw, fc_pci->io_mem + r);
+        return 0;
+}
+
+/* When PID filtering is turned on, we use the timer IRQ, because small amounts
+ * of data need to be passed to the user space instantly as well. When PID
+ * filtering is turned off, we use the page-change-IRQ */
+static irqreturn_t flexcop_pci_irq(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct flexcop_pci *fc_pci = dev_id;
+        struct flexcop_device *fc = fc_pci->fc_dev;
+        flexcop_ibi_value v = fc->read_ibi_reg(fc,irq_20c);
+        irqreturn_t ret = IRQ_HANDLED;
+
+        spin_lock_irq(&fc_pci->irq_lock);
+
+        if (v.irq_20c.DMA1_IRQ_Status == 1) {
+                if (fc_pci->active_dma1_addr == 0)
+                        flexcop_pass_dmx_packets(fc_pci->fc_dev,fc_pci->dma[0].cpu_addr0,fc_pci->dma[0].size / 188);
+                else
+                        flexcop_pass_dmx_packets(fc_pci->fc_dev,fc_pci->dma[0].cpu_addr1,fc_pci->dma[0].size / 188);
+
+                deb_irq("page change to page: %d\n",!fc_pci->active_dma1_addr);
+                fc_pci->active_dma1_addr = !fc_pci->active_dma1_addr;
+        } else if (v.irq_20c.DMA1_Timer_Status == 1) {
+                /* for the timer IRQ we only can use buffer dmx feeding, because we don't have
+                 * complete TS packets when reading from the DMA memory */
+                dma_addr_t cur_addr =
+                        fc->read_ibi_reg(fc,dma1_008).dma_0x8.dma_cur_addr << 2;
+                u32 cur_pos = cur_addr - fc_pci->dma[0].dma_addr0;
+
+                deb_irq("irq: %08x cur_addr: %08x: cur_pos: %08x, last_cur_pos: %08x ",
+                                v.raw,cur_addr,cur_pos,fc_pci->last_dma1_cur_pos);
+
+                /* buffer end was reached, restarted from the beginning
+                 * pass the data from last_cur_pos to the buffer end to the demux
+                 */
+                if (cur_pos < fc_pci->last_dma1_cur_pos) {
+                        deb_irq(" end was reached: passing %d bytes ",(fc_pci->dma[0].size*2 - 1) - fc_pci->last_dma1_cur_pos);
+                        flexcop_pass_dmx_data(fc_pci->fc_dev,
+                                        fc_pci->dma[0].cpu_addr0 + fc_pci->last_dma1_cur_pos,
+                                        (fc_pci->dma[0].size*2) - fc_pci->last_dma1_cur_pos);
+                        fc_pci->last_dma1_cur_pos = 0;
+                        fc_pci->count = 0;
+                }
+
+                if (cur_pos > fc_pci->last_dma1_cur_pos) {
+                        deb_irq(" passing %d bytes ",cur_pos - fc_pci->last_dma1_cur_pos);
+                        flexcop_pass_dmx_data(fc_pci->fc_dev,
+                                        fc_pci->dma[0].cpu_addr0 + fc_pci->last_dma1_cur_pos,
+                                        cur_pos - fc_pci->last_dma1_cur_pos);
+                }
+                deb_irq("\n");
+
+                fc_pci->last_dma1_cur_pos = cur_pos;
+        } else
+                ret = IRQ_NONE;
+
+        spin_unlock_irq(&fc_pci->irq_lock);
+
+/* packet count would be ideal for hw filtering, but it isn't working. Either
+ * the data book is wrong, or I'm unable to read it correctly */
+
+/*      if (v.irq_20c.DMA1_Size_IRQ_Status == 1) { packet counter */
+
+        return ret;
+}
+
+static int flexcop_pci_stream_control(struct flexcop_device *fc, int onoff)
+{
+        struct flexcop_pci *fc_pci = fc->bus_specific;
+        if (onoff) {
+                flexcop_dma_config(fc,&fc_pci->dma[0],FC_DMA_1,FC_DMA_SUBADDR_0 | FC_DMA_SUBADDR_1);
+                flexcop_dma_config(fc,&fc_pci->dma[1],FC_DMA_2,FC_DMA_SUBADDR_0 | FC_DMA_SUBADDR_1);
+                flexcop_dma_config_timer(fc,FC_DMA_1,1);
+
+                if (fc_pci->fc_dev->pid_filtering) {
+                        fc_pci->last_dma1_cur_pos = 0;
+                        flexcop_dma_control_timer_irq(fc,FC_DMA_1,1);
+                } else {
+                        fc_pci->active_dma1_addr = 0;
+                        flexcop_dma_control_size_irq(fc,FC_DMA_1,1);
+                }
+
+/*              flexcop_dma_config_packet_count(fc,FC_DMA_1,0xc0);
+                flexcop_dma_control_packet_irq(fc,FC_DMA_1,1); */
+
+                deb_irq("irqs enabled\n");
+        } else {
+                if (fc_pci->fc_dev->pid_filtering)
+                        flexcop_dma_control_timer_irq(fc,FC_DMA_1,0);
+                else
+                        flexcop_dma_control_size_irq(fc,FC_DMA_1,0);
+
+//              flexcop_dma_control_packet_irq(fc,FC_DMA_1,0);
+                deb_irq("irqs disabled\n");
+        }
+
+        return 0;
+}
+
+static int flexcop_pci_dma_init(struct flexcop_pci *fc_pci)
+{
+        int ret;
+        if ((ret = flexcop_dma_allocate(fc_pci->pdev,&fc_pci->dma[0],FC_DEFAULT_DMA1_BUFSIZE)) != 0)
+                return ret;
+
+        if ((ret = flexcop_dma_allocate(fc_pci->pdev,&fc_pci->dma[1],FC_DEFAULT_DMA2_BUFSIZE)) != 0)
+                goto dma1_free;
+
+        flexcop_sram_set_dest(fc_pci->fc_dev,FC_SRAM_DEST_MEDIA | FC_SRAM_DEST_NET, FC_SRAM_DEST_TARGET_DMA1);
+        flexcop_sram_set_dest(fc_pci->fc_dev,FC_SRAM_DEST_CAO   | FC_SRAM_DEST_CAI, FC_SRAM_DEST_TARGET_DMA2);
+
+        fc_pci->init_state |= FC_PCI_DMA_INIT;
+        goto success;
+dma1_free:
+        flexcop_dma_free(&fc_pci->dma[0]);
+
+success:
+        return ret;
+}
+
+static void flexcop_pci_dma_exit(struct flexcop_pci *fc_pci)
+{
+        if (fc_pci->init_state & FC_PCI_DMA_INIT) {
+                flexcop_dma_free(&fc_pci->dma[0]);
+                flexcop_dma_free(&fc_pci->dma[1]);
+        }
+        fc_pci->init_state &= ~FC_PCI_DMA_INIT;
+}
+
+static int flexcop_pci_init(struct flexcop_pci *fc_pci)
+{
+        int ret;
+        u8 card_rev;
+
+        pci_read_config_byte(fc_pci->pdev, PCI_CLASS_REVISION, &card_rev);
+        info("card revision %x", card_rev);
+
+        if ((ret = pci_enable_device(fc_pci->pdev)) != 0)
+                return ret;
+
+        pci_set_master(fc_pci->pdev);
+
+        /* enable interrupts */
+        // pci_write_config_dword(pdev, 0x6c, 0x8000);
+
+        if ((ret = pci_request_regions(fc_pci->pdev, DRIVER_NAME)) != 0)
+                goto err_pci_disable_device;
+
+        fc_pci->io_mem = pci_iomap(fc_pci->pdev, 0, 0x800);
+
+        if (!fc_pci->io_mem) {
+                err("cannot map io memory\n");
+                ret = -EIO;
+                goto err_pci_release_regions;
+        }
+
+        pci_set_drvdata(fc_pci->pdev, fc_pci);
+
+        if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_irq,
+                                        SA_SHIRQ, DRIVER_NAME, fc_pci)) != 0)
+                goto err_pci_iounmap;
+
+        spin_lock_init(&fc_pci->irq_lock);
+
+        fc_pci->init_state |= FC_PCI_INIT;
+        goto success;
+
+err_pci_iounmap:
+        pci_iounmap(fc_pci->pdev, fc_pci->io_mem);
+        pci_set_drvdata(fc_pci->pdev, NULL);
+err_pci_release_regions:
+        pci_release_regions(fc_pci->pdev);
+err_pci_disable_device:
+        pci_disable_device(fc_pci->pdev);
+
+success:
+        return ret;
+}
+
+static void flexcop_pci_exit(struct flexcop_pci *fc_pci)
+{
+        if (fc_pci->init_state & FC_PCI_INIT) {
+                free_irq(fc_pci->pdev->irq, fc_pci);
+                pci_iounmap(fc_pci->pdev, fc_pci->io_mem);
+                pci_set_drvdata(fc_pci->pdev, NULL);
+                pci_release_regions(fc_pci->pdev);
+                pci_disable_device(fc_pci->pdev);
+        }
+        fc_pci->init_state &= ~FC_PCI_INIT;
+}
+
+
+static int flexcop_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        struct flexcop_device *fc;
+        struct flexcop_pci *fc_pci;
+        int ret = -ENOMEM;
+
+        if ((fc = flexcop_device_kmalloc(sizeof(struct flexcop_pci))) == NULL) {
+                err("out of memory\n");
+                return -ENOMEM;
+        }
+
+/* general flexcop init */
+        fc_pci = fc->bus_specific;
+        fc_pci->fc_dev = fc;
+
+        fc->read_ibi_reg = flexcop_pci_read_ibi_reg;
+        fc->write_ibi_reg = flexcop_pci_write_ibi_reg;
+        fc->i2c_request = flexcop_i2c_request;
+        fc->get_mac_addr = flexcop_eeprom_check_mac_addr;
+
+        fc->stream_control = flexcop_pci_stream_control;
+
+        if (enable_pid_filtering)
+                info("will use the HW PID filter.");
+        else
+                info("will pass the complete TS to the demuxer.");
+
+        fc->pid_filtering = enable_pid_filtering;
+        fc->bus_type = FC_PCI;
+
+        fc->dev = &pdev->dev;
+        fc->owner = THIS_MODULE;
+
+/* bus specific part */
+        fc_pci->pdev = pdev;
+        if ((ret = flexcop_pci_init(fc_pci)) != 0)
+                goto err_kfree;
+
+/* init flexcop */
+        if ((ret = flexcop_device_initialize(fc)) != 0)
+                goto err_pci_exit;
+
+/* init dma */
+        if ((ret = flexcop_pci_dma_init(fc_pci)) != 0)
+                goto err_fc_exit;
+
+        goto success;
+err_fc_exit:
+        flexcop_device_exit(fc);
+err_pci_exit:
+        flexcop_pci_exit(fc_pci);
+err_kfree:
+        flexcop_device_kfree(fc);
+success:
+        return ret;
+}
+
+/* in theory every _exit function should be called exactly two times,
+ * here and in the bail-out-part of the _init-function
+ */
+static void flexcop_pci_remove(struct pci_dev *pdev)
+{
+        struct flexcop_pci *fc_pci = pci_get_drvdata(pdev);
+
+        flexcop_pci_dma_exit(fc_pci);
+        flexcop_device_exit(fc_pci->fc_dev);
+        flexcop_pci_exit(fc_pci);
+        flexcop_device_kfree(fc_pci->fc_dev);
+}
+
+static struct pci_device_id flexcop_pci_tbl[] = {
+        { PCI_DEVICE(0x13d0, 0x2103) },
+/*      { PCI_DEVICE(0x13d0, 0x2200) }, PCI FlexCopIII ? */
+        { },
+};
+
+MODULE_DEVICE_TABLE(pci, flexcop_pci_tbl);
+
+static struct pci_driver flexcop_pci_driver = {
+        .name = "Technisat/B2C2 FlexCop II/IIb/III PCI",
+        .id_table = flexcop_pci_tbl,
+        .probe = flexcop_pci_probe,
+        .remove = flexcop_pci_remove,
+};
+
+static int __init flexcop_pci_module_init(void)
+{
+        return pci_register_driver(&flexcop_pci_driver);
+}
+
+static void __exit flexcop_pci_module_exit(void)
+{
+        pci_unregister_driver(&flexcop_pci_driver);
+}
+
+module_init(flexcop_pci_module_init);
+module_exit(flexcop_pci_module_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_NAME);
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/b2c2/flexcop-reg.h b/drivers/media/dvb/b2c2/flexcop-reg.h
new file mode 100644
index 000000000000..75b50f21afe6
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-reg.h
@@ -0,0 +1,702 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop-reg.h - register abstraction for FlexCopII, FlexCopIIb and FlexCopIII
+ *
+ * see flexcop.c for copyright information.
+ */
+#ifndef __FLEXCOP_REG_H__
+#define __FLEXCOP_REG_H__
+
+
+typedef enum {
+        FLEXCOP_UNK = 0,
+        FLEXCOP_II,
+        FLEXCOP_IIB,
+        FLEXCOP_III,
+} flexcop_revision_t;
+
+extern const char *flexcop_revision_names[];
+
+typedef enum {
+        FC_UNK = 0,
+        FC_AIR_DVB,
+        FC_AIR_ATSC1,
+        FC_AIR_ATSC2,
+        FC_SKY,
+        FC_SKY_OLD,
+        FC_CABLE,
+} flexcop_device_type_t;
+
+typedef enum {
+        FC_USB = 0,
+        FC_PCI,
+} flexcop_bus_t;
+
+extern const char *flexcop_device_names[];
+
+/* FlexCop IBI Registers */
+
+/* flexcop_ibi_reg - a huge union representing the register structure */
+typedef union {
+        u32 raw;
+
+/* DMA 0x000 to 0x01c
+ * DMA1 0x000 to 0x00c
+ * DMA2 0x010 to 0x01c
+ */
+        struct {
+                u32 dma_0start        : 1;   /* set: data will be delivered to dma1_address0 */
+        u32 dma_0No_update    : 1;   /* set: dma1_cur_address will be updated, unset: no update */
+        u32 dma_address0      :30;   /* physical/virtual host memory address0 DMA */
+        } dma_0x0;
+
+        struct {
+                u32 DMA_maxpackets    : 8;   /* (remapped) PCI DMA1 Packet Count Interrupt. This variable
+                                                                                is able to be read and written while bit(1) of register
+                                                                                0x00c (remap_enable) is set. This variable represents
+                                                                                the number of packets that will be transmitted to the PCI
+                                                                                host using PCI DMA1 before an interrupt to the PCI is
+                                                                                asserted. This functionality may be enabled using bit(20)
+                                                                                of register 0x208. N=0 disables the IRQ. */
+                u32 dma_addr_size     :24;   /* size of memory buffer in DWORDs (bytesize / 4) for DMA */
+        } dma_0x4_remap;
+
+        struct {
+                u32 dma1timer         : 7;   /* reading PCI DMA1 timer ... when remap_enable is 0 */
+                u32 unused            : 1;
+                u32 dma_addr_size     :24;
+        } dma_0x4_read;
+
+        struct {
+                u32 unused            : 1;
+                u32 dmatimer          : 7;   /* writing PCI DMA1 timer ... when remap_enable is 0 */
+                u32 dma_addr_size     :24;
+        } dma_0x4_write;
+
+        struct {
+                u32 unused            : 2;
+                u32 dma_cur_addr      :30;   /* current physical host memory address pointer for DMA */
+        } dma_0x8;
+
+        struct {
+                u32 dma_1start        : 1;   /* set: data will be delivered to dma_address1, when dma_address0 is full */
+                u32 remap_enable      : 1;   /* remap enable for 0x0x4(7:0) */
+                u32 dma_address1      :30;   /* Physical/virtual address 1 on DMA */
+        } dma_0xc;
+
+/* Two-wire Serial Master and Clock 0x100-0x110 */
+        struct {
+//              u32 slave_transmitter : 1;   /* ???*/
+                u32 chipaddr          : 7;   /* two-line serial address of the target slave */
+                u32 reserved1         : 1;
+                u32 baseaddr          : 8;   /* address of the location of the read/write operation */
+                u32 data1_reg         : 8;   /* first byte in two-line serial read/write operation */
+                u32 working_start     : 1;  /* when doing a write operation this indicator is 0 when ready
+                                                                          * set to 1 when doing a write operation */
+                u32 twoWS_rw          : 1;   /* read/write indicator (1 = read, 0 write) */
+                u32 total_bytes       : 2;   /* number of data bytes in each two-line serial transaction (0 = 1 byte, 11 = 4byte)*/
+                u32 twoWS_port_reg    : 2;   /* port selection: 01 - Front End/Demod, 10 - EEPROM, 11 - Tuner */
+                u32 no_base_addr_ack_error : 1;   /* writing: write-req: frame is produced w/o baseaddr, read-req: read-cycles w/o
+                                                                          * preceding address assignment write frame
+                                                                          * ACK_ERROR = 1 when no ACK from slave in the last transaction */
+                u32 st_done           : 1;   /* indicator for transaction is done */
+        } tw_sm_c_100;
+
+        struct {
+                u32 data2_reg         : 8;   /* 2nd data byte */
+                u32 data3_reg         : 8;   /* 3rd data byte */
+                u32 data4_reg         : 8;   /* 4th data byte */
+                u32 exlicit_stops     : 1;   /* when set, transactions are produced w/o trailing STOP flag, then send isolated STOP flags */
+                u32 force_stop        : 1;   /* isolated stop flag */
+                u32 unused            : 6;
+        } tw_sm_c_104;
+
+/* Clock. The register allows the FCIII to convert an incoming Master clock
+ * (MCLK) signal into a lower frequency clock through the use of a LowCounter
+ * (TLO) and a High- Counter (THI). The time counts for THI and TLO are
+ * measured in MCLK; each count represents 4 MCLK input clock cycles.
+ *
+ * The default output for port #1 is set for Front End Demod communication. (0x108)
+ * The default output for port #2 is set for EEPROM communication. (0x10c)
+ * The default output for port #3 is set for Tuner communication. (0x110)
+ */
+        struct {
+                u32 thi1              : 6;   /* Thi for port #1 (def: 100110b; 38) */
+                u32 reserved1         : 2;
+                u32 tlo1              : 5;   /* Tlo for port #1 (def: 11100b; 28) */
+                u32 reserved2         :19;
+        } tw_sm_c_108;
+
+        struct {
+                u32 thi1              : 6;   /* Thi for port #2 (def: 111001b; 57) */
+                u32 reserved1         : 2;
+                u32 tlo1              : 5;   /* Tlo for port #2 (def: 11100b; 28) */
+                u32 reserved2         :19;
+        } tw_sm_c_10c;
+
+        struct {
+                u32 thi1              : 6;   /* Thi for port #3 (def: 111001b; 57) */
+                u32 reserved1         : 2;
+                u32 tlo1              : 5;   /* Tlo for port #3 (def: 11100b; 28) */
+                u32 reserved2         :19;
+        } tw_sm_c_110;
+
+/* LNB Switch Frequency 0x200
+ * Clock that creates the LNB switch tone. The default is set to have a fixed
+ * low output (not oscillating) to the LNB_CTL line.
+ */
+        struct {
+                u32 LNB_CTLHighCount_sig :15; /* It is the number of pre-scaled clock cycles that will be low. */
+                u32 LNB_CTLLowCount_sig  :15; /* For example, to obtain a 22KHz output given a 45 Mhz Master
+                                                                                Clock signal (MCLK), set PreScalar=01 and LowCounter value to 0x1ff. */
+                u32 LNB_CTLPrescaler_sig : 2; /* pre-scaler divides MCLK: 00 (no division), 01 by 2, 10 by 4, 11 by 12 */
+        } lnb_switch_freq_200;
+
+/* ACPI, Peripheral Reset, LNB Polarity
+ * ACPI power conservation mode, LNB polarity selection (low or high voltage),
+ * and peripheral reset.
+ */
+        struct {
+                u32 ACPI1_sig         : 1;   /* turn of the power of tuner and LNB, not implemented in FCIII */
+                u32 ACPI3_sig         : 1;   /* turn of power of the complete satelite receiver board (except FCIII) */
+                u32 LNB_L_H_sig       : 1;   /* low or high voltage for LNB. (0 = low, 1 = high) */
+                u32 Per_reset_sig     : 1;   /* misc. init reset (default: 1), to reset set to low and back to high */
+                u32 reserved          :20;
+                u32 Rev_N_sig_revision_hi : 4;/* 0xc in case of FCIII */
+                u32 Rev_N_sig_reserved1 : 2;
+                u32 Rev_N_sig_caps    : 1;   /* if 1, FCIII has 32 PID- and MAC-filters and is capable of IP multicast */
+                u32 Rev_N_sig_reserved2 : 1;
+        } misc_204;
+
+/* Control and Status 0x208 to 0x21c */
+/* Gross enable and disable control */
+        struct {
+                u32 Stream1_filter_sig : 1;  /* Stream1 PID filtering */
+                u32 Stream2_filter_sig : 1;  /* Stream2 PID filtering */
+                u32 PCR_filter_sig    : 1;   /* PCR PID filter */
+                u32 PMT_filter_sig    : 1;   /* PMT PID filter */
+
+                u32 EMM_filter_sig    : 1;   /* EMM PID filter */
+                u32 ECM_filter_sig    : 1;   /* ECM PID filter */
+                u32 Null_filter_sig   : 1;   /* Filters null packets, PID=0x1fff. */
+                u32 Mask_filter_sig   : 1;   /* mask PID filter */
+
+                u32 WAN_Enable_sig    : 1;   /* WAN output line through V8 memory space is activated. */
+                u32 WAN_CA_Enable_sig : 1;   /* not in FCIII */
+                u32 CA_Enable_sig     : 1;   /* not in FCIII */
+                u32 SMC_Enable_sig    : 1;   /* CI stream data (CAI) goes directly to the smart card intf (opposed IBI 0x600 or SC-cmd buf). */
+
+                u32 Per_CA_Enable_sig : 1;   /* not in FCIII */
+                u32 Multi2_Enable_sig : 1;   /* ? */
+                u32 MAC_filter_Mode_sig : 1; /* (MAC_filter_enable) Globally enables MAC filters for Net PID filteres. */
+                u32 Rcv_Data_sig      : 1;   /* PID filtering module enable. When this bit is a one, the PID filter will
+                                                                                examine and process packets according to all other (individual) PID
+                                                                                filtering controls. If it a zero, no packet processing of any kind will
+                                                                                take place. All data from the tuner will be thrown away. */
+
+                u32 DMA1_IRQ_Enable_sig : 1; /* When set, a DWORD counter is enabled on PCI DMA1 that asserts the PCI
+                                                                          * interrupt after the specified count for filling the buffer. */
+                u32 DMA1_Timer_Enable_sig : 1; /* When set, a timer is enabled on PCI DMA1 that asserts the PCI interrupt
+                                                                                        after a specified amount of time. */
+                u32 DMA2_IRQ_Enable_sig : 1;   /* same as DMA1_IRQ_Enable_sig but for DMA2 */
+                u32 DMA2_Timer_Enable_sig : 1;   /* same as DMA1_Timer_Enable_sig but for DMA2 */
+
+                u32 DMA1_Size_IRQ_Enable_sig : 1; /* When set, a packet count detector is enabled on PCI DMA1 that asserts the PCI interrupt. */
+                u32 DMA2_Size_IRQ_Enable_sig : 1; /* When set, a packet count detector is enabled on PCI DMA2 that asserts the PCI interrupt. */
+                u32 Mailbox_from_V8_Enable_sig: 1; /* When set, writes to the mailbox register produce an interrupt to the
+                                                                                        PCI host to indicate that mailbox data is available. */
+
+                u32 unused            : 9;
+        } ctrl_208;
+
+/* General status. When a PCI interrupt occurs, this register is read to
+ * discover the reason for the interrupt.
+ */
+        struct {
+                u32 DMA1_IRQ_Status   : 1;   /* When set(1) the DMA1 counter had generated an IRQ. Read Only. */
+                u32 DMA1_Timer_Status : 1;   /* When set(1) the DMA1 timer had generated an IRQ. Read Only. */
+                u32 DMA2_IRQ_Status   : 1;   /* When set(1) the DMA2 counter had generated an IRQ. Read Only. */
+                u32 DMA2_Timer_Status : 1;   /* When set(1) the DMA2 timer had generated an IRQ. Read Only. */
+                u32 DMA1_Size_IRQ_Status : 1; /* (Read only). This register is read after an interrupt to */
+                u32 DMA2_Size_IRQ_Status : 1; /* find out why we had an IRQ. Reading this register will clear this bit. Packet count*/
+                u32 Mailbox_from_V8_Status_sig: 1; /* Same as above. Reading this register will clear this bit. */
+                u32 Data_receiver_error : 1; /* 1 indicate an error in the receiver Front End (Tuner module) */
+                u32 Continuity_error_flag : 1;   /* 1 indicates a continuity error in the TS stream. */
+                u32 LLC_SNAP_FLAG_set : 1;   /* 1 indicates that the LCC_SNAP_FLAG was set. */
+                u32 Transport_Error   : 1;   /*  When set indicates that an unexpected packet was received. */
+                u32 reserved          :21;
+        } irq_20c;
+
+
+/* Software reset register */
+        struct {
+                u32 reset_blocks      : 8;   /* Enabled when Block_reset_enable = 0xB2 and 0x208 bits 15:8 = 0x00.
+                                                                                Each bit location represents a 0x100 block of registers. Writing
+                                                                                a one in a bit location resets that block of registers and the logic
+                                                                                that it controls. */
+                u32 Block_reset_enable : 8;  /* This variable is set to 0xB2 when the register is written. */
+                u32 Special_controls  :16;   /* Asserts Reset_V8 => 0xC258; Turns on pci encryption => 0xC25A;
+                                                                                Turns off pci encryption => 0xC259 Note: pci_encryption default
+                                                                                at power-up is ON. */
+        } sw_reset_210;
+
+        struct {
+                u32 vuart_oe_sig      : 1;   /* When clear, the V8 processor has sole control of the serial UART
+                                                                                (RS-232 Smart Card interface). When set, the IBI interface
+                                                                                defined by register 0x600 controls the serial UART. */
+                u32 v2WS_oe_sig       : 1;   /* When clear, the V8 processor has direct control of the Two-line
+                                                                                Serial Master EEPROM target. When set, the Two-line Serial Master
+                                                                                EEPROM target interface is controlled by IBI register 0x100. */
+                u32 halt_V8_sig       : 1;   /* When set, contiguous wait states are applied to the V8-space
+                                                                                bus masters. Once this signal is cleared, normal V8-space
+                                                                                operations resume. */
+                u32 section_pkg_enable_sig: 1; /* When set, this signal enables the front end translation circuitry
+                                                                                  to process section packed transport streams. */
+                u32 s2p_sel_sig       : 1;   /* Serial to parallel conversion. When set, polarized transport data
+                                                                                within the FlexCop3 front end circuitry is converted from a serial
+                                                                                stream into parallel data before downstream processing otherwise
+                                                                                interprets the data. */
+                u32 unused1           : 3;
+                u32 polarity_PS_CLK_sig: 1;  /* This signal is used to invert the input polarity of the tranport
+                                                                                stream CLOCK signal before any processing occurs on the transport
+                                                                                stream within FlexCop3. */
+                u32 polarity_PS_VALID_sig: 1; /* This signal is used to invert the input polarity of the tranport
+                                                                                stream VALID signal before any processing occurs on the transport
+                                                                                stream within FlexCop3. */
+                u32 polarity_PS_SYNC_sig: 1; /* This signal is used to invert the input polarity of the tranport
+                                                                                stream SYNC signal before any processing occurs on the transport
+                                                                                stream within FlexCop3. */
+                u32 polarity_PS_ERR_sig: 1;  /* This signal is used to invert the input polarity of the tranport
+                                                                                stream ERROR signal before any processing occurs on the transport
+                                                                                stream within FlexCop3. */
+                u32 unused2           :20;
+        } misc_214;
+
+/* Mailbox from V8 to host */
+        struct {
+                u32 Mailbox_from_V8   :32;   /* When this register is written by either the V8 processor or by an
+                                                                                end host, an interrupt is generated to the PCI host to indicate
+                                                                                that mailbox data is available. Reading register 20c will clear
+                                                                                the IRQ. */
+        } mbox_v8_to_host_218;
+
+/* Mailbox from host to v8 Mailbox_to_V8
+ * Mailbox_to_V8 mailbox storage register
+ * used to send messages from PCI to V8. Writing to this register will send an
+ * IRQ to the V8. Then it can read the data from here. Reading this register
+ * will clear the IRQ. If the V8 is halted and bit 31 of this register is set,
+ * then this register is used instead as a direct interface to access the
+ * V8space memory.
+ */
+        struct {
+                u32 sysramaccess_data : 8;   /* Data byte written or read from the specified address in V8 SysRAM. */
+                u32 sysramaccess_addr :15;   /* 15 bit address used to access V8 Sys-RAM. */
+                u32 unused            : 7;
+                u32 sysramaccess_write: 1;   /* Write flag used to latch data into the V8 SysRAM. */
+                u32 sysramaccess_busmuster: 1; /* Setting this bit when the V8 is halted at 0x214 Bit(2) allows
+                                                                                  this IBI register interface to directly drive the V8-space memory. */
+        } mbox_host_to_v8_21c;
+
+
+/* PIDs, Translation Bit, SMC Filter Select 0x300 to 0x31c */
+        struct {
+                u32 Stream1_PID       :13;   /* Primary use is receiving Net data, so these 13 bits normally
+                                                                                hold the PID value for the desired network stream. */
+                u32 Stream1_trans     : 1;   /* When set, Net translation will take place for Net data ferried in TS packets. */
+                u32 MAC_Multicast_filter : 1;   /* When clear, multicast MAC filtering is not allowed for Stream1 and PID_n filters. */
+                u32 debug_flag_pid_saved : 1;
+                u32 Stream2_PID       :13;   /* 13 bits for Stream 2 PID filter value. General use. */
+                u32 Stream2_trans     : 1;   /* When set Tables/CAI translation will take place for the data ferried in
+                                                                                Stream2_PID TS packets. */
+                u32 debug_flag_write_status00 : 1;
+                u32 debug_fifo_problem : 1;
+        } pid_filter_300;
+
+        struct {
+                u32 PCR_PID           :13;   /* PCR stream PID filter value. Primary use is Program Clock Reference stream filtering. */
+                u32 PCR_trans         : 1;   /* When set, Tables/CAI translation will take place for these packets. */
+                u32 debug_overrun3    : 1;
+                u32 debug_overrun2    : 1;
+                u32 PMT_PID           :13;   /* stream PID filter value. Primary use is Program Management Table segment filtering. */
+                u32 PMT_trans         : 1;   /* When set, Tables/CAI translation will take place for these packets. */
+                u32 reserved          : 2;
+        } pid_filter_304;
+
+        struct {
+                u32 EMM_PID           :13;   /* EMM PID filter value. Primary use is Entitlement Management Messaging for
+                                                                                conditional access-related data. */
+                u32 EMM_trans         : 1;   /* When set, Tables/CAI translation will take place for these packets. */
+                u32 EMM_filter_4      : 1;   /* When set will pass only EMM data possessing the same ID code as the
+                                                                                first four bytes (32 bits) of the end-user s 6-byte Smart Card ID number Select */
+                u32 EMM_filter_6      : 1;   /* When set will pass only EMM data possessing the same 6-byte code as the end-users
+                                                                                complete 6-byte Smart Card ID number. */
+                u32 ECM_PID           :13;   /* ECM PID filter value. Primary use is Entitlement Control Messaging for conditional
+                                                                                access-related data. */
+                u32 ECM_trans         : 1;   /* When set, Tables/CAI translation will take place for these packets. */
+                u32 reserved          : 2;
+        } pid_filter_308;
+
+        struct {
+                u32 Group_PID     :13;   /* PID value for group filtering. */
+                u32 Group_trans   : 1;   /* When set, Tables/CAI translation will take place for these packets. */
+                u32 unused1       : 2;
+                u32 Group_mask    :13;   /* Mask value used in logical "and" equation that defines group filtering */
+                u32 unused2       : 3;
+        } pid_filter_30c_ext_ind_0_7;
+
+        struct {
+                u32 net_master_read :17;
+                u32 unused        :15;
+        } pid_filter_30c_ext_ind_1;
+
+        struct {
+                u32 net_master_write :17;
+                u32 unused        :15;
+        } pid_filter_30c_ext_ind_2;
+
+        struct {
+                u32 next_net_master_write :17;
+                u32 unused        :15;
+        } pid_filter_30c_ext_ind_3;
+
+        struct {
+                u32 unused1       : 1;
+                u32 state_write   :10;
+                u32 reserved1     : 6;   /* default: 000100 */
+                u32 stack_read    :10;
+                u32 reserved2     : 5;   /* default: 00100 */
+        } pid_filter_30c_ext_ind_4;
+
+        struct {
+                u32 stack_cnt     :10;
+                u32 unused        :22;
+        } pid_filter_30c_ext_ind_5;
+
+        struct {
+                u32 pid_fsm_save_reg0 : 2;
+                u32 pid_fsm_save_reg1 : 2;
+                u32 pid_fsm_save_reg2 : 2;
+                u32 pid_fsm_save_reg3 : 2;
+                u32 pid_fsm_save_reg4 : 2;
+                u32 pid_fsm_save_reg300 : 2;
+                u32 write_status1 : 2;
+                u32 write_status4 : 2;
+                u32 data_size_reg :12;
+                u32 unused        : 4;
+        } pid_filter_30c_ext_ind_6;
+
+        struct {
+                u32 index_reg         : 5;   /* (Index pointer) Points at an internal PIDn register. A binary code
+                                                                                representing one of 32 internal PIDn registers as well as its
+                                                                                corresponding internal MAC_lown register. */
+                u32 extra_index_reg   : 3;   /* This vector is used to select between sets of debug signals routed to register 0x30c. */
+                u32 AB_select         : 1;   /* Used in conjunction with 0x31c. read/write to the MAC_highA or MAC_highB register
+                                                                                0=MAC_highB register, 1=MAC_highA */
+                u32 pass_alltables    : 1;   /* 1=Net packets are not filtered against the Network Table ID found in register 0x400.
+                                                                                All types of networks (DVB, ATSC, ISDB) are passed. */
+                u32 unused            :22;
+        } index_reg_310;
+
+        struct {
+                u32 PID               :13;   /* PID value */
+                u32 PID_trans         : 1;   /* translation will take place for packets filtered */
+                u32 PID_enable_bit    : 1;   /* When set this PID filter is enabled */
+                u32 reserved          :17;
+        } pid_n_reg_314;
+
+        struct {
+                u32 A4_byte           : 8;
+                u32 A5_byte           : 8;
+                u32 A6_byte           : 8;
+                u32 Enable_bit        : 1;   /* enabled (1) or disabled (1) */
+                u32 HighAB_bit        : 1;   /* use MAC_highA (1) or MAC_highB (0) as MSB */
+                u32 reserved          : 6;
+        } mac_low_reg_318;
+
+        struct {
+                u32 A1_byte           : 8;
+                u32 A2_byte           : 8;
+                u32 A3_byte           : 8;
+                u32 reserved          : 8;
+        } mac_high_reg_31c;
+
+/* Table, SMCID,MACDestination Filters 0x400 to 0x41c */
+        struct {
+                u32 reserved          :16;
+#define fc_data_Tag_ID_DVB  0x3e
+#define fc_data_Tag_ID_ATSC 0x3f
+#define fc_data_Tag_ID_IDSB 0x8b
+                u32 data_Tag_ID       :16;
+        } data_tag_400;
+
+        struct {
+                u32 Card_IDbyte6      : 8;
+                u32 Card_IDbyte5      : 8;
+                u32 Card_IDbyte4      : 8;
+                u32 Card_IDbyte3      : 8;
+        } card_id_408;
+
+        struct {
+                u32 Card_IDbyte2      : 8;
+                u32 Card_IDbyte1      : 8;
+        } card_id_40c;
+
+        /* holding the unique mac address of the receiver which houses the FlexCopIII */
+        struct {
+                u32 MAC1              : 8;
+                u32 MAC2              : 8;
+                u32 MAC3              : 8;
+                u32 MAC6              : 8;
+        } mac_address_418;
+
+        struct {
+                u32 MAC7              : 8;
+                u32 MAC8              : 8;
+                u32 reserved          : 16;
+        } mac_address_41c;
+
+        struct {
+                u32 transmitter_data_byte : 8;
+                u32 ReceiveDataReady  : 1;
+                u32 ReceiveByteFrameError: 1;
+                u32 txbuffempty       : 1;
+                u32 reserved          :21;
+        } ci_600;
+
+        struct {
+                u32 pi_d              : 8;
+                u32 pi_ha             :20;
+                u32 pi_rw             : 1;
+                u32 pi_component_reg  : 3;
+        } pi_604;
+
+        struct {
+                u32 serialReset       : 1;
+                u32 oncecycle_read    : 1;
+                u32 Timer_Read_req    : 1;
+                u32 Timer_Load_req    : 1;
+                u32 timer_data        : 7;
+                u32 unused            : 1; /* ??? not mentioned in data book */
+                u32 Timer_addr        : 5;
+                u32 reserved          : 3;
+                u32 pcmcia_a_mod_pwr_n : 1;
+                u32 pcmcia_b_mod_pwr_n : 1;
+                u32 config_Done_stat  : 1;
+                u32 config_Init_stat  : 1;
+                u32 config_Prog_n     : 1;
+                u32 config_wr_n       : 1;
+                u32 config_cs_n       : 1;
+                u32 config_cclk       : 1;
+                u32 pi_CiMax_IRQ_n    : 1;
+                u32 pi_timeout_status : 1;
+                u32 pi_wait_n         : 1;
+                u32 pi_busy_n         : 1;
+        } pi_608;
+
+        struct {
+                u32 PID               :13;
+                u32 key_enable        : 1;
+#define fc_key_code_default 0x1
+#define fc_key_code_even    0x2
+#define fc_key_code_odd     0x3
+                u32 key_code          : 2;
+                u32 key_array_col     : 3;
+                u32 key_array_row     : 5;
+                u32 dvb_en            : 1; /* 0=TS bypasses the Descrambler */
+                u32 rw_flag           : 1;
+                u32 reserved          : 6;
+        } dvb_reg_60c;
+
+/* SRAM and Output Destination 0x700 to 0x714 */
+        struct {
+                u32 sram_addr         :15;
+                u32 sram_rw           : 1;   /* 0=write, 1=read */
+                u32 sram_data         : 8;
+                u32 sc_xfer_bit       : 1;
+                u32 reserved1         : 3;
+                u32 oe_pin_reg        : 1;
+                u32 ce_pin_reg        : 1;
+                u32 reserved2         : 1;
+                u32 start_sram_ibi    : 1;
+        } sram_ctrl_reg_700;
+
+        struct {
+                u32 net_addr_read     :16;
+                u32 net_addr_write    :16;
+        } net_buf_reg_704;
+
+        struct {
+                u32 cai_read          :11;
+                u32 reserved1         : 5;
+                u32 cai_write         :11;
+                u32 reserved2         : 6;
+                u32 cai_cnt           : 4;
+        } cai_buf_reg_708;
+
+        struct {
+                u32 cao_read          :11;
+                u32 reserved1         : 5;
+                u32 cap_write         :11;
+                u32 reserved2         : 6;
+                u32 cao_cnt           : 4;
+        } cao_buf_reg_70c;
+
+        struct {
+                u32 media_read        :11;
+                u32 reserved1         : 5;
+                u32 media_write       :11;
+                u32 reserved2         : 6;
+                u32 media_cnt         : 4;
+        } media_buf_reg_710;
+
+        struct {
+                u32 NET_Dest          : 2;
+                u32 CAI_Dest          : 2;
+                u32 CAO_Dest          : 2;
+                u32 MEDIA_Dest        : 2;
+                u32 net_ovflow_error  : 1;
+                u32 media_ovflow_error : 1;
+                u32 cai_ovflow_error  : 1;
+                u32 cao_ovflow_error  : 1;
+                u32 ctrl_usb_wan      : 1;
+                u32 ctrl_sramdma      : 1;
+                u32 ctrl_maximumfill  : 1;
+                u32 reserved          :17;
+        } sram_dest_reg_714;
+
+        struct {
+                u32 net_cnt           :12;
+                u32 reserved1         : 4;
+                u32 net_addr_read     : 1;
+                u32 reserved2         : 3;
+                u32 net_addr_write    : 1;
+                u32 reserved3         :11;
+        } net_buf_reg_718;
+
+        struct {
+                u32 wan_speed_sig     : 2;
+                u32 reserved1         : 6;
+                u32 wan_wait_state    : 8;
+                u32 sram_chip         : 2;
+                u32 sram_memmap       : 2;
+                u32 reserved2         : 4;
+                u32 wan_pkt_frame     : 4;
+                u32 reserved3         : 4;
+        } wan_ctrl_reg_71c;
+} flexcop_ibi_value;
+
+extern flexcop_ibi_value ibi_zero;
+
+typedef enum {
+        FC_I2C_PORT_DEMOD  = 1,
+        FC_I2C_PORT_EEPROM = 2,
+        FC_I2C_PORT_TUNER  = 3,
+} flexcop_i2c_port_t;
+
+typedef enum {
+        FC_WRITE = 0,
+        FC_READ  = 1,
+} flexcop_access_op_t;
+
+typedef enum {
+        FC_SRAM_DEST_NET   = 1,
+        FC_SRAM_DEST_CAI   = 2,
+        FC_SRAM_DEST_CAO   = 4,
+        FC_SRAM_DEST_MEDIA = 8
+} flexcop_sram_dest_t;
+
+typedef enum {
+        FC_SRAM_DEST_TARGET_WAN_USB = 0,
+        FC_SRAM_DEST_TARGET_DMA1    = 1,
+        FC_SRAM_DEST_TARGET_DMA2    = 2,
+        FC_SRAM_DEST_TARGET_FC3_CA  = 3
+} flexcop_sram_dest_target_t;
+
+typedef enum {
+        FC_SRAM_2_32KB  = 0, /*  64KB */
+        FC_SRAM_1_32KB  = 1, /*  32KB - default fow FCII */
+        FC_SRAM_1_128KB = 2, /* 128KB */
+        FC_SRAM_1_48KB  = 3, /*  48KB - default for FCIII */
+} flexcop_sram_type_t;
+
+typedef enum {
+        FC_WAN_SPEED_4MBITS  = 0,
+        FC_WAN_SPEED_8MBITS  = 1,
+        FC_WAN_SPEED_12MBITS = 2,
+        FC_WAN_SPEED_16MBITS = 3,
+} flexcop_wan_speed_t;
+
+typedef enum {
+        FC_DMA_1 = 1,
+        FC_DMA_2 = 2,
+} flexcop_dma_index_t;
+
+typedef enum {
+        FC_DMA_SUBADDR_0 = 1,
+        FC_DMA_SUBADDR_1 = 2,
+} flexcop_dma_addr_index_t;
+
+/* names of the particular registers */
+typedef enum {
+        dma1_000            = 0x000,
+        dma1_004            = 0x004,
+        dma1_008            = 0x008,
+        dma1_00c            = 0x00c,
+        dma2_010            = 0x010,
+        dma2_014            = 0x014,
+        dma2_018            = 0x018,
+        dma2_01c            = 0x01c,
+
+        tw_sm_c_100         = 0x100,
+        tw_sm_c_104         = 0x104,
+        tw_sm_c_108         = 0x108,
+        tw_sm_c_10c         = 0x10c,
+        tw_sm_c_110         = 0x110,
+
+        lnb_switch_freq_200 = 0x200,
+        misc_204            = 0x204,
+        ctrl_208            = 0x208,
+        irq_20c             = 0x20c,
+        sw_reset_210        = 0x210,
+        misc_214            = 0x214,
+        mbox_v8_to_host_218 = 0x218,
+        mbox_host_to_v8_21c = 0x21c,
+
+        pid_filter_300      = 0x300,
+        pid_filter_304      = 0x304,
+        pid_filter_308      = 0x308,
+        pid_filter_30c      = 0x30c,
+        index_reg_310       = 0x310,
+        pid_n_reg_314       = 0x314,
+        mac_low_reg_318     = 0x318,
+        mac_high_reg_31c    = 0x31c,
+
+        data_tag_400        = 0x400,
+        card_id_408         = 0x408,
+        card_id_40c         = 0x40c,
+        mac_address_418     = 0x418,
+        mac_address_41c     = 0x41c,
+
+        ci_600              = 0x600,
+        pi_604              = 0x604,
+        pi_608              = 0x608,
+        dvb_reg_60c         = 0x60c,
+
+        sram_ctrl_reg_700   = 0x700,
+        net_buf_reg_704     = 0x704,
+        cai_buf_reg_708     = 0x708,
+        cao_buf_reg_70c     = 0x70c,
+        media_buf_reg_710   = 0x710,
+        sram_dest_reg_714   = 0x714,
+        net_buf_reg_718     = 0x718,
+        wan_ctrl_reg_71c    = 0x71c,
+} flexcop_ibi_register;
+
+#define flexcop_set_ibi_value(reg,attr,val) { \
+        flexcop_ibi_value v = fc->read_ibi_reg(fc,reg); \
+        v.reg.attr = val; \
+        fc->write_ibi_reg(fc,reg,v); \
+}
+
+#endif
diff --git a/drivers/media/dvb/b2c2/flexcop-sram.c b/drivers/media/dvb/b2c2/flexcop-sram.c
new file mode 100644
index 000000000000..01570ec80962
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-sram.c
@@ -0,0 +1,403 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop-sram.c - functions for controlling the SRAM.
+ *
+ * see flexcop.c for copyright information.
+ */
+#include "flexcop.h"
+
+static void flexcop_sram_set_chip (struct flexcop_device *fc, flexcop_sram_type_t type)
+{
+        flexcop_set_ibi_value(wan_ctrl_reg_71c,sram_chip,type);
+}
+
+int flexcop_sram_init(struct flexcop_device *fc)
+{
+        switch (fc->rev) {
+                case FLEXCOP_II:
+                case FLEXCOP_IIB:
+                        flexcop_sram_set_chip(fc,FC_SRAM_1_32KB);
+                        break;
+                case FLEXCOP_III:
+                        flexcop_sram_set_chip(fc,FC_SRAM_1_48KB);
+                        break;
+                default:
+                        return -EINVAL;
+        }
+        return 0;
+}
+
+int flexcop_sram_set_dest(struct flexcop_device *fc, flexcop_sram_dest_t dest, flexcop_sram_dest_target_t target)
+{
+        flexcop_ibi_value v;
+
+        v = fc->read_ibi_reg(fc,sram_dest_reg_714);
+
+        if (fc->rev != FLEXCOP_III && target == FC_SRAM_DEST_TARGET_FC3_CA) {
+                err("SRAM destination target to available on FlexCopII(b)\n");
+                return -EINVAL;
+        }
+
+        deb_sram("sram dest: %x target: %x\n",dest, target);
+
+        if (dest & FC_SRAM_DEST_NET)
+                v.sram_dest_reg_714.NET_Dest = target;
+        if (dest & FC_SRAM_DEST_CAI)
+                v.sram_dest_reg_714.CAI_Dest = target;
+        if (dest & FC_SRAM_DEST_CAO)
+                v.sram_dest_reg_714.CAO_Dest = target;
+        if (dest & FC_SRAM_DEST_MEDIA)
+                v.sram_dest_reg_714.MEDIA_Dest = target;
+
+        fc->write_ibi_reg(fc,sram_dest_reg_714,v);
+        udelay(1000); /* TODO delay really necessary */
+
+        return 0;
+}
+EXPORT_SYMBOL(flexcop_sram_set_dest);
+
+void flexcop_wan_set_speed(struct flexcop_device *fc, flexcop_wan_speed_t s)
+{
+        flexcop_set_ibi_value(wan_ctrl_reg_71c,wan_speed_sig,s);
+}
+EXPORT_SYMBOL(flexcop_wan_set_speed);
+
+void flexcop_sram_ctrl(struct flexcop_device *fc, int usb_wan, int sramdma, int maximumfill)
+{
+        flexcop_ibi_value v = fc->read_ibi_reg(fc,sram_dest_reg_714);
+        v.sram_dest_reg_714.ctrl_usb_wan = usb_wan;
+        v.sram_dest_reg_714.ctrl_sramdma = sramdma;
+        v.sram_dest_reg_714.ctrl_maximumfill = maximumfill;
+        fc->write_ibi_reg(fc,sram_dest_reg_714,v);
+}
+EXPORT_SYMBOL(flexcop_sram_ctrl);
+
+#if 0
+static void flexcop_sram_write(struct adapter *adapter, u32 bank, u32 addr, u8 *buf, u32 len)
+{
+        int i, retries;
+        u32 command;
+
+        for (i = 0; i < len; i++) {
+                command = bank | addr | 0x04000000 | (*buf << 0x10);
+
+                retries = 2;
+
+                while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
+                        mdelay(1);
+                        retries--;
+                };
+
+                if (retries == 0)
+                        printk("%s: SRAM timeout\n", __FUNCTION__);
+
+                write_reg_dw(adapter, 0x700, command);
+
+                buf++;
+                addr++;
+        }
+}
+
+static void flex_sram_read(struct adapter *adapter, u32 bank, u32 addr, u8 *buf, u32 len)
+{
+        int i, retries;
+        u32 command, value;
+
+        for (i = 0; i < len; i++) {
+                command = bank | addr | 0x04008000;
+
+                retries = 10000;
+
+                while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
+                        mdelay(1);
+                        retries--;
+                };
+
+                if (retries == 0)
+                        printk("%s: SRAM timeout\n", __FUNCTION__);
+
+                write_reg_dw(adapter, 0x700, command);
+
+                retries = 10000;
+
+                while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
+                        mdelay(1);
+                        retries--;
+                };
+
+                if (retries == 0)
+                        printk("%s: SRAM timeout\n", __FUNCTION__);
+
+                value = read_reg_dw(adapter, 0x700) >> 0x10;
+
+                *buf = (value & 0xff);
+
+                addr++;
+                buf++;
+        }
+}
+
+static void sram_write_chunk(struct adapter *adapter, u32 addr, u8 *buf, u16 len)
+{
+        u32 bank;
+
+        bank = 0;
+
+        if (adapter->dw_sram_type == 0x20000) {
+                bank = (addr & 0x18000) << 0x0d;
+        }
+
+        if (adapter->dw_sram_type == 0x00000) {
+                if ((addr >> 0x0f) == 0)
+                        bank = 0x20000000;
+                else
+                        bank = 0x10000000;
+        }
+
+        flex_sram_write(adapter, bank, addr & 0x7fff, buf, len);
+}
+
+static void sram_read_chunk(struct adapter *adapter, u32 addr, u8 *buf, u16 len)
+{
+        u32 bank;
+
+        bank = 0;
+
+        if (adapter->dw_sram_type == 0x20000) {
+                bank = (addr & 0x18000) << 0x0d;
+        }
+
+        if (adapter->dw_sram_type == 0x00000) {
+                if ((addr >> 0x0f) == 0)
+                        bank = 0x20000000;
+                else
+                        bank = 0x10000000;
+        }
+
+        flex_sram_read(adapter, bank, addr & 0x7fff, buf, len);
+}
+
+static void sram_read(struct adapter *adapter, u32 addr, u8 *buf, u32 len)
+{
+        u32 length;
+
+        while (len != 0) {
+                length = len;
+
+                // check if the address range belongs to the same
+                // 32K memory chip. If not, the data is read from
+                // one chip at a time.
+                if ((addr >> 0x0f) != ((addr + len - 1) >> 0x0f)) {
+                        length = (((addr >> 0x0f) + 1) << 0x0f) - addr;
+                }
+
+                sram_read_chunk(adapter, addr, buf, length);
+
+                addr = addr + length;
+                buf = buf + length;
+                len = len - length;
+        }
+}
+
+static void sram_write(struct adapter *adapter, u32 addr, u8 *buf, u32 len)
+{
+        u32 length;
+
+        while (len != 0) {
+                length = len;
+
+                // check if the address range belongs to the same
+                // 32K memory chip. If not, the data is written to
+                // one chip at a time.
+                if ((addr >> 0x0f) != ((addr + len - 1) >> 0x0f)) {
+                        length = (((addr >> 0x0f) + 1) << 0x0f) - addr;
+                }
+
+                sram_write_chunk(adapter, addr, buf, length);
+
+                addr = addr + length;
+                buf = buf + length;
+                len = len - length;
+        }
+}
+
+static void sram_set_size(struct adapter *adapter, u32 mask)
+{
+        write_reg_dw(adapter, 0x71c, (mask | (~0x30000 & read_reg_dw(adapter, 0x71c))));
+}
+
+static void sram_init(struct adapter *adapter)
+{
+        u32 tmp;
+
+        tmp = read_reg_dw(adapter, 0x71c);
+
+        write_reg_dw(adapter, 0x71c, 1);
+
+        if (read_reg_dw(adapter, 0x71c) != 0) {
+                write_reg_dw(adapter, 0x71c, tmp);
+
+                adapter->dw_sram_type = tmp & 0x30000;
+
+                ddprintk("%s: dw_sram_type = %x\n", __FUNCTION__, adapter->dw_sram_type);
+
+        } else {
+
+                adapter->dw_sram_type = 0x10000;
+
+                ddprintk("%s: dw_sram_type = %x\n", __FUNCTION__, adapter->dw_sram_type);
+        }
+
+        /* return value is never used? */
+/*      return adapter->dw_sram_type; */
+}
+
+static int sram_test_location(struct adapter *adapter, u32 mask, u32 addr)
+{
+        u8 tmp1, tmp2;
+
+        dprintk("%s: mask = %x, addr = %x\n", __FUNCTION__, mask, addr);
+
+        sram_set_size(adapter, mask);
+        sram_init(adapter);
+
+        tmp2 = 0xa5;
+        tmp1 = 0x4f;
+
+        sram_write(adapter, addr, &tmp2, 1);
+        sram_write(adapter, addr + 4, &tmp1, 1);
+
+        tmp2 = 0;
+
+        mdelay(20);
+
+        sram_read(adapter, addr, &tmp2, 1);
+        sram_read(adapter, addr, &tmp2, 1);
+
+        dprintk("%s: wrote 0xa5, read 0x%2x\n", __FUNCTION__, tmp2);
+
+        if (tmp2 != 0xa5)
+                return 0;
+
+        tmp2 = 0x5a;
+        tmp1 = 0xf4;
+
+        sram_write(adapter, addr, &tmp2, 1);
+        sram_write(adapter, addr + 4, &tmp1, 1);
+
+        tmp2 = 0;
+
+        mdelay(20);
+
+        sram_read(adapter, addr, &tmp2, 1);
+        sram_read(adapter, addr, &tmp2, 1);
+
+        dprintk("%s: wrote 0x5a, read 0x%2x\n", __FUNCTION__, tmp2);
+
+        if (tmp2 != 0x5a)
+                return 0;
+
+        return 1;
+}
+
+static u32 sram_length(struct adapter *adapter)
+{
+        if (adapter->dw_sram_type == 0x10000)
+                return 32768;   //  32K
+        if (adapter->dw_sram_type == 0x00000)
+                return 65536;   //  64K
+        if (adapter->dw_sram_type == 0x20000)
+                return 131072;  // 128K
+
+        return 32768;           // 32K
+}
+
+/* FlexcopII can work with 32K, 64K or 128K of external SRAM memory.
+    - for 128K there are 4x32K chips at bank 0,1,2,3.
+    - for  64K there are 2x32K chips at bank 1,2.
+    - for  32K there is one 32K chip at bank 0.
+
+   FlexCop works only with one bank at a time. The bank is selected
+   by bits 28-29 of the 0x700 register.
+
+   bank 0 covers addresses 0x00000-0x07fff
+   bank 1 covers addresses 0x08000-0x0ffff
+   bank 2 covers addresses 0x10000-0x17fff
+   bank 3 covers addresses 0x18000-0x1ffff
+*/
+
+static int flexcop_sram_detect(struct flexcop_device *fc)
+{
+        flexcop_ibi_value r208,r71c_0,vr71c_1;
+
+        r208 = fc->read_ibi_reg(fc, ctrl_208);
+        fc->write_ibi_reg(fc, ctrl_208, ibi_zero);
+
+        r71c_0 = fc->read_ibi_reg(fc, wan_ctrl_reg_71c);
+
+        write_reg_dw(adapter, 0x71c, 1);
+
+        tmp3 = read_reg_dw(adapter, 0x71c);
+
+        dprintk("%s: tmp3 = %x\n", __FUNCTION__, tmp3);
+
+        write_reg_dw(adapter, 0x71c, tmp2);
+
+        // check for internal SRAM ???
+        tmp3--;
+        if (tmp3 != 0) {
+                sram_set_size(adapter, 0x10000);
+                sram_init(adapter);
+                write_reg_dw(adapter, 0x208, tmp);
+
+                dprintk("%s: sram size = 32K\n", __FUNCTION__);
+
+                return 32;
+        }
+
+        if (sram_test_location(adapter, 0x20000, 0x18000) != 0) {
+                sram_set_size(adapter, 0x20000);
+                sram_init(adapter);
+                write_reg_dw(adapter, 0x208, tmp);
+
+                dprintk("%s: sram size = 128K\n", __FUNCTION__);
+
+                return 128;
+        }
+
+        if (sram_test_location(adapter, 0x00000, 0x10000) != 0) {
+                sram_set_size(adapter, 0x00000);
+                sram_init(adapter);
+                write_reg_dw(adapter, 0x208, tmp);
+
+                dprintk("%s: sram size = 64K\n", __FUNCTION__);
+
+                return 64;
+        }
+
+        if (sram_test_location(adapter, 0x10000, 0x00000) != 0) {
+                sram_set_size(adapter, 0x10000);
+                sram_init(adapter);
+                write_reg_dw(adapter, 0x208, tmp);
+
+                dprintk("%s: sram size = 32K\n", __FUNCTION__);
+
+                return 32;
+        }
+
+        sram_set_size(adapter, 0x10000);
+        sram_init(adapter);
+        write_reg_dw(adapter, 0x208, tmp);
+
+        dprintk("%s: SRAM detection failed. Set to 32K \n", __FUNCTION__);
+
+        return 0;
+}
+
+static void sll_detect_sram_size(struct adapter *adapter)
+{
+        sram_detect_for_flex2(adapter);
+}
+
+#endif
diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/dvb/b2c2/flexcop-usb.c
new file mode 100644
index 000000000000..0113449abd15
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -0,0 +1,577 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop-usb.c - covers the USB part.
+ *
+ * see flexcop.c for copyright information.
+ */
+
+#define FC_LOG_PREFIX "flexcop_usb"
+#include "flexcop-usb.h"
+#include "flexcop-common.h"
+
+/* Version information */
+#define DRIVER_VERSION "0.1"
+#define DRIVER_NAME "Technisat/B2C2 FlexCop II/IIb/III Digital TV USB Driver"
+#define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@desy.de>"
+
+/* debug */
+#ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG
+#define dprintk(level,args...) \
+            do { if ((debug & level)) { printk(args); } } while (0)
+#define debug_dump(b,l,method) {\
+        int i; \
+        for (i = 0; i < l; i++) method("%02x ", b[i]); \
+        method("\n");\
+}
+
+#define DEBSTATUS ""
+#else
+#define dprintk(level,args...)
+#define debug_dump(b,l,method)
+#define DEBSTATUS " (debugging is not enabled)"
+#endif
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=info,ts=2,ctrl=4,i2c=8,v8mem=16 (or-able))." DEBSTATUS);
+#undef DEBSTATUS
+
+#define deb_info(args...) dprintk(0x01,args)
+#define deb_ts(args...)   dprintk(0x02,args)
+#define deb_ctrl(args...) dprintk(0x04,args)
+#define deb_i2c(args...)  dprintk(0x08,args)
+#define deb_v8(args...)   dprintk(0x10,args)
+
+/* JLP 111700: we will include the 1 bit gap between the upper and lower 3 bits
+ * in the IBI address, to make the V8 code simpler.
+ * PCI ADDRESS FORMAT: 0x71C -> 0000 0111 0001 1100 (these are the six bits used)
+ *                  in general: 0000 0HHH 000L LL00
+ * IBI ADDRESS FORMAT:                    RHHH BLLL
+ *
+ * where R is the read(1)/write(0) bit, B is the busy bit
+ * and HHH and LLL are the two sets of three bits from the PCI address.
+ */
+#define B2C2_FLEX_PCIOFFSET_TO_INTERNALADDR(usPCI) (u8) (((usPCI >> 2) & 0x07) + ((usPCI >> 4) & 0x70))
+#define B2C2_FLEX_INTERNALADDR_TO_PCIOFFSET(ucAddr) (u16) (((ucAddr & 0x07) << 2) + ((ucAddr & 0x70) << 4))
+
+/*
+ * DKT 020228
+ * - forget about this VENDOR_BUFFER_SIZE, read and write register
+ *   deal with DWORD or 4 bytes, that should be should from now on
+ * - from now on, we don't support anything older than firm 1.00
+ *   I eliminated the write register as a 2 trip of writing hi word and lo word
+ *   and force this to write only 4 bytes at a time.
+ *   NOTE: this should work with all the firmware from 1.00 and newer
+ */
+static int flexcop_usb_readwrite_dw(struct flexcop_device *fc, u16 wRegOffsPCI, u32 *val, u8 read)
+{
+        struct flexcop_usb *fc_usb = fc->bus_specific;
+        u8 request = read ? B2C2_USB_READ_REG : B2C2_USB_WRITE_REG;
+        u8 request_type = (read ? USB_DIR_IN : USB_DIR_OUT) | USB_TYPE_VENDOR;
+        u8 wAddress = B2C2_FLEX_PCIOFFSET_TO_INTERNALADDR(wRegOffsPCI) | (read ? 0x80 : 0);
+
+        int len = usb_control_msg(fc_usb->udev,
+                        read ? B2C2_USB_CTRL_PIPE_IN : B2C2_USB_CTRL_PIPE_OUT,
+                        request,
+                        request_type,  /* 0xc0 read or 0x40 write*/
+                        wAddress,
+                        0,
+                        val,
+                        sizeof(u32),
+                        B2C2_WAIT_FOR_OPERATION_RDW * HZ);
+
+        if (len != sizeof(u32)) {
+                err("error while %s dword from %d (%d).",read ? "reading" : "writing",
+                        wAddress,wRegOffsPCI);
+                return -EIO;
+        }
+        return 0;
+}
+
+/*
+ * DKT 010817 - add support for V8 memory read/write and flash update
+ */
+static int flexcop_usb_v8_memory_req(struct flexcop_usb *fc_usb,
+                flexcop_usb_request_t req, u8 page, u16 wAddress,
+                u8 *pbBuffer,u32 buflen)
+{
+//      u8 dwRequestType;
+        u8 request_type = USB_TYPE_VENDOR;
+        u16 wIndex;
+        int nWaitTime,pipe,len;
+
+        wIndex = page << 8;
+
+        switch (req) {
+                case B2C2_USB_READ_V8_MEM:
+                        nWaitTime = B2C2_WAIT_FOR_OPERATION_V8READ;
+                        request_type |= USB_DIR_IN;
+//                      dwRequestType = (u8) RTYPE_READ_V8_MEMORY;
+                        pipe = B2C2_USB_CTRL_PIPE_IN;
+                break;
+                case B2C2_USB_WRITE_V8_MEM:
+                        wIndex |= pbBuffer[0];
+                        request_type |= USB_DIR_OUT;
+                        nWaitTime = B2C2_WAIT_FOR_OPERATION_V8WRITE;
+//                      dwRequestType = (u8) RTYPE_WRITE_V8_MEMORY;
+                        pipe = B2C2_USB_CTRL_PIPE_OUT;
+                break;
+                case B2C2_USB_FLASH_BLOCK:
+                        request_type |= USB_DIR_OUT;
+                        nWaitTime = B2C2_WAIT_FOR_OPERATION_V8FLASH;
+//                      dwRequestType = (u8) RTYPE_WRITE_V8_FLASH;
+                        pipe = B2C2_USB_CTRL_PIPE_OUT;
+                break;
+                default:
+                        deb_info("unsupported request for v8_mem_req %x.\n",req);
+                return -EINVAL;
+        }
+        deb_v8("v8mem: %02x %02x %04x %04x, len: %d\n",request_type,req,
+                        wAddress,wIndex,buflen);
+
+        len = usb_control_msg(fc_usb->udev,pipe,
+                        req,
+                        request_type,
+                        wAddress,
+                        wIndex,
+                        pbBuffer,
+                        buflen,
+                        nWaitTime * HZ);
+
+        debug_dump(pbBuffer,len,deb_v8);
+
+        return len == buflen ? 0 : -EIO;
+}
+
+#define bytes_left_to_read_on_page(paddr,buflen) \
+                        ((V8_MEMORY_PAGE_SIZE - (paddr & V8_MEMORY_PAGE_MASK)) > buflen \
+                        ? buflen : (V8_MEMORY_PAGE_SIZE - (paddr & V8_MEMORY_PAGE_MASK)))
+
+static int flexcop_usb_memory_req(struct flexcop_usb *fc_usb,flexcop_usb_request_t req,
+                flexcop_usb_mem_page_t page_start, u32 addr, int extended, u8 *buf, u32 len)
+{
+        int i,ret = 0;
+        u16 wMax;
+        u32 pagechunk = 0;
+
+        switch(req) {
+                case B2C2_USB_READ_V8_MEM:  wMax = USB_MEM_READ_MAX; break;
+                case B2C2_USB_WRITE_V8_MEM:     wMax = USB_MEM_WRITE_MAX; break;
+                case B2C2_USB_FLASH_BLOCK:  wMax = USB_FLASH_MAX; break;
+                default:
+                        return -EINVAL;
+                break;
+        }
+        for (i = 0; i < len;) {
+                pagechunk = wMax < bytes_left_to_read_on_page(addr,len) ? wMax : bytes_left_to_read_on_page(addr,len);
+                deb_info("%x\n",(addr & V8_MEMORY_PAGE_MASK) | (V8_MEMORY_EXTENDED*extended));
+                if ((ret = flexcop_usb_v8_memory_req(fc_usb,req,
+                                page_start + (addr / V8_MEMORY_PAGE_SIZE), /* actual page */
+                                (addr & V8_MEMORY_PAGE_MASK) | (V8_MEMORY_EXTENDED*extended),
+                                &buf[i],pagechunk)) < 0)
+                        return ret;
+
+                addr += pagechunk;
+                len -= pagechunk;
+        }
+        return 0;
+}
+
+static int flexcop_usb_get_mac_addr(struct flexcop_device *fc, int extended)
+{
+        return flexcop_usb_memory_req(fc->bus_specific,B2C2_USB_READ_V8_MEM,
+                        V8_MEMORY_PAGE_FLASH,0x1f010,1,fc->dvb_adapter.proposed_mac,6);
+}
+
+#if 0
+static int flexcop_usb_utility_req(struct flexcop_usb *fc_usb, int set,
+                flexcop_usb_utility_function_t func, u8 extra, u16 wIndex,
+                u16 buflen, u8 *pvBuffer)
+{
+        u16 wValue;
+        u8 request_type = (set ? USB_DIR_OUT : USB_DIR_IN) | USB_TYPE_VENDOR;
+//      u8 dwRequestType = (u8) RTYPE_GENERIC,
+        int nWaitTime = 2,
+                pipe = set ? B2C2_USB_CTRL_PIPE_OUT : B2C2_USB_CTRL_PIPE_IN,
+                len;
+
+        wValue = (func << 8) | extra;
+
+        len = usb_control_msg(fc_usb->udev,pipe,
+                        B2C2_USB_UTILITY,
+                        request_type,
+                        wValue,
+                        wIndex,
+                        pvBuffer,
+                        buflen,
+                        nWaitTime * HZ);
+        return len == buflen ? 0 : -EIO;
+}
+#endif
+
+/* usb i2c stuff */
+static int flexcop_usb_i2c_req(struct flexcop_usb *fc_usb,
+                flexcop_usb_request_t req, flexcop_usb_i2c_function_t func,
+                flexcop_i2c_port_t port, u8 chipaddr, u8 addr, u8 *buf, u8 buflen)
+{
+        u16 wValue, wIndex;
+        int nWaitTime,pipe,len;
+//      u8 dwRequestType;
+        u8 request_type = USB_TYPE_VENDOR;
+
+        switch (func) {
+                case USB_FUNC_I2C_WRITE:
+                case USB_FUNC_I2C_MULTIWRITE:
+                case USB_FUNC_I2C_REPEATWRITE:
+                /* DKT 020208 - add this to support special case of DiSEqC */
+                case USB_FUNC_I2C_CHECKWRITE:
+                        pipe = B2C2_USB_CTRL_PIPE_OUT;
+                        nWaitTime = 2;
+//                      dwRequestType = (u8) RTYPE_GENERIC;
+                        request_type |= USB_DIR_OUT;
+                break;
+                case USB_FUNC_I2C_READ:
+                case USB_FUNC_I2C_REPEATREAD:
+                        pipe = B2C2_USB_CTRL_PIPE_IN;
+                        nWaitTime = 2;
+//                      dwRequestType = (u8) RTYPE_GENERIC;
+                        request_type |= USB_DIR_IN;
+                break;
+                default:
+                        deb_info("unsupported function for i2c_req %x\n",func);
+                        return -EINVAL;
+        }
+        wValue = (func << 8 ) | (port << 4);
+        wIndex = (chipaddr << 8 ) | addr;
+
+        deb_i2c("i2c %2d: %02x %02x %02x %02x %02x %02x\n",func,request_type,req,
+                        ((wValue && 0xff) << 8),wValue >> 8,((wIndex && 0xff) << 8),wIndex >> 8);
+
+        len = usb_control_msg(fc_usb->udev,pipe,
+                        req,
+                        request_type,
+                        wValue,
+                        wIndex,
+                        buf,
+                        buflen,
+                        nWaitTime * HZ);
+
+        return len == buflen ? 0 : -EREMOTEIO;
+}
+
+/* actual bus specific access functions, make sure prototype are/will be equal to pci */
+static flexcop_ibi_value flexcop_usb_read_ibi_reg(struct flexcop_device *fc, flexcop_ibi_register reg)
+{
+        flexcop_ibi_value val;
+        val.raw = 0;
+        flexcop_usb_readwrite_dw(fc,reg, &val.raw, 1);
+        return val;
+}
+
+static int flexcop_usb_write_ibi_reg(struct flexcop_device *fc, flexcop_ibi_register reg, flexcop_ibi_value val)
+{
+        return flexcop_usb_readwrite_dw(fc,reg, &val.raw, 0);
+}
+
+static int flexcop_usb_i2c_request(struct flexcop_device *fc, flexcop_access_op_t op,
+                flexcop_i2c_port_t port, u8 chipaddr, u8 addr, u8 *buf, u16 len)
+{
+        if (op == FC_READ)
+                return flexcop_usb_i2c_req(fc->bus_specific,B2C2_USB_I2C_REQUEST,USB_FUNC_I2C_READ,port,chipaddr,addr,buf,len);
+        else
+                return flexcop_usb_i2c_req(fc->bus_specific,B2C2_USB_I2C_REQUEST,USB_FUNC_I2C_WRITE,port,chipaddr,addr,buf,len);
+}
+
+static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb, u8 *buffer, int buffer_length)
+{
+        u8 *b;
+        int l;
+
+        deb_ts("tmp_buffer_length=%d, buffer_length=%d\n", fc_usb->tmp_buffer_length, buffer_length);
+
+        if (fc_usb->tmp_buffer_length > 0) {
+                memcpy(fc_usb->tmp_buffer+fc_usb->tmp_buffer_length, buffer, buffer_length);
+                fc_usb->tmp_buffer_length += buffer_length;
+                b = fc_usb->tmp_buffer;
+                l = fc_usb->tmp_buffer_length;
+        } else {
+                b=buffer;
+                l=buffer_length;
+        }
+
+        while (l >= 190) {
+                if (*b == 0xff)
+                        switch (*(b+1) & 0x03) {
+                                case 0x01: /* media packet */
+                                        if ( *(b+2) == 0x47 )
+                                                flexcop_pass_dmx_packets(fc_usb->fc_dev, b+2, 1);
+                                        else
+                                                deb_ts("not ts packet %02x %02x %02x %02x \n", *(b+2), *(b+3), *(b+4), *(b+5) );
+
+                                        b += 190;
+                                        l -= 190;
+                                break;
+                                default:
+                                        deb_ts("wrong packet type\n");
+                                        l = 0;
+                                break;
+                        }
+                else {
+                        deb_ts("wrong header\n");
+                        l = 0;
+                }
+        }
+
+        if (l>0)
+                memcpy(fc_usb->tmp_buffer, b, l);
+        fc_usb->tmp_buffer_length = l;
+}
+
+static void flexcop_usb_urb_complete(struct urb *urb, struct pt_regs *ptregs)
+{
+        struct flexcop_usb *fc_usb = urb->context;
+        int i;
+
+        if (urb->actual_length > 0)
+                deb_ts("urb completed, bufsize: %d actlen; %d\n",urb->transfer_buffer_length, urb->actual_length);
+
+        for (i = 0; i < urb->number_of_packets; i++) {
+                if (urb->iso_frame_desc[i].status < 0) {
+                        err("iso frame descriptor %d has an error: %d\n",i,urb->iso_frame_desc[i].status);
+                } else
+                        if (urb->iso_frame_desc[i].actual_length > 0) {
+                                deb_ts("passed %d bytes to the demux\n",urb->iso_frame_desc[i].actual_length);
+
+                                flexcop_usb_process_frame(fc_usb,
+                                        urb->transfer_buffer + urb->iso_frame_desc[i].offset,
+                                        urb->iso_frame_desc[i].actual_length);
+                }
+                urb->iso_frame_desc[i].status = 0;
+                urb->iso_frame_desc[i].actual_length = 0;
+        }
+
+        usb_submit_urb(urb,GFP_ATOMIC);
+}
+
+static int flexcop_usb_stream_control(struct flexcop_device *fc, int onoff)
+{
+        /* submit/kill iso packets */
+        return 0;
+}
+
+static void flexcop_usb_transfer_exit(struct flexcop_usb *fc_usb)
+{
+        int i;
+        for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++)
+                if (fc_usb->iso_urb[i] != NULL) {
+                        deb_ts("unlinking/killing urb no. %d\n",i);
+                        usb_kill_urb(fc_usb->iso_urb[i]);
+                        usb_free_urb(fc_usb->iso_urb[i]);
+                }
+
+        if (fc_usb->iso_buffer != NULL)
+                pci_free_consistent(NULL,fc_usb->buffer_size, fc_usb->iso_buffer, fc_usb->dma_addr);
+}
+
+static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb)
+{
+        u16 frame_size = fc_usb->uintf->cur_altsetting->endpoint[0].desc.wMaxPacketSize;
+        int bufsize = B2C2_USB_NUM_ISO_URB * B2C2_USB_FRAMES_PER_ISO * frame_size,i,j,ret;
+        int buffer_offset = 0;
+
+        deb_ts("creating %d iso-urbs with %d frames each of %d bytes size = %d.\n",
+                        B2C2_USB_NUM_ISO_URB, B2C2_USB_FRAMES_PER_ISO, frame_size,bufsize);
+
+        fc_usb->iso_buffer = pci_alloc_consistent(NULL,bufsize,&fc_usb->dma_addr);
+        if (fc_usb->iso_buffer == NULL)
+                return -ENOMEM;
+        memset(fc_usb->iso_buffer, 0, bufsize);
+        fc_usb->buffer_size = bufsize;
+
+        /* creating iso urbs */
+        for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++)
+                if (!(fc_usb->iso_urb[i] = usb_alloc_urb(B2C2_USB_FRAMES_PER_ISO,GFP_ATOMIC))) {
+                        ret = -ENOMEM;
+                        goto urb_error;
+                }
+        /* initialising and submitting iso urbs */
+        for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++) {
+                int frame_offset = 0;
+                struct urb *urb = fc_usb->iso_urb[i];
+                deb_ts("initializing and submitting urb no. %d (buf_offset: %d).\n",i,buffer_offset);
+
+                urb->dev = fc_usb->udev;
+                urb->context = fc_usb;
+                urb->complete = flexcop_usb_urb_complete;
+                urb->pipe = B2C2_USB_DATA_PIPE;
+                urb->transfer_flags = URB_ISO_ASAP;
+                urb->interval = 1;
+                urb->number_of_packets = B2C2_USB_FRAMES_PER_ISO;
+                urb->transfer_buffer_length = frame_size * B2C2_USB_FRAMES_PER_ISO;
+                urb->transfer_buffer = fc_usb->iso_buffer + buffer_offset;
+
+                buffer_offset += frame_size * B2C2_USB_FRAMES_PER_ISO;
+                for (j = 0; j < B2C2_USB_FRAMES_PER_ISO; j++) {
+                        deb_ts("urb no: %d, frame: %d, frame_offset: %d\n",i,j,frame_offset);
+                        urb->iso_frame_desc[j].offset = frame_offset;
+                        urb->iso_frame_desc[j].length = frame_size;
+                        frame_offset += frame_size;
+                }
+
+                if ((ret = usb_submit_urb(fc_usb->iso_urb[i],GFP_ATOMIC))) {
+                        err("submitting urb %d failed with %d.",i,ret);
+                        goto urb_error;
+                }
+                deb_ts("submitted urb no. %d.\n",i);
+        }
+
+/* SRAM */
+
+        flexcop_sram_set_dest(fc_usb->fc_dev,FC_SRAM_DEST_MEDIA | FC_SRAM_DEST_NET |
+                        FC_SRAM_DEST_CAO | FC_SRAM_DEST_CAI, FC_SRAM_DEST_TARGET_WAN_USB);
+        flexcop_wan_set_speed(fc_usb->fc_dev,FC_WAN_SPEED_8MBITS);
+        flexcop_sram_ctrl(fc_usb->fc_dev,1,1,1);
+
+        ret = 0;
+        goto success;
+urb_error:
+        flexcop_usb_transfer_exit(fc_usb);
+success:
+        return ret;
+}
+
+static int flexcop_usb_init(struct flexcop_usb *fc_usb)
+{
+        /* use the alternate setting with the larges buffer */
+        usb_set_interface(fc_usb->udev,0,1);
+        switch (fc_usb->udev->speed) {
+                case USB_SPEED_LOW:
+                        err("cannot handle USB speed because it is to sLOW.");
+                        return -ENODEV;
+                        break;
+                case USB_SPEED_FULL:
+                        info("running at FULL speed.");
+                        break;
+                case USB_SPEED_HIGH:
+                        info("running at HIGH speed.");
+                        break;
+                case USB_SPEED_UNKNOWN: /* fall through */
+                default:
+                        err("cannot handle USB speed because it is unkown.");
+                        return -ENODEV;
+        }
+        usb_set_intfdata(fc_usb->uintf, fc_usb);
+        return 0;
+}
+
+static void flexcop_usb_exit(struct flexcop_usb *fc_usb)
+{
+        usb_set_intfdata(fc_usb->uintf, NULL);
+}
+
+static int flexcop_usb_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        struct usb_device *udev = interface_to_usbdev(intf);
+        struct flexcop_usb *fc_usb = NULL;
+        struct flexcop_device *fc = NULL;
+        int ret;
+
+        if ((fc = flexcop_device_kmalloc(sizeof(struct flexcop_usb))) == NULL) {
+                err("out of memory\n");
+                return -ENOMEM;
+        }
+
+/* general flexcop init */
+        fc_usb = fc->bus_specific;
+        fc_usb->fc_dev = fc;
+
+        fc->read_ibi_reg  = flexcop_usb_read_ibi_reg;
+        fc->write_ibi_reg = flexcop_usb_write_ibi_reg;
+        fc->i2c_request = flexcop_usb_i2c_request;
+        fc->get_mac_addr = flexcop_usb_get_mac_addr;
+
+        fc->stream_control = flexcop_usb_stream_control;
+
+        fc->pid_filtering = 1;
+        fc->bus_type = FC_USB;
+
+        fc->dev = &udev->dev;
+        fc->owner = THIS_MODULE;
+
+/* bus specific part */
+        fc_usb->udev = udev;
+        fc_usb->uintf = intf;
+        if ((ret = flexcop_usb_init(fc_usb)) != 0)
+                goto err_kfree;
+
+/* init flexcop */
+        if ((ret = flexcop_device_initialize(fc)) != 0)
+                goto err_usb_exit;
+
+/* xfer init */
+        if ((ret = flexcop_usb_transfer_init(fc_usb)) != 0)
+                goto err_fc_exit;
+
+        info("%s successfully initialized and connected.",DRIVER_NAME);
+        ret = 0;
+        goto success;
+err_fc_exit:
+        flexcop_device_exit(fc);
+err_usb_exit:
+        flexcop_usb_exit(fc_usb);
+err_kfree:
+        flexcop_device_kfree(fc);
+success:
+        return ret;
+}
+
+static void flexcop_usb_disconnect(struct usb_interface *intf)
+{
+        struct flexcop_usb *fc_usb = usb_get_intfdata(intf);
+        flexcop_usb_transfer_exit(fc_usb);
+        flexcop_device_exit(fc_usb->fc_dev);
+        flexcop_usb_exit(fc_usb);
+        flexcop_device_kfree(fc_usb->fc_dev);
+        info("%s successfully deinitialized and disconnected.",DRIVER_NAME);
+}
+
+static struct usb_device_id flexcop_usb_table [] = {
+            { USB_DEVICE(0x0af7, 0x0101) },
+            { }
+};
+
+/* usb specific object needed to register this driver with the usb subsystem */
+static struct usb_driver flexcop_usb_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "Technisat/B2C2 FlexCop II/IIb/III USB",
+        .probe          = flexcop_usb_probe,
+        .disconnect = flexcop_usb_disconnect,
+        .id_table       = flexcop_usb_table,
+};
+
+/* module stuff */
+static int __init flexcop_usb_module_init(void)
+{
+        int result;
+        if ((result = usb_register(&flexcop_usb_driver))) {
+                err("usb_register failed. (%d)",result);
+                return result;
+        }
+
+        return 0;
+}
+
+static void __exit flexcop_usb_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&flexcop_usb_driver);
+}
+
+module_init(flexcop_usb_module_init);
+module_exit(flexcop_usb_module_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_NAME);
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/b2c2/flexcop-usb.h b/drivers/media/dvb/b2c2/flexcop-usb.h
new file mode 100644
index 000000000000..630e647a2caa
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-usb.h
@@ -0,0 +1,119 @@
+#ifndef __FLEXCOP_USB_H_INCLUDED__
+#define __FLEXCOP_USB_H_INCLUDED__
+
+#include <linux/usb.h>
+
+/* transfer parameters */
+#define B2C2_USB_FRAMES_PER_ISO         4
+#define B2C2_USB_NUM_ISO_URB            4
+
+#define B2C2_USB_CTRL_PIPE_IN           usb_rcvctrlpipe(fc_usb->udev,0)
+#define B2C2_USB_CTRL_PIPE_OUT          usb_sndctrlpipe(fc_usb->udev,0)
+#define B2C2_USB_DATA_PIPE                      usb_rcvisocpipe(fc_usb->udev,0x81)
+
+struct flexcop_usb {
+        struct usb_device *udev;
+        struct usb_interface *uintf;
+
+        u8 *iso_buffer;
+        int buffer_size;
+        dma_addr_t dma_addr;
+        struct urb *iso_urb[B2C2_USB_NUM_ISO_URB];
+
+        struct flexcop_device *fc_dev;
+
+        u8 tmp_buffer[1023+190];
+        int tmp_buffer_length;
+};
+
+#if 0
+/* request types TODO What is its use?*/
+typedef enum {
+
+/* something is wrong with this part
+        RTYPE_READ_DW         = (1 << 6),
+        RTYPE_WRITE_DW_1      = (3 << 6),
+        RTYPE_READ_V8_MEMORY  = (6 << 6),
+        RTYPE_WRITE_V8_MEMORY = (7 << 6),
+        RTYPE_WRITE_V8_FLASH  = (8 << 6),
+        RTYPE_GENERIC         = (9 << 6),
+*/
+} flexcop_usb_request_type_t;
+#endif
+
+/* request */
+typedef enum {
+        B2C2_USB_WRITE_V8_MEM = 0x04,
+        B2C2_USB_READ_V8_MEM  = 0x05,
+        B2C2_USB_READ_REG     = 0x08,
+        B2C2_USB_WRITE_REG    = 0x0A,
+/*      B2C2_USB_WRITEREGLO   = 0x0A, */
+        B2C2_USB_WRITEREGHI   = 0x0B,
+        B2C2_USB_FLASH_BLOCK  = 0x10,
+        B2C2_USB_I2C_REQUEST  = 0x11,
+        B2C2_USB_UTILITY      = 0x12,
+} flexcop_usb_request_t;
+
+/* function definition for I2C_REQUEST */
+typedef enum {
+        USB_FUNC_I2C_WRITE       = 0x01,
+        USB_FUNC_I2C_MULTIWRITE  = 0x02,
+        USB_FUNC_I2C_READ        = 0x03,
+        USB_FUNC_I2C_REPEATWRITE = 0x04,
+        USB_FUNC_GET_DESCRIPTOR  = 0x05,
+        USB_FUNC_I2C_REPEATREAD  = 0x06,
+/* DKT 020208 - add this to support special case of DiSEqC */
+        USB_FUNC_I2C_CHECKWRITE  = 0x07,
+        USB_FUNC_I2C_CHECKRESULT = 0x08,
+} flexcop_usb_i2c_function_t;
+
+/*
+ * function definition for UTILITY request 0x12
+ * DKT 020304 - new utility function
+ */
+typedef enum {
+        UTILITY_SET_FILTER          = 0x01,
+        UTILITY_DATA_ENABLE         = 0x02,
+        UTILITY_FLEX_MULTIWRITE     = 0x03,
+        UTILITY_SET_BUFFER_SIZE     = 0x04,
+        UTILITY_FLEX_OPERATOR       = 0x05,
+        UTILITY_FLEX_RESET300_START = 0x06,
+        UTILITY_FLEX_RESET300_STOP  = 0x07,
+        UTILITY_FLEX_RESET300       = 0x08,
+        UTILITY_SET_ISO_SIZE        = 0x09,
+        UTILITY_DATA_RESET          = 0x0A,
+        UTILITY_GET_DATA_STATUS     = 0x10,
+        UTILITY_GET_V8_REG          = 0x11,
+/* DKT 020326 - add function for v1.14 */
+        UTILITY_SRAM_WRITE          = 0x12,
+        UTILITY_SRAM_READ           = 0x13,
+        UTILITY_SRAM_TESTFILL       = 0x14,
+        UTILITY_SRAM_TESTSET        = 0x15,
+        UTILITY_SRAM_TESTVERIFY     = 0x16,
+} flexcop_usb_utility_function_t;
+
+#define B2C2_WAIT_FOR_OPERATION_RW  1*HZ       /* 1 s */
+#define B2C2_WAIT_FOR_OPERATION_RDW 3*HZ       /* 3 s */
+#define B2C2_WAIT_FOR_OPERATION_WDW 1*HZ       /* 1 s */
+
+#define B2C2_WAIT_FOR_OPERATION_V8READ   3*HZ  /* 3 s */
+#define B2C2_WAIT_FOR_OPERATION_V8WRITE  3*HZ  /* 3 s */
+#define B2C2_WAIT_FOR_OPERATION_V8FLASH  3*HZ  /* 3 s */
+
+typedef enum {
+        V8_MEMORY_PAGE_DVB_CI = 0x20,
+        V8_MEMORY_PAGE_DVB_DS = 0x40,
+        V8_MEMORY_PAGE_MULTI2 = 0x60,
+        V8_MEMORY_PAGE_FLASH  = 0x80
+} flexcop_usb_mem_page_t;
+
+#define V8_MEMORY_EXTENDED      (1 << 15)
+
+#define USB_MEM_READ_MAX                32
+#define USB_MEM_WRITE_MAX               1
+#define USB_FLASH_MAX                   8
+
+#define V8_MEMORY_PAGE_SIZE     0x8000      // 32K
+#define V8_MEMORY_PAGE_MASK     0x7FFF
+
+#endif
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c
new file mode 100644
index 000000000000..8b5d14dd36e3
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop.c
@@ -0,0 +1,286 @@
+/*
+ * flexcop.c - driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher <patrick.boettcher@desy.de>
+ *
+ * based on the skystar2-driver
+ * Copyright (C) 2003 Vadim Catana, skystar@moldova.cc
+ *
+ * Acknowledgements:
+ *     John Jurrius from BBTI, Inc. for extensive support with
+ *         code examples and data books
+ *
+ *     Bjarne Steinsbo, bjarne at steinsbo.com (some ideas for rewriting)
+ *
+ * Contributions to the skystar2-driver have been done by
+ *     Vincenzo Di Massa, hawk.it at tiscalinet.it (several DiSEqC fixes)
+ *     Roberto Ragusa, r.ragusa at libero.it (polishing, restyling the code)
+ *     Niklas Peinecke, peinecke at gdv.uni-hannover.de (hardware pid/mac filtering)
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * 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 Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "flexcop.h"
+
+#define DRIVER_NAME "B2C2 FlexcopII/II(b)/III digital TV receiver chip"
+#define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@desy.de"
+
+#ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG
+#define DEBSTATUS ""
+#else
+#define DEBSTATUS " (debugging is not enabled)"
+#endif
+
+int b2c2_flexcop_debug;
+module_param_named(debug, b2c2_flexcop_debug,  int, 0644);
+MODULE_PARM_DESC(debug, "set debug level (1=info,2=tuner,4=i2c,8=ts,16=sram (|-able))." DEBSTATUS);
+#undef DEBSTATUS
+
+/* global zero for ibi values */
+flexcop_ibi_value ibi_zero;
+
+static int flexcop_dvb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
+{
+        struct flexcop_device *fc = dvbdmxfeed->demux->priv;
+        return flexcop_pid_feed_control(fc,dvbdmxfeed,1);
+}
+
+static int flexcop_dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
+{
+        struct flexcop_device *fc = dvbdmxfeed->demux->priv;
+        return flexcop_pid_feed_control(fc,dvbdmxfeed,0);
+}
+
+static int flexcop_dvb_init(struct flexcop_device *fc)
+{
+        int ret;
+        if ((ret = dvb_register_adapter(&fc->dvb_adapter,"FlexCop Digital TV device",fc->owner)) < 0) {
+                err("error registering DVB adapter");
+                return ret;
+        }
+        fc->dvb_adapter.priv = fc;
+
+        fc->demux.dmx.capabilities = (DMX_TS_FILTERING | DMX_SECTION_FILTERING | DMX_MEMORY_BASED_FILTERING);
+        fc->demux.priv = fc;
+
+        fc->demux.filternum = fc->demux.feednum = FC_MAX_FEED;
+
+        fc->demux.start_feed = flexcop_dvb_start_feed;
+        fc->demux.stop_feed = flexcop_dvb_stop_feed;
+        fc->demux.write_to_decoder = NULL;
+
+        if ((ret = dvb_dmx_init(&fc->demux)) < 0) {
+                err("dvb_dmx failed: error %d",ret);
+                goto err_dmx;
+        }
+
+        fc->hw_frontend.source = DMX_FRONTEND_0;
+
+        fc->dmxdev.filternum = fc->demux.feednum;
+        fc->dmxdev.demux = &fc->demux.dmx;
+        fc->dmxdev.capabilities = 0;
+        if ((ret = dvb_dmxdev_init(&fc->dmxdev, &fc->dvb_adapter)) < 0) {
+                err("dvb_dmxdev_init failed: error %d",ret);
+                goto err_dmx_dev;
+        }
+
+        if ((ret = fc->demux.dmx.add_frontend(&fc->demux.dmx, &fc->hw_frontend)) < 0) {
+                err("adding hw_frontend to dmx failed: error %d",ret);
+                goto err_dmx_add_hw_frontend;
+        }
+
+        fc->mem_frontend.source = DMX_MEMORY_FE;
+        if ((ret = fc->demux.dmx.add_frontend(&fc->demux.dmx, &fc->mem_frontend)) < 0) {
+                err("adding mem_frontend to dmx failed: error %d",ret);
+                goto err_dmx_add_mem_frontend;
+        }
+
+        if ((ret = fc->demux.dmx.connect_frontend(&fc->demux.dmx, &fc->hw_frontend)) < 0) {
+                err("connect frontend failed: error %d",ret);
+                goto err_connect_frontend;
+        }
+
+        dvb_net_init(&fc->dvb_adapter, &fc->dvbnet, &fc->demux.dmx);
+
+        fc->init_state |= FC_STATE_DVB_INIT;
+        goto success;
+
+err_connect_frontend:
+        fc->demux.dmx.remove_frontend(&fc->demux.dmx,&fc->mem_frontend);
+err_dmx_add_mem_frontend:
+        fc->demux.dmx.remove_frontend(&fc->demux.dmx,&fc->hw_frontend);
+err_dmx_add_hw_frontend:
+        dvb_dmxdev_release(&fc->dmxdev);
+err_dmx_dev:
+        dvb_dmx_release(&fc->demux);
+err_dmx:
+        dvb_unregister_adapter(&fc->dvb_adapter);
+        return ret;
+
+success:
+        return 0;
+}
+
+static void flexcop_dvb_exit(struct flexcop_device *fc)
+{
+        if (fc->init_state & FC_STATE_DVB_INIT) {
+                dvb_net_release(&fc->dvbnet);
+
+                fc->demux.dmx.close(&fc->demux.dmx);
+                fc->demux.dmx.remove_frontend(&fc->demux.dmx,&fc->mem_frontend);
+                fc->demux.dmx.remove_frontend(&fc->demux.dmx,&fc->hw_frontend);
+                dvb_dmxdev_release(&fc->dmxdev);
+                dvb_dmx_release(&fc->demux);
+                dvb_unregister_adapter(&fc->dvb_adapter);
+
+                deb_info("deinitialized dvb stuff\n");
+        }
+        fc->init_state &= ~FC_STATE_DVB_INIT;
+}
+
+/* these methods are necessary to achieve the long-term-goal of hiding the
+ * struct flexcop_device from the bus-parts */
+void flexcop_pass_dmx_data(struct flexcop_device *fc, u8 *buf, u32 len)
+{
+        dvb_dmx_swfilter(&fc->demux, buf, len);
+}
+EXPORT_SYMBOL(flexcop_pass_dmx_data);
+
+void flexcop_pass_dmx_packets(struct flexcop_device *fc, u8 *buf, u32 no)
+{
+        dvb_dmx_swfilter_packets(&fc->demux, buf, no);
+}
+EXPORT_SYMBOL(flexcop_pass_dmx_packets);
+
+static void flexcop_reset(struct flexcop_device *fc)
+{
+        flexcop_ibi_value v210,v204;
+
+/* reset the flexcop itself */
+        fc->write_ibi_reg(fc,ctrl_208,ibi_zero);
+
+        v210.raw = 0;
+        v210.sw_reset_210.reset_blocks = 0xff;
+        v210.sw_reset_210.Block_reset_enable = 0xb2;
+        fc->write_ibi_reg(fc,sw_reset_210,v210);
+
+/* reset the periphical devices */
+
+        v204 = fc->read_ibi_reg(fc,misc_204);
+        v204.misc_204.Per_reset_sig = 0;
+        fc->write_ibi_reg(fc,misc_204,v204);
+        v204.misc_204.Per_reset_sig = 1;
+        fc->write_ibi_reg(fc,misc_204,v204);
+}
+
+struct flexcop_device *flexcop_device_kmalloc(size_t bus_specific_len)
+{
+        void *bus;
+        struct flexcop_device *fc = kmalloc(sizeof(struct flexcop_device), GFP_KERNEL);
+        if (!fc) {
+                err("no memory");
+                return NULL;
+        }
+        memset(fc, 0, sizeof(struct flexcop_device));
+
+        bus = kmalloc(bus_specific_len, GFP_KERNEL);
+        if (!bus) {
+                err("no memory");
+                kfree(fc);
+                return NULL;
+        }
+        memset(bus, 0, bus_specific_len);
+
+        fc->bus_specific = bus;
+
+        return fc;
+}
+EXPORT_SYMBOL(flexcop_device_kmalloc);
+
+void flexcop_device_kfree(struct flexcop_device *fc)
+{
+        kfree(fc->bus_specific);
+        kfree(fc);
+}
+EXPORT_SYMBOL(flexcop_device_kfree);
+
+int flexcop_device_initialize(struct flexcop_device *fc)
+{
+        int ret;
+        ibi_zero.raw = 0;
+
+        flexcop_reset(fc);
+        flexcop_determine_revision(fc);
+        flexcop_sram_init(fc);
+        flexcop_hw_filter_init(fc);
+
+        flexcop_smc_ctrl(fc, 0);
+
+        if ((ret = flexcop_dvb_init(fc)))
+                goto error;
+
+        /* do the MAC address reading after initializing the dvb_adapter */
+        if (fc->get_mac_addr(fc, 0) == 0) {
+                u8 *b = fc->dvb_adapter.proposed_mac;
+                info("MAC address = %02x:%02x:%02x:%02x:%02x:%02x", b[0],b[1],b[2],b[3],b[4],b[5]);
+                flexcop_set_mac_filter(fc,b);
+                flexcop_mac_filter_ctrl(fc,1);
+        } else
+                warn("reading of MAC address failed.\n");
+
+
+        if ((ret = flexcop_i2c_init(fc)))
+                goto error;
+
+        if ((ret = flexcop_frontend_init(fc)))
+                goto error;
+
+        flexcop_device_name(fc,"initialization of","complete");
+
+        ret = 0;
+        goto success;
+error:
+        flexcop_device_exit(fc);
+success:
+        return ret;
+}
+EXPORT_SYMBOL(flexcop_device_initialize);
+
+void flexcop_device_exit(struct flexcop_device *fc)
+{
+        flexcop_frontend_exit(fc);
+        flexcop_i2c_exit(fc);
+        flexcop_dvb_exit(fc);
+}
+EXPORT_SYMBOL(flexcop_device_exit);
+
+static int flexcop_module_init(void)
+{
+        info(DRIVER_NAME " loaded successfully");
+        return 0;
+}
+
+static void flexcop_module_cleanup(void)
+{
+        info(DRIVER_NAME " unloaded successfully");
+}
+
+module_init(flexcop_module_init);
+module_exit(flexcop_module_cleanup);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_NAME);
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/b2c2/flexcop.h b/drivers/media/dvb/b2c2/flexcop.h
new file mode 100644
index 000000000000..caa343a97bdc
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
+ *
+ * flexcop.h - private header file for all flexcop-chip-source files.
+ *
+ * see flexcop.c for copyright information.
+ */
+#ifndef __FLEXCOP_H__
+#define __FLEXCOP_H___
+
+#define FC_LOG_PREFIX "b2c2-flexcop"
+#include "flexcop-common.h"
+
+extern int b2c2_flexcop_debug;
+
+/* debug */
+#ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG
+#define dprintk(level,args...) \
+        do { if ((b2c2_flexcop_debug & level)) printk(args); } while (0)
+#else
+#define dprintk(level,args...)
+#endif
+
+#define deb_info(args...)  dprintk(0x01,args)
+#define deb_tuner(args...) dprintk(0x02,args)
+#define deb_i2c(args...)   dprintk(0x04,args)
+#define deb_ts(args...)    dprintk(0x08,args)
+#define deb_sram(args...)  dprintk(0x10,args)
+
+#endif
diff --git a/drivers/media/dvb/b2c2/skystar2.c b/drivers/media/dvb/b2c2/skystar2.c
index 336c178fcd5f..acbc4c34f72a 100644
--- a/drivers/media/dvb/b2c2/skystar2.c
+++ b/drivers/media/dvb/b2c2/skystar2.c
@@ -97,7 +97,7 @@ struct adapter {
         u8 mac_addr[8];
         u32 dw_sram_type;
 
-        struct dvb_adapter *dvb_adapter;
+        struct dvb_adapter dvb_adapter;
         struct dvb_demux demux;
         struct dmxdev dmxdev;
         struct dmx_frontend hw_frontend;
@@ -2461,7 +2461,7 @@ static void frontend_init(struct adapter *skystar2)
                        skystar2->pdev->subsystem_vendor,
                        skystar2->pdev->subsystem_device);
         } else {
-                if (dvb_register_frontend(skystar2->dvb_adapter, skystar2->fe)) {
+                if (dvb_register_frontend(&skystar2->dvb_adapter, skystar2->fe)) {
                         printk("skystar2: Frontend registration failed!\n");
                         if (skystar2->fe->ops->release)
                                 skystar2->fe->ops->release(skystar2->fe);
@@ -2486,17 +2486,17 @@ static int skystar2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (ret < 0)
                 goto out;
 
-        ret = dvb_register_adapter(&dvb_adapter, skystar2_pci_driver.name,
+        adapter = pci_get_drvdata(pdev);
+        dvb_adapter = &adapter->dvb_adapter;
+
+        ret = dvb_register_adapter(dvb_adapter, skystar2_pci_driver.name,
                                    THIS_MODULE);
         if (ret < 0) {
                 printk("%s: Error registering DVB adapter\n", __FUNCTION__);
                 goto err_halt;
         }
 
-        adapter = pci_get_drvdata(pdev);
-
         dvb_adapter->priv = adapter;
-        adapter->dvb_adapter = dvb_adapter;
 
 
         init_MUTEX(&adapter->i2c_sem);
@@ -2541,7 +2541,7 @@ static int skystar2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         adapter->dmxdev.demux = dmx;
         adapter->dmxdev.capabilities = 0;
 
-        ret = dvb_dmxdev_init(&adapter->dmxdev, adapter->dvb_adapter);
+        ret = dvb_dmxdev_init(&adapter->dmxdev, &adapter->dvb_adapter);
         if (ret < 0)
                 goto err_dmx_release;
 
@@ -2559,7 +2559,7 @@ static int skystar2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (ret < 0)
                 goto err_remove_mem_frontend;
 
-        dvb_net_init(adapter->dvb_adapter, &adapter->dvbnet, &dvbdemux->dmx);
+        dvb_net_init(&adapter->dvb_adapter, &adapter->dvbnet, &dvbdemux->dmx);
 
         frontend_init(adapter);
 out:
@@ -2576,7 +2576,7 @@ err_dmx_release:
 err_i2c_del:
         i2c_del_adapter(&adapter->i2c_adap);
 err_dvb_unregister:
-        dvb_unregister_adapter(adapter->dvb_adapter);
+        dvb_unregister_adapter(&adapter->dvb_adapter);
 err_halt:
         driver_halt(pdev);
         goto out;
@@ -2605,7 +2605,7 @@ static void skystar2_remove(struct pci_dev *pdev)
         if (adapter->fe != NULL)
                 dvb_unregister_frontend(adapter->fe);
 
-        dvb_unregister_adapter(adapter->dvb_adapter);
+        dvb_unregister_adapter(&adapter->dvb_adapter);
 
                         i2c_del_adapter(&adapter->i2c_adap);
 
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index e7d11e0667a8..b12545f093f8 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -11,9 +11,8 @@ config DVB_BT8XX
           the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards and
           pcHDTV HD2000 cards.
 
-          Since these cards have no MPEG decoder onboard, they transmit
+          Since these cards have no MPEG decoder onboard, they transmit
           only compressed MPEG data over the PCI bus, so you need
           an external software decoder to watch TV on your computer.
 
           Say Y if you own such a device and want to use it.
-
diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/dvb/bt8xx/Makefile
index 9da8604b9e18..d188e4c670b5 100644
--- a/drivers/media/dvb/bt8xx/Makefile
+++ b/drivers/media/dvb/bt8xx/Makefile
@@ -1,5 +1,3 @@
-
-obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o
+obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/video -Idrivers/media/dvb/frontends
-
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c
index 213ff7902024..3c5a8e273c4a 100644
--- a/drivers/media/dvb/bt8xx/bt878.c
+++ b/drivers/media/dvb/bt8xx/bt878.c
@@ -4,27 +4,27 @@
  * Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@t-online.de>
  *
  * large parts based on the bttv driver
- * Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)
- *                        & Marcus Metzler (mocm@thp.uni-koeln.de)
+ * Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@metzlerbros.de)
+ *                        & Marcus Metzler (mocm@metzlerbros.de)
  * (c) 1999,2000 Gerd Knorr <kraxel@goldbach.in-berlin.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
- * 
+ *
  */
 
 #include <linux/module.h>
@@ -58,7 +58,7 @@ module_param_named(verbose, bt878_verbose, int, 0444);
 MODULE_PARM_DESC(verbose,
                  "verbose startup messages, default is 1 (yes)");
 module_param_named(debug, bt878_debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
+MODULE_PARM_DESC(debug, "Turn on/off debugging, default is 0 (off).");
 
 int bt878_num;
 struct bt878 bt878[BT878_MAX];
@@ -128,21 +128,21 @@ static int bt878_mem_alloc(struct bt878 *bt)
 }
 
 /* RISC instructions */
-#define RISC_WRITE              (0x01 << 28)
-#define RISC_JUMP               (0x07 << 28)
-#define RISC_SYNC               (0x08 << 28)
+#define RISC_WRITE              (0x01 << 28)
+#define RISC_JUMP               (0x07 << 28)
+#define RISC_SYNC               (0x08 << 28)
 
 /* RISC bits */
-#define RISC_WR_SOL             (1 << 27)
-#define RISC_WR_EOL             (1 << 26)
-#define RISC_IRQ                (1 << 24)
+#define RISC_WR_SOL             (1 << 27)
+#define RISC_WR_EOL             (1 << 26)
+#define RISC_IRQ                (1 << 24)
 #define RISC_STATUS(status)     ((((~status) & 0x0F) << 20) | ((status & 0x0F) << 16))
-#define RISC_SYNC_RESYNC        (1 << 15)
-#define RISC_SYNC_FM1           0x06
-#define RISC_SYNC_VRO           0x0C
+#define RISC_SYNC_RESYNC        (1 << 15)
+#define RISC_SYNC_FM1           0x06
+#define RISC_SYNC_VRO           0x0C
 
 #define RISC_FLUSH()            bt->risc_pos = 0
-#define RISC_INSTR(instr)       bt->risc_cpu[bt->risc_pos++] = cpu_to_le32(instr)
+#define RISC_INSTR(instr)       bt->risc_cpu[bt->risc_pos++] = cpu_to_le32(instr)
 
 static int bt878_make_risc(struct bt878 *bt)
 {
@@ -173,7 +173,7 @@ static void bt878_risc_program(struct bt878 *bt, u32 op_sync_orin)
         RISC_INSTR(RISC_SYNC | RISC_SYNC_FM1 | op_sync_orin);
         RISC_INSTR(0);
 
-        dprintk("bt878: risc len lines %u, bytes per line %u\n", 
+        dprintk("bt878: risc len lines %u, bytes per line %u\n",
                         bt->line_count, bt->line_bytes);
         for (line = 0; line < bt->line_count; line++) {
                 // At the beginning of every block we issue an IRQ with previous (finished) block number set
@@ -228,14 +228,14 @@ void bt878_start(struct bt878 *bt, u32 controlreg, u32 op_sync_orin,
          * Hacked for DST to:
          * SCERR | OCERR | FDSR | FTRGT | FBUS | RISCI
          */
-        int_mask = BT878_ASCERR | BT878_AOCERR | BT878_APABORT | 
-                BT878_ARIPERR | BT878_APPERR | BT878_AFDSR | BT878_AFTRGT | 
+        int_mask = BT878_ASCERR | BT878_AOCERR | BT878_APABORT |
+                BT878_ARIPERR | BT878_APPERR | BT878_AFDSR | BT878_AFTRGT |
                 BT878_AFBUS | BT878_ARISCI;
 
 
         /* ignore pesky bits */
         int_mask &= ~irq_err_ignore;
-        
+
         btwrite(int_mask, BT878_AINT_MASK);
         btwrite(controlreg, BT878_AGPIO_DMA_CTL);
 }
@@ -461,9 +461,9 @@ static int __devinit bt878_probe(struct pci_dev *dev,
         pci_set_drvdata(dev, bt);
 
 /*        if(init_bt878(btv) < 0) {
-                bt878_remove(dev);
-                return -EIO;
-        }
+                bt878_remove(dev);
+                return -EIO;
+        }
 */
 
         if ((result = bt878_mem_alloc(bt))) {
@@ -536,10 +536,10 @@ static struct pci_device_id bt878_pci_tbl[] __devinitdata = {
 MODULE_DEVICE_TABLE(pci, bt878_pci_tbl);
 
 static struct pci_driver bt878_pci_driver = {
-      .name     = "bt878",
+      .name     = "bt878",
       .id_table = bt878_pci_tbl,
-      .probe    = bt878_probe,
-      .remove   = bt878_remove,
+      .probe    = bt878_probe,
+      .remove   = bt878_remove,
 };
 
 static int bt878_pci_driver_registered = 0;
@@ -558,7 +558,7 @@ static int bt878_init_module(void)
                (BT878_VERSION_CODE >> 8) & 0xff,
                BT878_VERSION_CODE & 0xff);
 /*
-        bt878_check_chipset();
+        bt878_check_chipset();
 */
         /* later we register inside of bt878_find_audio_dma()
          * because we may want to ignore certain cards */
diff --git a/drivers/media/dvb/bt8xx/bt878.h b/drivers/media/dvb/bt8xx/bt878.h
index e1b9809d1b08..837623f7fcdf 100644
--- a/drivers/media/dvb/bt8xx/bt878.h
+++ b/drivers/media/dvb/bt8xx/bt878.h
@@ -1,4 +1,4 @@
-/* 
+/*
     bt878.h - Bt878 audio module (register offsets)
 
     Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@t-online.de>
@@ -120,14 +120,14 @@ struct bt878 {
         u32 risc_pos;
 
         struct tasklet_struct tasklet;
-        int shutdown;   
+        int shutdown;
 };
 
 extern struct bt878 bt878[BT878_MAX];
 
 void bt878_start(struct bt878 *bt, u32 controlreg, u32 op_sync_orin,
                 u32 irq_err_ignore);
-void bt878_stop(struct bt878 *bt);           
+void bt878_stop(struct bt878 *bt);
 
 #if defined(__powerpc__)        /* big-endian */
 extern __inline__ void io_st_le32(volatile unsigned __iomem *addr, unsigned val)
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index eac83768dfd0..1339912c308b 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1,25 +1,25 @@
 /*
-    Frontend-driver for TwinHan DST Frontend
 
-    Copyright (C) 2003 Jamie Honan
+        Frontend/Card driver for TwinHan DST Frontend
+        Copyright (C) 2003 Jamie Honan
+        Copyright (C) 2004, 2005 Manu Abraham (manu@kromtek.com)
 
-    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 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.
+        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/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -31,59 +31,22 @@
 
 #include "dvb_frontend.h"
 #include "dst_priv.h"
-#include "dst.h"
-
-struct dst_state {
-
-        struct i2c_adapter* i2c;
-
-        struct bt878* bt;
-
-        struct dvb_frontend_ops ops;
-
-        /* configuration settings */
-        const struct dst_config* config;
-
-        struct dvb_frontend frontend;
-
-        /* private demodulator data */
-        u8 tx_tuna[10];
-        u8 rx_tuna[10];
-        u8 rxbuffer[10];
-        u8 diseq_flags;
-        u8 dst_type;
-        u32 type_flags;
-        u32 frequency;          /* intermediate frequency in kHz for QPSK */
-        fe_spectral_inversion_t inversion;
-        u32 symbol_rate;        /* symbol rate in Symbols per second */
-        fe_code_rate_t fec;
-        fe_sec_voltage_t voltage;
-        fe_sec_tone_mode_t tone;
-        u32 decode_freq;
-        u8 decode_lock;
-        u16 decode_strength;
-        u16 decode_snr;
-        unsigned long cur_jiff;
-        u8 k22;
-        fe_bandwidth_t bandwidth;
-};
+#include "dst_common.h"
+
 
-static unsigned int dst_verbose = 0;
-module_param(dst_verbose, int, 0644);
-MODULE_PARM_DESC(dst_verbose, "verbose startup messages, default is 1 (yes)");
-static unsigned int dst_debug = 0;
-module_param(dst_debug, int, 0644);
-MODULE_PARM_DESC(dst_debug, "debug messages, default is 0 (no)");
+static unsigned int verbose = 1;
+module_param(verbose, int, 0644);
+MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)");
 
-#define dprintk if (dst_debug) printk
+static unsigned int debug = 1;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "debug messages, default is 0 (yes)");
 
-#define DST_TYPE_IS_SAT         0
-#define DST_TYPE_IS_TERR        1
-#define DST_TYPE_IS_CABLE       2
+static unsigned int dst_addons;
+module_param(dst_addons, int, 0644);
+MODULE_PARM_DESC(dst_addons, "CA daughterboard, default is 0 (No addons)");
 
-#define DST_TYPE_HAS_NEWTUNE    1
-#define DST_TYPE_HAS_TS204      2
-#define DST_TYPE_HAS_SYMDIV     4
+#define dprintk if (debug) printk
 
 #define HAS_LOCK        1
 #define ATTEMPT_TUNE    2
@@ -97,7 +60,7 @@ static void dst_packsize(struct dst_state* state, int psize)
         bt878_device_control(state->bt, DST_IG_TS, &bits);
 }
 
-static int dst_gpio_outb(struct dst_state* state, u32 mask, u32 enbb, u32 outhigh)
+int dst_gpio_outb(struct dst_state* state, u32 mask, u32 enbb, u32 outhigh, int delay)
 {
         union dst_gpio_packet enb;
         union dst_gpio_packet bits;
@@ -105,26 +68,33 @@ static int dst_gpio_outb(struct dst_state* state, u32 mask, u32 enbb, u32 outhig
 
         enb.enb.mask = mask;
         enb.enb.enable = enbb;
+        if (verbose > 4)
+                dprintk("%s: mask=[%04x], enbb=[%04x], outhigh=[%04x]\n", __FUNCTION__, mask, enbb, outhigh);
+
         if ((err = bt878_device_control(state->bt, DST_IG_ENABLE, &enb)) < 0) {
-                dprintk("%s: dst_gpio_enb error (err == %i, mask == 0x%02x, enb == 0x%02x)\n", __FUNCTION__, err, mask, enbb);
+                dprintk("%s: dst_gpio_enb error (err == %i, mask == %02x, enb == %02x)\n", __FUNCTION__, err, mask, enbb);
                 return -EREMOTEIO;
         }
-
+        udelay(1000);
         /* because complete disabling means no output, no need to do output packet */
         if (enbb == 0)
                 return 0;
 
+        if (delay)
+                msleep(10);
+
         bits.outp.mask = enbb;
         bits.outp.highvals = outhigh;
 
         if ((err = bt878_device_control(state->bt, DST_IG_WRITE, &bits)) < 0) {
-                dprintk("%s: dst_gpio_outb error (err == %i, enbb == 0x%02x, outhigh == 0x%02x)\n", __FUNCTION__, err, enbb, outhigh);
+                dprintk("%s: dst_gpio_outb error (err == %i, enbb == %02x, outhigh == %02x)\n", __FUNCTION__, err, enbb, outhigh);
                 return -EREMOTEIO;
         }
         return 0;
 }
+EXPORT_SYMBOL(dst_gpio_outb);
 
-static int dst_gpio_inb(struct dst_state *state, u8 * result)
+int dst_gpio_inb(struct dst_state *state, u8 * result)
 {
         union dst_gpio_packet rd_packet;
         int err;
@@ -139,143 +109,225 @@ static int dst_gpio_inb(struct dst_state *state, u8 * result)
         *result = (u8) rd_packet.rd.value;
         return 0;
 }
+EXPORT_SYMBOL(dst_gpio_inb);
 
-#define DST_I2C_ENABLE  1
-#define DST_8820        2
-
-static int dst_reset8820(struct dst_state *state)
+int rdc_reset_state(struct dst_state *state)
 {
-        int retval;
-        /* pull 8820 gpio pin low, wait, high, wait, then low */
-        // dprintk ("%s: reset 8820\n", __FUNCTION__);
-        retval = dst_gpio_outb(state, DST_8820, DST_8820, 0);
-        if (retval < 0)
-                return retval;
+        if (verbose > 1)
+                dprintk("%s: Resetting state machine\n", __FUNCTION__);
+
+        if (dst_gpio_outb(state, RDC_8820_INT, RDC_8820_INT, 0, NO_DELAY) < 0) {
+                dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__);
+                return -1;
+        }
+
         msleep(10);
-        retval = dst_gpio_outb(state, DST_8820, DST_8820, DST_8820);
-        if (retval < 0)
-                return retval;
-        /* wait for more feedback on what works here *
-           msleep(10);
-           retval = dst_gpio_outb(dst, DST_8820, DST_8820, 0);
-           if (retval < 0)
-           return retval;
-         */
+
+        if (dst_gpio_outb(state, RDC_8820_INT, RDC_8820_INT, RDC_8820_INT, NO_DELAY) < 0) {
+                dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__);
+                msleep(10);
+                return -1;
+        }
+
         return 0;
 }
+EXPORT_SYMBOL(rdc_reset_state);
 
-static int dst_i2c_enable(struct dst_state *state)
+int rdc_8820_reset(struct dst_state *state)
 {
-        int retval;
-        /* pull I2C enable gpio pin low, wait */
-        // dprintk ("%s: i2c enable\n", __FUNCTION__);
-        retval = dst_gpio_outb(state, ~0, DST_I2C_ENABLE, 0);
-        if (retval < 0)
-                return retval;
-        // dprintk ("%s: i2c enable delay\n", __FUNCTION__);
-        msleep(33);
+        if (verbose > 1)
+                dprintk("%s: Resetting DST\n", __FUNCTION__);
+
+        if (dst_gpio_outb(state, RDC_8820_RESET, RDC_8820_RESET, 0, NO_DELAY) < 0) {
+                dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__);
+                return -1;
+        }
+        udelay(1000);
+        if (dst_gpio_outb(state, RDC_8820_RESET, RDC_8820_RESET, RDC_8820_RESET, DELAY) < 0) {
+                dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__);
+                return -1;
+        }
+
         return 0;
 }
+EXPORT_SYMBOL(rdc_8820_reset);
 
-static int dst_i2c_disable(struct dst_state *state)
+int dst_pio_enable(struct dst_state *state)
 {
-        int retval;
-        /* release I2C enable gpio pin, wait */
-        // dprintk ("%s: i2c disable\n", __FUNCTION__);
-        retval = dst_gpio_outb(state, ~0, 0, 0);
-        if (retval < 0)
-                return retval;
-        // dprintk ("%s: i2c disable delay\n", __FUNCTION__);
-        msleep(33);
+        if (dst_gpio_outb(state, ~0, RDC_8820_PIO_0_ENABLE, 0, NO_DELAY) < 0) {
+                dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__);
+                return -1;
+        }
+        udelay(1000);
+        return 0;
+}
+EXPORT_SYMBOL(dst_pio_enable);
+
+int dst_pio_disable(struct dst_state *state)
+{
+        if (dst_gpio_outb(state, ~0, RDC_8820_PIO_0_DISABLE, RDC_8820_PIO_0_DISABLE, NO_DELAY) < 0) {
+                dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__);
+                return -1;
+        }
+        if (state->type_flags & DST_TYPE_HAS_FW_1)
+                udelay(1000);
+
         return 0;
 }
+EXPORT_SYMBOL(dst_pio_disable);
 
-static int dst_wait_dst_ready(struct dst_state *state)
+int dst_wait_dst_ready(struct dst_state *state, u8 delay_mode)
 {
         u8 reply;
-        int retval;
         int i;
+
         for (i = 0; i < 200; i++) {
-                retval = dst_gpio_inb(state, &reply);
-                if (retval < 0)
-                        return retval;
-                if ((reply & DST_I2C_ENABLE) == 0) {
-                        dprintk("%s: dst wait ready after %d\n", __FUNCTION__, i);
+                if (dst_gpio_inb(state, &reply) < 0) {
+                        dprintk("%s: dst_gpio_inb ERROR !\n", __FUNCTION__);
+                        return -1;
+                }
+
+                if ((reply & RDC_8820_PIO_0_ENABLE) == 0) {
+                        if (verbose > 4)
+                                dprintk("%s: dst wait ready after %d\n", __FUNCTION__, i);
                         return 1;
                 }
                 msleep(10);
         }
-        dprintk("%s: dst wait NOT ready after %d\n", __FUNCTION__, i);
+        if (verbose > 1)
+                dprintk("%s: dst wait NOT ready after %d\n", __FUNCTION__, i);
+
+        return 0;
+}
+EXPORT_SYMBOL(dst_wait_dst_ready);
+
+int dst_error_recovery(struct dst_state *state)
+{
+        dprintk("%s: Trying to return from previous errors...\n", __FUNCTION__);
+        dst_pio_disable(state);
+        msleep(10);
+        dst_pio_enable(state);
+        msleep(10);
+
         return 0;
 }
+EXPORT_SYMBOL(dst_error_recovery);
+
+int dst_error_bailout(struct dst_state *state)
+{
+        dprintk("%s: Trying to bailout from previous error...\n", __FUNCTION__);
+        rdc_8820_reset(state);
+        dst_pio_disable(state);
+        msleep(10);
+
+        return 0;
+}
+EXPORT_SYMBOL(dst_error_bailout);
+
+
+int dst_comm_init(struct dst_state* state)
+{
+        if (verbose > 1)
+                dprintk ("%s: Initializing DST..\n", __FUNCTION__);
+        if ((dst_pio_enable(state)) < 0) {
+                dprintk("%s: PIO Enable Failed.\n", __FUNCTION__);
+                return -1;
+        }
+        if ((rdc_reset_state(state)) < 0) {
+                dprintk("%s: RDC 8820 State RESET Failed.\n", __FUNCTION__);
+                return -1;
+        }
+        if (state->type_flags & DST_TYPE_HAS_FW_1)
+                msleep(100);
+        else
+                msleep(5);
+
+        return 0;
+}
+EXPORT_SYMBOL(dst_comm_init);
+
 
-static int write_dst(struct dst_state *state, u8 * data, u8 len)
+int write_dst(struct dst_state *state, u8 *data, u8 len)
 {
         struct i2c_msg msg = {
                 .addr = state->config->demod_address,.flags = 0,.buf = data,.len = len
         };
+
         int err;
         int cnt;
-
-        if (dst_debug && dst_verbose) {
+        if (debug && (verbose > 4)) {
                 u8 i;
-                dprintk("%s writing", __FUNCTION__);
-                for (i = 0; i < len; i++) {
-                        dprintk(" 0x%02x", data[i]);
+                if (verbose > 4) {
+                        dprintk("%s writing", __FUNCTION__);
+                        for (i = 0; i < len; i++)
+                                dprintk(" %02x", data[i]);
+                        dprintk("\n");
                 }
-                dprintk("\n");
         }
-        msleep(30);
-        for (cnt = 0; cnt < 4; cnt++) {
+        for (cnt = 0; cnt < 2; cnt++) {
                 if ((err = i2c_transfer(state->i2c, &msg, 1)) < 0) {
-                        dprintk("%s: write_dst error (err == %i, len == 0x%02x, b0 == 0x%02x)\n", __FUNCTION__, err, len, data[0]);
-                        dst_i2c_disable(state);
-                        msleep(500);
-                        dst_i2c_enable(state);
-                        msleep(500);
+                        dprintk("%s: _write_dst error (err == %i, len == 0x%02x, b0 == 0x%02x)\n", __FUNCTION__, err, len, data[0]);
+                        dst_error_recovery(state);
                         continue;
                 } else
                         break;
         }
-        if (cnt >= 4)
-                return -EREMOTEIO;
+
+        if (cnt >= 2) {
+                if (verbose > 1)
+                        printk("%s: RDC 8820 RESET...\n", __FUNCTION__);
+                dst_error_bailout(state);
+
+                return -1;
+        }
+
         return 0;
 }
+EXPORT_SYMBOL(write_dst);
 
-static int read_dst(struct dst_state *state, u8 * ret, u8 len)
+int read_dst(struct dst_state *state, u8 * ret, u8 len)
 {
         struct i2c_msg msg = {.addr = state->config->demod_address,.flags = I2C_M_RD,.buf = ret,.len = len };
         int err;
         int cnt;
 
-        for (cnt = 0; cnt < 4; cnt++) {
+        for (cnt = 0; cnt < 2; cnt++) {
                 if ((err = i2c_transfer(state->i2c, &msg, 1)) < 0) {
+
                         dprintk("%s: read_dst error (err == %i, len == 0x%02x, b0 == 0x%02x)\n", __FUNCTION__, err, len, ret[0]);
-                        dst_i2c_disable(state);
-                        dst_i2c_enable(state);
+                        dst_error_recovery(state);
+
                         continue;
                 } else
                         break;
         }
-        if (cnt >= 4)
-                return -EREMOTEIO;
-        dprintk("%s reply is 0x%x\n", __FUNCTION__, ret[0]);
-        if (dst_debug && dst_verbose) {
+        if (cnt >= 2) {
+                if (verbose > 1)
+                        printk("%s: RDC 8820 RESET...\n", __FUNCTION__);
+                dst_error_bailout(state);
+
+                return -1;
+        }
+        if (debug && (verbose > 4)) {
+                dprintk("%s reply is 0x%x\n", __FUNCTION__, ret[0]);
                 for (err = 1; err < len; err++)
                         dprintk(" 0x%x", ret[err]);
                 if (err > 1)
                         dprintk("\n");
         }
+
         return 0;
 }
+EXPORT_SYMBOL(read_dst);
 
 static int dst_set_freq(struct dst_state *state, u32 freq)
 {
         u8 *val;
 
         state->frequency = freq;
+        if (debug > 4)
+                dprintk("%s: set Frequency %u\n", __FUNCTION__, freq);
 
-        // dprintk("%s: set frequency %u\n", __FUNCTION__, freq);
         if (state->dst_type == DST_TYPE_IS_SAT) {
                 freq = freq / 1000;
                 if (freq < 950 || freq > 2150)
@@ -398,7 +450,8 @@ static int dst_set_symbolrate(struct dst_state* state, u32 srate)
         if (state->dst_type == DST_TYPE_IS_TERR) {
                 return 0;
         }
-        // dprintk("%s: set srate %u\n", __FUNCTION__, srate);
+        if (debug > 4)
+                dprintk("%s: set symrate %u\n", __FUNCTION__, srate);
         srate /= 1000;
         val = &state->tx_tuna[0];
 
@@ -407,7 +460,10 @@ static int dst_set_symbolrate(struct dst_state* state, u32 srate)
                 sval <<= 20;
                 do_div(sval, 88000);
                 symcalc = (u32) sval;
-                // dprintk("%s: set symcalc %u\n", __FUNCTION__, symcalc);
+
+                if (debug > 4)
+                        dprintk("%s: set symcalc %u\n", __FUNCTION__, symcalc);
+
                 val[5] = (u8) (symcalc >> 12);
                 val[6] = (u8) (symcalc >> 4);
                 val[7] = (u8) (symcalc << 4);
@@ -422,7 +478,7 @@ static int dst_set_symbolrate(struct dst_state* state, u32 srate)
         return 0;
 }
 
-static u8 dst_check_sum(u8 * buf, u32 len)
+u8 dst_check_sum(u8 * buf, u32 len)
 {
         u32 i;
         u8 val = 0;
@@ -433,28 +489,7 @@ static u8 dst_check_sum(u8 * buf, u32 len)
         }
         return ((~val) + 1);
 }
-
-struct dst_types {
-        char *mstr;
-        int offs;
-        u8 dst_type;
-        u32 type_flags;
-};
-
-static struct dst_types dst_tlist[] = {
-        {"DST-020", 0, DST_TYPE_IS_SAT, DST_TYPE_HAS_SYMDIV},
-        {"DST-030", 0, DST_TYPE_IS_SAT, DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE},
-        {"DST-03T", 0, DST_TYPE_IS_SAT, DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_TS204},
-        {"DST-MOT", 0, DST_TYPE_IS_SAT, DST_TYPE_HAS_SYMDIV},
-        {"DST-CI",  1, DST_TYPE_IS_SAT, DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE},
-        {"DSTMCI",  1, DST_TYPE_IS_SAT, DST_TYPE_HAS_NEWTUNE},
-        {"DSTFCI",  1, DST_TYPE_IS_SAT, DST_TYPE_HAS_NEWTUNE},
-        {"DCTNEW",  1, DST_TYPE_IS_CABLE, DST_TYPE_HAS_NEWTUNE},
-        {"DCT-CI",  1, DST_TYPE_IS_CABLE, DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_TS204},
-        {"DTTDIG",  1, DST_TYPE_IS_TERR, 0}
-};
-
-/* DCTNEW and DCT-CI are guesses */
+EXPORT_SYMBOL(dst_check_sum);
 
 static void dst_type_flags_print(u32 type_flags)
 {
@@ -465,93 +500,270 @@ static void dst_type_flags_print(u32 type_flags)
                 printk(" 0x%x ts204", DST_TYPE_HAS_TS204);
         if (type_flags & DST_TYPE_HAS_SYMDIV)
                 printk(" 0x%x symdiv", DST_TYPE_HAS_SYMDIV);
+        if (type_flags & DST_TYPE_HAS_FW_1)
+                printk(" 0x%x firmware version = 1", DST_TYPE_HAS_FW_1);
+        if (type_flags & DST_TYPE_HAS_FW_2)
+                printk(" 0x%x firmware version = 2", DST_TYPE_HAS_FW_2);
+        if (type_flags & DST_TYPE_HAS_FW_3)
+                printk(" 0x%x firmware version = 3", DST_TYPE_HAS_FW_3);
+//      if ((type_flags & DST_TYPE_HAS_FW_BUILD) && new_fw)
+
         printk("\n");
 }
 
-static int dst_type_print(u8 type)
+
+static int dst_type_print (u8 type)
 {
         char *otype;
         switch (type) {
         case DST_TYPE_IS_SAT:
                 otype = "satellite";
                 break;
+
         case DST_TYPE_IS_TERR:
                 otype = "terrestrial";
                 break;
+
         case DST_TYPE_IS_CABLE:
                 otype = "cable";
                 break;
+
         default:
                 printk("%s: invalid dst type %d\n", __FUNCTION__, type);
                 return -EINVAL;
         }
         printk("DST type : %s\n", otype);
+
         return 0;
 }
 
-static int dst_check_ci(struct dst_state *state)
+/*
+        Known cards list
+        Satellite
+        -------------------
+                  200103A
+        VP-1020   DST-MOT       LG(old), TS=188
+
+        VP-1020   DST-03T       LG(new), TS=204
+        VP-1022   DST-03T       LG(new), TS=204
+        VP-1025   DST-03T       LG(new), TS=204
+
+        VP-1030   DSTMCI,       LG(new), TS=188
+        VP-1032   DSTMCI,       LG(new), TS=188
+
+        Cable
+        -------------------
+        VP-2030   DCT-CI,       Samsung, TS=204
+        VP-2021   DCT-CI,       Unknown, TS=204
+        VP-2031   DCT-CI,       Philips, TS=188
+        VP-2040   DCT-CI,       Philips, TS=188, with CA daughter board
+        VP-2040   DCT-CI,       Philips, TS=204, without CA daughter board
+
+        Terrestrial
+        -------------------
+        VP-3050  DTTNXT                  TS=188
+        VP-3040  DTT-CI,        Philips, TS=188
+        VP-3040  DTT-CI,        Philips, TS=204
+
+        ATSC
+        -------------------
+        VP-3220  ATSCDI,                 TS=188
+        VP-3250  ATSCAD,                 TS=188
+
+*/
+
+struct dst_types dst_tlist[] = {
+        {
+                .device_id = "200103A",
+                .offset = 0,
+                .dst_type =  DST_TYPE_IS_SAT,
+                .type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1,
+                .dst_feature = 0
+        },      /*      obsolete        */
+
+        {
+                .device_id = "DST-020",
+                .offset = 0,
+                .dst_type =  DST_TYPE_IS_SAT,
+                .type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1,
+                .dst_feature = 0
+        },      /*      obsolete        */
+
+        {
+                .device_id = "DST-030",
+                .offset =  0,
+                .dst_type = DST_TYPE_IS_SAT,
+                .type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1,
+                .dst_feature = 0
+        },      /*      obsolete        */
+
+        {
+                .device_id = "DST-03T",
+                .offset = 0,
+                .dst_type = DST_TYPE_IS_SAT,
+                .type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_TS204 | DST_TYPE_HAS_FW_2,
+                .dst_feature = DST_TYPE_HAS_DISEQC3 | DST_TYPE_HAS_DISEQC4 | DST_TYPE_HAS_DISEQC5
+                                                         | DST_TYPE_HAS_MAC | DST_TYPE_HAS_MOTO
+         },
+
+        {
+                .device_id = "DST-MOT",
+                .offset =  0,
+                .dst_type = DST_TYPE_IS_SAT,
+                .type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1,
+                .dst_feature = 0
+        },      /*      obsolete        */
+
+        {
+                .device_id = "DST-CI",
+                .offset = 1,
+                .dst_type = DST_TYPE_IS_SAT,
+                .type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1,
+                .dst_feature = DST_TYPE_HAS_CA
+        },      /*      An OEM board    */
+
+        {
+                .device_id = "DSTMCI",
+                .offset = 1,
+                .dst_type = DST_TYPE_IS_SAT,
+                .type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD,
+                .dst_feature = DST_TYPE_HAS_CA | DST_TYPE_HAS_DISEQC3 | DST_TYPE_HAS_DISEQC4
+                                                        | DST_TYPE_HAS_MOTO | DST_TYPE_HAS_MAC
+        },
+
+        {
+                .device_id = "DSTFCI",
+                .offset = 1,
+                .dst_type = DST_TYPE_IS_SAT,
+                .type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1,
+                .dst_feature = 0
+        },      /* unknown to vendor    */
+
+        {
+                .device_id = "DCT-CI",
+                .offset = 1,
+                .dst_type = DST_TYPE_IS_CABLE,
+                .type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1
+                                                        | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD,
+                .dst_feature = DST_TYPE_HAS_CA
+        },
+
+        {
+                .device_id = "DCTNEW",
+                .offset = 1,
+                .dst_type = DST_TYPE_IS_CABLE,
+                .type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_3,
+                .dst_feature = 0
+        },
+
+        {
+                .device_id = "DTT-CI",
+                .offset = 1,
+                .dst_type = DST_TYPE_IS_TERR,
+                .type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD,
+                .dst_feature = 0
+        },
+
+        {
+                .device_id = "DTTDIG",
+                .offset = 1,
+                .dst_type = DST_TYPE_IS_TERR,
+                .type_flags = DST_TYPE_HAS_FW_2,
+                .dst_feature = 0
+        },
+
+        {
+                .device_id = "DTTNXT",
+                .offset = 1,
+                .dst_type = DST_TYPE_IS_TERR,
+                .type_flags = DST_TYPE_HAS_FW_2,
+                .dst_feature = DST_TYPE_HAS_ANALOG
+        },
+
+        {
+                .device_id = "ATSCDI",
+                .offset = 1,
+                .dst_type = DST_TYPE_IS_ATSC,
+                .type_flags = DST_TYPE_HAS_FW_2,
+                .dst_feature = 0
+        },
+
+        {
+                .device_id = "ATSCAD",
+                .offset = 1,
+                .dst_type = DST_TYPE_IS_ATSC,
+                .type_flags = DST_TYPE_HAS_FW_2,
+                .dst_feature = 0
+        },
+
+        { }
+
+};
+
+
+static int dst_get_device_id(struct dst_state *state)
 {
-        u8 txbuf[8];
-        u8 rxbuf[8];
-        int retval;
+        u8 reply;
+
         int i;
-        struct dst_types *dsp;
-        u8 use_dst_type;
-        u32 use_type_flags;
+        struct dst_types *p_dst_type;
+        u8 use_dst_type = 0;
+        u32 use_type_flags = 0;
 
-        memset(txbuf, 0, sizeof(txbuf));
-        txbuf[1] = 6;
-        txbuf[7] = dst_check_sum(txbuf, 7);
+        static u8 device_type[8] = {0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff};
 
-        dst_i2c_enable(state);
-        dst_reset8820(state);
-        retval = write_dst(state, txbuf, 8);
-        if (retval < 0) {
-                dst_i2c_disable(state);
-                dprintk("%s: write not successful, maybe no card?\n", __FUNCTION__);
-                return retval;
-        }
-        msleep(3);
-        retval = read_dst(state, rxbuf, 1);
-        dst_i2c_disable(state);
-        if (retval < 0) {
-                dprintk("%s: read not successful, maybe no card?\n", __FUNCTION__);
-                return retval;
-        }
-        if (rxbuf[0] != 0xff) {
-                dprintk("%s: write reply not 0xff, not ci (%02x)\n", __FUNCTION__, rxbuf[0]);
-                return retval;
-        }
-        if (!dst_wait_dst_ready(state))
-                return 0;
-        // dst_i2c_enable(i2c); Dimitri
-        retval = read_dst(state, rxbuf, 8);
-        dst_i2c_disable(state);
-        if (retval < 0) {
-                dprintk("%s: read not successful\n", __FUNCTION__);
-                return retval;
+        device_type[7] = dst_check_sum(device_type, 7);
+
+        if (write_dst(state, device_type, FIXED_COMM))
+                return -1;              /*      Write failed            */
+
+        if ((dst_pio_disable(state)) < 0)
+                return -1;
+
+        if (read_dst(state, &reply, GET_ACK))
+                return -1;              /*      Read failure            */
+
+        if (reply != ACK) {
+                dprintk("%s: Write not Acknowledged! [Reply=0x%02x]\n", __FUNCTION__, reply);
+                return -1;              /*      Unack'd write           */
         }
-        if (rxbuf[7] != dst_check_sum(rxbuf, 7)) {
-                dprintk("%s: checksum failure\n", __FUNCTION__);
-                return retval;
+
+        if (!dst_wait_dst_ready(state, DEVICE_INIT))
+                return -1;              /*      DST not ready yet       */
+
+        if (read_dst(state, state->rxbuffer, FIXED_COMM))
+                return -1;
+
+        dst_pio_disable(state);
+
+        if (state->rxbuffer[7] != dst_check_sum(state->rxbuffer, 7)) {
+                dprintk("%s: Checksum failure! \n", __FUNCTION__);
+                return -1;              /*      Checksum failure        */
         }
-        rxbuf[7] = '\0';
-        for (i = 0, dsp = &dst_tlist[0]; i < sizeof(dst_tlist) / sizeof(dst_tlist[0]); i++, dsp++) {
-                if (!strncmp(&rxbuf[dsp->offs], dsp->mstr, strlen(dsp->mstr))) {
-                        use_type_flags = dsp->type_flags;
-                        use_dst_type = dsp->dst_type;
-                        printk("%s: recognize %s\n", __FUNCTION__, dsp->mstr);
+
+        state->rxbuffer[7] = '\0';
+
+        for (i = 0, p_dst_type = dst_tlist; i < ARRAY_SIZE (dst_tlist); i++, p_dst_type++) {
+                if (!strncmp (&state->rxbuffer[p_dst_type->offset], p_dst_type->device_id, strlen (p_dst_type->device_id))) {
+                        use_type_flags = p_dst_type->type_flags;
+                        use_dst_type = p_dst_type->dst_type;
+
+                        /*      Card capabilities       */
+                        state->dst_hw_cap = p_dst_type->dst_feature;
+                        printk ("%s: Recognise [%s]\n", __FUNCTION__, p_dst_type->device_id);
+
                         break;
                 }
         }
-        if (i >= sizeof(dst_tlist) / sizeof(dst_tlist[0])) {
-                printk("%s: unable to recognize %s or %s\n", __FUNCTION__, &rxbuf[0], &rxbuf[1]);
-                printk("%s please email linux-dvb@linuxtv.org with this type in\n", __FUNCTION__);
+
+        if (i >= sizeof (dst_tlist) / sizeof (dst_tlist [0])) {
+                printk("%s: Unable to recognize %s or %s\n", __FUNCTION__, &state->rxbuffer[0], &state->rxbuffer[1]);
+                printk("%s: please email linux-dvb@linuxtv.org with this type in\n", __FUNCTION__);
                 use_dst_type = DST_TYPE_IS_SAT;
                 use_type_flags = DST_TYPE_HAS_SYMDIV;
         }
-        dst_type_print(use_dst_type);
 
+        dst_type_print(use_dst_type);
         state->type_flags = use_type_flags;
         state->dst_type = use_dst_type;
         dst_type_flags_print(state->type_flags);
@@ -559,50 +771,102 @@ static int dst_check_ci(struct dst_state *state)
         if (state->type_flags & DST_TYPE_HAS_TS204) {
                 dst_packsize(state, 204);
         }
+
         return 0;
 }
 
-static int dst_command(struct dst_state* state, u8 * data, u8 len)
+static int dst_probe(struct dst_state *state)
+{
+        if ((rdc_8820_reset(state)) < 0) {
+                dprintk("%s: RDC 8820 RESET Failed.\n", __FUNCTION__);
+                return -1;
+        }
+        if (dst_addons & DST_TYPE_HAS_CA)
+                msleep(4000);
+        else
+                msleep(100);
+
+        if ((dst_comm_init(state)) < 0) {
+                dprintk("%s: DST Initialization Failed.\n", __FUNCTION__);
+                return -1;
+        }
+        msleep(100);
+        if (dst_get_device_id(state) < 0) {
+                dprintk("%s: unknown device.\n", __FUNCTION__);
+                return -1;
+        }
+
+        return 0;
+}
+
+int dst_command(struct dst_state* state, u8 * data, u8 len)
 {
-        int retval;
         u8 reply;
+        if ((dst_comm_init(state)) < 0) {
+                dprintk("%s: DST Communication Initialization Failed.\n", __FUNCTION__);
+                return -1;
+        }
 
-        dst_i2c_enable(state);
-        dst_reset8820(state);
-        retval = write_dst(state, data, len);
-        if (retval < 0) {
-                dst_i2c_disable(state);
-                dprintk("%s: write not successful\n", __FUNCTION__);
-                return retval;
+        if (write_dst(state, data, len)) {
+                if (verbose > 1)
+                        dprintk("%s: Tring to recover.. \n", __FUNCTION__);
+                if ((dst_error_recovery(state)) < 0) {
+                        dprintk("%s: Recovery Failed.\n", __FUNCTION__);
+                        return -1;
+                }
+                return -1;
         }
-        msleep(33);
-        retval = read_dst(state, &reply, 1);
-        dst_i2c_disable(state);
-        if (retval < 0) {
-                dprintk("%s: read verify  not successful\n", __FUNCTION__);
-                return retval;
+        if ((dst_pio_disable(state)) < 0) {
+                dprintk("%s: PIO Disable Failed.\n", __FUNCTION__);
+                return -1;
         }
-        if (reply != 0xff) {
-                dprintk("%s: write reply not 0xff 0x%02x \n", __FUNCTION__, reply);
-                return 0;
+        if (state->type_flags & DST_TYPE_HAS_FW_1)
+                udelay(3000);
+
+        if (read_dst(state, &reply, GET_ACK)) {
+                if (verbose > 1)
+                        dprintk("%s: Trying to recover.. \n", __FUNCTION__);
+                if ((dst_error_recovery(state)) < 0) {
+                        dprintk("%s: Recovery Failed.\n", __FUNCTION__);
+                        return -1;
+                }
+                return -1;
+        }
+
+        if (reply != ACK) {
+                dprintk("%s: write not acknowledged 0x%02x \n", __FUNCTION__, reply);
+                return -1;
         }
         if (len >= 2 && data[0] == 0 && (data[1] == 1 || data[1] == 3))
                 return 0;
-        if (!dst_wait_dst_ready(state))
-                return 0;
-        // dst_i2c_enable(i2c); Per dimitri
-        retval = read_dst(state, state->rxbuffer, 8);
-        dst_i2c_disable(state);
-        if (retval < 0) {
-                dprintk("%s: read not successful\n", __FUNCTION__);
-                return 0;
+
+//      udelay(3000);
+        if (state->type_flags & DST_TYPE_HAS_FW_1)
+                udelay(3000);
+        else
+                udelay(2000);
+
+        if (!dst_wait_dst_ready(state, NO_DELAY))
+                return -1;
+
+        if (read_dst(state, state->rxbuffer, FIXED_COMM)) {
+                if (verbose > 1)
+                        dprintk("%s: Trying to recover.. \n", __FUNCTION__);
+                if ((dst_error_recovery(state)) < 0) {
+                        dprintk("%s: Recovery failed.\n", __FUNCTION__);
+                        return -1;
+                }
+                return -1;
         }
+
         if (state->rxbuffer[7] != dst_check_sum(state->rxbuffer, 7)) {
                 dprintk("%s: checksum failure\n", __FUNCTION__);
-                return 0;
+                return -1;
         }
+
         return 0;
 }
+EXPORT_SYMBOL(dst_command);
 
 static int dst_get_signal(struct dst_state* state)
 {
@@ -642,37 +906,38 @@ static int dst_tone_power_cmd(struct dst_state* state)
         if (state->dst_type == DST_TYPE_IS_TERR)
                 return 0;
 
-        if (state->voltage == SEC_VOLTAGE_OFF)
-                paket[4] = 0;
-        else
-                paket[4] = 1;
-        if (state->tone == SEC_TONE_ON)
-                paket[2] = state->k22;
-        else
-                paket[2] = 0;
-        paket[7] = dst_check_sum(&paket[0], 7);
+        paket[4] = state->tx_tuna[4];
+        paket[2] = state->tx_tuna[2];
+        paket[3] = state->tx_tuna[3];
+        paket[7] = dst_check_sum (paket, 7);
         dst_command(state, paket, 8);
+
         return 0;
 }
 
 static int dst_get_tuna(struct dst_state* state)
 {
         int retval;
+
         if ((state->diseq_flags & ATTEMPT_TUNE) == 0)
                 return 0;
+
         state->diseq_flags &= ~(HAS_LOCK);
-        if (!dst_wait_dst_ready(state))
+        if (!dst_wait_dst_ready(state, NO_DELAY))
                 return 0;
+
         if (state->type_flags & DST_TYPE_HAS_NEWTUNE) {
                 /* how to get variable length reply ???? */
                 retval = read_dst(state, state->rx_tuna, 10);
         } else {
-                retval = read_dst(state, &state->rx_tuna[2], 8);
+                retval = read_dst(state, &state->rx_tuna[2], FIXED_COMM);
         }
+
         if (retval < 0) {
                 dprintk("%s: read not successful\n", __FUNCTION__);
                 return 0;
         }
+
         if (state->type_flags & DST_TYPE_HAS_NEWTUNE) {
                 if (state->rx_tuna[9] != dst_check_sum(&state->rx_tuna[0], 9)) {
                         dprintk("%s: checksum failure?\n", __FUNCTION__);
@@ -705,11 +970,13 @@ static int dst_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
 
 static int dst_write_tuna(struct dvb_frontend* fe)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
         int retval;
         u8 reply;
 
-        dprintk("%s: type_flags 0x%x \n", __FUNCTION__, state->type_flags);
+        if (debug > 4)
+                dprintk("%s: type_flags 0x%x \n", __FUNCTION__, state->type_flags);
+
         state->decode_freq = 0;
         state->decode_lock = state->decode_strength = state->decode_snr = 0;
         if (state->dst_type == DST_TYPE_IS_SAT) {
@@ -717,32 +984,41 @@ static int dst_write_tuna(struct dvb_frontend* fe)
                         dst_set_voltage(fe, SEC_VOLTAGE_13);
         }
         state->diseq_flags &= ~(HAS_LOCK | ATTEMPT_TUNE);
-        dst_i2c_enable(state);
+
+        if ((dst_comm_init(state)) < 0) {
+                dprintk("%s: DST Communication initialization failed.\n", __FUNCTION__);
+                return -1;
+        }
+
         if (state->type_flags & DST_TYPE_HAS_NEWTUNE) {
-                dst_reset8820(state);
                 state->tx_tuna[9] = dst_check_sum(&state->tx_tuna[0], 9);
                 retval = write_dst(state, &state->tx_tuna[0], 10);
+
         } else {
                 state->tx_tuna[9] = dst_check_sum(&state->tx_tuna[2], 7);
-                retval = write_dst(state, &state->tx_tuna[2], 8);
+                retval = write_dst(state, &state->tx_tuna[2], FIXED_COMM);
         }
         if (retval < 0) {
-                dst_i2c_disable(state);
+                dst_pio_disable(state);
                 dprintk("%s: write not successful\n", __FUNCTION__);
                 return retval;
         }
-        msleep(3);
-        retval = read_dst(state, &reply, 1);
-        dst_i2c_disable(state);
-        if (retval < 0) {
-                dprintk("%s: read verify  not successful\n", __FUNCTION__);
-                return retval;
+
+        if ((dst_pio_disable(state)) < 0) {
+                dprintk("%s: DST PIO disable failed !\n", __FUNCTION__);
+                return -1;
         }
-        if (reply != 0xff) {
-                dprintk("%s: write reply not 0xff 0x%02x \n", __FUNCTION__, reply);
+
+        if ((read_dst(state, &reply, GET_ACK) < 0)) {
+                dprintk("%s: read verify not successful.\n", __FUNCTION__);
+                return -1;
+        }
+        if (reply != ACK) {
+                dprintk("%s: write not acknowledged 0x%02x \n", __FUNCTION__, reply);
                 return 0;
         }
         state->diseq_flags |= ATTEMPT_TUNE;
+
         return dst_get_tuna(state);
 }
 
@@ -762,10 +1038,10 @@ static int dst_write_tuna(struct dvb_frontend* fe)
 
 static int dst_set_diseqc(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
         u8 paket[8] = { 0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf0, 0xec };
 
-        if (state->dst_type == DST_TYPE_IS_TERR)
+        if (state->dst_type != DST_TYPE_IS_SAT)
                 return 0;
 
         if (cmd->msg_len == 0 || cmd->msg_len > 4)
@@ -778,73 +1054,91 @@ static int dst_set_diseqc(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd*
 
 static int dst_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        u8 *val;
         int need_cmd;
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         state->voltage = voltage;
 
-        if (state->dst_type == DST_TYPE_IS_TERR)
+        if (state->dst_type != DST_TYPE_IS_SAT)
                 return 0;
 
         need_cmd = 0;
-        val = &state->tx_tuna[0];
-        val[8] &= ~0x40;
         switch (voltage) {
-        case SEC_VOLTAGE_13:
-                if ((state->diseq_flags & HAS_POWER) == 0)
-                        need_cmd = 1;
-                state->diseq_flags |= HAS_POWER;
-                break;
-        case SEC_VOLTAGE_18:
-                if ((state->diseq_flags & HAS_POWER) == 0)
+                case SEC_VOLTAGE_13:
+                case SEC_VOLTAGE_18:
+                        if ((state->diseq_flags & HAS_POWER) == 0)
+                                need_cmd = 1;
+                        state->diseq_flags |= HAS_POWER;
+                        state->tx_tuna[4] = 0x01;
+                        break;
+
+                case SEC_VOLTAGE_OFF:
                         need_cmd = 1;
-                state->diseq_flags |= HAS_POWER;
-                val[8] |= 0x40;
-                break;
-        case SEC_VOLTAGE_OFF:
-                need_cmd = 1;
-                state->diseq_flags &= ~(HAS_POWER | HAS_LOCK | ATTEMPT_TUNE);
-                break;
-        default:
-                return -EINVAL;
+                        state->diseq_flags &= ~(HAS_POWER | HAS_LOCK | ATTEMPT_TUNE);
+                        state->tx_tuna[4] = 0x00;
+                        break;
+
+                default:
+                        return -EINVAL;
         }
-        if (need_cmd) {
+        if (need_cmd)
                 dst_tone_power_cmd(state);
-        }
+
         return 0;
 }
 
 static int dst_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
-        u8 *val;
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         state->tone = tone;
 
-        if (state->dst_type == DST_TYPE_IS_TERR)
+        if (state->dst_type != DST_TYPE_IS_SAT)
                 return 0;
 
-        val = &state->tx_tuna[0];
+        switch (tone) {
+                case SEC_TONE_OFF:
+                        state->tx_tuna[2] = 0xff;
+                        break;
 
-        val[8] &= ~0x1;
+                case SEC_TONE_ON:
+                        state->tx_tuna[2] = 0x02;
+                        break;
 
-        switch (tone) {
-        case SEC_TONE_OFF:
-                break;
-        case SEC_TONE_ON:
-                val[8] |= 1;
-                break;
-        default:
-                return -EINVAL;
+                default:
+                        return -EINVAL;
         }
         dst_tone_power_cmd(state);
+
+        return 0;
+}
+
+static int dst_send_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t minicmd)
+{
+        struct dst_state *state = fe->demodulator_priv;
+
+        if (state->dst_type != DST_TYPE_IS_SAT)
+                return 0;
+
+        state->minicmd = minicmd;
+
+        switch (minicmd) {
+                case SEC_MINI_A:
+                        state->tx_tuna[3] = 0x02;
+                        break;
+                case SEC_MINI_B:
+                        state->tx_tuna[3] = 0xff;
+                        break;
+        }
+        dst_tone_power_cmd(state);
+
         return 0;
 }
 
+
 static int dst_init(struct dvb_frontend* fe)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
         static u8 ini_satci_tuna[] = { 9, 0, 3, 0xb6, 1, 0, 0x73, 0x21, 0, 0 };
         static u8 ini_satfta_tuna[] = { 0, 0, 3, 0xb6, 1, 0x55, 0xbd, 0x50, 0, 0 };
         static u8 ini_tvfta_tuna[] = { 0, 0, 3, 0xb6, 1, 7, 0x0, 0x0, 0, 0 };
@@ -876,7 +1170,7 @@ static int dst_init(struct dvb_frontend* fe)
 
 static int dst_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         *status = 0;
         if (state->diseq_flags & HAS_LOCK) {
@@ -890,7 +1184,7 @@ static int dst_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int dst_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         dst_get_signal(state);
         *strength = state->decode_strength;
@@ -900,7 +1194,7 @@ static int dst_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int dst_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         dst_get_signal(state);
         *snr = state->decode_snr;
@@ -910,13 +1204,19 @@ static int dst_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int dst_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         dst_set_freq(state, p->frequency);
+        if (verbose > 4)
+                dprintk("Set Frequency = [%d]\n", p->frequency);
+
         dst_set_inversion(state, p->inversion);
         if (state->dst_type == DST_TYPE_IS_SAT) {
                 dst_set_fec(state, p->u.qpsk.fec_inner);
                 dst_set_symbolrate(state, p->u.qpsk.symbol_rate);
+                if (verbose > 4)
+                        dprintk("Set Symbolrate = [%d]\n", p->u.qpsk.symbol_rate);
+
         } else if (state->dst_type == DST_TYPE_IS_TERR) {
                 dst_set_bandwidth(state, p->u.ofdm.bandwidth);
         } else if (state->dst_type == DST_TYPE_IS_CABLE) {
@@ -930,7 +1230,7 @@ static int dst_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_paramet
 
 static int dst_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         p->frequency = state->decode_freq;
         p->inversion = state->inversion;
@@ -950,7 +1250,7 @@ static int dst_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_paramet
 
 static void dst_release(struct dvb_frontend* fe)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -958,50 +1258,47 @@ static struct dvb_frontend_ops dst_dvbt_ops;
 static struct dvb_frontend_ops dst_dvbs_ops;
 static struct dvb_frontend_ops dst_dvbc_ops;
 
-struct dvb_frontend* dst_attach(const struct dst_config* config,
-                                struct i2c_adapter* i2c,
-                                struct bt878 *bt)
+struct dst_state* dst_attach(struct dst_state *state, struct dvb_adapter *dvb_adapter)
 {
-        struct dst_state* state = NULL;
-
-        /* allocate memory for the internal state */
-        state = (struct dst_state*) kmalloc(sizeof(struct dst_state), GFP_KERNEL);
-        if (state == NULL) goto error;
 
-        /* setup the state */
-        state->config = config;
-        state->i2c = i2c;
-        state->bt = bt;
-
-        /* check if the demod is there */
-        if (dst_check_ci(state) < 0) goto error;
+        /* check if the ASIC is there */
+        if (dst_probe(state) < 0) {
+                if (state)
+                        kfree(state);
 
+                return NULL;
+        }
         /* determine settings based on type */
         switch (state->dst_type) {
         case DST_TYPE_IS_TERR:
                 memcpy(&state->ops, &dst_dvbt_ops, sizeof(struct dvb_frontend_ops));
                 break;
+
         case DST_TYPE_IS_CABLE:
                 memcpy(&state->ops, &dst_dvbc_ops, sizeof(struct dvb_frontend_ops));
                 break;
+
         case DST_TYPE_IS_SAT:
                 memcpy(&state->ops, &dst_dvbs_ops, sizeof(struct dvb_frontend_ops));
                 break;
+
         default:
-                printk("dst: unknown frontend type. please report to the LinuxTV.org DVB mailinglist.\n");
-                goto error;
+                printk("%s: unknown DST type. please report to the LinuxTV.org DVB mailinglist.\n", __FUNCTION__);
+                if (state)
+                        kfree(state);
+
+                return NULL;
         }
 
         /* create dvb_frontend */
         state->frontend.ops = &state->ops;
         state->frontend.demodulator_priv = state;
-        return &state->frontend;
 
-error:
-        kfree(state);
-        return NULL;
+        return state;                           /*      Manu (DST is a card not a frontend)     */
 }
 
+EXPORT_SYMBOL(dst_attach);
+
 static struct dvb_frontend_ops dst_dvbt_ops = {
 
         .info = {
@@ -1051,6 +1348,7 @@ static struct dvb_frontend_ops dst_dvbs_ops = {
         .read_signal_strength = dst_read_signal_strength,
         .read_snr = dst_read_snr,
 
+        .diseqc_send_burst = dst_send_burst,
         .diseqc_send_master_cmd = dst_set_diseqc,
         .set_voltage = dst_set_voltage,
         .set_tone = dst_set_tone,
@@ -1082,8 +1380,7 @@ static struct dvb_frontend_ops dst_dvbc_ops = {
         .read_snr = dst_read_snr,
 };
 
+
 MODULE_DESCRIPTION("DST DVB-S/T/C Combo Frontend driver");
-MODULE_AUTHOR("Jamie Honan");
+MODULE_AUTHOR("Jamie Honan, Manu Abraham");
 MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(dst_attach);
diff --git a/drivers/media/dvb/bt8xx/dst.h b/drivers/media/dvb/bt8xx/dst.h
deleted file mode 100644
index bcb418c5c121..000000000000
--- a/drivers/media/dvb/bt8xx/dst.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-    Frontend-driver for TwinHan DST Frontend
-
-    Copyright (C) 2003 Jamie Honan
-
-    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 DST_H
-#define DST_H
-
-#include <linux/dvb/frontend.h>
-#include <linux/device.h>
-#include "bt878.h"
-
-struct dst_config
-{
-        /* the demodulator's i2c address */
-        u8 demod_address;
-};
-
-extern struct dvb_frontend* dst_attach(const struct dst_config* config,
-                                       struct i2c_adapter* i2c,
-                                       struct bt878 *bt);
-
-#endif // DST_H
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
new file mode 100644
index 000000000000..d781504cc2fa
--- /dev/null
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -0,0 +1,861 @@
+/*
+        CA-driver for TwinHan DST Frontend/Card
+
+        Copyright (C) 2004, 2005 Manu Abraham (manu@kromtek.com)
+
+        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/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/string.h>
+
+#include <linux/dvb/ca.h>
+#include "dvbdev.h"
+#include "dvb_frontend.h"
+
+#include "dst_ca.h"
+#include "dst_common.h"
+
+static unsigned int verbose = 1;
+module_param(verbose, int, 0644);
+MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)");
+
+static unsigned int debug = 1;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "debug messages, default is 1 (yes)");
+
+#define dprintk if (debug) printk
+
+/*      Need some more work     */
+static int ca_set_slot_descr(void)
+{
+        /*      We could make this more graceful ?      */
+        return -EOPNOTSUPP;
+}
+
+/*      Need some more work     */
+static int ca_set_pid(void)
+{
+        /*      We could make this more graceful ?      */
+        return -EOPNOTSUPP;
+}
+
+
+static int put_checksum(u8 *check_string, int length)
+{
+        u8 i = 0, checksum = 0;
+
+        if (verbose > 3) {
+                dprintk("%s: ========================= Checksum calculation ===========================\n", __FUNCTION__);
+                dprintk("%s: String Length=[0x%02x]\n", __FUNCTION__, length);
+
+                dprintk("%s: String=[", __FUNCTION__);
+        }
+        while (i < length) {
+                if (verbose > 3)
+                        dprintk(" %02x", check_string[i]);
+                checksum += check_string[i];
+                i++;
+        }
+        if (verbose > 3) {
+                dprintk(" ]\n");
+                dprintk("%s: Sum=[%02x]\n", __FUNCTION__, checksum);
+        }
+        check_string[length] = ~checksum + 1;
+        if (verbose > 3) {
+                dprintk("%s: Checksum=[%02x]\n", __FUNCTION__, check_string[length]);
+                dprintk("%s: ==========================================================================\n", __FUNCTION__);
+        }
+
+        return 0;
+}
+
+static int dst_ci_command(struct dst_state* state, u8 * data, u8 *ca_string, u8 len, int read)
+{
+        u8 reply;
+
+        dst_comm_init(state);
+        msleep(65);
+
+        if (write_dst(state, data, len)) {
+                dprintk("%s: Write not successful, trying to recover\n", __FUNCTION__);
+                dst_error_recovery(state);
+                return -1;
+        }
+
+        if ((dst_pio_disable(state)) < 0) {
+                dprintk("%s: DST PIO disable failed.\n", __FUNCTION__);
+                return -1;
+        }
+
+        if (read_dst(state, &reply, GET_ACK) < 0) {
+                dprintk("%s: Read not successful, trying to recover\n", __FUNCTION__);
+                dst_error_recovery(state);
+                return -1;
+        }
+
+        if (read) {
+                if (! dst_wait_dst_ready(state, LONG_DELAY)) {
+                        dprintk("%s: 8820 not ready\n", __FUNCTION__);
+                        return -1;
+                }
+
+                if (read_dst(state, ca_string, 128) < 0) {      /*      Try to make this dynamic        */
+                        dprintk("%s: Read not successful, trying to recover\n", __FUNCTION__);
+                        dst_error_recovery(state);
+                        return -1;
+                }
+        }
+
+        return 0;
+}
+
+
+static int dst_put_ci(struct dst_state *state, u8 *data, int len, u8 *ca_string, int read)
+{
+        u8 dst_ca_comm_err = 0;
+
+        while (dst_ca_comm_err < RETRIES) {
+                dst_comm_init(state);
+                if (verbose > 2)
+                        dprintk("%s: Put Command\n", __FUNCTION__);
+                if (dst_ci_command(state, data, ca_string, len, read)) {        // If error
+                        dst_error_recovery(state);
+                        dst_ca_comm_err++; // work required here.
+                }
+                break;
+        }
+
+        return 0;
+}
+
+
+
+static int ca_get_app_info(struct dst_state *state)
+{
+        static u8 command[8] = {0x07, 0x40, 0x01, 0x00, 0x01, 0x00, 0x00, 0xff};
+
+        put_checksum(&command[0], command[0]);
+        if ((dst_put_ci(state, command, sizeof(command), state->messages, GET_REPLY)) < 0) {
+                dprintk("%s: -->dst_put_ci FAILED !\n", __FUNCTION__);
+                return -1;
+        }
+        if (verbose > 1) {
+                dprintk("%s: -->dst_put_ci SUCCESS !\n", __FUNCTION__);
+
+                dprintk("%s: ================================ CI Module Application Info ======================================\n", __FUNCTION__);
+                dprintk("%s: Application Type=[%d], Application Vendor=[%d], Vendor Code=[%d]\n%s: Application info=[%s]\n",
+                        __FUNCTION__, state->messages[7], (state->messages[8] << 8) | state->messages[9],
+                        (state->messages[10] << 8) | state->messages[11], __FUNCTION__, (char *)(&state->messages[12]));
+                dprintk("%s: ==================================================================================================\n", __FUNCTION__);
+        }
+
+        return 0;
+}
+
+static int ca_get_slot_caps(struct dst_state *state, struct ca_caps *p_ca_caps, void *arg)
+{
+        int i;
+        u8 slot_cap[256];
+        static u8 slot_command[8] = {0x07, 0x40, 0x02, 0x00, 0x02, 0x00, 0x00, 0xff};
+
+        put_checksum(&slot_command[0], slot_command[0]);
+        if ((dst_put_ci(state, slot_command, sizeof (slot_command), slot_cap, GET_REPLY)) < 0) {
+                dprintk("%s: -->dst_put_ci FAILED !\n", __FUNCTION__);
+                return -1;
+        }
+        if (verbose > 1)
+                dprintk("%s: -->dst_put_ci SUCCESS !\n", __FUNCTION__);
+
+        /*      Will implement the rest soon            */
+
+        if (verbose > 1) {
+                dprintk("%s: Slot cap = [%d]\n", __FUNCTION__, slot_cap[7]);
+                dprintk("===================================\n");
+                for (i = 0; i < 8; i++)
+                        dprintk(" %d", slot_cap[i]);
+                dprintk("\n");
+        }
+
+        p_ca_caps->slot_num = 1;
+        p_ca_caps->slot_type = 1;
+        p_ca_caps->descr_num = slot_cap[7];
+        p_ca_caps->descr_type = 1;
+
+
+        if (copy_to_user((struct ca_caps *)arg, p_ca_caps, sizeof (struct ca_caps))) {
+                return -EFAULT;
+        }
+
+        return 0;
+}
+
+/*      Need some more work     */
+static int ca_get_slot_descr(struct dst_state *state, struct ca_msg *p_ca_message, void *arg)
+{
+        return -EOPNOTSUPP;
+}
+
+
+static int ca_get_slot_info(struct dst_state *state, struct ca_slot_info *p_ca_slot_info, void *arg)
+{
+        int i;
+        static u8 slot_command[8] = {0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff};
+
+        u8 *slot_info = state->rxbuffer;
+
+        put_checksum(&slot_command[0], 7);
+        if ((dst_put_ci(state, slot_command, sizeof (slot_command), slot_info, GET_REPLY)) < 0) {
+                dprintk("%s: -->dst_put_ci FAILED !\n", __FUNCTION__);
+                return -1;
+        }
+        if (verbose > 1)
+                dprintk("%s: -->dst_put_ci SUCCESS !\n", __FUNCTION__);
+
+        /*      Will implement the rest soon            */
+
+        if (verbose > 1) {
+                dprintk("%s: Slot info = [%d]\n", __FUNCTION__, slot_info[3]);
+                dprintk("===================================\n");
+                for (i = 0; i < 8; i++)
+                        dprintk(" %d", slot_info[i]);
+                dprintk("\n");
+        }
+
+        if (slot_info[4] & 0x80) {
+                p_ca_slot_info->flags = CA_CI_MODULE_PRESENT;
+                p_ca_slot_info->num = 1;
+                p_ca_slot_info->type = CA_CI;
+        }
+        else if (slot_info[4] & 0x40) {
+                p_ca_slot_info->flags = CA_CI_MODULE_READY;
+                p_ca_slot_info->num = 1;
+                p_ca_slot_info->type = CA_CI;
+        }
+        else {
+                p_ca_slot_info->flags = 0;
+        }
+
+        if (copy_to_user((struct ca_slot_info *)arg, p_ca_slot_info, sizeof (struct ca_slot_info))) {
+                return -EFAULT;
+        }
+
+        return 0;
+}
+
+
+
+
+static int ca_get_message(struct dst_state *state, struct ca_msg *p_ca_message, void *arg)
+{
+        u8 i = 0;
+        u32 command = 0;
+
+        if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg)))
+                return -EFAULT;
+
+
+        if (p_ca_message->msg) {
+                if (verbose > 3)
+                        dprintk("Message = [%02x %02x %02x]\n", p_ca_message->msg[0], p_ca_message->msg[1], p_ca_message->msg[2]);
+
+                for (i = 0; i < 3; i++) {
+                        command = command | p_ca_message->msg[i];
+                        if (i < 2)
+                                command = command << 8;
+                }
+                if (verbose > 3)
+                        dprintk("%s:Command=[0x%x]\n", __FUNCTION__, command);
+
+                switch (command) {
+                        case CA_APP_INFO:
+                                memcpy(p_ca_message->msg, state->messages, 128);
+                                if (copy_to_user((void *)arg, p_ca_message, sizeof (struct ca_msg)) )
+                                        return -EFAULT;
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+static int handle_en50221_tag(struct dst_state *state, struct ca_msg *p_ca_message, struct ca_msg *hw_buffer)
+{
+        if (state->dst_hw_cap & DST_TYPE_HAS_SESSION) {
+                hw_buffer->msg[2] = p_ca_message->msg[1];               /*              MSB                     */
+                hw_buffer->msg[3] = p_ca_message->msg[2];               /*              LSB                     */
+        }
+        else {
+                hw_buffer->msg[2] = 0x03;
+                hw_buffer->msg[3] = 0x00;
+        }
+        return 0;
+}
+
+static int debug_8820_buffer(struct ca_msg *hw_buffer)
+{
+        unsigned int i;
+
+        dprintk("%s:Debug=[", __FUNCTION__);
+        for (i = 0; i < (hw_buffer->msg[0] + 1); i++)
+                dprintk(" %02x", hw_buffer->msg[i]);
+        dprintk("]\n");
+
+        return 0;
+}
+
+static int write_to_8820(struct dst_state *state, struct ca_msg *hw_buffer, u8 reply)
+{
+        if ((dst_put_ci(state, hw_buffer->msg, (hw_buffer->length + 1), hw_buffer->msg, reply)) < 0) {
+                dprintk("%s: DST-CI Command failed.\n", __FUNCTION__);
+                dprintk("%s: Resetting DST.\n", __FUNCTION__);
+                rdc_reset_state(state);
+                return -1;
+        }
+        if (verbose > 2)
+                dprintk("%s: DST-CI Command succes.\n", __FUNCTION__);
+
+        return 0;
+}
+
+
+static int ca_set_pmt(struct dst_state *state, struct ca_msg *p_ca_message, struct ca_msg *hw_buffer, u8 reply, u8 query)
+{
+        u32 hw_offset, buf_offset, i, k;
+        u32 program_info_length = 0, es_info_length = 0, length = 0, words = 0;
+        u8 found_prog_ca_desc = 0, found_stream_ca_desc = 0, error_condition = 0, hw_buffer_length = 0;
+
+        if (verbose > 3)
+                dprintk("%s, p_ca_message length %d (0x%x)\n", __FUNCTION__,p_ca_message->length,p_ca_message->length );
+
+        handle_en50221_tag(state, p_ca_message, hw_buffer);                     /*      EN50221 tag             */
+
+        /*      Handle the length field (variable)      */
+        if (!(p_ca_message->msg[3] & 0x80)) {                           /*      Length = 1              */
+                length = p_ca_message->msg[3] & 0x7f;
+                words = 0;                                              /*      domi's suggestion       */
+        }
+        else {                                                          /*      Length = words          */
+                words = p_ca_message->msg[3] & 0x7f;
+                for (i = 0; i < words; i++) {
+                        length = length << 8;
+                        length = length | p_ca_message->msg[4 + i];
+                }
+        }
+        if (verbose > 4) {
+                dprintk("%s:Length=[%d (0x%x)], Words=[%d]\n", __FUNCTION__, length,length, words);
+
+                /*      Debug Input string              */
+                for (i = 0; i < length; i++)
+                        dprintk(" %02x", p_ca_message->msg[i]);
+                dprintk("]\n");
+        }
+
+        hw_offset = 7;
+        buf_offset = words + 4;
+
+        /*              Program Header                  */
+        if (verbose > 4)
+                dprintk("\n%s:Program Header=[", __FUNCTION__);
+        for (i = 0; i < 6; i++) {
+                hw_buffer->msg[hw_offset] = p_ca_message->msg[buf_offset];
+                if (verbose > 4)
+                        dprintk(" %02x", p_ca_message->msg[buf_offset]);
+                hw_offset++, buf_offset++, hw_buffer_length++;
+        }
+        if (verbose > 4)
+                dprintk("]\n");
+
+        program_info_length = 0;
+        program_info_length = (((program_info_length | p_ca_message->msg[words + 8]) & 0x0f) << 8) | p_ca_message->msg[words + 9];
+        if (verbose > 4)
+                dprintk("%s:Program info Length=[%d][%02x], hw_offset=[%d], buf_offset=[%d] \n",
+                        __FUNCTION__, program_info_length, program_info_length, hw_offset, buf_offset);
+
+        if (program_info_length && (program_info_length < 256)) {       /*      If program_info_length          */
+                hw_buffer->msg[11] = hw_buffer->msg[11] & 0x0f;         /*      req only 4 bits                 */
+                hw_buffer->msg[12] = hw_buffer->msg[12] + 1;            /*      increment! ASIC bug!            */
+
+                if (p_ca_message->msg[buf_offset + 1] == 0x09) {        /*      Check CA descriptor             */
+                        found_prog_ca_desc = 1;
+                        if (verbose > 4)
+                                dprintk("%s: Found CA descriptor @ Program level\n", __FUNCTION__);
+                }
+
+                if (found_prog_ca_desc) {                               /*      Command only if CA descriptor   */
+                        hw_buffer->msg[13] = p_ca_message->msg[buf_offset];     /*      CA PMT command ID       */
+                        hw_offset++, buf_offset++, hw_buffer_length++;
+                }
+
+                /*                      Program descriptors                             */
+                if (verbose > 4) {
+                        dprintk("%s:**********>buf_offset=[%d], hw_offset=[%d]\n", __FUNCTION__, buf_offset, hw_offset);
+                        dprintk("%s:Program descriptors=[", __FUNCTION__);
+                }
+                while (program_info_length && !error_condition) {               /*      Copy prog descriptors   */
+                        if (program_info_length > p_ca_message->length) {       /*      Error situation         */
+                                dprintk ("%s:\"WARNING\" Length error, line=[%d], prog_info_length=[%d]\n",
+                                                                __FUNCTION__, __LINE__, program_info_length);
+                                dprintk("%s:\"WARNING\" Bailing out of possible loop\n", __FUNCTION__);
+                                error_condition = 1;
+                                break;
+                        }
+
+                        hw_buffer->msg[hw_offset] = p_ca_message->msg[buf_offset];
+                        dprintk(" %02x", p_ca_message->msg[buf_offset]);
+                        hw_offset++, buf_offset++, hw_buffer_length++, program_info_length--;
+                }
+                if (verbose > 4) {
+                        dprintk("]\n");
+                        dprintk("%s:**********>buf_offset=[%d], hw_offset=[%d]\n", __FUNCTION__, buf_offset, hw_offset);
+                }
+                if (found_prog_ca_desc) {
+                        if (!reply) {
+                                hw_buffer->msg[13] = 0x01;              /*      OK descrambling                 */
+                                if (verbose > 1)
+                                        dprintk("CA PMT Command = OK Descrambling\n");
+                        }
+                        else {
+                                hw_buffer->msg[13] = 0x02;              /*      Ok MMI                          */
+                                if (verbose > 1)
+                                        dprintk("CA PMT Command = Ok MMI\n");
+                        }
+                        if (query) {
+                                hw_buffer->msg[13] = 0x03;              /*      Query                           */
+                                if (verbose > 1)
+                                        dprintk("CA PMT Command = CA PMT query\n");
+                        }
+                }
+        }
+        else {
+                hw_buffer->msg[11] = hw_buffer->msg[11] & 0xf0;         /*      Don't write to ASIC             */
+                hw_buffer->msg[12] = hw_buffer->msg[12] = 0x00;
+        }
+        if (verbose > 4)
+                dprintk("%s:**********>p_ca_message->length=[%d], buf_offset=[%d], hw_offset=[%d]\n",
+                                        __FUNCTION__, p_ca_message->length, buf_offset, hw_offset);
+
+        while ((buf_offset  < p_ca_message->length)  && !error_condition) {
+                /*      Bail out in case of an indefinite loop          */
+                if ((es_info_length > p_ca_message->length) || (buf_offset > p_ca_message->length)) {
+                        dprintk("%s:\"WARNING\" Length error, line=[%d], prog_info_length=[%d], buf_offset=[%d]\n",
+                                                        __FUNCTION__, __LINE__, program_info_length, buf_offset);
+
+                        dprintk("%s:\"WARNING\" Bailing out of possible loop\n", __FUNCTION__);
+                        error_condition = 1;
+                        break;
+                }
+
+                /*              Stream Header                           */
+
+                for (k = 0; k < 5; k++) {
+                        hw_buffer->msg[hw_offset + k] = p_ca_message->msg[buf_offset + k];
+                }
+
+                es_info_length = 0;
+                es_info_length = (es_info_length | (p_ca_message->msg[buf_offset + 3] & 0x0f)) << 8 | p_ca_message->msg[buf_offset + 4];
+
+                if (verbose > 4) {
+                        dprintk("\n%s:----->Stream header=[%02x %02x %02x %02x %02x]\n", __FUNCTION__,
+                                p_ca_message->msg[buf_offset + 0], p_ca_message->msg[buf_offset + 1],
+                                p_ca_message->msg[buf_offset + 2], p_ca_message->msg[buf_offset + 3],
+                                p_ca_message->msg[buf_offset + 4]);
+
+                        dprintk("%s:----->Stream type=[%02x], es length=[%d (0x%x)], Chars=[%02x] [%02x], buf_offset=[%d]\n", __FUNCTION__,
+                                p_ca_message->msg[buf_offset + 0], es_info_length, es_info_length,
+                                p_ca_message->msg[buf_offset + 3], p_ca_message->msg[buf_offset + 4], buf_offset);
+                }
+
+                hw_buffer->msg[hw_offset + 3] &= 0x0f;                  /*      req only 4 bits                 */
+
+                if (found_prog_ca_desc) {
+                        hw_buffer->msg[hw_offset + 3] = 0x00;
+                        hw_buffer->msg[hw_offset + 4] = 0x00;
+                }
+
+                hw_offset += 5, buf_offset += 5, hw_buffer_length += 5;
+
+                /*              Check for CA descriptor                 */
+                if (p_ca_message->msg[buf_offset + 1] == 0x09) {
+                        if (verbose > 4)
+                                dprintk("%s:Found CA descriptor @ Stream level\n", __FUNCTION__);
+                        found_stream_ca_desc = 1;
+                }
+
+                /*              ES descriptors                          */
+
+                if (es_info_length && !error_condition && !found_prog_ca_desc && found_stream_ca_desc) {
+//                      if (!ca_pmt_done) {
+                                hw_buffer->msg[hw_offset] = p_ca_message->msg[buf_offset];      /*      CA PMT cmd(es)  */
+                                if (verbose > 4)
+                                        printk("%s:----->CA PMT Command ID=[%02x]\n", __FUNCTION__, p_ca_message->msg[buf_offset]);
+//                              hw_offset++, buf_offset++, hw_buffer_length++, es_info_length--, ca_pmt_done = 1;
+                                hw_offset++, buf_offset++, hw_buffer_length++, es_info_length--;
+//                      }
+                        if (verbose > 4)
+                                dprintk("%s:----->ES descriptors=[", __FUNCTION__);
+
+                        while (es_info_length && !error_condition) {    /*      ES descriptors                  */
+                                if ((es_info_length > p_ca_message->length) || (buf_offset > p_ca_message->length)) {
+                                        if (verbose > 4) {
+                                                dprintk("%s:\"WARNING\" ES Length error, line=[%d], es_info_length=[%d], buf_offset=[%d]\n",
+                                                                                __FUNCTION__, __LINE__, es_info_length, buf_offset);
+
+                                                dprintk("%s:\"WARNING\" Bailing out of possible loop\n", __FUNCTION__);
+                                        }
+                                        error_condition = 1;
+                                        break;
+                                }
+
+                                hw_buffer->msg[hw_offset] = p_ca_message->msg[buf_offset];
+                                if (verbose > 3)
+                                        dprintk("%02x ", hw_buffer->msg[hw_offset]);
+                                hw_offset++, buf_offset++, hw_buffer_length++, es_info_length--;
+                        }
+                        found_stream_ca_desc = 0;                       /*      unset for new streams           */
+                        dprintk("]\n");
+                }
+        }
+
+        /*              MCU Magic words                                 */
+
+        hw_buffer_length += 7;
+        hw_buffer->msg[0] = hw_buffer_length;
+        hw_buffer->msg[1] = 64;
+        hw_buffer->msg[4] = 3;
+        hw_buffer->msg[5] = hw_buffer->msg[0] - 7;
+        hw_buffer->msg[6] = 0;
+
+
+        /*      Fix length      */
+        hw_buffer->length = hw_buffer->msg[0];
+
+        put_checksum(&hw_buffer->msg[0], hw_buffer->msg[0]);
+        /*      Do the actual write     */
+        if (verbose > 4) {
+                dprintk("%s:======================DEBUGGING================================\n", __FUNCTION__);
+                dprintk("%s: Actual Length=[%d]\n", __FUNCTION__, hw_buffer_length);
+        }
+        /*      Only for debugging!     */
+        if (verbose > 2)
+                debug_8820_buffer(hw_buffer);
+        if (verbose > 3)
+                dprintk("%s: Reply = [%d]\n", __FUNCTION__, reply);
+        write_to_8820(state, hw_buffer, reply);
+
+        return 0;
+}
+
+/*      Board supports CA PMT reply ?           */
+static int dst_check_ca_pmt(struct dst_state *state, struct ca_msg *p_ca_message, struct ca_msg *hw_buffer)
+{
+        int ca_pmt_reply_test = 0;
+
+        /*      Do test board                   */
+        /*      Not there yet but soon          */
+
+
+        /*      CA PMT Reply capable            */
+        if (ca_pmt_reply_test) {
+                if ((ca_set_pmt(state, p_ca_message, hw_buffer, 1, GET_REPLY)) < 0) {
+                        dprintk("%s: ca_set_pmt.. failed !\n", __FUNCTION__);
+                        return -1;
+                }
+
+        /*      Process CA PMT Reply            */
+        /*      will implement soon             */
+                dprintk("%s: Not there yet\n", __FUNCTION__);
+        }
+        /*      CA PMT Reply not capable        */
+        if (!ca_pmt_reply_test) {
+                if ((ca_set_pmt(state, p_ca_message, hw_buffer, 0, NO_REPLY)) < 0) {
+                        dprintk("%s: ca_set_pmt.. failed !\n", __FUNCTION__);
+                        return -1;
+                }
+                if (verbose > 3)
+                        dprintk("%s: ca_set_pmt.. success !\n", __FUNCTION__);
+        /*      put a dummy message             */
+
+        }
+        return 0;
+}
+
+static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message, void *arg)
+{
+        int i = 0;
+        unsigned int ca_message_header_len;
+
+        u32 command = 0;
+        struct ca_msg *hw_buffer;
+
+        if ((hw_buffer = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {
+                printk("%s: Memory allocation failure\n", __FUNCTION__);
+                return -ENOMEM;
+        }
+        if (verbose > 3)
+                dprintk("%s\n", __FUNCTION__);
+
+        if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg)))
+                return -EFAULT;
+
+        if (p_ca_message->msg) {
+                ca_message_header_len = p_ca_message->length;   /*      Restore it back when you are done       */
+                /*      EN50221 tag     */
+                command = 0;
+
+                for (i = 0; i < 3; i++) {
+                        command = command | p_ca_message->msg[i];
+                        if (i < 2)
+                                command = command << 8;
+                }
+                if (verbose > 3)
+                        dprintk("%s:Command=[0x%x]\n", __FUNCTION__, command);
+
+                switch (command) {
+                        case CA_PMT:
+                                if (verbose > 3)
+                                        dprintk("Command = SEND_CA_PMT\n");
+                                if ((ca_set_pmt(state, p_ca_message, hw_buffer, 0, 0)) < 0) {
+                                        dprintk("%s: -->CA_PMT Failed !\n", __FUNCTION__);
+                                        return -1;
+                                }
+                                if (verbose > 3)
+                                        dprintk("%s: -->CA_PMT Success !\n", __FUNCTION__);
+//                              retval = dummy_set_pmt(state, p_ca_message, hw_buffer, 0, 0);
+
+                                break;
+
+                        case CA_PMT_REPLY:
+                                if (verbose > 3)
+                                        dprintk("Command = CA_PMT_REPLY\n");
+                                /*      Have to handle the 2 basic types of cards here  */
+                                if ((dst_check_ca_pmt(state, p_ca_message, hw_buffer)) < 0) {
+                                        dprintk("%s: -->CA_PMT_REPLY Failed !\n", __FUNCTION__);
+                                        return -1;
+                                }
+                                if (verbose > 3)
+                                        dprintk("%s: -->CA_PMT_REPLY Success !\n", __FUNCTION__);
+
+                                /*      Certain boards do behave different ?            */
+//                              retval = ca_set_pmt(state, p_ca_message, hw_buffer, 1, 1);
+
+                        case CA_APP_INFO_ENQUIRY:               // only for debugging
+                                if (verbose > 3)
+                                        dprintk("%s: Getting Cam Application information\n", __FUNCTION__);
+
+                                if ((ca_get_app_info(state)) < 0) {
+                                        dprintk("%s: -->CA_APP_INFO_ENQUIRY Failed !\n", __FUNCTION__);
+                                        return -1;
+                                }
+                                if (verbose > 3)
+                                        printk("%s: -->CA_APP_INFO_ENQUIRY Success !\n", __FUNCTION__);
+
+                                break;
+                }
+        }
+        return 0;
+}
+
+static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg)
+{
+        struct dvb_device* dvbdev = (struct dvb_device*) file->private_data;
+        struct dst_state* state = (struct dst_state*) dvbdev->priv;
+        struct ca_slot_info *p_ca_slot_info;
+        struct ca_caps *p_ca_caps;
+        struct ca_msg *p_ca_message;
+
+        if ((p_ca_message = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {
+                printk("%s: Memory allocation failure\n", __FUNCTION__);
+                return -ENOMEM;
+        }
+
+        if ((p_ca_slot_info = (struct ca_slot_info *) kmalloc(sizeof (struct ca_slot_info), GFP_KERNEL)) == NULL) {
+                printk("%s: Memory allocation failure\n", __FUNCTION__);
+                return -ENOMEM;
+        }
+
+        if ((p_ca_caps = (struct ca_caps *) kmalloc(sizeof (struct ca_caps), GFP_KERNEL)) == NULL) {
+                printk("%s: Memory allocation failure\n", __FUNCTION__);
+                return -ENOMEM;
+        }
+
+        /*      We have now only the standard ioctl's, the driver is upposed to handle internals.       */
+        switch (cmd) {
+                case CA_SEND_MSG:
+                        if (verbose > 1)
+                                dprintk("%s: Sending message\n", __FUNCTION__);
+                        if ((ca_send_message(state, p_ca_message, arg)) < 0) {
+                                dprintk("%s: -->CA_SEND_MSG Failed !\n", __FUNCTION__);
+                                return -1;
+                        }
+
+                        break;
+
+                case CA_GET_MSG:
+                        if (verbose > 1)
+                                dprintk("%s: Getting message\n", __FUNCTION__);
+                        if ((ca_get_message(state, p_ca_message, arg)) < 0) {
+                                dprintk("%s: -->CA_GET_MSG Failed !\n", __FUNCTION__);
+                                return -1;
+                        }
+                        if (verbose > 1)
+                                dprintk("%s: -->CA_GET_MSG Success !\n", __FUNCTION__);
+
+                        break;
+
+                case CA_RESET:
+                        if (verbose > 1)
+                                dprintk("%s: Resetting DST\n", __FUNCTION__);
+                        dst_error_bailout(state);
+                        msleep(4000);
+
+                        break;
+
+                case CA_GET_SLOT_INFO:
+                        if (verbose > 1)
+                                dprintk("%s: Getting Slot info\n", __FUNCTION__);
+                        if ((ca_get_slot_info(state, p_ca_slot_info, arg)) < 0) {
+                                dprintk("%s: -->CA_GET_SLOT_INFO Failed !\n", __FUNCTION__);
+                                return -1;
+                        }
+                        if (verbose > 1)
+                                dprintk("%s: -->CA_GET_SLOT_INFO Success !\n", __FUNCTION__);
+
+                        break;
+
+                case CA_GET_CAP:
+                        if (verbose > 1)
+                                dprintk("%s: Getting Slot capabilities\n", __FUNCTION__);
+                        if ((ca_get_slot_caps(state, p_ca_caps, arg)) < 0) {
+                                dprintk("%s: -->CA_GET_CAP Failed !\n", __FUNCTION__);
+                                return -1;
+                        }
+                        if (verbose > 1)
+                                dprintk("%s: -->CA_GET_CAP Success !\n", __FUNCTION__);
+
+                        break;
+
+                case CA_GET_DESCR_INFO:
+                        if (verbose > 1)
+                                dprintk("%s: Getting descrambler description\n", __FUNCTION__);
+                        if ((ca_get_slot_descr(state, p_ca_message, arg)) < 0) {
+                                dprintk("%s: -->CA_GET_DESCR_INFO Failed !\n", __FUNCTION__);
+                                return -1;
+                        }
+                        if (verbose > 1)
+                                dprintk("%s: -->CA_GET_DESCR_INFO Success !\n", __FUNCTION__);
+
+                        break;
+
+                case CA_SET_DESCR:
+                        if (verbose > 1)
+                                dprintk("%s: Setting descrambler\n", __FUNCTION__);
+                        if ((ca_set_slot_descr()) < 0) {
+                                dprintk("%s: -->CA_SET_DESCR Failed !\n", __FUNCTION__);
+                                return -1;
+                        }
+                        if (verbose > 1)
+                                dprintk("%s: -->CA_SET_DESCR Success !\n", __FUNCTION__);
+
+                        break;
+
+                case CA_SET_PID:
+                        if (verbose > 1)
+                                dprintk("%s: Setting PID\n", __FUNCTION__);
+                        if ((ca_set_pid()) < 0) {
+                                dprintk("%s: -->CA_SET_PID Failed !\n", __FUNCTION__);
+                                return -1;
+                        }
+                        if (verbose > 1)
+                                dprintk("%s: -->CA_SET_PID Success !\n", __FUNCTION__);
+
+                default:
+                        return -EOPNOTSUPP;
+                };
+
+        return 0;
+}
+
+static int dst_ca_open(struct inode *inode, struct file *file)
+{
+        if (verbose > 4)
+                dprintk("%s:Device opened [%p]\n", __FUNCTION__, file);
+        try_module_get(THIS_MODULE);
+
+        return 0;
+}
+
+static int dst_ca_release(struct inode *inode, struct file *file)
+{
+        if (verbose > 4)
+                dprintk("%s:Device closed.\n", __FUNCTION__);
+        module_put(THIS_MODULE);
+
+        return 0;
+}
+
+static int dst_ca_read(struct file *file, char __user * buffer, size_t length, loff_t * offset)
+{
+        int bytes_read = 0;
+
+        if (verbose > 4)
+                dprintk("%s:Device read.\n", __FUNCTION__);
+
+        return bytes_read;
+}
+
+static int dst_ca_write(struct file *file, const char __user * buffer, size_t length, loff_t * offset)
+{
+        if (verbose > 4)
+                dprintk("%s:Device write.\n", __FUNCTION__);
+
+        return 0;
+}
+
+static struct file_operations dst_ca_fops = {
+        .owner = THIS_MODULE,
+        .ioctl = (void *)dst_ca_ioctl,
+        .open = dst_ca_open,
+        .release = dst_ca_release,
+        .read = dst_ca_read,
+        .write = dst_ca_write
+};
+
+static struct dvb_device dvbdev_ca = {
+        .priv = NULL,
+        .users = 1,
+        .readers = 1,
+        .writers = 1,
+        .fops = &dst_ca_fops
+};
+
+int dst_ca_attach(struct dst_state *dst, struct dvb_adapter *dvb_adapter)
+{
+        struct dvb_device *dvbdev;
+        if (verbose > 4)
+                dprintk("%s:registering DST-CA device\n", __FUNCTION__);
+        dvb_register_device(dvb_adapter, &dvbdev, &dvbdev_ca, dst, DVB_DEVICE_CA);
+        return 0;
+}
+
+EXPORT_SYMBOL(dst_ca_attach);
+
+MODULE_DESCRIPTION("DST DVB-S/T/C Combo CA driver");
+MODULE_AUTHOR("Manu Abraham");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/bt8xx/dst_ca.h b/drivers/media/dvb/bt8xx/dst_ca.h
new file mode 100644
index 000000000000..59cd0ddd6d8e
--- /dev/null
+++ b/drivers/media/dvb/bt8xx/dst_ca.h
@@ -0,0 +1,58 @@
+/*
+        CA-driver for TwinHan DST Frontend/Card
+
+        Copyright (C) 2004, 2005 Manu Abraham (manu@kromtek.com)
+
+        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 _DST_CA_H_
+#define _DST_CA_H_
+
+#define RETRIES                 5
+
+
+#define CA_APP_INFO_ENQUIRY     0x9f8020
+#define CA_APP_INFO             0x9f8021
+#define CA_ENTER_MENU           0x9f8022
+#define CA_INFO_ENQUIRY         0x9f8030
+#define CA_INFO                 0x9f8031
+#define CA_PMT                  0x9f8032
+#define CA_PMT_REPLY            0x9f8033
+
+#define CA_CLOSE_MMI            0x9f8800
+#define CA_DISPLAY_CONTROL      0x9f8801
+#define CA_DISPLAY_REPLY        0x9f8802
+#define CA_TEXT_LAST            0x9f8803
+#define CA_TEXT_MORE            0x9f8804
+#define CA_KEYPAD_CONTROL       0x9f8805
+#define CA_KEYPRESS             0x9f8806
+
+#define CA_ENQUIRY              0x9f8807
+#define CA_ANSWER               0x9f8808
+#define CA_MENU_LAST            0x9f8809
+#define CA_MENU_MORE            0x9f880a
+#define CA_MENU_ANSWER          0x9f880b
+#define CA_LIST_LAST            0x9f880c
+#define CA_LIST_MORE            0x9f880d
+
+
+struct dst_ca_private {
+        struct dst_state *dst;
+        struct dvb_device *dvbdev;
+};
+
+
+#endif
diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
new file mode 100644
index 000000000000..0b3da29245fb
--- /dev/null
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -0,0 +1,153 @@
+/*
+        Frontend-driver for TwinHan DST Frontend
+
+        Copyright (C) 2003 Jamie Honan
+        Copyright (C) 2004, 2005 Manu Abraham (manu@kromtek.com)
+
+        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 DST_COMMON_H
+#define DST_COMMON_H
+
+#include <linux/dvb/frontend.h>
+#include <linux/device.h>
+#include "bt878.h"
+
+#include "dst_ca.h"
+
+
+#define NO_DELAY                0
+#define LONG_DELAY              1
+#define DEVICE_INIT             2
+
+#define DELAY                   1
+
+#define DST_TYPE_IS_SAT         0
+#define DST_TYPE_IS_TERR        1
+#define DST_TYPE_IS_CABLE       2
+#define DST_TYPE_IS_ATSC        3
+
+#define DST_TYPE_HAS_NEWTUNE    1
+#define DST_TYPE_HAS_TS204      2
+#define DST_TYPE_HAS_SYMDIV     4
+#define DST_TYPE_HAS_FW_1       8
+#define DST_TYPE_HAS_FW_2       16
+#define DST_TYPE_HAS_FW_3       32
+#define DST_TYPE_HAS_FW_BUILD   64
+
+/*      Card capability list    */
+
+#define DST_TYPE_HAS_MAC        1
+#define DST_TYPE_HAS_DISEQC3    2
+#define DST_TYPE_HAS_DISEQC4    4
+#define DST_TYPE_HAS_DISEQC5    8
+#define DST_TYPE_HAS_MOTO       16
+#define DST_TYPE_HAS_CA         32
+#define DST_TYPE_HAS_ANALOG     64      /*      Analog inputs   */
+#define DST_TYPE_HAS_SESSION    128
+
+
+#define RDC_8820_PIO_0_DISABLE  0
+#define RDC_8820_PIO_0_ENABLE   1
+#define RDC_8820_INT            2
+#define RDC_8820_RESET          4
+
+/*      DST Communication       */
+#define GET_REPLY               1
+#define NO_REPLY                0
+
+#define GET_ACK                 1
+#define FIXED_COMM              8
+
+#define ACK                     0xff
+
+struct dst_state {
+
+        struct i2c_adapter* i2c;
+
+        struct bt878* bt;
+
+        struct dvb_frontend_ops ops;
+
+        /* configuration settings */
+        const struct dst_config* config;
+
+        struct dvb_frontend frontend;
+
+        /* private ASIC data */
+        u8 tx_tuna[10];
+        u8 rx_tuna[10];
+        u8 rxbuffer[10];
+        u8 diseq_flags;
+        u8 dst_type;
+        u32 type_flags;
+        u32 frequency;          /* intermediate frequency in kHz for QPSK */
+        fe_spectral_inversion_t inversion;
+        u32 symbol_rate;        /* symbol rate in Symbols per second */
+        fe_code_rate_t fec;
+        fe_sec_voltage_t voltage;
+        fe_sec_tone_mode_t tone;
+        u32 decode_freq;
+        u8 decode_lock;
+        u16 decode_strength;
+        u16 decode_snr;
+        unsigned long cur_jiff;
+        u8 k22;
+        fe_bandwidth_t bandwidth;
+        u32 dst_hw_cap;
+        u8 dst_fw_version;
+        fe_sec_mini_cmd_t minicmd;
+        u8 messages[256];
+};
+
+struct dst_types {
+        char *device_id;
+        int offset;
+        u8 dst_type;
+        u32 type_flags;
+        u32 dst_feature;
+};
+
+
+
+struct dst_config
+{
+        /* the ASIC i2c address */
+        u8 demod_address;
+};
+
+
+int rdc_reset_state(struct dst_state *state);
+int rdc_8820_reset(struct dst_state *state);
+
+int dst_wait_dst_ready(struct dst_state *state, u8 delay_mode);
+int dst_pio_enable(struct dst_state *state);
+int dst_pio_disable(struct dst_state *state);
+int dst_error_recovery(struct dst_state* state);
+int dst_error_bailout(struct dst_state *state);
+int dst_comm_init(struct dst_state* state);
+
+int write_dst(struct dst_state *state, u8 * data, u8 len);
+int read_dst(struct dst_state *state, u8 * ret, u8 len);
+u8 dst_check_sum(u8 * buf, u32 len);
+struct dst_state* dst_attach(struct dst_state* state, struct dvb_adapter *dvb_adapter);
+int dst_ca_attach(struct dst_state *state, struct dvb_adapter *dvb_adapter);
+int dst_gpio_outb(struct dst_state* state, u32 mask, u32 enbb, u32 outhigh, int delay);
+
+int dst_command(struct dst_state* state, u8 * data, u8 len);
+
+
+#endif // DST_COMMON_H
diff --git a/drivers/media/dvb/bt8xx/dst_priv.h b/drivers/media/dvb/bt8xx/dst_priv.h
index 80488aa628b4..3974a4c6ebe7 100644
--- a/drivers/media/dvb/bt8xx/dst_priv.h
+++ b/drivers/media/dvb/bt8xx/dst_priv.h
@@ -33,4 +33,3 @@ union dst_gpio_packet {
 struct bt878;
 
 int bt878_device_control(struct bt878 *bt, unsigned int cmd, union dst_gpio_packet *mp);
-
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index b735397f59aa..6f857c6091f3 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -142,7 +142,7 @@ static int thomson_dtt7579_demod_init(struct dvb_frontend* fe)
         mt352_write(fe, mt352_adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg));
 
         mt352_write(fe, mt352_agc_cfg, sizeof(mt352_agc_cfg));
-        mt352_write(fe, mt352_gpp_ctl_cfg, sizeof(mt352_gpp_ctl_cfg));
+        mt352_write(fe, mt352_gpp_ctl_cfg, sizeof(mt352_gpp_ctl_cfg));
         mt352_write(fe, mt352_capt_range_cfg, sizeof(mt352_capt_range_cfg));
 
         return 0;
@@ -161,7 +161,7 @@ static int thomson_dtt7579_pll_set(struct dvb_frontend* fe, struct dvb_frontend_
         else if (params->frequency < 771000000) cp = 0xbc;
         else cp = 0xf4;
 
-        if (params->frequency == 0) bs = 0x03;
+        if (params->frequency == 0) bs = 0x03;
         else if (params->frequency < 443250000) bs = 0x02;
         else bs = 0x08;
 
@@ -190,44 +190,44 @@ static int cx24108_pll_set(struct dvb_frontend* fe, struct dvb_frontend_paramete
 
 
    u32 osci[]={950000,1019000,1075000,1178000,1296000,1432000,
-               1576000,1718000,1856000,2036000,2150000};
+               1576000,1718000,1856000,2036000,2150000};
    u32 bandsel[]={0,0x00020000,0x00040000,0x00100800,0x00101000,
-               0x00102000,0x00104000,0x00108000,0x00110000,
-               0x00120000,0x00140000};
+               0x00102000,0x00104000,0x00108000,0x00110000,
+               0x00120000,0x00140000};
 
 #define XTAL 1011100 /* Hz, really 1.0111 MHz and a /10 prescaler */
-        printk("cx24108 debug: entering SetTunerFreq, freq=%d\n",freq);
-
-        /* This is really the bit driving the tuner chip cx24108 */
-
-        if(freq<950000) freq=950000; /* kHz */
-        if(freq>2150000) freq=2150000; /* satellite IF is 950..2150MHz */
-
-        /* decide which VCO to use for the input frequency */
-        for(i=1;(i<sizeof(osci)/sizeof(osci[0]))&&(osci[i]<freq);i++);
-        printk("cx24108 debug: select vco #%d (f=%d)\n",i,freq);
-        band=bandsel[i];
-        /* the gain values must be set by SetSymbolrate */
-        /* compute the pll divider needed, from Conexant data sheet,
-           resolved for (n*32+a), remember f(vco) is f(receive) *2 or *4,
-           depending on the divider bit. It is set to /4 on the 2 lowest
-           bands  */
-        n=((i<=2?2:1)*freq*10L)/(XTAL/100);
-        a=n%32; n/=32; if(a==0) n--;
-        pump=(freq<(osci[i-1]+osci[i])/2);
-        pll=0xf8000000|
-            ((pump?1:2)<<(14+11))|
-            ((n&0x1ff)<<(5+11))|
-            ((a&0x1f)<<11);
-        /* everything is shifted left 11 bits to left-align the bits in the
-           32bit word. Output to the tuner goes MSB-aligned, after all */
-        printk("cx24108 debug: pump=%d, n=%d, a=%d\n",pump,n,a);
-        cx24110_pll_write(fe,band);
-        /* set vga and vca to their widest-band settings, as a precaution.
-           SetSymbolrate might not be called to set this up */
-        cx24110_pll_write(fe,0x500c0000);
-        cx24110_pll_write(fe,0x83f1f800);
-        cx24110_pll_write(fe,pll);
+        printk("cx24108 debug: entering SetTunerFreq, freq=%d\n",freq);
+
+        /* This is really the bit driving the tuner chip cx24108 */
+
+        if(freq<950000) freq=950000; /* kHz */
+        if(freq>2150000) freq=2150000; /* satellite IF is 950..2150MHz */
+
+        /* decide which VCO to use for the input frequency */
+        for(i=1;(i<sizeof(osci)/sizeof(osci[0]))&&(osci[i]<freq);i++);
+        printk("cx24108 debug: select vco #%d (f=%d)\n",i,freq);
+        band=bandsel[i];
+        /* the gain values must be set by SetSymbolrate */
+        /* compute the pll divider needed, from Conexant data sheet,
+           resolved for (n*32+a), remember f(vco) is f(receive) *2 or *4,
+           depending on the divider bit. It is set to /4 on the 2 lowest
+           bands  */
+        n=((i<=2?2:1)*freq*10L)/(XTAL/100);
+        a=n%32; n/=32; if(a==0) n--;
+        pump=(freq<(osci[i-1]+osci[i])/2);
+        pll=0xf8000000|
+            ((pump?1:2)<<(14+11))|
+            ((n&0x1ff)<<(5+11))|
+            ((a&0x1f)<<11);
+        /* everything is shifted left 11 bits to left-align the bits in the
+           32bit word. Output to the tuner goes MSB-aligned, after all */
+        printk("cx24108 debug: pump=%d, n=%d, a=%d\n",pump,n,a);
+        cx24110_pll_write(fe,band);
+        /* set vga and vca to their widest-band settings, as a precaution.
+           SetSymbolrate might not be called to set this up */
+        cx24110_pll_write(fe,0x500c0000);
+        cx24110_pll_write(fe,0x83f1f800);
+        cx24110_pll_write(fe,pll);
 /*        writereg(client,0x56,0x7f);*/
 
         return 0;
@@ -299,7 +299,7 @@ static int advbt771_samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe)
         static u8 mt352_reset [] = { 0x50, 0x80 };
         static u8 mt352_adc_ctl_1_cfg [] = { 0x8E, 0x40 };
         static u8 mt352_agc_cfg [] = { 0x67, 0x10, 0x23, 0x00, 0xFF, 0xFF,
-                                       0x00, 0xFF, 0x00, 0x40, 0x40 };
+                                       0x00, 0xFF, 0x00, 0x40, 0x40 };
         static u8 mt352_av771_extra[] = { 0xB5, 0x7A };
         static u8 mt352_capt_range_cfg[] = { 0x75, 0x32 };
 
@@ -463,6 +463,9 @@ static struct nxt6000_config vp3021_alps_tded4_config = {
 
 static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
 {
+        int ret;
+        struct dst_state* state = NULL;
+
         switch(type) {
 #ifdef BTTV_DVICO_DVBT_LITE
         case BTTV_DVICO_DVBT_LITE:
@@ -503,7 +506,25 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                 break;
 
         case BTTV_TWINHAN_DST:
-                card->fe = dst_attach(&dst_config, card->i2c_adapter, card->bt);
+                /*      DST is not a frontend driver !!!                */
+                state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL);
+                /*      Setup the Card                                  */
+                state->config = &dst_config;
+                state->i2c = card->i2c_adapter;
+                state->bt = card->bt;
+
+                /*      DST is not a frontend, attaching the ASIC       */
+                if ((dst_attach(state, &card->dvb_adapter)) == NULL) {
+                        printk("%s: Could not find a Twinhan DST.\n", __FUNCTION__);
+                        break;
+                }
+                card->fe = &state->frontend;
+
+                /*      Attach other DST peripherals if any             */
+                /*      Conditional Access device                       */
+                if (state->dst_hw_cap & DST_TYPE_HAS_CA) {
+                        ret = dst_ca_attach(state, &card->dvb_adapter);
+                }
                 if (card->fe != NULL) {
                         break;
                 }
@@ -531,7 +552,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
                        card->bt->dev->subsystem_vendor,
                        card->bt->dev->subsystem_device);
         } else {
-                if (dvb_register_frontend(card->dvb_adapter, card->fe)) {
+                if (dvb_register_frontend(&card->dvb_adapter, card->fe)) {
                         printk("dvb-bt8xx: Frontend registration failed!\n");
                         if (card->fe->ops->release)
                                 card->fe->ops->release(card->fe);
@@ -550,7 +571,7 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
                 return result;
 
         }
-        card->dvb_adapter->priv = card;
+        card->dvb_adapter.priv = card;
 
         card->bt->adapter = card->i2c_adapter;
 
@@ -568,7 +589,7 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
         if ((result = dvb_dmx_init(&card->demux)) < 0) {
                 printk("dvb_bt8xx: dvb_dmx_init failed (errno = %d)\n", result);
 
-                dvb_unregister_adapter(card->dvb_adapter);
+                dvb_unregister_adapter(&card->dvb_adapter);
                 return result;
         }
 
@@ -576,11 +597,11 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
         card->dmxdev.demux = &card->demux.dmx;
         card->dmxdev.capabilities = 0;
 
-        if ((result = dvb_dmxdev_init(&card->dmxdev, card->dvb_adapter)) < 0) {
+        if ((result = dvb_dmxdev_init(&card->dmxdev, &card->dvb_adapter)) < 0) {
                 printk("dvb_bt8xx: dvb_dmxdev_init failed (errno = %d)\n", result);
 
                 dvb_dmx_release(&card->demux);
-                dvb_unregister_adapter(card->dvb_adapter);
+                dvb_unregister_adapter(&card->dvb_adapter);
                 return result;
         }
 
@@ -591,7 +612,7 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
 
                 dvb_dmxdev_release(&card->dmxdev);
                 dvb_dmx_release(&card->demux);
-                dvb_unregister_adapter(card->dvb_adapter);
+                dvb_unregister_adapter(&card->dvb_adapter);
                 return result;
         }
 
@@ -603,7 +624,7 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
                 card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_hw);
                 dvb_dmxdev_release(&card->dmxdev);
                 dvb_dmx_release(&card->demux);
-                dvb_unregister_adapter(card->dvb_adapter);
+                dvb_unregister_adapter(&card->dvb_adapter);
                 return result;
         }
 
@@ -614,11 +635,11 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
                 card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_hw);
                 dvb_dmxdev_release(&card->dmxdev);
                 dvb_dmx_release(&card->demux);
-                dvb_unregister_adapter(card->dvb_adapter);
+                dvb_unregister_adapter(&card->dvb_adapter);
                 return result;
         }
 
-        dvb_net_init(card->dvb_adapter, &card->dvbnet, &card->demux.dmx);
+        dvb_net_init(&card->dvb_adapter, &card->dvbnet, &card->demux.dmx);
 
         tasklet_init(&card->bt->tasklet, dvb_bt8xx_task, (unsigned long) card);
 
@@ -648,7 +669,7 @@ static int dvb_bt8xx_probe(struct device *dev)
         case BTTV_PINNACLESAT:
                 card->gpio_mode = 0x0400c060;
                 /* should be: BT878_A_GAIN=0,BT878_A_PWRDN,BT878_DA_DPM,BT878_DA_SBR,
-                              BT878_DA_IOM=1,BT878_DA_APP to enable serial highspeed mode. */
+                              BT878_DA_IOM=1,BT878_DA_APP to enable serial highspeed mode. */
                 card->op_sync_orin = 0;
                 card->irq_err_ignore = 0;
                 break;
@@ -759,7 +780,7 @@ static int dvb_bt8xx_remove(struct device *dev)
         dvb_dmxdev_release(&card->dmxdev);
         dvb_dmx_release(&card->demux);
         if (card->fe) dvb_unregister_frontend(card->fe);
-        dvb_unregister_adapter(card->dvb_adapter);
+        dvb_unregister_adapter(&card->dvb_adapter);
 
         kfree(card);
 
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index 80ef189f930f..2923b3b0dd3c 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -31,7 +31,7 @@
 #include "bttv.h"
 #include "mt352.h"
 #include "sp887x.h"
-#include "dst.h"
+#include "dst_common.h"
 #include "nxt6000.h"
 #include "cx24110.h"
 #include "or51211.h"
@@ -40,7 +40,7 @@ struct dvb_bt8xx_card {
         struct semaphore lock;
         int nfeeds;
         char card_name[32];
-        struct dvb_adapter *dvb_adapter;
+        struct dvb_adapter dvb_adapter;
         struct bt878 *bt;
         unsigned int bttv_nr;
         struct dvb_demux demux;
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 28d4d926de3e..96c57fde95a0 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -119,7 +119,7 @@ struct cinergyt2 {
         struct dvb_demux demux;
         struct usb_device *udev;
         struct semaphore sem;
-        struct dvb_adapter *adapter;
+        struct dvb_adapter adapter;
         struct dvb_device *fedev;
         struct dmxdev dmxdev;
         struct dvb_net dvbnet;
@@ -813,15 +813,15 @@ static int cinergyt2_probe (struct usb_interface *intf,
         cinergyt2->dmxdev.demux = &cinergyt2->demux.dmx;
         cinergyt2->dmxdev.capabilities = 0;
 
-        if ((err = dvb_dmxdev_init(&cinergyt2->dmxdev, cinergyt2->adapter)) < 0) {
+        if ((err = dvb_dmxdev_init(&cinergyt2->dmxdev, &cinergyt2->adapter)) < 0) {
                 dprintk(1, "dvb_dmxdev_init() failed (err = %d)\n", err);
                 goto bailout;
         }
 
-        if (dvb_net_init(cinergyt2->adapter, &cinergyt2->dvbnet, &cinergyt2->demux.dmx))
+        if (dvb_net_init(&cinergyt2->adapter, &cinergyt2->dvbnet, &cinergyt2->demux.dmx))
                 dprintk(1, "dvb_net_init() failed!\n");
 
-        dvb_register_device(cinergyt2->adapter, &cinergyt2->fedev,
+        dvb_register_device(&cinergyt2->adapter, &cinergyt2->fedev,
                             &cinergyt2_fe_template, cinergyt2,
                             DVB_DEVICE_FRONTEND);
 
@@ -848,7 +848,7 @@ static int cinergyt2_probe (struct usb_interface *intf,
 bailout:
         dvb_dmxdev_release(&cinergyt2->dmxdev);
         dvb_dmx_release(&cinergyt2->demux);
-        dvb_unregister_adapter (cinergyt2->adapter);
+        dvb_unregister_adapter (&cinergyt2->adapter);
         cinergyt2_free_stream_urbs (cinergyt2);
         kfree(cinergyt2);
         return -ENOMEM;
@@ -872,7 +872,7 @@ static void cinergyt2_disconnect (struct usb_interface *intf)
         dvb_dmxdev_release(&cinergyt2->dmxdev);
         dvb_dmx_release(&cinergyt2->demux);
         dvb_unregister_device(cinergyt2->fedev);
-        dvb_unregister_adapter(cinergyt2->adapter);
+        dvb_unregister_adapter(&cinergyt2->adapter);
 
         cinergyt2_free_stream_urbs(cinergyt2);
         up(&cinergyt2->sem);
diff --git a/drivers/media/dvb/dibusb/Kconfig b/drivers/media/dvb/dibusb/Kconfig
deleted file mode 100644
index 74dfc73ae5b0..000000000000
--- a/drivers/media/dvb/dibusb/Kconfig
+++ /dev/null
@@ -1,62 +0,0 @@
-config DVB_DIBUSB
-        tristate "DiBcom USB DVB-T devices (see help for a complete device list)"
-        depends on DVB_CORE && USB
-        select FW_LOADER
-        select DVB_DIB3000MB
-        select DVB_DIB3000MC
-        select DVB_MT352
-        help
-          Support for USB 1.1 and 2.0 DVB-T devices based on reference designs made by
-          DiBcom (http://www.dibcom.fr) and C&E.
-
-          Devices supported by this driver:
-
-            TwinhanDTV USB-Ter (VP7041)
-                TwinhanDTV Magic Box (VP7041e)
-            KWorld/JetWay/ADSTech V-Stream XPERT DTV - DVB-T USB1.1 and USB2.0
-            Hama DVB-T USB-Box
-            DiBcom reference devices (non-public)
-            Ultima Electronic/Artec T1 USB TVBOX
-            Compro Videomate DVB-U2000 - DVB-T USB
-            Grandtec DVB-T USB
-            Avermedia AverTV DVBT USB
-            Artec T1 USB1.1 and USB2.0 boxes
-            Yakumo/Typhoon DVB-T USB2.0
-            Hanftek UMT-010 USB2.0
-            Hauppauge WinTV NOVA-T USB2
-
-          The VP7041 seems to be identical to "CTS Portable" (Chinese
-          Television System).
-
-          These devices can be understood as budget ones, they "only" deliver
-          (a part of) the MPEG2 transport stream.
-
-          A firmware is needed to get the device working. See Documentation/dvb/README.dibusb
-          details.
-
-          Say Y if you own such a device and want to use it. You should build it as
-          a module.
-
-config DVB_DIBUSB_MISDESIGNED_DEVICES
-        bool "Enable support for some misdesigned (see help) devices, which identify with wrong IDs"
-        depends on DVB_DIBUSB
-        help
-          Somehow Artec/Ultima Electronic forgot to program the eeprom of some of their
-          USB1.1/USB2.0 devices.
-          So comes that they identify with the default Vendor and Product ID of the Cypress
-          CY7C64613 (AN2235) or Cypress FX2.
-
-          Affected device IDs:
-            0x0574:0x2235 (Artec T1 USB1.1, cold)
-            0x04b4:0x8613 (Artec T1 USB2.0, cold)
-            0x0574:0x1002 (Artec T1 USB2.0, warm)
-            0x0574:0x2131 (aged DiBcom USB1.1 test device)
-
-          Say Y if your device has one of the mentioned IDs.
-
-config DVB_DIBCOM_DEBUG
-        bool "Enable extended debug support for DiBcom USB device"
-        depends on DVB_DIBUSB
-        help
-          Say Y if you want to enable debuging. See modinfo dvb-dibusb for
-          debug levels.
diff --git a/drivers/media/dvb/dibusb/Makefile b/drivers/media/dvb/dibusb/Makefile
deleted file mode 100644
index e941c508624e..000000000000
--- a/drivers/media/dvb/dibusb/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-dvb-dibusb-objs = dvb-dibusb-core.o \
-        dvb-dibusb-dvb.o \
-        dvb-dibusb-fe-i2c.o \
-        dvb-dibusb-firmware.o \
-        dvb-dibusb-remote.o \
-        dvb-dibusb-usb.o \
-        dvb-fe-dtt200u.o
-
-obj-$(CONFIG_DVB_DIBUSB) += dvb-dibusb.o
-
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/dibusb/dvb-dibusb-core.c b/drivers/media/dvb/dibusb/dvb-dibusb-core.c
deleted file mode 100644
index 26235f9247e4..000000000000
--- a/drivers/media/dvb/dibusb/dvb-dibusb-core.c
+++ /dev/null
@@ -1,558 +0,0 @@
-/*
- * Driver for mobile USB Budget DVB-T devices based on reference 
- * design made by DiBcom (http://www.dibcom.fr/)
- * 
- * dvb-dibusb-core.c
- * 
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
- * 
- * based on GPL code from DiBcom, which has
- * Copyright (C) 2004 Amaury Demol for DiBcom (ademol@dibcom.fr)
- *
- * Remote control code added by David Matthews (dm@prolingua.co.uk)
- * 
- *      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, version 2.
- *
- * Acknowledgements
- * 
- *  Amaury Demol (ademol@dibcom.fr) from DiBcom for providing specs and driver
- *  sources, on which this driver (and the dib3000mb/mc/p frontends) are based.
- * 
- * see Documentation/dvb/README.dibusb for more information
- */
-#include "dvb-dibusb.h"
-
-#include <linux/moduleparam.h>
-
-/* debug */
-int dvb_dibusb_debug;
-module_param_named(debug, dvb_dibusb_debug,  int, 0644);
-
-#ifdef CONFIG_DVB_DIBCOM_DEBUG
-#define DBSTATUS ""
-#else
-#define DBSTATUS " (debugging is not enabled)"
-#endif
-MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=alotmore,8=ts,16=err,32=rc (|-able))." DBSTATUS);
-#undef DBSTATUS
-
-static int pid_parse;
-module_param(pid_parse, int, 0644);
-MODULE_PARM_DESC(pid_parse, "enable pid parsing (filtering) when running at USB2.0");
-
-static int rc_query_interval = 100;
-module_param(rc_query_interval, int, 0644);
-MODULE_PARM_DESC(rc_query_interval, "interval in msecs for remote control query (default: 100; min: 40)");
-
-static int rc_key_repeat_count = 2;
-module_param(rc_key_repeat_count, int, 0644);
-MODULE_PARM_DESC(rc_key_repeat_count, "how many key repeats will be dropped before passing the key event again (default: 2)");
-
-/* Vendor IDs */
-#define USB_VID_ADSTECH                                         0x06e1
-#define USB_VID_ANCHOR                                          0x0547
-#define USB_VID_AVERMEDIA                                       0x14aa
-#define USB_VID_COMPRO                                          0x185b
-#define USB_VID_COMPRO_UNK                                      0x145f
-#define USB_VID_CYPRESS                                         0x04b4
-#define USB_VID_DIBCOM                                          0x10b8
-#define USB_VID_EMPIA                                           0xeb1a
-#define USB_VID_GRANDTEC                                        0x5032
-#define USB_VID_HANFTEK                                         0x15f4
-#define USB_VID_HAUPPAUGE                                       0x2040
-#define USB_VID_HYPER_PALTEK                            0x1025
-#define USB_VID_IMC_NETWORKS                            0x13d3
-#define USB_VID_TWINHAN                                         0x1822
-#define USB_VID_ULTIMA_ELECTRONIC                       0x05d8
-
-/* Product IDs */
-#define USB_PID_ADSTECH_USB2_COLD                       0xa333
-#define USB_PID_ADSTECH_USB2_WARM                       0xa334
-#define USB_PID_AVERMEDIA_DVBT_USB_COLD         0x0001
-#define USB_PID_AVERMEDIA_DVBT_USB_WARM         0x0002
-#define USB_PID_COMPRO_DVBU2000_COLD            0xd000
-#define USB_PID_COMPRO_DVBU2000_WARM            0xd001
-#define USB_PID_COMPRO_DVBU2000_UNK_COLD        0x010c
-#define USB_PID_COMPRO_DVBU2000_UNK_WARM        0x010d
-#define USB_PID_DIBCOM_MOD3000_COLD                     0x0bb8
-#define USB_PID_DIBCOM_MOD3000_WARM                     0x0bb9
-#define USB_PID_DIBCOM_MOD3001_COLD                     0x0bc6
-#define USB_PID_DIBCOM_MOD3001_WARM                     0x0bc7
-#define USB_PID_DIBCOM_ANCHOR_2135_COLD         0x2131
-#define USB_PID_GRANDTEC_DVBT_USB_COLD          0x0fa0
-#define USB_PID_GRANDTEC_DVBT_USB_WARM          0x0fa1
-#define USB_PID_KWORLD_VSTREAM_COLD                     0x17de
-#define USB_PID_KWORLD_VSTREAM_WARM                     0x17df
-#define USB_PID_TWINHAN_VP7041_COLD                     0x3201
-#define USB_PID_TWINHAN_VP7041_WARM                     0x3202
-#define USB_PID_ULTIMA_TVBOX_COLD                       0x8105
-#define USB_PID_ULTIMA_TVBOX_WARM                       0x8106
-#define USB_PID_ULTIMA_TVBOX_AN2235_COLD        0x8107
-#define USB_PID_ULTIMA_TVBOX_AN2235_WARM        0x8108
-#define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD        0x2235
-#define USB_PID_ULTIMA_TVBOX_USB2_COLD          0x8109
-#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD       0x8613
-#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM       0x1002
-#define USB_PID_UNK_HYPER_PALTEK_COLD           0x005e
-#define USB_PID_UNK_HYPER_PALTEK_WARM           0x005f
-#define USB_PID_HANFTEK_UMT_010_COLD            0x0001
-#define USB_PID_HANFTEK_UMT_010_WARM            0x0015
-#define USB_PID_YAKUMO_DTT200U_COLD                     0x0201
-#define USB_PID_YAKUMO_DTT200U_WARM                     0x0301
-#define USB_PID_WINTV_NOVA_T_USB2_COLD          0x9300
-#define USB_PID_WINTV_NOVA_T_USB2_WARM          0x9301
-
-/* USB Driver stuff
- * table of devices that this driver is working with
- *
- * ATTENTION: Never ever change the order of this table, the particular 
- * devices depend on this order 
- *
- * Each entry is used as a reference in the device_struct. Currently this is 
- * the only non-redundant way of assigning USB ids to actual devices I'm aware 
- * of, because there is only one place in the code where the assignment of 
- * vendor and product id is done, here.
- */
-static struct usb_device_id dib_table [] = {
-/* 00 */        { USB_DEVICE(USB_VID_AVERMEDIA,         USB_PID_AVERMEDIA_DVBT_USB_COLD)},
-/* 01 */        { USB_DEVICE(USB_VID_AVERMEDIA,         USB_PID_AVERMEDIA_DVBT_USB_WARM)},
-/* 02 */        { USB_DEVICE(USB_VID_AVERMEDIA,         USB_PID_YAKUMO_DTT200U_COLD) },
-/* 03 */        { USB_DEVICE(USB_VID_AVERMEDIA,         USB_PID_YAKUMO_DTT200U_WARM) },
-
-/* 04 */        { USB_DEVICE(USB_VID_COMPRO,            USB_PID_COMPRO_DVBU2000_COLD) },
-/* 05 */        { USB_DEVICE(USB_VID_COMPRO,            USB_PID_COMPRO_DVBU2000_WARM) },
-/* 06 */        { USB_DEVICE(USB_VID_COMPRO_UNK,        USB_PID_COMPRO_DVBU2000_UNK_COLD) },
-/* 07 */        { USB_DEVICE(USB_VID_DIBCOM,            USB_PID_DIBCOM_MOD3000_COLD) },
-/* 08 */        { USB_DEVICE(USB_VID_DIBCOM,            USB_PID_DIBCOM_MOD3000_WARM) },
-/* 09 */        { USB_DEVICE(USB_VID_DIBCOM,            USB_PID_DIBCOM_MOD3001_COLD) },
-/* 10 */        { USB_DEVICE(USB_VID_DIBCOM,            USB_PID_DIBCOM_MOD3001_WARM) },
-/* 11 */        { USB_DEVICE(USB_VID_EMPIA,                     USB_PID_KWORLD_VSTREAM_COLD) },
-/* 12 */        { USB_DEVICE(USB_VID_EMPIA,                     USB_PID_KWORLD_VSTREAM_WARM) },
-/* 13 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB_COLD) },
-/* 14 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB_WARM) },
-/* 15 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_DIBCOM_MOD3000_COLD) },
-/* 16 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_DIBCOM_MOD3000_WARM) },
-/* 17 */        { USB_DEVICE(USB_VID_HYPER_PALTEK,      USB_PID_UNK_HYPER_PALTEK_COLD) },
-/* 18 */        { USB_DEVICE(USB_VID_HYPER_PALTEK,      USB_PID_UNK_HYPER_PALTEK_WARM) },
-/* 19 */        { USB_DEVICE(USB_VID_IMC_NETWORKS,      USB_PID_TWINHAN_VP7041_COLD) },
-/* 20 */        { USB_DEVICE(USB_VID_IMC_NETWORKS,      USB_PID_TWINHAN_VP7041_WARM) },
-/* 21 */        { USB_DEVICE(USB_VID_TWINHAN,           USB_PID_TWINHAN_VP7041_COLD) },
-/* 22 */        { USB_DEVICE(USB_VID_TWINHAN,           USB_PID_TWINHAN_VP7041_WARM) },
-/* 23 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_COLD) },
-/* 24 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_WARM) },
-/* 25 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
-/* 26 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
-/* 27 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_USB2_COLD) },
-        
-/* 28 */        { USB_DEVICE(USB_VID_HANFTEK,           USB_PID_HANFTEK_UMT_010_COLD) },
-/* 29 */        { USB_DEVICE(USB_VID_HANFTEK,           USB_PID_HANFTEK_UMT_010_WARM) },
-
-/* 30 */        { USB_DEVICE(USB_VID_HAUPPAUGE,         USB_PID_WINTV_NOVA_T_USB2_COLD) },
-/* 31 */        { USB_DEVICE(USB_VID_HAUPPAUGE,         USB_PID_WINTV_NOVA_T_USB2_WARM) },
-/* 32 */        { USB_DEVICE(USB_VID_ADSTECH,           USB_PID_ADSTECH_USB2_COLD) },
-/* 33 */        { USB_DEVICE(USB_VID_ADSTECH,           USB_PID_ADSTECH_USB2_WARM) },
-/* 
- * activate the following define when you have one of the devices and want to 
- * build it from build-2.6 in dvb-kernel
- */
-// #define CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES
-#ifdef CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES
-/* 34 */        { USB_DEVICE(USB_VID_ANCHOR,            USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
-/* 35 */        { USB_DEVICE(USB_VID_CYPRESS,           USB_PID_ULTIMA_TVBOX_USB2_FX_COLD) },
-/* 36 */        { USB_DEVICE(USB_VID_ANCHOR,            USB_PID_ULTIMA_TVBOX_USB2_FX_WARM) },
-/* 37 */        { USB_DEVICE(USB_VID_ANCHOR,            USB_PID_DIBCOM_ANCHOR_2135_COLD) },
-#endif
-                        { }             /* Terminating entry */
-};
-
-MODULE_DEVICE_TABLE (usb, dib_table);
-
-static struct dibusb_usb_controller dibusb_usb_ctrl[] = {
-        { .name = "Cypress AN2135", .cpu_cs_register = 0x7f92 },
-        { .name = "Cypress AN2235", .cpu_cs_register = 0x7f92 },
-        { .name = "Cypress FX2",    .cpu_cs_register = 0xe600 },
-};
-
-struct dibusb_tuner dibusb_tuner[] = {
-        { DIBUSB_TUNER_CABLE_THOMSON, 
-          0x61 
-        },
-        { DIBUSB_TUNER_COFDM_PANASONIC_ENV57H1XD5,
-          0x60 
-        },
-        { DIBUSB_TUNER_CABLE_LG_TDTP_E102P,
-          0x61
-        },
-        { DIBUSB_TUNER_COFDM_PANASONIC_ENV77H11D5,
-          0x60
-        },
-};
-
-static struct dibusb_demod dibusb_demod[] = {
-        { DIBUSB_DIB3000MB,
-          16,
-          { 0x8, 0 },
-        },
-        { DIBUSB_DIB3000MC,
-          32,
-          { 0x9, 0xa, 0xb, 0xc }, 
-        },
-        { DIBUSB_MT352,
-          254,
-          { 0xf, 0 }, 
-        },
-        { DTT200U_FE,
-          8,
-          { 0xff,0 }, /* there is no i2c bus in this device */
-        }
-};
-
-static struct dibusb_device_class dibusb_device_classes[] = {
-        { .id = DIBUSB1_1, .usb_ctrl = &dibusb_usb_ctrl[0],
-          .firmware = "dvb-dibusb-5.0.0.11.fw",
-          .pipe_cmd = 0x01, .pipe_data = 0x02, 
-          .urb_count = 7, .urb_buffer_size = 4096,
-          DIBUSB_RC_NEC_PROTOCOL,
-          &dibusb_demod[DIBUSB_DIB3000MB],
-          &dibusb_tuner[DIBUSB_TUNER_CABLE_THOMSON],
-        },
-        { DIBUSB1_1_AN2235, &dibusb_usb_ctrl[1],
-          "dvb-dibusb-an2235-1.fw",
-          0x01, 0x02, 
-          7, 4096,
-          DIBUSB_RC_NEC_PROTOCOL,
-          &dibusb_demod[DIBUSB_DIB3000MB],
-          &dibusb_tuner[DIBUSB_TUNER_CABLE_THOMSON],
-        },
-        { DIBUSB2_0,&dibusb_usb_ctrl[2],
-          "dvb-dibusb-6.0.0.5.fw",
-          0x01, 0x06, 
-          7, 4096,
-          DIBUSB_RC_NEC_PROTOCOL,
-          &dibusb_demod[DIBUSB_DIB3000MC],
-          &dibusb_tuner[DIBUSB_TUNER_COFDM_PANASONIC_ENV57H1XD5],
-        },
-        { UMT2_0, &dibusb_usb_ctrl[2],
-          "dvb-dibusb-umt-2.fw",
-          0x01, 0x06,
-          20, 512,
-          DIBUSB_RC_NO,
-          &dibusb_demod[DIBUSB_MT352],
-          &dibusb_tuner[DIBUSB_TUNER_CABLE_LG_TDTP_E102P],
-        },
-        { DIBUSB2_0B,&dibusb_usb_ctrl[2],
-          "dvb-dibusb-adstech-usb2-1.fw",
-          0x01, 0x06,
-          7, 4096,
-          DIBUSB_RC_NEC_PROTOCOL,
-          &dibusb_demod[DIBUSB_DIB3000MB],
-          &dibusb_tuner[DIBUSB_TUNER_CABLE_THOMSON],
-        },
-        { NOVAT_USB2,&dibusb_usb_ctrl[2],
-          "dvb-dibusb-nova-t-1.fw",
-          0x01, 0x06,
-          7, 4096,
-          DIBUSB_RC_HAUPPAUGE_PROTO,
-          &dibusb_demod[DIBUSB_DIB3000MC],
-          &dibusb_tuner[DIBUSB_TUNER_COFDM_PANASONIC_ENV57H1XD5],
-        },
-        { DTT200U,&dibusb_usb_ctrl[2],
-          "dvb-dtt200u-1.fw",
-          0x01, 0x02,
-          7, 4096,
-          DIBUSB_RC_NO,
-          &dibusb_demod[DTT200U_FE],
-          NULL, /* no explicit tuner/pll-programming necessary (it has the ENV57H1XD5) */
-        },
-};
-
-static struct dibusb_usb_device dibusb_devices[] = {
-        {       "TwinhanDTV USB1.1 / Magic Box / HAMA USB1.1 DVB-T device",
-                &dibusb_device_classes[DIBUSB1_1],
-                { &dib_table[19], &dib_table[21], NULL},
-                { &dib_table[20], &dib_table[22], NULL},
-        },
-        {       "KWorld V-Stream XPERT DTV - DVB-T USB1.1",
-                &dibusb_device_classes[DIBUSB1_1],
-                { &dib_table[11], NULL },
-                { &dib_table[12], NULL },
-        },
-        {       "Grandtec USB1.1 DVB-T",
-                &dibusb_device_classes[DIBUSB1_1],
-                { &dib_table[13], &dib_table[15], NULL },
-                { &dib_table[14], &dib_table[16], NULL },
-        },
-        {       "DiBcom USB1.1 DVB-T reference design (MOD3000)",
-                &dibusb_device_classes[DIBUSB1_1],
-                { &dib_table[7],  NULL },
-                { &dib_table[8],  NULL },
-        },
-        {       "Artec T1 USB1.1 TVBOX with AN2135",
-                &dibusb_device_classes[DIBUSB1_1],
-                { &dib_table[23], NULL },
-                { &dib_table[24], NULL },
-        },
-        {       "Artec T1 USB1.1 TVBOX with AN2235",
-                &dibusb_device_classes[DIBUSB1_1_AN2235],
-                { &dib_table[25], NULL },
-                { &dib_table[26], NULL },
-        },
-        {       "Avermedia AverTV DVBT USB1.1",
-                &dibusb_device_classes[DIBUSB1_1],
-                { &dib_table[0],  NULL },
-                { &dib_table[1],  NULL },
-        },
-        {       "Compro Videomate DVB-U2000 - DVB-T USB1.1 (please confirm to linux-dvb)",
-                &dibusb_device_classes[DIBUSB1_1],
-                { &dib_table[4], &dib_table[6], NULL},
-                { &dib_table[5], NULL },
-        },
-        {       "Unkown USB1.1 DVB-T device ???? please report the name to the author",
-                &dibusb_device_classes[DIBUSB1_1],
-                { &dib_table[17], NULL },
-                { &dib_table[18], NULL },
-        },
-        {       "DiBcom USB2.0 DVB-T reference design (MOD3000P)",
-                &dibusb_device_classes[DIBUSB2_0],
-                { &dib_table[9],  NULL },
-                { &dib_table[10], NULL },
-        },
-        {       "Artec T1 USB2.0 TVBOX (please report the warm ID)",
-                &dibusb_device_classes[DIBUSB2_0],
-                { &dib_table[27], NULL },
-                { NULL },
-        },
-        {       "Hauppauge WinTV NOVA-T USB2",
-                &dibusb_device_classes[NOVAT_USB2],
-                { &dib_table[30], NULL },
-                { &dib_table[31], NULL },
-        },
-        {       "DTT200U (Yakumo/Hama/Typhoon) DVB-T USB2.0",
-                &dibusb_device_classes[DTT200U],
-                { &dib_table[2], NULL },
-                { &dib_table[3], NULL },
-        },      
-        {       "Hanftek UMT-010 DVB-T USB2.0",
-                &dibusb_device_classes[UMT2_0],
-                { &dib_table[28], NULL },
-                { &dib_table[29], NULL },
-        },      
-        {       "KWorld/ADSTech Instant DVB-T USB 2.0",
-                &dibusb_device_classes[DIBUSB2_0B],
-                { &dib_table[32], NULL },
-                { &dib_table[33], NULL }, /* device ID with default DIBUSB2_0-firmware */
-        },
-#ifdef CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES
-        {       "Artec T1 USB1.1 TVBOX with AN2235 (misdesigned)",
-                &dibusb_device_classes[DIBUSB1_1_AN2235],
-                { &dib_table[34], NULL },
-                { NULL },
-        },
-        {       "Artec T1 USB2.0 TVBOX with FX2 IDs (misdesigned, please report the warm ID)",
-                &dibusb_device_classes[DTT200U],
-                { &dib_table[35], NULL },
-                { &dib_table[36], NULL }, /* undefined, it could be that the device will get another USB ID in warm state */
-        },
-        {       "DiBcom USB1.1 DVB-T reference design (MOD3000) with AN2135 default IDs",
-                &dibusb_device_classes[DIBUSB1_1],
-                { &dib_table[37], NULL },
-                { NULL },
-        },
-#endif
-};
-
-static int dibusb_exit(struct usb_dibusb *dib)
-{
-        deb_info("init_state before exiting everything: %x\n",dib->init_state);
-        dibusb_remote_exit(dib);
-        dibusb_fe_exit(dib);
-        dibusb_i2c_exit(dib);
-        dibusb_dvb_exit(dib);
-        dibusb_urb_exit(dib);
-        deb_info("init_state should be zero now: %x\n",dib->init_state);
-        dib->init_state = DIBUSB_STATE_INIT;
-        kfree(dib);
-        return 0;
-}
-
-static int dibusb_init(struct usb_dibusb *dib)
-{
-        int ret = 0;
-        sema_init(&dib->usb_sem, 1);
-        sema_init(&dib->i2c_sem, 1);
-
-        dib->init_state = DIBUSB_STATE_INIT;
-        
-        if ((ret = dibusb_urb_init(dib)) ||
-                (ret = dibusb_dvb_init(dib)) || 
-                (ret = dibusb_i2c_init(dib))) {
-                dibusb_exit(dib);
-                return ret;
-        }
-
-        if ((ret = dibusb_fe_init(dib)))
-                err("could not initialize a frontend.");
-        
-        if ((ret = dibusb_remote_init(dib)))
-                err("could not initialize remote control.");
-        
-        return 0;
-}
-
-static struct dibusb_usb_device * dibusb_device_class_quirk(struct usb_device *udev, struct dibusb_usb_device *dev)
-{
-        int i;
-
-        /* Quirk for the Kworld/ADSTech Instant USB2.0 device. It has the same USB
-         * IDs like the USB1.1 KWorld after loading the firmware. Which is a bad
-         * idea and make this quirk necessary.
-         */
-        if (dev->dev_cl->id == DIBUSB1_1 && udev->speed == USB_SPEED_HIGH) {
-                info("this seems to be the Kworld/ADSTech Instant USB2.0 device or equal.");
-                for (i = 0; i < sizeof(dibusb_devices)/sizeof(struct dibusb_usb_device); i++) {
-                        if (dibusb_devices[i].dev_cl->id == DIBUSB2_0B) {
-                                dev = &dibusb_devices[i];
-                                break;
-                        }
-                }
-        }
-
-        return dev;
-}
-
-static struct dibusb_usb_device * dibusb_find_device (struct usb_device *udev,int *cold)
-{
-        int i,j;
-        struct dibusb_usb_device *dev = NULL;
-        *cold = -1;
-
-        for (i = 0; i < sizeof(dibusb_devices)/sizeof(struct dibusb_usb_device); i++) {
-                for (j = 0; j < DIBUSB_ID_MAX_NUM && dibusb_devices[i].cold_ids[j] != NULL; j++) {
-                        deb_info("check for cold %x %x\n",dibusb_devices[i].cold_ids[j]->idVendor, dibusb_devices[i].cold_ids[j]->idProduct);
-                        if (dibusb_devices[i].cold_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) &&
-                                dibusb_devices[i].cold_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) {
-                                *cold = 1;
-                                dev = &dibusb_devices[i];
-                                break;
-                        }
-                }
-
-                if (dev != NULL)
-                        break;
-
-                for (j = 0; j < DIBUSB_ID_MAX_NUM && dibusb_devices[i].warm_ids[j] != NULL; j++) {
-                        deb_info("check for warm %x %x\n",dibusb_devices[i].warm_ids[j]->idVendor, dibusb_devices[i].warm_ids[j]->idProduct);
-                        if (dibusb_devices[i].warm_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) &&
-                                dibusb_devices[i].warm_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) {
-                                *cold = 0;
-                                dev = &dibusb_devices[i];
-                                break;
-                        }
-                }
-        }
-
-        if (dev != NULL)
-                dev = dibusb_device_class_quirk(udev,dev);
-
-        return dev;
-}
-
-/*
- * USB 
- */
-static int dibusb_probe(struct usb_interface *intf, 
-                const struct usb_device_id *id)
-{
-        struct usb_device *udev = interface_to_usbdev(intf);
-        struct usb_dibusb *dib = NULL;
-        struct dibusb_usb_device *dibdev = NULL;
-        
-        int ret = -ENOMEM,cold=0;
-
-        if ((dibdev = dibusb_find_device(udev,&cold)) == NULL) {
-                err("something went very wrong, "
-                                "unknown product ID: %.4x",le16_to_cpu(udev->descriptor.idProduct));
-                return -ENODEV;
-        }
-        
-        if (cold == 1) {
-                info("found a '%s' in cold state, will try to load a firmware",dibdev->name);
-                ret = dibusb_loadfirmware(udev,dibdev);
-        } else {
-                info("found a '%s' in warm state.",dibdev->name);
-                dib = kmalloc(sizeof(struct usb_dibusb),GFP_KERNEL);
-                if (dib == NULL) {
-                        err("no memory");
-                        return ret;
-                }
-                memset(dib,0,sizeof(struct usb_dibusb));
-                
-                dib->udev = udev;
-                dib->dibdev = dibdev;
-
-                /* store parameters to structures */
-                dib->rc_query_interval = rc_query_interval;
-                dib->pid_parse = pid_parse;
-                dib->rc_key_repeat_count = rc_key_repeat_count;
-
-                usb_set_intfdata(intf, dib);
-                
-                ret = dibusb_init(dib);
-        }
-        
-        if (ret == 0)
-                info("%s successfully initialized and connected.",dibdev->name);
-        else 
-                info("%s error while loading driver (%d)",dibdev->name,ret);
-        return ret;
-}
-
-static void dibusb_disconnect(struct usb_interface *intf)
-{
-        struct usb_dibusb *dib = usb_get_intfdata(intf);
-        const char *name = DRIVER_DESC;
-        
-        usb_set_intfdata(intf,NULL);
-        if (dib != NULL && dib->dibdev != NULL) {
-                name = dib->dibdev->name;
-                dibusb_exit(dib);
-        }
-        info("%s successfully deinitialized and disconnected.",name);
-        
-}
-
-/* usb specific object needed to register this driver with the usb subsystem */
-static struct usb_driver dibusb_driver = {
-        .owner          = THIS_MODULE,
-        .name           = DRIVER_DESC,
-        .probe          = dibusb_probe,
-        .disconnect = dibusb_disconnect,
-        .id_table       = dib_table,
-};
-
-/* module stuff */
-static int __init usb_dibusb_init(void)
-{
-        int result;
-        if ((result = usb_register(&dibusb_driver))) {
-                err("usb_register failed. Error number %d",result);
-                return result;
-        }
-        
-        return 0;
-}
-
-static void __exit usb_dibusb_exit(void)
-{
-        /* deregister this driver from the USB subsystem */
-        usb_deregister(&dibusb_driver);
-}
-
-module_init (usb_dibusb_init);
-module_exit (usb_dibusb_exit);
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c b/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c
deleted file mode 100644
index 04e54ec093f0..000000000000
--- a/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * dvb-dibusb-dvb.c is part of the driver for mobile USB Budget DVB-T devices 
- * based on reference design made by DiBcom (http://www.dibcom.fr/)
- *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
- *
- * see dvb-dibusb-core.c for more copyright details.
- *
- * This file contains functions for initializing and handling the 
- * linux-dvb API.
- */
-#include "dvb-dibusb.h"
-
-#include <linux/usb.h>
-#include <linux/version.h>
-
-static u32 urb_compl_count;
-
-/*
- * MPEG2 TS DVB stuff 
- */
-void dibusb_urb_complete(struct urb *urb, struct pt_regs *ptregs)
-{
-        struct usb_dibusb *dib = urb->context;
-
-        deb_ts("urb complete feedcount: %d, status: %d, length: %d\n",dib->feedcount,urb->status,
-                        urb->actual_length);
-
-        urb_compl_count++;
-        if (urb_compl_count % 1000 == 0)
-                deb_info("%d urbs completed so far.\n",urb_compl_count);
-
-        switch (urb->status) {
-                case 0:         /* success */
-                case -ETIMEDOUT:    /* NAK */
-                        break;
-                case -ECONNRESET:   /* kill */
-                case -ENOENT:
-                case -ESHUTDOWN:
-                        return;
-                default:        /* error */
-                        deb_ts("urb completition error %d.", urb->status);
-                        break;
-        }
-
-        if (dib->feedcount > 0 && urb->actual_length > 0) {
-                if (dib->init_state & DIBUSB_STATE_DVB)
-                        dvb_dmx_swfilter(&dib->demux, (u8*) urb->transfer_buffer,urb->actual_length);
-        } else 
-                deb_ts("URB dropped because of feedcount.\n");
-
-        usb_submit_urb(urb,GFP_ATOMIC);
-}
-
-static int dibusb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) 
-{
-        struct usb_dibusb *dib = dvbdmxfeed->demux->priv;
-        int newfeedcount;
-        
-        if (dib == NULL)
-                return -ENODEV;
-
-        newfeedcount = dib->feedcount + (onoff ? 1 : -1);
-
-        /* 
-         * stop feed before setting a new pid if there will be no pid anymore 
-         */
-        if (newfeedcount == 0) {
-                deb_ts("stop feeding\n");
-                if (dib->xfer_ops.fifo_ctrl != NULL) {
-                        if (dib->xfer_ops.fifo_ctrl(dib->fe,0)) {
-                                err("error while inhibiting fifo.");
-                                return -ENODEV;
-                        }
-                }
-                dibusb_streaming(dib,0);
-        }
-        
-        dib->feedcount = newfeedcount;
-
-        /* activate the pid on the device specific pid_filter */
-        deb_ts("setting pid: %5d %04x at index %d '%s'\n",dvbdmxfeed->pid,dvbdmxfeed->pid,dvbdmxfeed->index,onoff ? "on" : "off");
-        if (dib->pid_parse && dib->xfer_ops.pid_ctrl != NULL)
-                dib->xfer_ops.pid_ctrl(dib->fe,dvbdmxfeed->index,dvbdmxfeed->pid,onoff);
-
-        /* 
-         * start the feed if this was the first pid to set and there is still a pid
-         * for reception.
-         */
-        if (dib->feedcount == onoff && dib->feedcount > 0) {
-
-                deb_ts("controlling pid parser\n");
-                if (dib->xfer_ops.pid_parse != NULL) {
-                        if (dib->xfer_ops.pid_parse(dib->fe,dib->pid_parse) < 0) {
-                                err("could not handle pid_parser");
-                        }
-                }
-                
-                deb_ts("start feeding\n");
-                if (dib->xfer_ops.fifo_ctrl != NULL) {
-                        if (dib->xfer_ops.fifo_ctrl(dib->fe,1)) {
-                                err("error while enabling fifo.");
-                                return -ENODEV;
-                        }
-                }
-                dibusb_streaming(dib,1);
-        }
-        return 0;
-}
-
-static int dibusb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
-{
-        deb_ts("start pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid,dvbdmxfeed->type);
-        return dibusb_ctrl_feed(dvbdmxfeed,1);
-}
-
-static int dibusb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
-{
-        deb_ts("stop pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type);
-        return dibusb_ctrl_feed(dvbdmxfeed,0);
-}
-
-int dibusb_dvb_init(struct usb_dibusb *dib)
-{
-        int ret;
-
-        urb_compl_count = 0;
-
-        if ((ret = dvb_register_adapter(&dib->adapter, DRIVER_DESC,
-                        THIS_MODULE)) < 0) {
-                deb_info("dvb_register_adapter failed: error %d", ret);
-                goto err;
-        }
-        dib->adapter->priv = dib;
-        
-/* i2c is done in dibusb_i2c_init */
-        
-        dib->demux.dmx.capabilities = DMX_TS_FILTERING | DMX_SECTION_FILTERING;
-
-        dib->demux.priv = (void *)dib;
-        /* get pidcount from demod */
-        dib->demux.feednum = dib->demux.filternum = 255;
-        dib->demux.start_feed = dibusb_start_feed;
-        dib->demux.stop_feed = dibusb_stop_feed;
-        dib->demux.write_to_decoder = NULL;
-        if ((ret = dvb_dmx_init(&dib->demux)) < 0) {
-                err("dvb_dmx_init failed: error %d",ret);
-                goto err_dmx;
-        }
-
-        dib->dmxdev.filternum = dib->demux.filternum;
-        dib->dmxdev.demux = &dib->demux.dmx;
-        dib->dmxdev.capabilities = 0;
-        if ((ret = dvb_dmxdev_init(&dib->dmxdev, dib->adapter)) < 0) {
-                err("dvb_dmxdev_init failed: error %d",ret);
-                goto err_dmx_dev;
-        }
-
-        dvb_net_init(dib->adapter, &dib->dvb_net, &dib->demux.dmx);
-
-        goto success;
-err_dmx_dev:
-        dvb_dmx_release(&dib->demux);
-err_dmx:
-        dvb_unregister_adapter(dib->adapter);
-err:
-        return ret;
-success:
-        dib->init_state |= DIBUSB_STATE_DVB;
-        return 0;
-}
-
-int dibusb_dvb_exit(struct usb_dibusb *dib)
-{
-        if (dib->init_state & DIBUSB_STATE_DVB) {
-                dib->init_state &= ~DIBUSB_STATE_DVB;
-                deb_info("unregistering DVB part\n");
-                dvb_net_release(&dib->dvb_net);
-                dib->demux.dmx.close(&dib->demux.dmx);
-                dvb_dmxdev_release(&dib->dmxdev);
-                dvb_dmx_release(&dib->demux);
-                dvb_unregister_adapter(dib->adapter);
-        }
-        return 0;
-}
diff --git a/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c b/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c
deleted file mode 100644
index 2ed89488c7c4..000000000000
--- a/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- * dvb-dibusb-fe-i2c.c is part of the driver for mobile USB Budget DVB-T devices
- * based on reference design made by DiBcom (http://www.dibcom.fr/)
- *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
- *
- * see dvb-dibusb-core.c for more copyright details.
- *
- * This file contains functions for attaching, initializing of an appropriate
- * demodulator/frontend. I2C-stuff is also located here.
- *
- */
-#include "dvb-dibusb.h"
-
-#include <linux/usb.h>
-
-static int dibusb_i2c_msg(struct usb_dibusb *dib, u8 addr,
-                          u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
-{
-        u8 sndbuf[wlen+4]; /* lead(1) devaddr,direction(1) addr(2) data(wlen) (len(2) (when reading)) */
-        /* write only ? */
-        int wo = (rbuf == NULL || rlen == 0),
-                len = 2 + wlen + (wo ? 0 : 2);
-
-        sndbuf[0] = wo ? DIBUSB_REQ_I2C_WRITE : DIBUSB_REQ_I2C_READ;
-        sndbuf[1] = (addr << 1) | (wo ? 0 : 1);
-
-        memcpy(&sndbuf[2],wbuf,wlen);
-
-        if (!wo) {
-                sndbuf[wlen+2] = (rlen >> 8) & 0xff;
-                sndbuf[wlen+3] = rlen & 0xff;
-        }
-
-        return dibusb_readwrite_usb(dib,sndbuf,len,rbuf,rlen);
-}
-
-/*
- * I2C master xfer function
- */
-static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *msg,int num)
-{
-        struct usb_dibusb *dib = i2c_get_adapdata(adap);
-        int i;
-
-        if (down_interruptible(&dib->i2c_sem) < 0)
-                return -EAGAIN;
-
-        if (num > 2)
-                warn("more than 2 i2c messages at a time is not handled yet. TODO.");
-
-        for (i = 0; i < num; i++) {
-                /* write/read request */
-                if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
-                        if (dibusb_i2c_msg(dib, msg[i].addr, msg[i].buf,msg[i].len,
-                                                msg[i+1].buf,msg[i+1].len) < 0)
-                                break;
-                        i++;
-                } else
-                        if (dibusb_i2c_msg(dib, msg[i].addr, msg[i].buf,msg[i].len,NULL,0) < 0)
-                                break;
-        }
-
-        up(&dib->i2c_sem);
-        return i;
-}
-
-static u32 dibusb_i2c_func(struct i2c_adapter *adapter)
-{
-        return I2C_FUNC_I2C;
-}
-
-static struct i2c_algorithm dibusb_algo = {
-        .name                   = "DiBcom USB i2c algorithm",
-        .id                             = I2C_ALGO_BIT,
-        .master_xfer    = dibusb_i2c_xfer,
-        .functionality  = dibusb_i2c_func,
-};
-
-static int dibusb_general_demod_init(struct dvb_frontend *fe);
-static u8 dibusb_general_pll_addr(struct dvb_frontend *fe);
-static int dibusb_general_pll_init(struct dvb_frontend *fe, u8 pll_buf[5]);
-static int dibusb_general_pll_set(struct dvb_frontend *fe,
-                struct dvb_frontend_parameters* params, u8 pll_buf[5]);
-
-static struct mt352_config mt352_hanftek_umt_010_config = {
-        .demod_address = 0x1e,
-        .demod_init = dibusb_general_demod_init,
-        .pll_set = dibusb_general_pll_set,
-};
-
-static int dibusb_tuner_quirk(struct usb_dibusb *dib)
-{
-        switch (dib->dibdev->dev_cl->id) {
-                case DIBUSB1_1: /* some these device have the ENV77H11D5 and some the THOMSON CABLE */
-                case DIBUSB1_1_AN2235: { /* actually its this device, but in warm state they are indistinguishable */
-                        struct dibusb_tuner *t;
-                        u8 b[2] = { 0,0 } ,b2[1];
-                        struct i2c_msg msg[2] = {
-                                { .flags = 0, .buf = b, .len = 2 },
-                                { .flags = I2C_M_RD, .buf = b2, .len = 1},
-                        };
-
-                        t = &dibusb_tuner[DIBUSB_TUNER_COFDM_PANASONIC_ENV77H11D5];
-
-                        msg[0].addr = msg[1].addr = t->pll_addr;
-
-                        if (dib->xfer_ops.tuner_pass_ctrl != NULL)
-                                dib->xfer_ops.tuner_pass_ctrl(dib->fe,1,t->pll_addr);
-                        dibusb_i2c_xfer(&dib->i2c_adap,msg,2);
-                        if (dib->xfer_ops.tuner_pass_ctrl != NULL)
-                                dib->xfer_ops.tuner_pass_ctrl(dib->fe,0,t->pll_addr);
-
-                        if (b2[0] == 0xfe)
-                                info("this device has the Thomson Cable onboard. Which is default.");
-                        else {
-                                dib->tuner = t;
-                                info("this device has the Panasonic ENV77H11D5 onboard.");
-                        }
-                        break;
-                }
-                default:
-                        break;
-        }
-        return 0;
-}
-
-int dibusb_fe_init(struct usb_dibusb* dib)
-{
-        struct dib3000_config demod_cfg;
-        int i;
-
-        if (dib->init_state & DIBUSB_STATE_I2C) {
-                for (i = 0; i < sizeof(dib->dibdev->dev_cl->demod->i2c_addrs) / sizeof(unsigned char) &&
-                                dib->dibdev->dev_cl->demod->i2c_addrs[i] != 0; i++) {
-
-                        demod_cfg.demod_address = dib->dibdev->dev_cl->demod->i2c_addrs[i];
-                        demod_cfg.pll_addr = dibusb_general_pll_addr;
-                        demod_cfg.pll_set = dibusb_general_pll_set;
-                        demod_cfg.pll_init = dibusb_general_pll_init;
-
-                        deb_info("demod id: %d %d\n",dib->dibdev->dev_cl->demod->id,DTT200U_FE);
-
-                        switch (dib->dibdev->dev_cl->demod->id) {
-                                case DIBUSB_DIB3000MB:
-                                        dib->fe = dib3000mb_attach(&demod_cfg,&dib->i2c_adap,&dib->xfer_ops);
-                                break;
-                                case DIBUSB_DIB3000MC:
-                                        dib->fe = dib3000mc_attach(&demod_cfg,&dib->i2c_adap,&dib->xfer_ops);
-                                break;
-                                case DIBUSB_MT352:
-                                        mt352_hanftek_umt_010_config.demod_address = dib->dibdev->dev_cl->demod->i2c_addrs[i];
-                                        dib->fe = mt352_attach(&mt352_hanftek_umt_010_config, &dib->i2c_adap);
-                                break;
-                                case DTT200U_FE:
-                                        dib->fe = dtt200u_fe_attach(dib,&dib->xfer_ops);
-                                break;
-                        }
-                        if (dib->fe != NULL) {
-                                info("found demodulator at i2c address 0x%x",dib->dibdev->dev_cl->demod->i2c_addrs[i]);
-                                break;
-                        }
-                }
-                /* if a frontend was found */
-                if (dib->fe != NULL) {
-                        if (dib->fe->ops->sleep != NULL)
-                                dib->fe_sleep = dib->fe->ops->sleep;
-                        dib->fe->ops->sleep = dibusb_hw_sleep;
-
-                        if (dib->fe->ops->init != NULL )
-                                dib->fe_init = dib->fe->ops->init;
-                        dib->fe->ops->init = dibusb_hw_wakeup;
-
-                        /* setting the default tuner */
-                        dib->tuner = dib->dibdev->dev_cl->tuner;
-
-                        /* check which tuner is mounted on this device, in case this is unsure */
-                        dibusb_tuner_quirk(dib);
-                }
-        }
-        if (dib->fe == NULL) {
-                err("A frontend driver was not found for device '%s'.",
-                       dib->dibdev->name);
-                return -ENODEV;
-        } else {
-                if (dvb_register_frontend(dib->adapter, dib->fe)) {
-                        err("Frontend registration failed.");
-                        if (dib->fe->ops->release)
-                                dib->fe->ops->release(dib->fe);
-                        dib->fe = NULL;
-                        return -ENODEV;
-                }
-        }
-
-        return 0;
-}
-
-int dibusb_fe_exit(struct usb_dibusb *dib)
-{
-        if (dib->fe != NULL)
-                dvb_unregister_frontend(dib->fe);
-        return 0;
-}
-
-int dibusb_i2c_init(struct usb_dibusb *dib)
-{
-        int ret = 0;
-
-        dib->adapter->priv = dib;
-
-        strncpy(dib->i2c_adap.name,dib->dibdev->name,I2C_NAME_SIZE);
-#ifdef I2C_ADAP_CLASS_TV_DIGITAL
-        dib->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
-#else
-        dib->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
-#endif
-        dib->i2c_adap.algo              = &dibusb_algo;
-        dib->i2c_adap.algo_data = NULL;
-        dib->i2c_adap.id                = I2C_ALGO_BIT;
-
-        i2c_set_adapdata(&dib->i2c_adap, dib);
-
-        if ((ret = i2c_add_adapter(&dib->i2c_adap)) < 0)
-                err("could not add i2c adapter");
-
-        dib->init_state |= DIBUSB_STATE_I2C;
-
-        return ret;
-}
-
-int dibusb_i2c_exit(struct usb_dibusb *dib)
-{
-        if (dib->init_state & DIBUSB_STATE_I2C)
-                i2c_del_adapter(&dib->i2c_adap);
-        dib->init_state &= ~DIBUSB_STATE_I2C;
-        return 0;
-}
-
-
-/* pll stuff, maybe removed soon (thx to Gerd/Andrew in advance) */
-static int thomson_cable_eu_pll_set(struct dvb_frontend_parameters *fep, u8 pllbuf[4])
-{
-        u32 tfreq = (fep->frequency + 36125000) / 62500;
-        int vu,p0,p1,p2;
-
-        if (fep->frequency > 403250000)
-                vu = 1, p2 = 1, p1 = 0, p0 = 1;
-        else if (fep->frequency > 115750000)
-                vu = 0, p2 = 1, p1 = 1, p0 = 0;
-        else if (fep->frequency > 44250000)
-                vu = 0, p2 = 0, p1 = 1, p0 = 1;
-        else
-                return -EINVAL;
-
-        pllbuf[0] = (tfreq >> 8) & 0x7f;
-        pllbuf[1] = tfreq & 0xff;
-        pllbuf[2] = 0x8e;
-        pllbuf[3] = (vu << 7) | (p2 << 2) | (p1 << 1) | p0;
-        return 0;
-}
-
-static int panasonic_cofdm_env57h1xd5_pll_set(struct dvb_frontend_parameters *fep, u8 pllbuf[4])
-{
-        u32 freq_khz = fep->frequency / 1000;
-        u32 tfreq = ((freq_khz + 36125)*6 + 500) / 1000;
-        u8 TA, T210, R210, ctrl1, cp210, p4321;
-        if (freq_khz > 858000) {
-                err("frequency cannot be larger than 858 MHz.");
-                return -EINVAL;
-        }
-
-        // contol data 1 : 1 | T/A=1 | T2,T1,T0 = 0,0,0 | R2,R1,R0 = 0,1,0
-        TA = 1;
-        T210 = 0;
-        R210 = 0x2;
-        ctrl1 = (1 << 7) | (TA << 6) | (T210 << 3) | R210;
-
-// ********    CHARGE PUMP CONFIG vs RF FREQUENCIES     *****************
-        if (freq_khz < 470000)
-                cp210 = 2;  // VHF Low and High band ch E12 to E4 to E12
-        else if (freq_khz < 526000)
-                cp210 = 4;  // UHF band Ch E21 to E27
-        else // if (freq < 862000000)
-                cp210 = 5;  // UHF band ch E28 to E69
-
-//*********************    BW select  *******************************
-        if (freq_khz < 153000)
-                p4321  = 1; // BW selected for VHF low
-        else if (freq_khz < 470000)
-                p4321  = 2; // BW selected for VHF high E5 to E12
-        else // if (freq < 862000000)
-                p4321  = 4; // BW selection for UHF E21 to E69
-
-        pllbuf[0] = (tfreq >> 8) & 0xff;
-        pllbuf[1] = (tfreq >> 0) & 0xff;
-        pllbuf[2] = 0xff & ctrl1;
-        pllbuf[3] =  (cp210 << 5) | (p4321);
-
-        return 0;
-}
-
-/*
- *                          7   6               5       4       3       2       1       0
- * Address Byte             1   1               0       0       0       MA1     MA0     R/~W=0
- *
- * Program divider byte 1   0   n14             n13     n12     n11     n10     n9      n8
- * Program divider byte 2       n7      n6              n5      n4      n3      n2      n1      n0
- *
- * Control byte 1           1   T/A=1   T2      T1      T0      R2      R1      R0
- *                          1   T/A=0   0       0       ATC     AL2     AL1     AL0
- *
- * Control byte 2           CP2 CP1             CP0     BS5     BS4     BS3     BS2     BS1
- *
- * MA0/1 = programmable address bits
- * R/~W  = read/write bit (0 for writing)
- * N14-0 = programmable LO frequency
- *
- * T/A   = test AGC bit (0 = next 6 bits AGC setting,
- *                       1 = next 6 bits test and reference divider ratio settings)
- * T2-0  = test bits
- * R2-0  = reference divider ratio and programmable frequency step
- * ATC   = AGC current setting and time constant
- *         ATC = 0: AGC current = 220nA, AGC time constant = 2s
- *         ATC = 1: AGC current = 9uA, AGC time constant = 50ms
- * AL2-0 = AGC take-over point bits
- * CP2-0 = charge pump current
- * BS5-1 = PMOS ports control bits;
- *             BSn = 0 corresponding port is off, high-impedance state (at power-on)
- *             BSn = 1 corresponding port is on
- */
-static int panasonic_cofdm_env77h11d5_tda6650_init(struct dvb_frontend *fe, u8 pllbuf[4])
-{
-        pllbuf[0] = 0x0b;
-        pllbuf[1] = 0xf5;
-        pllbuf[2] = 0x85;
-        pllbuf[3] = 0xab;
-        return 0;
-}
-
-static int panasonic_cofdm_env77h11d5_tda6650_set (struct dvb_frontend_parameters *fep,u8 pllbuf[4])
-{
-        int tuner_frequency = 0;
-        u8 band, cp, filter;
-
-        // determine charge pump
-        tuner_frequency = fep->frequency + 36166000;
-        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;
-
-        // determine band
-        if (fep->frequency < 49000000)
-                return -EINVAL;
-        else if (fep->frequency < 161000000)
-                band = 1;
-        else if (fep->frequency < 444000000)
-                band = 2;
-        else if (fep->frequency < 861000000)
-                band = 4;
-        else
-                return -EINVAL;
-
-        // setup PLL filter
-        switch (fep->u.ofdm.bandwidth) {
-                case BANDWIDTH_6_MHZ:
-                case BANDWIDTH_7_MHZ:
-                        filter = 0;
-                        break;
-                case BANDWIDTH_8_MHZ:
-                        filter = 1;
-                        break;
-                default:
-                        return -EINVAL;
-        }
-
-        // calculate divisor
-        // ((36166000+((1000000/6)/2)) + Finput)/(1000000/6)
-        tuner_frequency = (((fep->frequency / 1000) * 6) + 217496) / 1000;
-
-        // setup tuner buffer
-        pllbuf[0] = (tuner_frequency >> 8) & 0x7f;
-        pllbuf[1] = tuner_frequency & 0xff;
-        pllbuf[2] = 0xca;
-        pllbuf[3] = (cp << 5) | (filter << 3) | band;
-        return 0;
-}
-
-/*
- *                          7   6       5       4       3       2       1       0
- * Address Byte             1   1       0       0       0       MA1     MA0     R/~W=0
- *
- * Program divider byte 1   0   n14     n13     n12     n11     n10     n9      n8
- * Program divider byte 2       n7      n6      n5      n4      n3      n2      n1      n0
- *
- * Control byte             1   CP      T2      T1      T0      RSA     RSB     OS
- *
- * Band Switch byte         X   X       X       P4      P3      P2      P1      P0
- *
- * Auxiliary byte           ATC AL2     AL1     AL0     0       0       0       0
- *
- * Address: MA1 MA0     Address
- *          0   0       c0
- *          0   1       c2 (always valid)
- *          1   0       c4
- *          1   1       c6
- */
-static int lg_tdtp_e102p_tua6034(struct dvb_frontend_parameters* fep, u8 pllbuf[4])
-{
-        u32 div;
-        u8 p210, p3;
-
-#define TUNER_MUL 62500
-
-        div = (fep->frequency + 36125000 + TUNER_MUL / 2) / TUNER_MUL;
-//      div = ((fep->frequency/1000 + 36166) * 6) / 1000;
-
-        if (fep->frequency < 174500000)
-                p210 = 1; // not supported by the tdtp_e102p
-        else if (fep->frequency < 230000000) // VHF
-                p210 = 2;
-        else
-                p210 = 4;
-
-        if (fep->u.ofdm.bandwidth == BANDWIDTH_7_MHZ)
-                p3 = 0;
-        else
-                p3 = 1;
-
-        pllbuf[0] = (div >> 8) & 0x7f;
-        pllbuf[1] = div & 0xff;
-        pllbuf[2] = 0xce;
-//      pllbuf[2] = 0xcc;
-        pllbuf[3] = (p3 << 3) | p210;
-
-        return 0;
-}
-
-static int lg_tdtp_e102p_mt352_demod_init(struct dvb_frontend *fe)
-{
-        static u8 mt352_clock_config[] = { 0x89, 0xb8, 0x2d };
-        static u8 mt352_reset[] = { 0x50, 0x80 };
-        static u8 mt352_mclk_ratio[] = { 0x8b, 0x00 };
-        static u8 mt352_adc_ctl_1_cfg[] = { 0x8E, 0x40 };
-        static u8 mt352_agc_cfg[] = { 0x67, 0x10, 0xa0 };
-
-        static u8 mt352_sec_agc_cfg1[] = { 0x6a, 0xff };
-        static u8 mt352_sec_agc_cfg2[] = { 0x6d, 0xff };
-        static u8 mt352_sec_agc_cfg3[] = { 0x70, 0x40 };
-        static u8 mt352_sec_agc_cfg4[] = { 0x7b, 0x03 };
-        static u8 mt352_sec_agc_cfg5[] = { 0x7d, 0x0f };
-
-        static u8 mt352_acq_ctl[] = { 0x53, 0x50 };
-        static u8 mt352_input_freq_1[] = { 0x56, 0x31, 0x06 };
-
-        mt352_write(fe, mt352_clock_config, sizeof(mt352_clock_config));
-        udelay(2000);
-        mt352_write(fe, mt352_reset, sizeof(mt352_reset));
-        mt352_write(fe, mt352_mclk_ratio, sizeof(mt352_mclk_ratio));
-
-        mt352_write(fe, mt352_adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg));
-        mt352_write(fe, mt352_agc_cfg, sizeof(mt352_agc_cfg));
-
-        mt352_write(fe, mt352_sec_agc_cfg1, sizeof(mt352_sec_agc_cfg1));
-        mt352_write(fe, mt352_sec_agc_cfg2, sizeof(mt352_sec_agc_cfg2));
-        mt352_write(fe, mt352_sec_agc_cfg3, sizeof(mt352_sec_agc_cfg3));
-        mt352_write(fe, mt352_sec_agc_cfg4, sizeof(mt352_sec_agc_cfg4));
-        mt352_write(fe, mt352_sec_agc_cfg5, sizeof(mt352_sec_agc_cfg5));
-
-        mt352_write(fe, mt352_acq_ctl, sizeof(mt352_acq_ctl));
-        mt352_write(fe, mt352_input_freq_1, sizeof(mt352_input_freq_1));
-
-        return 0;
-}
-
-static int dibusb_general_demod_init(struct dvb_frontend *fe)
-{
-        struct usb_dibusb* dib = (struct usb_dibusb*) fe->dvb->priv;
-        switch (dib->dibdev->dev_cl->id) {
-                case UMT2_0:
-                        return lg_tdtp_e102p_mt352_demod_init(fe);
-                default: /* other device classes do not have device specific demod inits */
-                        break;
-        }
-        return 0;
-}
-
-static u8 dibusb_general_pll_addr(struct dvb_frontend *fe)
-{
-        struct usb_dibusb* dib = (struct usb_dibusb*) fe->dvb->priv;
-        return dib->tuner->pll_addr;
-}
-
-static int dibusb_pll_i2c_helper(struct usb_dibusb *dib, u8 pll_buf[5], u8 buf[4])
-{
-        if (pll_buf == NULL) {
-                struct i2c_msg msg = {
-                        .addr = dib->tuner->pll_addr,
-                        .flags = 0,
-                        .buf = buf,
-                        .len = sizeof(buf)
-                };
-                if (i2c_transfer (&dib->i2c_adap, &msg, 1) != 1)
-                        return -EIO;
-                msleep(1);
-        } else {
-                pll_buf[0] = dib->tuner->pll_addr << 1;
-                memcpy(&pll_buf[1],buf,4);
-        }
-
-        return 0;
-}
-
-static int dibusb_general_pll_init(struct dvb_frontend *fe,
-                u8 pll_buf[5])
-{
-        struct usb_dibusb* dib = (struct usb_dibusb*) fe->dvb->priv;
-        u8 buf[4];
-        int ret=0;
-        switch (dib->tuner->id) {
-                case DIBUSB_TUNER_COFDM_PANASONIC_ENV77H11D5:
-                        ret = panasonic_cofdm_env77h11d5_tda6650_init(fe,buf);
-                        break;
-                default:
-                        break;
-        }
-
-        if (ret)
-                return ret;
-
-        return dibusb_pll_i2c_helper(dib,pll_buf,buf);
-}
-
-static int dibusb_general_pll_set(struct dvb_frontend *fe,
-                struct dvb_frontend_parameters *fep, u8 pll_buf[5])
-{
-        struct usb_dibusb* dib = (struct usb_dibusb*) fe->dvb->priv;
-        u8 buf[4];
-        int ret=0;
-
-        switch (dib->tuner->id) {
-                case DIBUSB_TUNER_CABLE_THOMSON:
-                        ret = thomson_cable_eu_pll_set(fep, buf);
-                        break;
-                case DIBUSB_TUNER_COFDM_PANASONIC_ENV57H1XD5:
-                        ret = panasonic_cofdm_env57h1xd5_pll_set(fep, buf);
-                        break;
-                case DIBUSB_TUNER_CABLE_LG_TDTP_E102P:
-                        ret = lg_tdtp_e102p_tua6034(fep, buf);
-                        break;
-                case DIBUSB_TUNER_COFDM_PANASONIC_ENV77H11D5:
-                        ret = panasonic_cofdm_env77h11d5_tda6650_set(fep,buf);
-                        break;
-                default:
-                        warn("no pll programming routine found for tuner %d.\n",dib->tuner->id);
-                        ret = -ENODEV;
-                        break;
-        }
-
-        if (ret)
-                return ret;
-
-        return dibusb_pll_i2c_helper(dib,pll_buf,buf);
-}
diff --git a/drivers/media/dvb/dibusb/dvb-dibusb-firmware.c b/drivers/media/dvb/dibusb/dvb-dibusb-firmware.c
deleted file mode 100644
index 504ba47afdf3..000000000000
--- a/drivers/media/dvb/dibusb/dvb-dibusb-firmware.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * dvb-dibusb-firmware.c is part of the driver for mobile USB Budget DVB-T devices 
- * based on reference design made by DiBcom (http://www.dibcom.fr/)
- *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
- *
- * see dvb-dibusb-core.c for more copyright details.
- *
- * This file contains functions for downloading the firmware to the device.
- */
-#include "dvb-dibusb.h"
-
-#include <linux/firmware.h>
-#include <linux/usb.h>
-
-/*
- * load a firmware packet to the device 
- */
-static int dibusb_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 len)
-{
-        return usb_control_msg(udev, usb_sndctrlpipe(udev,0),
-                        0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5000);
-}
-
-int dibusb_loadfirmware(struct usb_device *udev, struct dibusb_usb_device *dibdev)
-{
-        const struct firmware *fw = NULL;
-        u16 addr;
-        u8 *b,*p;
-        int ret = 0,i;
-        
-        if ((ret = request_firmware(&fw, dibdev->dev_cl->firmware, &udev->dev)) != 0) {
-                err("did not find the firmware file. (%s) "
-                        "Please see linux/Documentation/dvb/ for more details on firmware-problems.",
-                        dibdev->dev_cl->firmware);
-                return ret;
-        }
-
-        info("downloading firmware from file '%s'.",dibdev->dev_cl->firmware);
-        
-        p = kmalloc(fw->size,GFP_KERNEL);       
-        if (p != NULL) {
-                u8 reset;
-                /*
-                 * you cannot use the fw->data as buffer for 
-                 * usb_control_msg, a new buffer has to be
-                 * created
-                 */
-                memcpy(p,fw->data,fw->size);
-
-                /* stop the CPU */
-                reset = 1;
-                if ((ret = dibusb_writemem(udev,dibdev->dev_cl->usb_ctrl->cpu_cs_register,&reset,1)) != 1) 
-                        err("could not stop the USB controller CPU.");
-                for(i = 0; p[i+3] == 0 && i < fw->size; ) { 
-                        b = (u8 *) &p[i];
-                        addr = *((u16 *) &b[1]);
-
-                        ret = dibusb_writemem(udev,addr,&b[4],b[0]);
-                
-                        if (ret != b[0]) {
-                                err("error while transferring firmware "
-                                        "(transferred size: %d, block size: %d)",
-                                        ret,b[0]);
-                                ret = -EINVAL;
-                                break;
-                        }
-                        i += 5 + b[0];
-                }
-                /* length in ret */
-                if (ret > 0)
-                        ret = 0;
-                /* restart the CPU */
-                reset = 0;
-                if (ret || dibusb_writemem(udev,dibdev->dev_cl->usb_ctrl->cpu_cs_register,&reset,1) != 1) {
-                        err("could not restart the USB controller CPU.");
-                        ret = -EINVAL;
-                }
-
-                kfree(p);
-        } else { 
-                ret = -ENOMEM;
-        }
-        release_firmware(fw);
-
-        return ret;
-}
diff --git a/drivers/media/dvb/dibusb/dvb-dibusb-remote.c b/drivers/media/dvb/dibusb/dvb-dibusb-remote.c
deleted file mode 100644
index 9dc8b15517b7..000000000000
--- a/drivers/media/dvb/dibusb/dvb-dibusb-remote.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * dvb-dibusb-remote.c is part of the driver for mobile USB Budget DVB-T devices
- * based on reference design made by DiBcom (http://www.dibcom.fr/)
- *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
- *
- * see dvb-dibusb-core.c for more copyright details.
- *
- * This file contains functions for handling the event device on the software
- * side and the remote control on the hardware side.
- */
-#include "dvb-dibusb.h"
-
-/* Table to map raw key codes to key events.  This should not be hard-wired
-   into the kernel.  */
-static const struct { u8 c0, c1, c2; uint32_t key; } nec_rc_keys [] =
-{
-        /* Key codes for the little Artec T1/Twinhan/HAMA/ remote. */
-        { 0x00, 0xff, 0x16, KEY_POWER },
-        { 0x00, 0xff, 0x10, KEY_MUTE },
-        { 0x00, 0xff, 0x03, KEY_1 },
-        { 0x00, 0xff, 0x01, KEY_2 },
-        { 0x00, 0xff, 0x06, KEY_3 },
-        { 0x00, 0xff, 0x09, KEY_4 },
-        { 0x00, 0xff, 0x1d, KEY_5 },
-        { 0x00, 0xff, 0x1f, KEY_6 },
-        { 0x00, 0xff, 0x0d, KEY_7 },
-        { 0x00, 0xff, 0x19, KEY_8 },
-        { 0x00, 0xff, 0x1b, KEY_9 },
-        { 0x00, 0xff, 0x15, KEY_0 },
-        { 0x00, 0xff, 0x05, KEY_CHANNELUP },
-        { 0x00, 0xff, 0x02, KEY_CHANNELDOWN },
-        { 0x00, 0xff, 0x1e, KEY_VOLUMEUP },
-        { 0x00, 0xff, 0x0a, KEY_VOLUMEDOWN },
-        { 0x00, 0xff, 0x11, KEY_RECORD },
-        { 0x00, 0xff, 0x17, KEY_FAVORITES }, /* Heart symbol - Channel list. */
-        { 0x00, 0xff, 0x14, KEY_PLAY },
-        { 0x00, 0xff, 0x1a, KEY_STOP },
-        { 0x00, 0xff, 0x40, KEY_REWIND },
-        { 0x00, 0xff, 0x12, KEY_FASTFORWARD },
-        { 0x00, 0xff, 0x0e, KEY_PREVIOUS }, /* Recall - Previous channel. */
-        { 0x00, 0xff, 0x4c, KEY_PAUSE },
-        { 0x00, 0xff, 0x4d, KEY_SCREEN }, /* Full screen mode. */
-        { 0x00, 0xff, 0x54, KEY_AUDIO }, /* MTS - Switch to secondary audio. */
-        /* additional keys TwinHan VisionPlus, the Artec seemingly not have */
-        { 0x00, 0xff, 0x0c, KEY_CANCEL }, /* Cancel */
-        { 0x00, 0xff, 0x1c, KEY_EPG }, /* EPG */
-        { 0x00, 0xff, 0x00, KEY_TAB }, /* Tab */
-        { 0x00, 0xff, 0x48, KEY_INFO }, /* Preview */
-        { 0x00, 0xff, 0x04, KEY_LIST }, /* RecordList */
-        { 0x00, 0xff, 0x0f, KEY_TEXT }, /* Teletext */
-        /* Key codes for the KWorld/ADSTech/JetWay remote. */
-        { 0x86, 0x6b, 0x12, KEY_POWER },
-        { 0x86, 0x6b, 0x0f, KEY_SELECT }, /* source */
-        { 0x86, 0x6b, 0x0c, KEY_UNKNOWN }, /* scan */
-        { 0x86, 0x6b, 0x0b, KEY_EPG },
-        { 0x86, 0x6b, 0x10, KEY_MUTE },
-        { 0x86, 0x6b, 0x01, KEY_1 },
-        { 0x86, 0x6b, 0x02, KEY_2 },
-        { 0x86, 0x6b, 0x03, KEY_3 },
-        { 0x86, 0x6b, 0x04, KEY_4 },
-        { 0x86, 0x6b, 0x05, KEY_5 },
-        { 0x86, 0x6b, 0x06, KEY_6 },
-        { 0x86, 0x6b, 0x07, KEY_7 },
-        { 0x86, 0x6b, 0x08, KEY_8 },
-        { 0x86, 0x6b, 0x09, KEY_9 },
-        { 0x86, 0x6b, 0x0a, KEY_0 },
-        { 0x86, 0x6b, 0x18, KEY_ZOOM },
-        { 0x86, 0x6b, 0x1c, KEY_UNKNOWN }, /* preview */
-        { 0x86, 0x6b, 0x13, KEY_UNKNOWN }, /* snap */
-        { 0x86, 0x6b, 0x00, KEY_UNDO },
-        { 0x86, 0x6b, 0x1d, KEY_RECORD },
-        { 0x86, 0x6b, 0x0d, KEY_STOP },
-        { 0x86, 0x6b, 0x0e, KEY_PAUSE },
-        { 0x86, 0x6b, 0x16, KEY_PLAY },
-        { 0x86, 0x6b, 0x11, KEY_BACK },
-        { 0x86, 0x6b, 0x19, KEY_FORWARD },
-        { 0x86, 0x6b, 0x14, KEY_UNKNOWN }, /* pip */
-        { 0x86, 0x6b, 0x15, KEY_ESC },
-        { 0x86, 0x6b, 0x1a, KEY_UP },
-        { 0x86, 0x6b, 0x1e, KEY_DOWN },
-        { 0x86, 0x6b, 0x1f, KEY_LEFT },
-        { 0x86, 0x6b, 0x1b, KEY_RIGHT },
-};
-
-/* Hauppauge NOVA-T USB2 keys */
-static const struct { u16 raw; uint32_t key; } haupp_rc_keys [] = {
-        { 0xddf, KEY_GOTO },
-        { 0xdef, KEY_POWER },
-        { 0xce7, KEY_TV },
-        { 0xcc7, KEY_VIDEO },
-        { 0xccf, KEY_AUDIO },
-        { 0xcd7, KEY_MEDIA },
-        { 0xcdf, KEY_EPG },
-        { 0xca7, KEY_UP },
-        { 0xc67, KEY_RADIO },
-        { 0xcb7, KEY_LEFT },
-        { 0xd2f, KEY_OK },
-        { 0xcbf, KEY_RIGHT },
-        { 0xcff, KEY_BACK },
-        { 0xcaf, KEY_DOWN },
-        { 0xc6f, KEY_MENU },
-        { 0xc87, KEY_VOLUMEUP },
-        { 0xc8f, KEY_VOLUMEDOWN },
-        { 0xc97, KEY_CHANNEL },
-        { 0xc7f, KEY_MUTE },
-        { 0xd07, KEY_CHANNELUP },
-        { 0xd0f, KEY_CHANNELDOWN },
-        { 0xdbf, KEY_RECORD },
-        { 0xdb7, KEY_STOP },
-        { 0xd97, KEY_REWIND },
-        { 0xdaf, KEY_PLAY },
-        { 0xda7, KEY_FASTFORWARD },
-        { 0xd27, KEY_LAST }, /* Skip backwards */
-        { 0xd87, KEY_PAUSE },
-        { 0xcf7, KEY_NEXT },
-        { 0xc07, KEY_0 },
-        { 0xc0f, KEY_1 },
-        { 0xc17, KEY_2 },
-        { 0xc1f, KEY_3 },
-        { 0xc27, KEY_4 },
-        { 0xc2f, KEY_5 },
-        { 0xc37, KEY_6 },
-        { 0xc3f, KEY_7 },
-        { 0xc47, KEY_8 },
-        { 0xc4f, KEY_9 },
-        { 0xc57, KEY_KPASTERISK },
-        { 0xc77, KEY_GRAVE }, /* # */
-        { 0xc5f, KEY_RED },
-        { 0xd77, KEY_GREEN },
-        { 0xdc7, KEY_YELLOW },
-        { 0xd4f, KEY_BLUE},
-};
-
-static int dibusb_key2event_nec(struct usb_dibusb *dib,u8 rb[5])
-{
-        int i;
-        switch (rb[0]) {
-                case DIBUSB_RC_NEC_KEY_PRESSED:
-                        /* rb[1-3] is the actual key, rb[4] is a checksum */
-                        deb_rc("raw key code 0x%02x, 0x%02x, 0x%02x, 0x%02x\n",
-                                rb[1], rb[2], rb[3], rb[4]);
-
-                        if ((0xff - rb[3]) != rb[4]) {
-                                deb_rc("remote control checksum failed.\n");
-                                break;
-                        }
-
-                        /* See if we can match the raw key code. */
-                        for (i = 0; i < sizeof(nec_rc_keys)/sizeof(nec_rc_keys[0]); i++) {
-                                if (nec_rc_keys[i].c0 == rb[1] &&
-                                        nec_rc_keys[i].c1 == rb[2] &&
-                                        nec_rc_keys[i].c2 == rb[3]) {
-
-                                        dib->last_event = nec_rc_keys[i].key;
-                                        return 1;
-                                }
-                        }
-                        break;
-                case DIBUSB_RC_NEC_KEY_REPEATED:
-                        /* rb[1]..rb[4] are always zero.*/
-                        /* Repeats often seem to occur so for the moment just ignore this. */
-                        return 0;
-                case DIBUSB_RC_NEC_EMPTY: /* No (more) remote control keys. */
-                default:
-                        break;
-        }
-        return -1;
-}
-
-static int dibusb_key2event_hauppauge(struct usb_dibusb *dib,u8 rb[4])
-{
-        u16 raw;
-        int i,state;
-        switch (rb[0]) {
-                case DIBUSB_RC_HAUPPAUGE_KEY_PRESSED:
-                        raw = ((rb[1] & 0x0f) << 8) | rb[2];
-
-                        state = !!(rb[1] & 0x40);
-
-                        deb_rc("raw key code 0x%02x, 0x%02x, 0x%02x to %04x state: %d\n",rb[1],rb[2],rb[3],raw,state);
-                        for (i = 0; i < sizeof(haupp_rc_keys)/sizeof(haupp_rc_keys[0]); i++) {
-                                if (haupp_rc_keys[i].raw == raw) {
-                                        if (dib->last_event == haupp_rc_keys[i].key &&
-                                                dib->last_state == state) {
-                                                deb_rc("key repeat\n");
-                                                return 0;
-                                        } else {
-                                                dib->last_event = haupp_rc_keys[i].key;
-                                                dib->last_state = state;
-                                                return 1;
-                                        }
-                                }
-                        }
-
-                        break;
-                case DIBUSB_RC_HAUPPAUGE_KEY_EMPTY:
-                default:
-                        break;
-        }
-        return -1;
-}
-
-/*
- * Read the remote control and feed the appropriate event.
- * NEC protocol is used for remote controls
- */
-static int dibusb_read_remote_control(struct usb_dibusb *dib)
-{
-        u8 b[1] = { DIBUSB_REQ_POLL_REMOTE }, rb[5];
-        int ret,event = 0;
-
-        if ((ret = dibusb_readwrite_usb(dib,b,1,rb,5)))
-                return ret;
-
-        switch (dib->dibdev->dev_cl->remote_type) {
-                case DIBUSB_RC_NEC_PROTOCOL:
-                        event = dibusb_key2event_nec(dib,rb);
-                        break;
-                case DIBUSB_RC_HAUPPAUGE_PROTO:
-                        event = dibusb_key2event_hauppauge(dib,rb);
-                default:
-                        break;
-        }
-
-        /* key repeat */
-        if (event == 0)
-                if (++dib->repeat_key_count < dib->rc_key_repeat_count) {
-                        deb_rc("key repeat dropped. (%d)\n",dib->repeat_key_count);
-                        event = -1; /* skip this key repeat */
-                }
-
-        if (event == 1 || event == 0) {
-                deb_rc("Translated key 0x%04x\n",event);
-
-                /* Signal down and up events for this key. */
-                input_report_key(&dib->rc_input_dev, dib->last_event, 1);
-                input_report_key(&dib->rc_input_dev, dib->last_event, 0);
-                input_sync(&dib->rc_input_dev);
-
-                if (event == 1)
-                        dib->repeat_key_count = 0;
-        }
-        return 0;
-}
-
-/* Remote-control poll function - called every dib->rc_query_interval ms to see
-   whether the remote control has received anything. */
-static void dibusb_remote_query(void *data)
-{
-        struct usb_dibusb *dib = (struct usb_dibusb *) data;
-        /* TODO: need a lock here.  We can simply skip checking for the remote control
-           if we're busy. */
-        dibusb_read_remote_control(dib);
-        schedule_delayed_work(&dib->rc_query_work,
-                              msecs_to_jiffies(dib->rc_query_interval));
-}
-
-int dibusb_remote_init(struct usb_dibusb *dib)
-{
-        int i;
-
-        if (dib->dibdev->dev_cl->remote_type == DIBUSB_RC_NO)
-                return 0;
-        
-        /* Initialise the remote-control structures.*/
-        init_input_dev(&dib->rc_input_dev);
-
-        dib->rc_input_dev.evbit[0] = BIT(EV_KEY);
-        dib->rc_input_dev.keycodesize = sizeof(unsigned char);
-        dib->rc_input_dev.keycodemax = KEY_MAX;
-        dib->rc_input_dev.name = DRIVER_DESC " remote control";
-
-        switch (dib->dibdev->dev_cl->remote_type) {
-                case DIBUSB_RC_NEC_PROTOCOL:
-                        for (i=0; i<sizeof(nec_rc_keys)/sizeof(nec_rc_keys[0]); i++)
-                                set_bit(nec_rc_keys[i].key, dib->rc_input_dev.keybit);
-                        break;
-                case DIBUSB_RC_HAUPPAUGE_PROTO:
-                        for (i=0; i<sizeof(haupp_rc_keys)/sizeof(haupp_rc_keys[0]); i++)
-                                set_bit(haupp_rc_keys[i].key, dib->rc_input_dev.keybit);
-                        break;
-                default:
-                        break;
-        }
-
-
-        input_register_device(&dib->rc_input_dev);
-
-        INIT_WORK(&dib->rc_query_work, dibusb_remote_query, dib);
-
-        /* Start the remote-control polling. */
-        if (dib->rc_query_interval < 40)
-                dib->rc_query_interval = 100; /* default */
-
-        info("schedule remote query interval to %d msecs.",dib->rc_query_interval);
-        schedule_delayed_work(&dib->rc_query_work,msecs_to_jiffies(dib->rc_query_interval));
-
-        dib->init_state |= DIBUSB_STATE_REMOTE;
-        
-        return 0;
-}
-
-int dibusb_remote_exit(struct usb_dibusb *dib)
-{
-        if (dib->dibdev->dev_cl->remote_type == DIBUSB_RC_NO)
-                return 0;
-
-        if (dib->init_state & DIBUSB_STATE_REMOTE) {
-                cancel_delayed_work(&dib->rc_query_work);
-                flush_scheduled_work();
-                input_unregister_device(&dib->rc_input_dev);
-        }
-        dib->init_state &= ~DIBUSB_STATE_REMOTE;
-        return 0;
-}
diff --git a/drivers/media/dvb/dibusb/dvb-dibusb-usb.c b/drivers/media/dvb/dibusb/dvb-dibusb-usb.c
deleted file mode 100644
index 642f0596a5ba..000000000000
--- a/drivers/media/dvb/dibusb/dvb-dibusb-usb.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * dvb-dibusb-usb.c is part of the driver for mobile USB Budget DVB-T devices
- * based on reference design made by DiBcom (http://www.dibcom.fr/)
- *
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
- *
- * see dvb-dibusb-core.c for more copyright details.
- *
- * This file contains functions for initializing and handling the
- * usb specific stuff.
- */
-#include "dvb-dibusb.h"
-
-#include <linux/version.h>
-#include <linux/pci.h>
-
-int dibusb_readwrite_usb(struct usb_dibusb *dib, u8 *wbuf, u16 wlen, u8 *rbuf,
-                u16 rlen)
-{
-        int actlen,ret = -ENOMEM;
-
-        if (wbuf == NULL || wlen == 0)
-                return -EINVAL;
-
-        if ((ret = down_interruptible(&dib->usb_sem)))
-                return ret;
-
-        debug_dump(wbuf,wlen);
-
-        ret = usb_bulk_msg(dib->udev,usb_sndbulkpipe(dib->udev,
-                        dib->dibdev->dev_cl->pipe_cmd), wbuf,wlen,&actlen,
-                        DIBUSB_I2C_TIMEOUT);
-
-        if (ret)
-                err("bulk message failed: %d (%d/%d)",ret,wlen,actlen);
-        else
-                ret = actlen != wlen ? -1 : 0;
-
-        /* an answer is expected, and no error before */
-        if (!ret && rbuf && rlen) {
-                ret = usb_bulk_msg(dib->udev,usb_rcvbulkpipe(dib->udev,
-                                dib->dibdev->dev_cl->pipe_cmd),rbuf,rlen,&actlen,
-                                DIBUSB_I2C_TIMEOUT);
-
-                if (ret)
-                        err("recv bulk message failed: %d",ret);
-                else {
-                        deb_alot("rlen: %d\n",rlen);
-                        debug_dump(rbuf,actlen);
-                }
-        }
-
-        up(&dib->usb_sem);
-        return ret;
-}
-
-/*
- * Cypress controls
- */
-int dibusb_write_usb(struct usb_dibusb *dib, u8 *buf, u16 len)
-{
-        return dibusb_readwrite_usb(dib,buf,len,NULL,0);
-}
-
-#if 0
-/*
- * #if 0'ing the following functions as they are not in use _now_,
- * but probably will be sometime.
- */
-/*
- * do not use this, just a workaround for a bug,
- * which will hopefully never occur :).
- */
-int dibusb_interrupt_read_loop(struct usb_dibusb *dib)
-{
-        u8 b[1] = { DIBUSB_REQ_INTR_READ };
-        return dibusb_write_usb(dib,b,1);
-}
-#endif
-
-/*
- * ioctl for the firmware
- */
-static int dibusb_ioctl_cmd(struct usb_dibusb *dib, u8 cmd, u8 *param, int plen)
-{
-        u8 b[34];
-        int size = plen > 32 ? 32 : plen;
-        memset(b,0,34);
-        b[0] = DIBUSB_REQ_SET_IOCTL;
-        b[1] = cmd;
-
-        if (size > 0)
-                memcpy(&b[2],param,size);
-
-        return dibusb_write_usb(dib,b,34); //2+size);
-}
-
-/*
- * ioctl for power control
- */
-int dibusb_hw_wakeup(struct dvb_frontend *fe)
-{
-        struct usb_dibusb *dib = (struct usb_dibusb *) fe->dvb->priv;
-        u8 b[1] = { DIBUSB_IOCTL_POWER_WAKEUP };
-        deb_info("dibusb-device is getting up.\n");
-
-        switch (dib->dibdev->dev_cl->id) {
-                case DTT200U:
-                        break;
-                default:
-                        dibusb_ioctl_cmd(dib,DIBUSB_IOCTL_CMD_POWER_MODE, b,1);
-                        break;
-        }
-
-        if (dib->fe_init)
-                return dib->fe_init(fe);
-
-        return 0;
-}
-
-int dibusb_hw_sleep(struct dvb_frontend *fe)
-{
-        struct usb_dibusb *dib = (struct usb_dibusb *) fe->dvb->priv;
-        u8 b[1] = { DIBUSB_IOCTL_POWER_SLEEP };
-        deb_info("dibusb-device is going to bed.\n");
-        /* workaround, something is wrong, when dibusb 1.1 device are going to bed too late */
-        switch (dib->dibdev->dev_cl->id) {
-                case DIBUSB1_1:
-                case NOVAT_USB2:
-                case DTT200U:
-                        break;
-                default:
-                        dibusb_ioctl_cmd(dib,DIBUSB_IOCTL_CMD_POWER_MODE, b,1);
-                        break;
-        }
-        if (dib->fe_sleep)
-                return dib->fe_sleep(fe);
-
-        return 0;
-}
-
-int dibusb_set_streaming_mode(struct usb_dibusb *dib,u8 mode)
-{
-        u8 b[2] = { DIBUSB_REQ_SET_STREAMING_MODE, mode };
-        return dibusb_readwrite_usb(dib,b,2,NULL,0);
-}
-
-static int dibusb_urb_kill(struct usb_dibusb *dib)
-{
-        int i;
-deb_info("trying to kill urbs\n");
-        if (dib->init_state & DIBUSB_STATE_URB_SUBMIT) {
-                for (i = 0; i < dib->dibdev->dev_cl->urb_count; i++) {
-                        deb_info("killing URB no. %d.\n",i);
-
-                        /* stop the URB */
-                        usb_kill_urb(dib->urb_list[i]);
-                }
-        } else
-        deb_info(" URBs not killed.\n");
-        dib->init_state &= ~DIBUSB_STATE_URB_SUBMIT;
-        return 0;
-}
-
-static int dibusb_urb_submit(struct usb_dibusb *dib)
-{
-        int i,ret;
-        if (dib->init_state & DIBUSB_STATE_URB_INIT) {
-                for (i = 0; i < dib->dibdev->dev_cl->urb_count; i++) {
-                        deb_info("submitting URB no. %d\n",i);
-                        if ((ret = usb_submit_urb(dib->urb_list[i],GFP_ATOMIC))) {
-                                err("could not submit buffer urb no. %d - get them all back\n",i);
-                                dibusb_urb_kill(dib);
-                                return ret;
-                        }
-                        dib->init_state |= DIBUSB_STATE_URB_SUBMIT;
-                }
-        }
-        return 0;
-}
-
-int dibusb_streaming(struct usb_dibusb *dib,int onoff)
-{
-        if (onoff)
-                dibusb_urb_submit(dib);
-        else
-                dibusb_urb_kill(dib);
-
-        switch (dib->dibdev->dev_cl->id) {
-                case DIBUSB2_0:
-                case DIBUSB2_0B:
-                case NOVAT_USB2:
-                case UMT2_0:
-                        if (onoff)
-                                return dibusb_ioctl_cmd(dib,DIBUSB_IOCTL_CMD_ENABLE_STREAM,NULL,0);
-                        else
-                                return dibusb_ioctl_cmd(dib,DIBUSB_IOCTL_CMD_DISABLE_STREAM,NULL,0);
-                        break;
-                default:
-                        break;
-        }
-        return 0;
-}
-
-int dibusb_urb_init(struct usb_dibusb *dib)
-{
-        int i,bufsize,def_pid_parse = 1;
-
-        /*
-         * when reloading the driver w/o replugging the device
-         * a timeout occures, this helps
-         */
-        usb_clear_halt(dib->udev,usb_sndbulkpipe(dib->udev,dib->dibdev->dev_cl->pipe_cmd));
-        usb_clear_halt(dib->udev,usb_rcvbulkpipe(dib->udev,dib->dibdev->dev_cl->pipe_cmd));
-        usb_clear_halt(dib->udev,usb_rcvbulkpipe(dib->udev,dib->dibdev->dev_cl->pipe_data));
-
-        /* allocate the array for the data transfer URBs */
-        dib->urb_list = kmalloc(dib->dibdev->dev_cl->urb_count*sizeof(struct urb *),GFP_KERNEL);
-        if (dib->urb_list == NULL)
-                return -ENOMEM;
-        memset(dib->urb_list,0,dib->dibdev->dev_cl->urb_count*sizeof(struct urb *));
-
-        dib->init_state |= DIBUSB_STATE_URB_LIST;
-
-        bufsize = dib->dibdev->dev_cl->urb_count*dib->dibdev->dev_cl->urb_buffer_size;
-        deb_info("allocate %d bytes as buffersize for all URBs\n",bufsize);
-        /* allocate the actual buffer for the URBs */
-        if ((dib->buffer = pci_alloc_consistent(NULL,bufsize,&dib->dma_handle)) == NULL) {
-                deb_info("not enough memory.\n");
-                return -ENOMEM;
-        }
-        deb_info("allocation complete\n");
-        memset(dib->buffer,0,bufsize);
-
-        dib->init_state |= DIBUSB_STATE_URB_BUF;
-
-        /* allocate and submit the URBs */
-        for (i = 0; i < dib->dibdev->dev_cl->urb_count; i++) {
-                if (!(dib->urb_list[i] = usb_alloc_urb(0,GFP_ATOMIC))) {
-                        return -ENOMEM;
-                }
-
-                usb_fill_bulk_urb( dib->urb_list[i], dib->udev,
-                                usb_rcvbulkpipe(dib->udev,dib->dibdev->dev_cl->pipe_data),
-                                &dib->buffer[i*dib->dibdev->dev_cl->urb_buffer_size],
-                                dib->dibdev->dev_cl->urb_buffer_size,
-                                dibusb_urb_complete, dib);
-
-                dib->urb_list[i]->transfer_flags = 0;
-
-                dib->init_state |= DIBUSB_STATE_URB_INIT;
-        }
-
-        /* dib->pid_parse here contains the value of the module parameter */
-        /* decide if pid parsing can be deactivated:
-         * is possible (by device type) and wanted (by user)
-         */
-        switch (dib->dibdev->dev_cl->id) {
-                case DIBUSB2_0:
-                case DIBUSB2_0B:
-                        if (dib->udev->speed == USB_SPEED_HIGH && !dib->pid_parse) {
-                                def_pid_parse = 0;
-                                info("running at HIGH speed, will deliver the complete TS.");
-                        } else
-                                info("will use pid_parsing.");
-                        break;
-                default:
-                        break;
-        }
-        /* from here on it contains the device and user decision */
-        dib->pid_parse = def_pid_parse;
-
-        return 0;
-}
-
-int dibusb_urb_exit(struct usb_dibusb *dib)
-{
-        int i;
-
-        dibusb_urb_kill(dib);
-
-        if (dib->init_state & DIBUSB_STATE_URB_LIST) {
-                for (i = 0; i < dib->dibdev->dev_cl->urb_count; i++) {
-                        if (dib->urb_list[i] != NULL) {
-                                deb_info("freeing URB no. %d.\n",i);
-                                /* free the URBs */
-                                usb_free_urb(dib->urb_list[i]);
-                        }
-                }
-                /* free the urb array */
-                kfree(dib->urb_list);
-                dib->init_state &= ~DIBUSB_STATE_URB_LIST;
-        }
-
-        if (dib->init_state & DIBUSB_STATE_URB_BUF)
-                pci_free_consistent(NULL,
-                        dib->dibdev->dev_cl->urb_buffer_size*dib->dibdev->dev_cl->urb_count,
-                        dib->buffer,dib->dma_handle);
-
-        dib->init_state &= ~DIBUSB_STATE_URB_BUF;
-        dib->init_state &= ~DIBUSB_STATE_URB_INIT;
-        return 0;
-}
diff --git a/drivers/media/dvb/dibusb/dvb-dibusb.h b/drivers/media/dvb/dibusb/dvb-dibusb.h
deleted file mode 100644
index 52cd35dd9d83..000000000000
--- a/drivers/media/dvb/dibusb/dvb-dibusb.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * dvb-dibusb.h
- *
- * Copyright (C) 2004-5 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, version 2.
- *
- * for more information see dvb-dibusb-core.c .
- */
-#ifndef __DVB_DIBUSB_H__
-#define __DVB_DIBUSB_H__
-
-#include <linux/input.h>
-#include <linux/config.h>
-#include <linux/usb.h>
-
-#include "dvb_frontend.h"
-#include "dvb_demux.h"
-#include "dvb_net.h"
-#include "dmxdev.h"
-
-#include "dib3000.h"
-#include "mt352.h"
-
-/* debug */
-#ifdef CONFIG_DVB_DIBCOM_DEBUG
-#define dprintk(level,args...) \
-            do { if ((dvb_dibusb_debug & level)) { printk(args); } } while (0)
-
-#define debug_dump(b,l) {\
-        int i; \
-        for (i = 0; i < l; i++) deb_xfer("%02x ", b[i]); \
-        deb_xfer("\n");\
-}
-
-#else
-#define dprintk(args...)
-#define debug_dump(b,l)
-#endif
-
-extern int dvb_dibusb_debug;
-
-/* Version information */
-#define DRIVER_VERSION "0.3"
-#define DRIVER_DESC "DiBcom based USB Budget DVB-T device"
-#define DRIVER_AUTHOR "Patrick Boettcher, patrick.boettcher@desy.de"
-
-#define deb_info(args...) dprintk(0x01,args)
-#define deb_xfer(args...) dprintk(0x02,args)
-#define deb_alot(args...) dprintk(0x04,args)
-#define deb_ts(args...)   dprintk(0x08,args)
-#define deb_err(args...)  dprintk(0x10,args)
-#define deb_rc(args...)   dprintk(0x20,args)
-
-/* generic log methods - taken from usb.h */
-#undef err
-#define err(format, arg...)  printk(KERN_ERR     "dvb-dibusb: " format "\n" , ## arg)
-#undef info
-#define info(format, arg...) printk(KERN_INFO    "dvb-dibusb: " format "\n" , ## arg)
-#undef warn
-#define warn(format, arg...) printk(KERN_WARNING "dvb-dibusb: " format "\n" , ## arg)
-
-struct dibusb_usb_controller {
-        const char *name;       /* name of the usb controller */
-        u16 cpu_cs_register;    /* needs to be restarted, when the firmware has been downloaded. */
-};
-
-typedef enum {
-        DIBUSB1_1 = 0,
-        DIBUSB1_1_AN2235,
-        DIBUSB2_0,
-        UMT2_0,
-        DIBUSB2_0B,
-        NOVAT_USB2,
-        DTT200U,
-} dibusb_class_t;
-
-typedef enum {
-        DIBUSB_TUNER_CABLE_THOMSON = 0,
-        DIBUSB_TUNER_COFDM_PANASONIC_ENV57H1XD5,
-        DIBUSB_TUNER_CABLE_LG_TDTP_E102P,
-        DIBUSB_TUNER_COFDM_PANASONIC_ENV77H11D5,
-} dibusb_tuner_t;
-
-typedef enum {
-        DIBUSB_DIB3000MB = 0,
-        DIBUSB_DIB3000MC,
-        DIBUSB_MT352,
-        DTT200U_FE,
-} dibusb_demodulator_t;
-
-typedef enum {
-        DIBUSB_RC_NO = 0,
-        DIBUSB_RC_NEC_PROTOCOL,
-        DIBUSB_RC_HAUPPAUGE_PROTO,
-} dibusb_remote_t;
-
-struct dibusb_tuner {
-        dibusb_tuner_t id;
-
-        u8 pll_addr;       /* tuner i2c address */
-};
-extern struct dibusb_tuner dibusb_tuner[];
-
-#define DIBUSB_POSSIBLE_I2C_ADDR_NUM 4
-struct dibusb_demod {
-        dibusb_demodulator_t id;
-
-        int pid_filter_count;                       /* counter of the internal pid_filter */
-        u8 i2c_addrs[DIBUSB_POSSIBLE_I2C_ADDR_NUM]; /* list of possible i2c addresses of the demod */
-};
-
-#define DIBUSB_MAX_TUNER_NUM 2
-struct dibusb_device_class {
-        dibusb_class_t id;
-
-        const struct dibusb_usb_controller *usb_ctrl; /* usb controller */
-        const char *firmware;                         /* valid firmware filenames */
-
-        int pipe_cmd;                                 /* command pipe (read/write) */
-        int pipe_data;                                /* data pipe */
-
-        int urb_count;                                /* number of data URBs to be submitted */
-        int urb_buffer_size;                          /* the size of the buffer for each URB */
-
-        dibusb_remote_t remote_type;                  /* does this device have a ir-receiver */
-
-        struct dibusb_demod *demod;                   /* which demodulator is mount */
-        struct dibusb_tuner *tuner;                   /* which tuner can be found here */
-};
-
-#define DIBUSB_ID_MAX_NUM 15
-struct dibusb_usb_device {
-        const char *name;                                 /* real name of the box */
-        struct dibusb_device_class *dev_cl;               /* which dibusb_device_class is this device part of */
-
-        struct usb_device_id *cold_ids[DIBUSB_ID_MAX_NUM]; /* list of USB ids when this device is at pre firmware state */
-        struct usb_device_id *warm_ids[DIBUSB_ID_MAX_NUM]; /* list of USB ids when this device is at post firmware state */
-};
-
-/* a PID for the pid_filter list, when in use */
-struct dibusb_pid
-{
-        int index;
-        u16 pid;
-        int active;
-};
-
-struct usb_dibusb {
-        /* usb */
-        struct usb_device * udev;
-
-        struct dibusb_usb_device * dibdev;
-
-#define DIBUSB_STATE_INIT       0x000
-#define DIBUSB_STATE_URB_LIST   0x001
-#define DIBUSB_STATE_URB_BUF    0x002
-#define DIBUSB_STATE_URB_INIT   0x004
-#define DIBUSB_STATE_DVB        0x008
-#define DIBUSB_STATE_I2C        0x010
-#define DIBUSB_STATE_REMOTE             0x020
-#define DIBUSB_STATE_URB_SUBMIT 0x040
-        int init_state;
-
-        int feedcount;
-        struct dib_fe_xfer_ops xfer_ops;
-
-        struct dibusb_tuner *tuner;
-
-        struct urb **urb_list;
-        u8 *buffer;
-        dma_addr_t dma_handle;
-
-        /* I2C */
-        struct i2c_adapter i2c_adap;
-
-        /* locking */
-        struct semaphore usb_sem;
-        struct semaphore i2c_sem;
-
-        /* dvb */
-        struct dvb_adapter *adapter;
-        struct dmxdev dmxdev;
-        struct dvb_demux demux;
-        struct dvb_net dvb_net;
-        struct dvb_frontend* fe;
-
-        int (*fe_sleep) (struct dvb_frontend *);
-        int (*fe_init) (struct dvb_frontend *);
-
-        /* remote control */
-        struct input_dev rc_input_dev;
-        struct work_struct rc_query_work;
-        int last_event;
-        int last_state; /* for Hauppauge RC protocol */
-        int repeat_key_count;
-        int rc_key_repeat_count; /* module parameter */
-
-        /* module parameters */
-        int pid_parse;
-        int rc_query_interval;
-};
-
-/* commonly used functions in the separated files */
-
-/* dvb-dibusb-firmware.c */
-int dibusb_loadfirmware(struct usb_device *udev, struct dibusb_usb_device *dibdev);
-
-/* dvb-dibusb-remote.c */
-int dibusb_remote_exit(struct usb_dibusb *dib);
-int dibusb_remote_init(struct usb_dibusb *dib);
-
-/* dvb-dibusb-fe-i2c.c */
-int dibusb_fe_init(struct usb_dibusb* dib);
-int dibusb_fe_exit(struct usb_dibusb *dib);
-int dibusb_i2c_init(struct usb_dibusb *dib);
-int dibusb_i2c_exit(struct usb_dibusb *dib);
-
-/* dvb-dibusb-dvb.c */
-void dibusb_urb_complete(struct urb *urb, struct pt_regs *ptregs);
-int dibusb_dvb_init(struct usb_dibusb *dib);
-int dibusb_dvb_exit(struct usb_dibusb *dib);
-
-/* dvb-dibusb-usb.c */
-int dibusb_readwrite_usb(struct usb_dibusb *dib, u8 *wbuf, u16 wlen, u8 *rbuf,
-        u16 rlen);
-int dibusb_write_usb(struct usb_dibusb *dib, u8 *buf, u16 len);
-
-int dibusb_hw_wakeup(struct dvb_frontend *);
-int dibusb_hw_sleep(struct dvb_frontend *);
-int dibusb_set_streaming_mode(struct usb_dibusb *,u8);
-int dibusb_streaming(struct usb_dibusb *,int);
-
-int dibusb_urb_init(struct usb_dibusb *);
-int dibusb_urb_exit(struct usb_dibusb *);
-
-/* dvb-fe-dtt200u.c */
-struct dvb_frontend* dtt200u_fe_attach(struct usb_dibusb *,struct dib_fe_xfer_ops *);
-
-/* i2c and transfer stuff */
-#define DIBUSB_I2C_TIMEOUT                              5000
-
-/*
- * protocol of all dibusb related devices
- */
-
-/*
- * bulk msg to/from endpoint 0x01
- *
- * general structure:
- * request_byte parameter_bytes
- */
-
-#define DIBUSB_REQ_START_READ                   0x00
-#define DIBUSB_REQ_START_DEMOD                  0x01
-
-/*
- * i2c read
- * bulk write: 0x02 ((7bit i2c_addr << 1) & 0x01) register_bytes length_word
- * bulk read:  byte_buffer (length_word bytes)
- */
-#define DIBUSB_REQ_I2C_READ                     0x02
-
-/*
- * i2c write
- * bulk write: 0x03 (7bit i2c_addr << 1) register_bytes value_bytes
- */
-#define DIBUSB_REQ_I2C_WRITE                    0x03
-
-/*
- * polling the value of the remote control
- * bulk write: 0x04
- * bulk read:  byte_buffer (5 bytes)
- *
- * first byte of byte_buffer shows the status (0x00, 0x01, 0x02)
- */
-#define DIBUSB_REQ_POLL_REMOTE                  0x04
-
-#define DIBUSB_RC_NEC_EMPTY                             0x00
-#define DIBUSB_RC_NEC_KEY_PRESSED               0x01
-#define DIBUSB_RC_NEC_KEY_REPEATED              0x02
-
-/* additional status values for Hauppauge Remote Control Protocol */
-#define DIBUSB_RC_HAUPPAUGE_KEY_PRESSED 0x01
-#define DIBUSB_RC_HAUPPAUGE_KEY_EMPTY   0x03
-
-/* streaming mode:
- * bulk write: 0x05 mode_byte
- *
- * mode_byte is mostly 0x00
- */
-#define DIBUSB_REQ_SET_STREAMING_MODE   0x05
-
-/* interrupt the internal read loop, when blocking */
-#define DIBUSB_REQ_INTR_READ                    0x06
-
-/* io control
- * 0x07 cmd_byte param_bytes
- *
- * param_bytes can be up to 32 bytes
- *
- * cmd_byte function    parameter name
- * 0x00     power mode
- *                      0x00      sleep
- *                      0x01      wakeup
- *
- * 0x01     enable streaming
- * 0x02     disable streaming
- *
- *
- */
-#define DIBUSB_REQ_SET_IOCTL                    0x07
-
-/* IOCTL commands */
-
-/* change the power mode in firmware */
-#define DIBUSB_IOCTL_CMD_POWER_MODE             0x00
-#define DIBUSB_IOCTL_POWER_SLEEP                        0x00
-#define DIBUSB_IOCTL_POWER_WAKEUP                       0x01
-
-/* modify streaming of the FX2 */
-#define DIBUSB_IOCTL_CMD_ENABLE_STREAM  0x01
-#define DIBUSB_IOCTL_CMD_DISABLE_STREAM 0x02
-
-#endif
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index 1863f1dfb00c..c225de7ffd82 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -175,8 +175,8 @@ static inline void dvb_dmxdev_dvr_state_set(struct dmxdev_dvr *dmxdevdvr, int st
 
 static int dvb_dvr_open(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-        struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dmxdev *dmxdev = dvbdev->priv;
         struct dmx_frontend *front;
 
         dprintk ("function : %s\n", __FUNCTION__);
@@ -224,8 +224,8 @@ static int dvb_dvr_open(struct inode *inode, struct file *file)
 
 static int dvb_dvr_release(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-        struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dmxdev *dmxdev = dvbdev->priv;
 
         if (down_interruptible (&dmxdev->mutex))
                 return -ERESTARTSYS;
@@ -252,8 +252,8 @@ static int dvb_dvr_release(struct inode *inode, struct file *file)
 static ssize_t dvb_dvr_write(struct file *file, const char __user *buf,
                 size_t count, loff_t *ppos)
 {
-        struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-        struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dmxdev *dmxdev = dvbdev->priv;
         int ret;
 
         if (!dmxdev->demux->write)
@@ -270,8 +270,8 @@ static ssize_t dvb_dvr_write(struct file *file, const char __user *buf,
 static ssize_t dvb_dvr_read(struct file *file, char __user *buf, size_t count,
                 loff_t *ppos)
 {
-        struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-        struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dmxdev *dmxdev = dvbdev->priv;
         int ret;
 
         //down(&dmxdev->mutex);
@@ -345,7 +345,7 @@ static int dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
                             const u8 *buffer2, size_t buffer2_len,
                             struct dmx_section_filter *filter, enum dmx_success success)
 {
-        struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *) filter->priv;
+        struct dmxdev_filter *dmxdevfilter = filter->priv;
         int ret;
 
         if (dmxdevfilter->buffer.error) {
@@ -381,7 +381,7 @@ static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
                        const u8 *buffer2, size_t buffer2_len,
                        struct dmx_ts_feed *feed, enum dmx_success success)
 {
-        struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *) feed->priv;
+        struct dmxdev_filter *dmxdevfilter = feed->priv;
         struct dmxdev_buffer *buffer;
         int ret;
 
@@ -684,8 +684,8 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
 
 static int dvb_demux_open(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-        struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dmxdev *dmxdev = dvbdev->priv;
         int i;
         struct dmxdev_filter *dmxdevfilter;
 
@@ -1013,8 +1013,8 @@ static struct dvb_device dvbdev_demux = {
 static int dvb_dvr_do_ioctl(struct inode *inode, struct file *file,
                      unsigned int cmd, void *parg)
 {
-        struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
-        struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dmxdev *dmxdev = dvbdev->priv;
 
         int ret=0;
 
@@ -1044,8 +1044,8 @@ static int dvb_dvr_ioctl(struct inode *inode, struct file *file,
 
 static unsigned int dvb_dvr_poll (struct file *file, poll_table *wait)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct dmxdev *dmxdev = (struct dmxdev *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dmxdev *dmxdev = dvbdev->priv;
         unsigned int mask = 0;
 
         dprintk ("function : %s\n", __FUNCTION__);
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index c1ea89f2880c..0eb9aa711fb0 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -829,7 +829,7 @@ EXPORT_SYMBOL(dvb_ca_en50221_camready_irq);
  */
 void dvb_ca_en50221_camchange_irq(struct dvb_ca_en50221 *pubca, int slot, int change_type)
 {
-        struct dvb_ca_private *ca = (struct dvb_ca_private *) pubca->private;
+        struct dvb_ca_private *ca = pubca->private;
 
         dprintk("CAMCHANGE IRQ slot:%i change_type:%i\n", slot, change_type);
 
@@ -857,7 +857,7 @@ EXPORT_SYMBOL(dvb_ca_en50221_frda_irq);
  */
 void dvb_ca_en50221_camready_irq(struct dvb_ca_en50221 *pubca, int slot)
 {
-        struct dvb_ca_private *ca = (struct dvb_ca_private *) pubca->private;
+        struct dvb_ca_private *ca = pubca->private;
 
         dprintk("CAMREADY IRQ slot:%i\n", slot);
 
@@ -876,7 +876,7 @@ void dvb_ca_en50221_camready_irq(struct dvb_ca_en50221 *pubca, int slot)
  */
 void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221 *pubca, int slot)
 {
-        struct dvb_ca_private *ca = (struct dvb_ca_private *) pubca->private;
+        struct dvb_ca_private *ca = pubca->private;
         int flags;
 
         dprintk("FR/DA IRQ slot:%i\n", slot);
@@ -993,7 +993,7 @@ static void dvb_ca_en50221_thread_update_delay(struct dvb_ca_private *ca)
  */
 static int dvb_ca_en50221_thread(void *data)
 {
-        struct dvb_ca_private *ca = (struct dvb_ca_private *) data;
+        struct dvb_ca_private *ca = data;
         char name[15];
         int slot;
         int flags;
@@ -1202,8 +1202,8 @@ static int dvb_ca_en50221_thread(void *data)
 static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file,
                                       unsigned int cmd, void *parg)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_ca_private *ca = dvbdev->priv;
         int err = 0;
         int slot;
 
@@ -1225,7 +1225,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file,
                 break;
 
         case CA_GET_CAP: {
-                struct ca_caps *caps = (struct ca_caps *) parg;
+                struct ca_caps *caps = parg;
 
                 caps->slot_num = ca->slot_count;
                 caps->slot_type = CA_CI_LINK;
@@ -1235,7 +1235,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file,
         }
 
         case CA_GET_SLOT_INFO: {
-                struct ca_slot_info *info = (struct ca_slot_info *) parg;
+                struct ca_slot_info *info = parg;
 
                 if ((info->num > ca->slot_count) || (info->num < 0))
                         return -EINVAL;
@@ -1291,8 +1291,8 @@ static int dvb_ca_en50221_io_ioctl(struct inode *inode, struct file *file,
 static ssize_t dvb_ca_en50221_io_write(struct file *file,
                                        const char __user * buf, size_t count, loff_t * ppos)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_ca_private *ca = dvbdev->priv;
         u8 slot, connection_id;
         int status;
         char fragbuf[HOST_LINK_BUF_SIZE];
@@ -1428,8 +1428,8 @@ static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca, int *resu
 static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf,
                                       size_t count, loff_t * ppos)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_ca_private *ca = dvbdev->priv;
         int status;
         int result = 0;
         u8 hdr[2];
@@ -1526,8 +1526,8 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf,
  */
 static int dvb_ca_en50221_io_open(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_ca_private *ca = dvbdev->priv;
         int err;
         int i;
 
@@ -1569,8 +1569,8 @@ static int dvb_ca_en50221_io_open(struct inode *inode, struct file *file)
  */
 static int dvb_ca_en50221_io_release(struct inode *inode, struct file *file)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_ca_private *ca = dvbdev->priv;
         int err = 0;
 
         dprintk("%s\n", __FUNCTION__);
@@ -1597,8 +1597,8 @@ static int dvb_ca_en50221_io_release(struct inode *inode, struct file *file)
  */
 static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table * wait)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct dvb_ca_private *ca = (struct dvb_ca_private *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_ca_private *ca = dvbdev->priv;
         unsigned int mask = 0;
         int slot;
         int result = 0;
@@ -1750,7 +1750,7 @@ EXPORT_SYMBOL(dvb_ca_en50221_release);
  */
 void dvb_ca_en50221_release(struct dvb_ca_en50221 *pubca)
 {
-        struct dvb_ca_private *ca = (struct dvb_ca_private *) pubca->private;
+        struct dvb_ca_private *ca = pubca->private;
         int i;
 
         dprintk("%s\n", __FUNCTION__);
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 59a9adfae1eb..f11daae91cd4 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -35,6 +35,7 @@
 #include <linux/moduleparam.h>
 #include <linux/list.h>
 #include <linux/suspend.h>
+#include <linux/jiffies.h>
 #include <asm/processor.h>
 #include <asm/semaphore.h>
 
@@ -48,7 +49,7 @@ static int dvb_override_tune_delay;
 static int dvb_powerdown_on_sleep = 1;
 
 module_param_named(frontend_debug, dvb_frontend_debug, int, 0644);
-MODULE_PARM_DESC(dvb_frontend_debug, "Turn on/off frontend core debugging (default:off).");
+MODULE_PARM_DESC(frontend_debug, "Turn on/off frontend core debugging (default:off).");
 module_param(dvb_shutdown_timeout, int, 0444);
 MODULE_PARM_DESC(dvb_shutdown_timeout, "wait <shutdown_timeout> seconds after close() before suspending hardware");
 module_param(dvb_force_auto_inversion, int, 0444);
@@ -117,7 +118,7 @@ struct dvb_frontend_private {
 
 static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)
 {
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
         struct dvb_fe_events *events = &fepriv->events;
         struct dvb_frontend_event *e;
         int wp;
@@ -155,7 +156,7 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)
 static int dvb_frontend_get_event(struct dvb_frontend *fe,
                             struct dvb_frontend_event *event, int flags)
 {
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
         struct dvb_fe_events *events = &fepriv->events;
 
         dprintk ("%s\n", __FUNCTION__);
@@ -234,7 +235,7 @@ static int dvb_frontend_autotune(struct dvb_frontend *fe, int check_wrapped)
 {
         int autoinversion;
         int ready = 0;
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
         int original_inversion = fepriv->parameters.inversion;
         u32 original_frequency = fepriv->parameters.frequency;
 
@@ -321,13 +322,14 @@ static int dvb_frontend_autotune(struct dvb_frontend *fe, int check_wrapped)
 
 static int dvb_frontend_is_exiting(struct dvb_frontend *fe)
 {
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
 
         if (fepriv->exit)
                 return 1;
 
         if (fepriv->dvbdev->writers == 1)
-                if (jiffies - fepriv->release_jiffies > dvb_shutdown_timeout * HZ)
+                if (time_after(jiffies, fepriv->release_jiffies +
+                                        dvb_shutdown_timeout * HZ))
                         return 1;
 
         return 0;
@@ -335,7 +337,7 @@ static int dvb_frontend_is_exiting(struct dvb_frontend *fe)
 
 static int dvb_frontend_should_wakeup(struct dvb_frontend *fe)
 {
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
 
         if (fepriv->wakeup) {
                 fepriv->wakeup = 0;
@@ -346,7 +348,7 @@ static int dvb_frontend_should_wakeup(struct dvb_frontend *fe)
 
 static void dvb_frontend_wakeup(struct dvb_frontend *fe)
 {
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
 
         fepriv->wakeup = 1;
         wake_up_interruptible(&fepriv->wait_queue);
@@ -357,8 +359,8 @@ static void dvb_frontend_wakeup(struct dvb_frontend *fe)
  */
 static int dvb_frontend_thread(void *data)
 {
-        struct dvb_frontend *fe = (struct dvb_frontend *) data;
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend *fe = data;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
         unsigned long timeout;
         char name [15];
         int quality = 0, delay = 3*HZ;
@@ -389,8 +391,7 @@ static int dvb_frontend_thread(void *data)
                         break;
                 }
 
-                if (current->flags & PF_FREEZE)
-                        refrigerator(PF_FREEZE);
+                try_to_freeze();
 
                 if (down_interruptible(&fepriv->sem))
                         break;
@@ -520,7 +521,7 @@ static int dvb_frontend_thread(void *data)
 static void dvb_frontend_stop(struct dvb_frontend *fe)
 {
         unsigned long ret;
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
 
         dprintk ("%s\n", __FUNCTION__);
 
@@ -559,7 +560,7 @@ static void dvb_frontend_stop(struct dvb_frontend *fe)
 static int dvb_frontend_start(struct dvb_frontend *fe)
 {
         int ret;
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
 
         dprintk ("%s\n", __FUNCTION__);
 
@@ -597,7 +598,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
 {
         struct dvb_device *dvbdev = file->private_data;
         struct dvb_frontend *fe = dvbdev->priv;
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
         int err = -EOPNOTSUPP;
 
         dprintk ("%s\n", __FUNCTION__);
@@ -615,7 +616,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
         case FE_GET_INFO: {
-                struct dvb_frontend_info* info = (struct dvb_frontend_info*) parg;
+                struct dvb_frontend_info* info = parg;
                 memcpy(info, &fe->ops->info, sizeof(struct dvb_frontend_info));
 
                 /* Force the CAN_INVERSION_AUTO bit on. If the frontend doesn't
@@ -793,7 +794,7 @@ static unsigned int dvb_frontend_poll(struct file *file, struct poll_table_struc
 {
         struct dvb_device *dvbdev = file->private_data;
         struct dvb_frontend *fe = dvbdev->priv;
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
 
         dprintk ("%s\n", __FUNCTION__);
 
@@ -809,7 +810,7 @@ static int dvb_frontend_open(struct inode *inode, struct file *file)
 {
         struct dvb_device *dvbdev = file->private_data;
         struct dvb_frontend *fe = dvbdev->priv;
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
         int ret;
 
         dprintk ("%s\n", __FUNCTION__);
@@ -833,7 +834,7 @@ static int dvb_frontend_release(struct inode *inode, struct file *file)
 {
         struct dvb_device *dvbdev = file->private_data;
         struct dvb_frontend *fe = dvbdev->priv;
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
 
         dprintk ("%s\n", __FUNCTION__);
 
@@ -873,7 +874,7 @@ int dvb_register_frontend(struct dvb_adapter* dvb,
                 up(&frontend_mutex);
                 return -ENOMEM;
         }
-        fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        fepriv = fe->frontend_priv;
         memset(fe->frontend_priv, 0, sizeof(struct dvb_frontend_private));
 
         init_MUTEX (&fepriv->sem);
@@ -897,7 +898,7 @@ EXPORT_SYMBOL(dvb_register_frontend);
 
 int dvb_unregister_frontend(struct dvb_frontend* fe)
 {
-        struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
+        struct dvb_frontend_private *fepriv = fe->frontend_priv;
         dprintk ("%s\n", __FUNCTION__);
 
         down (&frontend_mutex);
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index 44892e7abd3d..6a968c346a36 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -315,7 +315,7 @@ static inline void reset_ule( struct dvb_net_priv *p )
  */
 static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
 {
-        struct dvb_net_priv *priv = (struct dvb_net_priv *)dev->priv;
+        struct dvb_net_priv *priv = dev->priv;
         unsigned long skipped = 0L;
         u8 *ts, *ts_end, *from_where = NULL, ts_remain = 0, how_much = 0, new_ts = 1;
         struct ethhdr *ethh = NULL;
@@ -709,7 +709,7 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
                                const u8 *buffer2, size_t buffer2_len,
                                struct dmx_ts_feed *feed, enum dmx_success success)
 {
-        struct net_device *dev = (struct net_device *)feed->priv;
+        struct net_device *dev = feed->priv;
 
         if (buffer2 != 0)
                 printk(KERN_WARNING "buffer2 not 0: %p.\n", buffer2);
@@ -727,6 +727,7 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
         u8 *eth;
         struct sk_buff *skb;
         struct net_device_stats *stats = &(((struct dvb_net_priv *) dev->priv)->stats);
+        int snap = 0;
 
         /* note: pkt_len includes a 32bit checksum */
         if (pkt_len < 16) {
@@ -750,9 +751,12 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
                 return;
         }
         if (pkt[5] & 0x02) {
-                //FIXME: handle LLC/SNAP
-                stats->rx_dropped++;
-                return;
+                /* handle LLC/SNAP, see rfc-1042 */
+                if (pkt_len < 24 || memcmp(&pkt[12], "\xaa\xaa\x03\0\0\0", 6)) {
+                        stats->rx_dropped++;
+                        return;
+                }
+                snap = 8;
         }
         if (pkt[7]) {
                 /* FIXME: assemble datagram from multiple sections */
@@ -762,9 +766,9 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
         }
 
         /* we have 14 byte ethernet header (ip header follows);
-         * 12 byte MPE header; 4 byte checksum; + 2 byte alignment
+         * 12 byte MPE header; 4 byte checksum; + 2 byte alignment, 8 byte LLC/SNAP
          */
-        if (!(skb = dev_alloc_skb(pkt_len - 4 - 12 + 14 + 2))) {
+        if (!(skb = dev_alloc_skb(pkt_len - 4 - 12 + 14 + 2 - snap))) {
                 //printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name);
                 stats->rx_dropped++;
                 return;
@@ -773,8 +777,8 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
         skb->dev = dev;
 
         /* copy L3 payload */
-        eth = (u8 *) skb_put(skb, pkt_len - 12 - 4 + 14);
-        memcpy(eth + 14, pkt + 12, pkt_len - 12 - 4);
+        eth = (u8 *) skb_put(skb, pkt_len - 12 - 4 + 14 - snap);
+        memcpy(eth + 14, pkt + 12 + snap, pkt_len - 12 - 4 - snap);
 
         /* create ethernet header: */
         eth[0]=pkt[0x0b];
@@ -786,8 +790,21 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
 
         eth[6]=eth[7]=eth[8]=eth[9]=eth[10]=eth[11]=0;
 
-        eth[12] = 0x08; /* ETH_P_IP */
-        eth[13] = 0x00;
+        if (snap) {
+                eth[12] = pkt[18];
+                eth[13] = pkt[19];
+        } else {
+                /* protocol numbers are from rfc-1700 or
+                 * http://www.iana.org/assignments/ethernet-numbers
+                 */
+                if (pkt[12] >> 4 == 6) { /* version field from IP header */
+                        eth[12] = 0x86; /* IPv6 */
+                        eth[13] = 0xdd;
+                } else {
+                        eth[12] = 0x08; /* IPv4 */
+                        eth[13] = 0x00;
+                }
+        }
 
         skb->protocol = dvb_net_eth_type_trans(skb, dev);
 
@@ -801,7 +818,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
                  struct dmx_section_filter *filter,
                  enum dmx_success success)
 {
-        struct net_device *dev=(struct net_device *) filter->priv;
+        struct net_device *dev = filter->priv;
 
         /**
          * we rely on the DVB API definition where exactly one complete
@@ -826,7 +843,7 @@ static int dvb_net_filter_sec_set(struct net_device *dev,
                    struct dmx_section_filter **secfilter,
                    u8 *mac, u8 *mac_mask)
 {
-        struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
+        struct dvb_net_priv *priv = dev->priv;
         int ret;
 
         *secfilter=NULL;
@@ -870,7 +887,7 @@ static int dvb_net_filter_sec_set(struct net_device *dev,
 static int dvb_net_feed_start(struct net_device *dev)
 {
         int ret, i;
-        struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
+        struct dvb_net_priv *priv = dev->priv;
         struct dmx_demux *demux = priv->demux;
         unsigned char *mac = (unsigned char *) dev->dev_addr;
 
@@ -965,7 +982,7 @@ static int dvb_net_feed_start(struct net_device *dev)
 
 static int dvb_net_feed_stop(struct net_device *dev)
 {
-        struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
+        struct dvb_net_priv *priv = dev->priv;
         int i;
 
         dprintk("%s\n", __FUNCTION__);
@@ -1016,7 +1033,7 @@ static int dvb_net_feed_stop(struct net_device *dev)
 
 static int dvb_set_mc_filter (struct net_device *dev, struct dev_mc_list *mc)
 {
-        struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
+        struct dvb_net_priv *priv = dev->priv;
 
         if (priv->multi_num == DVB_NET_MULTICAST_MAX)
                 return -ENOMEM;
@@ -1031,7 +1048,7 @@ static int dvb_set_mc_filter (struct net_device *dev, struct dev_mc_list *mc)
 static void wq_set_multicast_list (void *data)
 {
         struct net_device *dev = data;
-        struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
+        struct dvb_net_priv *priv = dev->priv;
 
         dvb_net_feed_stop(dev);
 
@@ -1066,7 +1083,7 @@ static void wq_set_multicast_list (void *data)
 
 static void dvb_net_set_multicast_list (struct net_device *dev)
 {
-        struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
+        struct dvb_net_priv *priv = dev->priv;
         schedule_work(&priv->set_multicast_list_wq);
 }
 
@@ -1084,7 +1101,7 @@ static void wq_restart_net_feed (void *data)
 
 static int dvb_net_set_mac (struct net_device *dev, void *p)
 {
-        struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
+        struct dvb_net_priv *priv = dev->priv;
         struct sockaddr *addr=p;
 
         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
@@ -1098,7 +1115,7 @@ static int dvb_net_set_mac (struct net_device *dev, void *p)
 
 static int dvb_net_open(struct net_device *dev)
 {
-        struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
+        struct dvb_net_priv *priv = dev->priv;
 
         priv->in_use++;
         dvb_net_feed_start(dev);
@@ -1108,7 +1125,7 @@ static int dvb_net_open(struct net_device *dev)
 
 static int dvb_net_stop(struct net_device *dev)
 {
-        struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
+        struct dvb_net_priv *priv = dev->priv;
 
         priv->in_use--;
         return dvb_net_feed_stop(dev);
@@ -1228,8 +1245,8 @@ static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned int num)
 static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
                   unsigned int cmd, void *parg)
 {
-        struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
-        struct dvb_net *dvbnet = (struct dvb_net *) dvbdev->priv;
+        struct dvb_device *dvbdev = file->private_data;
+        struct dvb_net *dvbnet = dvbdev->priv;
 
         if (((file->f_flags&O_ACCMODE)==O_RDONLY))
                 return -EPERM;
@@ -1237,7 +1254,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
         switch (cmd) {
         case NET_ADD_IF:
         {
-                struct dvb_net_if *dvbnetif=(struct dvb_net_if *)parg;
+                struct dvb_net_if *dvbnetif = parg;
                 int result;
 
                 if (!capable(CAP_SYS_ADMIN))
@@ -1258,7 +1275,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
         {
                 struct net_device *netdev;
                 struct dvb_net_priv *priv_data;
-                struct dvb_net_if *dvbnetif=(struct dvb_net_if *)parg;
+                struct dvb_net_if *dvbnetif = parg;
 
                 if (dvbnetif->if_num >= DVB_NET_DEVICES_MAX ||
                     !dvbnet->state[dvbnetif->if_num])
@@ -1266,7 +1283,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
 
                 netdev = dvbnet->device[dvbnetif->if_num];
 
-                priv_data=(struct dvb_net_priv*)netdev->priv;
+                priv_data = netdev->priv;
                 dvbnetif->pid=priv_data->pid;
                 dvbnetif->feedtype=priv_data->feedtype;
                 break;
@@ -1288,7 +1305,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
         /* binary compatiblity cruft */
         case __NET_ADD_IF_OLD:
         {
-                struct __dvb_net_if_old *dvbnetif=(struct __dvb_net_if_old *)parg;
+                struct __dvb_net_if_old *dvbnetif = parg;
                 int result;
 
                 if (!capable(CAP_SYS_ADMIN))
@@ -1309,7 +1326,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
         {
                 struct net_device *netdev;
                 struct dvb_net_priv *priv_data;
-                struct __dvb_net_if_old *dvbnetif=(struct __dvb_net_if_old *)parg;
+                struct __dvb_net_if_old *dvbnetif = parg;
 
                 if (dvbnetif->if_num >= DVB_NET_DEVICES_MAX ||
                     !dvbnet->state[dvbnetif->if_num])
@@ -1317,7 +1334,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
 
                 netdev = dvbnet->device[dvbnetif->if_num];
 
-                priv_data=(struct dvb_net_priv*)netdev->priv;
+                priv_data = netdev->priv;
                 dvbnetif->pid=priv_data->pid;
                 break;
         }
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index cf4ffe38fda3..4b7adca3e286 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -56,8 +56,7 @@ static const char * const dnames[] = {
 #define nums2minor(num,type,id) ((num << 6) | (id << 4) | type)
 #define MAX_DVB_MINORS          (DVB_MAX_ADAPTERS*64)
 
-struct class_simple *dvb_class;
-EXPORT_SYMBOL(dvb_class);
+static struct class *dvb_class;
 
 static struct dvb_device* dvbdev_find_device (int minor)
 {
@@ -236,8 +235,8 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
                         S_IFCHR | S_IRUSR | S_IWUSR,
                         "dvb/adapter%d/%s%d", adap->num, dnames[type], id);
 
-        class_simple_device_add(dvb_class, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
-                                NULL, "dvb%d.%s%d", adap->num, dnames[type], id);
+        class_device_create(dvb_class, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
+                            NULL, "dvb%d.%s%d", adap->num, dnames[type], id);
 
         dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",
                 adap->num, dnames[type], id, nums2minor(adap->num, type, id),
@@ -256,7 +255,7 @@ void dvb_unregister_device(struct dvb_device *dvbdev)
         devfs_remove("dvb/adapter%d/%s%d", dvbdev->adapter->num,
                         dnames[dvbdev->type], dvbdev->id);
 
-        class_simple_device_remove(MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num,
+        class_device_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num,
                                         dvbdev->type, dvbdev->id)));
 
         list_del (&dvbdev->list_head);
@@ -286,9 +285,8 @@ skip:
 }
 
 
-int dvb_register_adapter(struct dvb_adapter **padap, const char *name, struct module *module)
+int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct module *module)
 {
-        struct dvb_adapter *adap;
         int num;
 
         if (down_interruptible (&dvbdev_register_lock))
@@ -299,11 +297,6 @@ int dvb_register_adapter(struct dvb_adapter **padap, const char *name, struct mo
                 return -ENFILE;
         }
 
-        if (!(*padap = adap = kmalloc(sizeof(struct dvb_adapter), GFP_KERNEL))) {
-                up(&dvbdev_register_lock);
-                return -ENOMEM;
-        }
-
         memset (adap, 0, sizeof(struct dvb_adapter));
         INIT_LIST_HEAD (&adap->device_list);
 
@@ -331,7 +324,6 @@ int dvb_unregister_adapter(struct dvb_adapter *adap)
                 return -ERESTARTSYS;
         list_del (&adap->list_head);
         up (&dvbdev_register_lock);
-        kfree (adap);
         return 0;
 }
 EXPORT_SYMBOL(dvb_unregister_adapter);
@@ -419,7 +411,7 @@ static int __init init_dvbdev(void)
 
         devfs_mk_dir("dvb");
 
-        dvb_class = class_simple_create(THIS_MODULE, "dvb");
+        dvb_class = class_create(THIS_MODULE, "dvb");
         if (IS_ERR(dvb_class)) {
                 retval = PTR_ERR(dvb_class);
                 goto error;
@@ -436,7 +428,7 @@ error:
 static void __exit exit_dvbdev(void)
 {
         devfs_remove("dvb");
-        class_simple_destroy(dvb_class);
+        class_destroy(dvb_class);
         cdev_del(&dvb_device_cdev);
         unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);
 }
diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h
index 184edba3caa7..a251867f30f1 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -76,7 +76,7 @@ struct dvb_device {
 };
 
 
-extern int dvb_register_adapter (struct dvb_adapter **padap, const char *name, struct module *module);
+extern int dvb_register_adapter (struct dvb_adapter *adap, const char *name, struct module *module);
 extern int dvb_unregister_adapter (struct dvb_adapter *adap);
 
 extern int dvb_register_device (struct dvb_adapter *adap,
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
new file mode 100644
index 000000000000..8aa32f6e447b
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -0,0 +1,99 @@
+config DVB_USB
+        tristate "Support for various USB DVB devices"
+        depends on DVB_CORE && USB
+        select FW_LOADER
+        help
+          By enabling this you will be able to choose the various USB 1.1 and
+          USB2.0 DVB devices.
+
+          Almost every USB device needs a firmware, please look into
+          <file:Documentation/dvb/README.dvb-usb>
+
+          Say Y if you own an USB DVB device.
+
+config DVB_USB_DEBUG
+        bool "Enable extended debug support for all DVB-USB devices"
+        depends on DVB_USB
+        help
+          Say Y if you want to enable debuging. See modinfo dvb-usb (and the
+          appropriate drivers) for debug levels.
+
+config DVB_USB_A800
+        tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)"
+        depends on DVB_USB
+        help
+          Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.
+
+config DVB_USB_DIBUSB_MB
+        tristate "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)"
+        depends on DVB_USB
+        help
+          Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by
+          DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator.
+
+          Devices supported by this driver:
+            TwinhanDTV USB-Ter (VP7041)
+            TwinhanDTV Magic Box (VP7041e)
+            KWorld/JetWay/ADSTech V-Stream XPERT DTV - DVB-T USB1.1 and USB2.0
+            Hama DVB-T USB1.1-Box
+            DiBcom USB1.1 reference devices (non-public)
+            Ultima Electronic/Artec T1 USB TVBOX
+            Compro Videomate DVB-U2000 - DVB-T USB
+            Grandtec DVB-T USB
+            Avermedia AverTV DVBT USB1.1
+            Artec T1 USB1.1 boxes
+
+          The VP7041 seems to be identical to "CTS Portable" (Chinese
+          Television System).
+
+          Say Y if you own such a device and want to use it. You should build it as
+          a module.
+
+config DVB_USB_DIBUSB_MC
+        tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)"
+        depends on DVB_USB
+        help
+          Support for 2.0 DVB-T receivers based on reference designs made by
+          DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator.
+
+          Devices supported by this driver:
+            DiBcom USB2.0 reference devices (non-public)
+            Artec T1 USB2.0 boxes
+
+          Say Y if you own such a device and want to use it. You should build it as
+          a module.
+
+config DVB_USB_UMT_010
+        tristate "HanfTek UMT-010 DVB-T USB2.0 support"
+        depends on DVB_USB
+        help
+          Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.
+
+config DVB_USB_DIGITV
+        tristate "Nebula Electronics uDigiTV DVB-T USB2.0 support"
+        depends on DVB_USB
+        help
+          Say Y here to support the Nebula Electronics uDigitV USB2.0 DVB-T receiver.
+
+config DVB_USB_VP7045
+        tristate "TwinhanDTV Alpha/MagicBoxII and DNTV tinyUSB2 DVB-T USB2.0 support"
+        depends on DVB_USB
+        help
+          Say Y here to support the
+            TwinhanDTV Alpha (stick) (VP-7045),
+                TwinhanDTV MagicBox II (VP-7046) and
+                DigitalNow TinyUSB 2 DVB-t DVB-T USB2.0 receivers.
+
+config DVB_USB_NOVA_T_USB2
+        tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"
+        depends on DVB_USB
+        help
+          Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.
+
+config DVB_USB_DTT200U
+        tristate "Yakumo/Hama/Typhoon/Yuan DVB-T USB2.0 support"
+        depends on DVB_USB
+        help
+          Say Y here to support the Yakumo/Hama/Typhoon/Yuan DVB-T USB2.0 receiver.
+
+          The receivers are also known as DTT200U (Yakumo) and UB300 (Yuan).
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
new file mode 100644
index 000000000000..d65b50f9abb0
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -0,0 +1,30 @@
+dvb-usb-objs = dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o dvb-usb-dvb.o dvb-usb-remote.o
+obj-$(CONFIG_DVB_USB) += dvb-usb.o
+
+dvb-usb-vp7045-objs = vp7045.o vp7045-fe.o
+obj-$(CONFIG_DVB_USB_VP7045) += dvb-usb-vp7045.o
+
+dvb-usb-dtt200u-objs = dtt200u.o dtt200u-fe.o
+obj-$(CONFIG_DVB_USB_DTT200U) += dvb-usb-dtt200u.o
+
+dvb-usb-dibusb-common-objs = dibusb-common.o
+
+dvb-usb-a800-objs = a800.o
+obj-$(CONFIG_DVB_USB_A800) += dvb-usb-dibusb-common.o dvb-usb-a800.o
+
+dvb-usb-dibusb-mb-objs = dibusb-mb.o
+obj-$(CONFIG_DVB_USB_DIBUSB_MB) += dvb-usb-dibusb-common.o dvb-usb-dibusb-mb.o
+
+dvb-usb-dibusb-mc-objs = dibusb-mc.o
+obj-$(CONFIG_DVB_USB_DIBUSB_MC) += dvb-usb-dibusb-common.o dvb-usb-dibusb-mc.o
+
+dvb-usb-nova-t-usb2-objs = nova-t-usb2.o
+obj-$(CONFIG_DVB_USB_NOVA_T_USB2) += dvb-usb-dibusb-common.o dvb-usb-nova-t-usb2.o
+
+dvb-usb-umt-010-objs = umt-010.o
+obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-dibusb-common.o dvb-usb-umt-010.o
+
+dvb-usb-digitv-objs = digitv.o
+obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o
+
+EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/dvb/dvb-usb/a800.c
new file mode 100644
index 000000000000..a3542935604f
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/a800.c
@@ -0,0 +1,176 @@
+/* DVB USB framework compliant Linux driver for the AVerMedia AverTV DVB-T
+ * USB2.0 (A800) DVB-T receiver.
+ *
+ * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@desy.de)
+ *
+ * Thanks to
+ *   - AVerMedia who kindly provided information and
+ *   - Glen Harris who suffered from my mistakes during development.
+ *
+ *      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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "dibusb.h"
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (rc=1 (or-able))." DVB_USB_DEBUG_STATUS);
+#define deb_rc(args...)   dprintk(debug,0x01,args)
+
+static int a800_power_ctrl(struct dvb_usb_device *d, int onoff)
+{
+        /* do nothing for the AVerMedia */
+        return 0;
+}
+
+static struct dvb_usb_rc_key a800_rc_keys[] = {
+        { 0x02, 0x01, KEY_PROG1 },       /* SOURCE */
+        { 0x02, 0x00, KEY_POWER },       /* POWER */
+        { 0x02, 0x05, KEY_1 },           /* 1 */
+        { 0x02, 0x06, KEY_2 },           /* 2 */
+        { 0x02, 0x07, KEY_3 },           /* 3 */
+        { 0x02, 0x09, KEY_4 },           /* 4 */
+        { 0x02, 0x0a, KEY_5 },           /* 5 */
+        { 0x02, 0x0b, KEY_6 },           /* 6 */
+        { 0x02, 0x0d, KEY_7 },           /* 7 */
+        { 0x02, 0x0e, KEY_8 },           /* 8 */
+        { 0x02, 0x0f, KEY_9 },           /* 9 */
+        { 0x02, 0x12, KEY_LEFT },        /* L / DISPLAY */
+        { 0x02, 0x11, KEY_0 },           /* 0 */
+        { 0x02, 0x13, KEY_RIGHT },       /* R / CH RTN */
+        { 0x02, 0x17, KEY_PROG2 },       /* SNAP SHOT */
+        { 0x02, 0x10, KEY_PROG3 },       /* 16-CH PREV */
+        { 0x02, 0x03, KEY_CHANNELUP },   /* CH UP */
+        { 0x02, 0x1e, KEY_VOLUMEDOWN },  /* VOL DOWN */
+        { 0x02, 0x0c, KEY_ZOOM },        /* FULL SCREEN */
+        { 0x02, 0x1f, KEY_VOLUMEUP },    /* VOL UP */
+        { 0x02, 0x02, KEY_CHANNELDOWN }, /* CH DOWN */
+        { 0x02, 0x14, KEY_MUTE },        /* MUTE */
+        { 0x02, 0x08, KEY_AUDIO },       /* AUDIO */
+        { 0x02, 0x19, KEY_RECORD },      /* RECORD */
+        { 0x02, 0x18, KEY_PLAY },        /* PLAY */
+        { 0x02, 0x1b, KEY_STOP },        /* STOP */
+        { 0x02, 0x1a, KEY_PLAYPAUSE },   /* TIMESHIFT / PAUSE */
+        { 0x02, 0x1d, KEY_BACK },        /* << / RED */
+        { 0x02, 0x1c, KEY_FORWARD },     /* >> / YELLOW */
+        { 0x02, 0x03, KEY_TEXT },        /* TELETEXT */
+        { 0x02, 0x01, KEY_FIRST },       /* |<< / GREEN */
+        { 0x02, 0x00, KEY_LAST },        /* >>| / BLUE */
+        { 0x02, 0x04, KEY_EPG },         /* EPG */
+        { 0x02, 0x15, KEY_MENU },        /* MENU */
+};
+
+int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+        u8 key[5];
+        if (usb_control_msg(d->udev,usb_rcvctrlpipe(d->udev,0),
+                                0x04, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, key, 5,
+                                2*HZ) != 5)
+                return -ENODEV;
+
+        /* call the universal NEC remote processor, to find out the key's state and event */
+        dvb_usb_nec_rc_key_to_event(d,key,event,state);
+        if (key[0] != 0)
+                deb_rc("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]);
+        return 0;
+}
+
+/* USB Driver stuff */
+static struct dvb_usb_properties a800_properties;
+
+static int a800_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        return dvb_usb_device_init(intf,&a800_properties,THIS_MODULE);
+}
+
+/* do not change the order of the ID table */
+static struct usb_device_id a800_table [] = {
+/* 00 */        { USB_DEVICE(USB_VID_AVERMEDIA,     USB_PID_AVERMEDIA_DVBT_USB2_COLD) },
+/* 01 */        { USB_DEVICE(USB_VID_AVERMEDIA,     USB_PID_AVERMEDIA_DVBT_USB2_WARM) },
+                        { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, a800_table);
+
+static struct dvb_usb_properties a800_properties = {
+        .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
+        .pid_filter_count = 32,
+
+        .usb_ctrl = CYPRESS_FX2,
+
+        .firmware = "dvb-usb-avertv-a800-02.fw",
+
+        .size_of_priv     = sizeof(struct dibusb_state),
+
+        .streaming_ctrl   = dibusb2_0_streaming_ctrl,
+        .pid_filter       = dibusb_pid_filter,
+        .pid_filter_ctrl  = dibusb_pid_filter_ctrl,
+        .power_ctrl       = a800_power_ctrl,
+        .frontend_attach  = dibusb_dib3000mc_frontend_attach,
+        .tuner_attach     = dibusb_dib3000mc_tuner_attach,
+
+        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc_key_map       = a800_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(a800_rc_keys),
+        .rc_query         = a800_rc_query,
+
+        .i2c_algo         = &dibusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        /* parameter for the MPEG2-data transfer */
+        .urb = {
+                .type = DVB_USB_BULK,
+                .count = 7,
+                .endpoint = 0x06,
+                .u = {
+                        .bulk = {
+                                .buffersize = 4096,
+                        }
+                }
+        },
+
+        .num_device_descs = 1,
+        .devices = {
+                {   "AVerMedia AverTV DVB-T USB 2.0 (A800)",
+                        { &a800_table[0], NULL },
+                        { &a800_table[1], NULL },
+                },
+        }
+};
+
+static struct usb_driver a800_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "AVerMedia AverTV DVB-T USB 2.0 (A800)",
+        .probe          = a800_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table       = a800_table,
+};
+
+/* module stuff */
+static int __init a800_module_init(void)
+{
+        int result;
+        if ((result = usb_register(&a800_driver))) {
+                err("usb_register failed. Error number %d",result);
+                return result;
+        }
+
+        return 0;
+}
+
+static void __exit a800_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&a800_driver);
+}
+
+module_init (a800_module_init);
+module_exit (a800_module_exit);
+
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_DESCRIPTION("AVerMedia AverTV DVB-T USB 2.0 (A800)");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
new file mode 100644
index 000000000000..63b626f70c81
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -0,0 +1,272 @@
+/* Common methods for dibusb-based-receivers.
+ *
+ * Copyright (C) 2004-5 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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "dibusb.h"
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=info (|-able))." DVB_USB_DEBUG_STATUS);
+MODULE_LICENSE("GPL");
+
+#define deb_info(args...) dprintk(debug,0x01,args)
+
+/* common stuff used by the different dibusb modules */
+int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff)
+{
+        if (d->priv != NULL) {
+                struct dib_fe_xfer_ops *ops = d->priv;
+                if (ops->fifo_ctrl != NULL)
+                        if (ops->fifo_ctrl(d->fe,onoff)) {
+                                err("error while controlling the fifo of the demod.");
+                                return -ENODEV;
+                        }
+        }
+        return 0;
+}
+EXPORT_SYMBOL(dibusb_streaming_ctrl);
+
+int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff)
+{
+        if (d->priv != NULL) {
+                struct dib_fe_xfer_ops *ops = d->priv;
+                if (d->pid_filtering && ops->pid_ctrl != NULL)
+                        ops->pid_ctrl(d->fe,index,pid,onoff);
+        }
+        return 0;
+}
+EXPORT_SYMBOL(dibusb_pid_filter);
+
+int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff)
+{
+        if (d->priv != NULL) {
+                struct dib_fe_xfer_ops *ops = d->priv;
+                if (ops->pid_parse != NULL)
+                        if (ops->pid_parse(d->fe,onoff) < 0)
+                                err("could not handle pid_parser");
+        }
+        return 0;
+}
+EXPORT_SYMBOL(dibusb_pid_filter_ctrl);
+
+int dibusb_power_ctrl(struct dvb_usb_device *d, int onoff)
+{
+        u8 b[3];
+        int ret;
+        b[0] = DIBUSB_REQ_SET_IOCTL;
+        b[1] = DIBUSB_IOCTL_CMD_POWER_MODE;
+        b[2] = onoff ? DIBUSB_IOCTL_POWER_WAKEUP : DIBUSB_IOCTL_POWER_SLEEP;
+        ret = dvb_usb_generic_write(d,b,3);
+        msleep(10);
+        return ret;
+}
+EXPORT_SYMBOL(dibusb_power_ctrl);
+
+int dibusb2_0_streaming_ctrl(struct dvb_usb_device *d, int onoff)
+{
+        u8 b[2];
+        b[0] = DIBUSB_REQ_SET_IOCTL;
+        b[1] = onoff ? DIBUSB_IOCTL_CMD_ENABLE_STREAM : DIBUSB_IOCTL_CMD_DISABLE_STREAM;
+
+        dvb_usb_generic_write(d,b,3);
+
+        return dibusb_streaming_ctrl(d,onoff);
+}
+EXPORT_SYMBOL(dibusb2_0_streaming_ctrl);
+
+int dibusb2_0_power_ctrl(struct dvb_usb_device *d, int onoff)
+{
+        if (onoff) {
+                u8 b[3] = { DIBUSB_REQ_SET_IOCTL, DIBUSB_IOCTL_CMD_POWER_MODE, DIBUSB_IOCTL_POWER_WAKEUP };
+                return dvb_usb_generic_write(d,b,3);
+        } else
+                return 0;
+}
+EXPORT_SYMBOL(dibusb2_0_power_ctrl);
+
+static int dibusb_i2c_msg(struct dvb_usb_device *d, u8 addr,
+                          u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+{
+        u8 sndbuf[wlen+4]; /* lead(1) devaddr,direction(1) addr(2) data(wlen) (len(2) (when reading)) */
+        /* write only ? */
+        int wo = (rbuf == NULL || rlen == 0),
+                len = 2 + wlen + (wo ? 0 : 2);
+
+        sndbuf[0] = wo ? DIBUSB_REQ_I2C_WRITE : DIBUSB_REQ_I2C_READ;
+        sndbuf[1] = (addr << 1) | (wo ? 0 : 1);
+
+        memcpy(&sndbuf[2],wbuf,wlen);
+
+        if (!wo) {
+                sndbuf[wlen+2] = (rlen >> 8) & 0xff;
+                sndbuf[wlen+3] = rlen & 0xff;
+        }
+
+        return dvb_usb_generic_rw(d,sndbuf,len,rbuf,rlen,0);
+}
+
+/*
+ * I2C master xfer function
+ */
+static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int i;
+
+        if (down_interruptible(&d->i2c_sem) < 0)
+                return -EAGAIN;
+
+        if (num > 2)
+                warn("more than 2 i2c messages at a time is not handled yet. TODO.");
+
+        for (i = 0; i < num; i++) {
+                /* write/read request */
+                if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
+                        if (dibusb_i2c_msg(d, msg[i].addr, msg[i].buf,msg[i].len,
+                                                msg[i+1].buf,msg[i+1].len) < 0)
+                                break;
+                        i++;
+                } else
+                        if (dibusb_i2c_msg(d, msg[i].addr, msg[i].buf,msg[i].len,NULL,0) < 0)
+                                break;
+        }
+
+        up(&d->i2c_sem);
+        return i;
+}
+
+static u32 dibusb_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+struct i2c_algorithm dibusb_i2c_algo = {
+        .name          = "DiBcom USB I2C algorithm",
+        .id            = I2C_ALGO_BIT,
+        .master_xfer   = dibusb_i2c_xfer,
+        .functionality = dibusb_i2c_func,
+};
+EXPORT_SYMBOL(dibusb_i2c_algo);
+
+int dibusb_read_eeprom_byte(struct dvb_usb_device *d, u8 offs, u8 *val)
+{
+        u8 wbuf[1] = { offs };
+        return dibusb_i2c_msg(d, 0x50, wbuf, 1, val, 1);
+}
+EXPORT_SYMBOL(dibusb_read_eeprom_byte);
+
+int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *d)
+{
+        struct dib3000_config demod_cfg;
+        struct dibusb_state *st = d->priv;
+
+        demod_cfg.pll_set = dvb_usb_pll_set_i2c;
+        demod_cfg.pll_init = dvb_usb_pll_init_i2c;
+
+        for (demod_cfg.demod_address = 0x8; demod_cfg.demod_address < 0xd; demod_cfg.demod_address++)
+                if ((d->fe = dib3000mc_attach(&demod_cfg,&d->i2c_adap,&st->ops)) != NULL) {
+                        d->tuner_pass_ctrl = st->ops.tuner_pass_ctrl;
+                        return 0;
+                }
+
+        return -ENODEV;
+}
+EXPORT_SYMBOL(dibusb_dib3000mc_frontend_attach);
+
+int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d)
+{
+        d->pll_addr = 0x60;
+        d->pll_desc = &dvb_pll_env57h1xd5;
+        return 0;
+}
+EXPORT_SYMBOL(dibusb_dib3000mc_tuner_attach);
+
+/*
+ * common remote control stuff
+ */
+struct dvb_usb_rc_key dibusb_rc_keys[] = {
+        /* Key codes for the little Artec T1/Twinhan/HAMA/ remote. */
+        { 0x00, 0x16, KEY_POWER },
+        { 0x00, 0x10, KEY_MUTE },
+        { 0x00, 0x03, KEY_1 },
+        { 0x00, 0x01, KEY_2 },
+        { 0x00, 0x06, KEY_3 },
+        { 0x00, 0x09, KEY_4 },
+        { 0x00, 0x1d, KEY_5 },
+        { 0x00, 0x1f, KEY_6 },
+        { 0x00, 0x0d, KEY_7 },
+        { 0x00, 0x19, KEY_8 },
+        { 0x00, 0x1b, KEY_9 },
+        { 0x00, 0x15, KEY_0 },
+        { 0x00, 0x05, KEY_CHANNELUP },
+        { 0x00, 0x02, KEY_CHANNELDOWN },
+        { 0x00, 0x1e, KEY_VOLUMEUP },
+        { 0x00, 0x0a, KEY_VOLUMEDOWN },
+        { 0x00, 0x11, KEY_RECORD },
+        { 0x00, 0x17, KEY_FAVORITES }, /* Heart symbol - Channel list. */
+        { 0x00, 0x14, KEY_PLAY },
+        { 0x00, 0x1a, KEY_STOP },
+        { 0x00, 0x40, KEY_REWIND },
+        { 0x00, 0x12, KEY_FASTFORWARD },
+        { 0x00, 0x0e, KEY_PREVIOUS }, /* Recall - Previous channel. */
+        { 0x00, 0x4c, KEY_PAUSE },
+        { 0x00, 0x4d, KEY_SCREEN }, /* Full screen mode. */
+        { 0x00, 0x54, KEY_AUDIO }, /* MTS - Switch to secondary audio. */
+        /* additional keys TwinHan VisionPlus, the Artec seemingly not have */
+        { 0x00, 0x0c, KEY_CANCEL }, /* Cancel */
+        { 0x00, 0x1c, KEY_EPG }, /* EPG */
+        { 0x00, 0x00, KEY_TAB }, /* Tab */
+        { 0x00, 0x48, KEY_INFO }, /* Preview */
+        { 0x00, 0x04, KEY_LIST }, /* RecordList */
+        { 0x00, 0x0f, KEY_TEXT }, /* Teletext */
+        /* Key codes for the KWorld/ADSTech/JetWay remote. */
+        { 0x86, 0x12, KEY_POWER },
+        { 0x86, 0x0f, KEY_SELECT }, /* source */
+        { 0x86, 0x0c, KEY_UNKNOWN }, /* scan */
+        { 0x86, 0x0b, KEY_EPG },
+        { 0x86, 0x10, KEY_MUTE },
+        { 0x86, 0x01, KEY_1 },
+        { 0x86, 0x02, KEY_2 },
+        { 0x86, 0x03, KEY_3 },
+        { 0x86, 0x04, KEY_4 },
+        { 0x86, 0x05, KEY_5 },
+        { 0x86, 0x06, KEY_6 },
+        { 0x86, 0x07, KEY_7 },
+        { 0x86, 0x08, KEY_8 },
+        { 0x86, 0x09, KEY_9 },
+        { 0x86, 0x0a, KEY_0 },
+        { 0x86, 0x18, KEY_ZOOM },
+        { 0x86, 0x1c, KEY_UNKNOWN }, /* preview */
+        { 0x86, 0x13, KEY_UNKNOWN }, /* snap */
+        { 0x86, 0x00, KEY_UNDO },
+        { 0x86, 0x1d, KEY_RECORD },
+        { 0x86, 0x0d, KEY_STOP },
+        { 0x86, 0x0e, KEY_PAUSE },
+        { 0x86, 0x16, KEY_PLAY },
+        { 0x86, 0x11, KEY_BACK },
+        { 0x86, 0x19, KEY_FORWARD },
+        { 0x86, 0x14, KEY_UNKNOWN }, /* pip */
+        { 0x86, 0x15, KEY_ESC },
+        { 0x86, 0x1a, KEY_UP },
+        { 0x86, 0x1e, KEY_DOWN },
+        { 0x86, 0x1f, KEY_LEFT },
+        { 0x86, 0x1b, KEY_RIGHT },
+};
+EXPORT_SYMBOL(dibusb_rc_keys);
+
+int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+        u8 key[5],cmd = DIBUSB_REQ_POLL_REMOTE;
+        dvb_usb_generic_rw(d,&cmd,1,key,5,0);
+        dvb_usb_nec_rc_key_to_event(d,key,event,state);
+        if (key[0] != 0)
+                deb_info("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]);
+        return 0;
+}
+EXPORT_SYMBOL(dibusb_rc_query);
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
new file mode 100644
index 000000000000..a0ffbb59fa14
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -0,0 +1,316 @@
+/* DVB USB compliant linux driver for mobile DVB-T USB devices based on
+ * reference designs made by DiBcom (http://www.dibcom.fr/) (DiB3000M-B)
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ *
+ * based on GPL code from DiBcom, which has
+ * Copyright (C) 2004 Amaury Demol for DiBcom (ademol@dibcom.fr)
+ *
+ *      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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "dibusb.h"
+
+static int dibusb_dib3000mb_frontend_attach(struct dvb_usb_device *d)
+{
+        struct dib3000_config demod_cfg;
+        struct dibusb_state *st = d->priv;
+
+        demod_cfg.demod_address = 0x8;
+        demod_cfg.pll_set = dvb_usb_pll_set_i2c;
+        demod_cfg.pll_init = dvb_usb_pll_init_i2c;
+
+        if ((d->fe = dib3000mb_attach(&demod_cfg,&d->i2c_adap,&st->ops)) == NULL)
+                return -ENODEV;
+
+        d->tuner_pass_ctrl = st->ops.tuner_pass_ctrl;
+
+        return 0;
+}
+
+/* some of the dibusb 1.1 device aren't equipped with the default tuner
+ * (Thomson Cable), but with a Panasonic ENV77H11D5.  This function figures
+ * this out. */
+static int dibusb_dib3000mb_tuner_attach (struct dvb_usb_device *d)
+{
+        u8 b[2] = { 0,0 }, b2[1];
+        int ret = 0;
+        struct i2c_msg msg[2] = {
+                { .flags = 0,        .buf = b,  .len = 2 },
+                { .flags = I2C_M_RD, .buf = b2, .len = 1 },
+        };
+
+        /* the Panasonic sits on I2C addrass 0x60, the Thomson on 0x61 */
+        msg[0].addr = msg[1].addr = 0x60;
+
+        if (d->tuner_pass_ctrl)
+                d->tuner_pass_ctrl(d->fe,1,msg[0].addr);
+
+        if (i2c_transfer (&d->i2c_adap, msg, 2) != 2) {
+                err("tuner i2c write failed.");
+                ret = -EREMOTEIO;
+        }
+
+        if (d->tuner_pass_ctrl)
+                d->tuner_pass_ctrl(d->fe,0,msg[0].addr);
+
+        if (b2[0] == 0xfe) {
+                info("this device has the Thomson Cable onboard. Which is default.");
+                d->pll_addr = 0x61;
+                d->pll_desc = &dvb_pll_tua6010xs;
+        } else {
+                u8 bpll[4] = { 0x0b, 0xf5, 0x85, 0xab };
+                info("this device has the Panasonic ENV77H11D5 onboard.");
+                d->pll_addr = 0x60;
+                memcpy(d->pll_init,bpll,4);
+                d->pll_desc = &dvb_pll_tda665x;
+        }
+
+        return ret;
+}
+
+/* USB Driver stuff */
+static struct dvb_usb_properties dibusb1_1_properties;
+static struct dvb_usb_properties dibusb1_1_an2235_properties;
+static struct dvb_usb_properties dibusb2_0b_properties;
+
+static int dibusb_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        if (dvb_usb_device_init(intf,&dibusb1_1_properties,THIS_MODULE) == 0 ||
+                dvb_usb_device_init(intf,&dibusb1_1_an2235_properties,THIS_MODULE) == 0 ||
+                dvb_usb_device_init(intf,&dibusb2_0b_properties,THIS_MODULE) == 0)
+                return 0;
+
+        return -EINVAL;
+}
+
+/* do not change the order of the ID table */
+static struct usb_device_id dibusb_dib3000mb_table [] = {
+/* 00 */        { USB_DEVICE(USB_VID_AVERMEDIA_UNK,     USB_PID_AVERMEDIA_DVBT_USB_COLD)},
+/* 01 */        { USB_DEVICE(USB_VID_AVERMEDIA_UNK,     USB_PID_AVERMEDIA_DVBT_USB_WARM)},
+/* 02 */        { USB_DEVICE(USB_VID_COMPRO,            USB_PID_COMPRO_DVBU2000_COLD) },
+/* 03 */        { USB_DEVICE(USB_VID_COMPRO,            USB_PID_COMPRO_DVBU2000_WARM) },
+/* 04 */        { USB_DEVICE(USB_VID_COMPRO_UNK,        USB_PID_COMPRO_DVBU2000_UNK_COLD) },
+/* 05 */        { USB_DEVICE(USB_VID_DIBCOM,            USB_PID_DIBCOM_MOD3000_COLD) },
+/* 06 */        { USB_DEVICE(USB_VID_DIBCOM,            USB_PID_DIBCOM_MOD3000_WARM) },
+/* 07 */        { USB_DEVICE(USB_VID_EMPIA,                     USB_PID_KWORLD_VSTREAM_COLD) },
+/* 08 */        { USB_DEVICE(USB_VID_EMPIA,                     USB_PID_KWORLD_VSTREAM_WARM) },
+/* 09 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB_COLD) },
+/* 10 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB_WARM) },
+/* 11 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_DIBCOM_MOD3000_COLD) },
+/* 12 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_DIBCOM_MOD3000_WARM) },
+/* 13 */        { USB_DEVICE(USB_VID_HYPER_PALTEK,      USB_PID_UNK_HYPER_PALTEK_COLD) },
+/* 14 */        { USB_DEVICE(USB_VID_HYPER_PALTEK,      USB_PID_UNK_HYPER_PALTEK_WARM) },
+/* 15 */        { USB_DEVICE(USB_VID_VISIONPLUS,        USB_PID_TWINHAN_VP7041_COLD) },
+/* 16 */        { USB_DEVICE(USB_VID_VISIONPLUS,        USB_PID_TWINHAN_VP7041_WARM) },
+/* 17 */        { USB_DEVICE(USB_VID_TWINHAN,           USB_PID_TWINHAN_VP7041_COLD) },
+/* 18 */        { USB_DEVICE(USB_VID_TWINHAN,           USB_PID_TWINHAN_VP7041_WARM) },
+/* 19 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_COLD) },
+/* 20 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_WARM) },
+/* 21 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_AN2235_COLD) },
+/* 22 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_AN2235_WARM) },
+/* 23 */        { USB_DEVICE(USB_VID_ADSTECH,           USB_PID_ADSTECH_USB2_COLD) },
+/* 24 */        { USB_DEVICE(USB_VID_ADSTECH,           USB_PID_ADSTECH_USB2_WARM) },
+                        { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, dibusb_dib3000mb_table);
+
+static struct dvb_usb_properties dibusb1_1_properties = {
+        .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
+        .pid_filter_count = 16,
+
+        .usb_ctrl = CYPRESS_AN2135,
+
+        .firmware = "dvb-usb-dibusb-5.0.0.11.fw",
+
+        .size_of_priv     = sizeof(struct dibusb_state),
+
+        .streaming_ctrl   = dibusb_streaming_ctrl,
+        .pid_filter       = dibusb_pid_filter,
+        .pid_filter_ctrl  = dibusb_pid_filter_ctrl,
+        .power_ctrl       = dibusb_power_ctrl,
+        .frontend_attach  = dibusb_dib3000mb_frontend_attach,
+        .tuner_attach     = dibusb_dib3000mb_tuner_attach,
+
+        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc_key_map       = dibusb_rc_keys,
+        .rc_key_map_size  = 63, /* wow, that is ugly ... I want to load it to the driver dynamically */
+        .rc_query         = dibusb_rc_query,
+
+        .i2c_algo         = &dibusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        /* parameter for the MPEG2-data transfer */
+        .urb = {
+                .type = DVB_USB_BULK,
+                .count = 7,
+                .endpoint = 0x02,
+                .u = {
+                        .bulk = {
+                                .buffersize = 4096,
+                        }
+                }
+        },
+
+        .num_device_descs = 8,
+        .devices = {
+                {       "AVerMedia AverTV DVBT USB1.1",
+                        { &dibusb_dib3000mb_table[0],  NULL },
+                        { &dibusb_dib3000mb_table[1],  NULL },
+                },
+                {       "Compro Videomate DVB-U2000 - DVB-T USB1.1 (please confirm to linux-dvb)",
+                        { &dibusb_dib3000mb_table[2], &dibusb_dib3000mb_table[4], NULL},
+                        { &dibusb_dib3000mb_table[3], NULL },
+                },
+                {       "DiBcom USB1.1 DVB-T reference design (MOD3000)",
+                        { &dibusb_dib3000mb_table[5],  NULL },
+                        { &dibusb_dib3000mb_table[6],  NULL },
+                },
+                {       "KWorld V-Stream XPERT DTV - DVB-T USB1.1",
+                        { &dibusb_dib3000mb_table[7], NULL },
+                        { &dibusb_dib3000mb_table[8], NULL },
+                },
+                {       "Grandtec USB1.1 DVB-T",
+                        { &dibusb_dib3000mb_table[9],  &dibusb_dib3000mb_table[11], NULL },
+                        { &dibusb_dib3000mb_table[10], &dibusb_dib3000mb_table[12], NULL },
+                },
+                {       "Unkown USB1.1 DVB-T device ???? please report the name to the author",
+                        { &dibusb_dib3000mb_table[13], NULL },
+                        { &dibusb_dib3000mb_table[14], NULL },
+                },
+                {       "TwinhanDTV USB-Ter USB1.1 / Magic Box I / HAMA USB1.1 DVB-T device",
+                        { &dibusb_dib3000mb_table[15], &dibusb_dib3000mb_table[17], NULL},
+                        { &dibusb_dib3000mb_table[16], &dibusb_dib3000mb_table[18], NULL},
+                },
+                {       "Artec T1 USB1.1 TVBOX with AN2135",
+                        { &dibusb_dib3000mb_table[19], NULL },
+                        { &dibusb_dib3000mb_table[20], NULL },
+                },
+        }
+};
+
+static struct dvb_usb_properties dibusb1_1_an2235_properties = {
+        .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
+        .usb_ctrl = CYPRESS_AN2235,
+
+        .firmware = "dvb-usb-dibusb-an2235-01.fw",
+
+        .size_of_priv     = sizeof(struct dibusb_state),
+
+        .streaming_ctrl   = dibusb_streaming_ctrl,
+        .pid_filter       = dibusb_pid_filter,
+        .pid_filter_ctrl  = dibusb_pid_filter_ctrl,
+        .power_ctrl       = dibusb_power_ctrl,
+        .frontend_attach  = dibusb_dib3000mb_frontend_attach,
+        .tuner_attach     = dibusb_dib3000mb_tuner_attach,
+
+        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc_key_map       = dibusb_rc_keys,
+        .rc_key_map_size  = 63, /* wow, that is ugly ... I want to load it to the driver dynamically */
+        .rc_query         = dibusb_rc_query,
+
+        .i2c_algo         = &dibusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        /* parameter for the MPEG2-data transfer */
+        .urb = {
+                .type = DVB_USB_BULK,
+                .count = 7,
+                .endpoint = 0x02,
+                .u = {
+                        .bulk = {
+                                .buffersize = 4096,
+                        }
+                }
+        },
+
+        .num_device_descs = 1,
+        .devices = {
+                {       "Artec T1 USB1.1 TVBOX with AN2235",
+                        { &dibusb_dib3000mb_table[20], NULL },
+                        { &dibusb_dib3000mb_table[21], NULL },
+                },
+        }
+};
+
+static struct dvb_usb_properties dibusb2_0b_properties = {
+        .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
+        .usb_ctrl = CYPRESS_FX2,
+
+        .firmware = "dvb-usb-adstech-usb2-01.fw",
+
+        .size_of_priv     = sizeof(struct dibusb_state),
+
+        .streaming_ctrl   = dibusb2_0_streaming_ctrl,
+        .pid_filter       = dibusb_pid_filter,
+        .pid_filter_ctrl  = dibusb_pid_filter_ctrl,
+        .power_ctrl       = dibusb2_0_power_ctrl,
+        .frontend_attach  = dibusb_dib3000mb_frontend_attach,
+        .tuner_attach     = dibusb_dib3000mb_tuner_attach,
+
+        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc_key_map       = dibusb_rc_keys,
+        .rc_key_map_size  = 63, /* wow, that is ugly ... I want to load it to the driver dynamically */
+        .rc_query         = dibusb_rc_query,
+
+        .i2c_algo         = &dibusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        /* parameter for the MPEG2-data transfer */
+        .urb = {
+                .type = DVB_USB_BULK,
+                .count = 7,
+                .endpoint = 0x06,
+                .u = {
+                        .bulk = {
+                                .buffersize = 4096,
+                        }
+                }
+        },
+
+        .num_device_descs = 2,
+        .devices = {
+                {       "KWorld/ADSTech Instant DVB-T USB 2.0",
+                        { &dibusb_dib3000mb_table[23], NULL },
+                        { &dibusb_dib3000mb_table[24], NULL }, /* device ID with default DIBUSB2_0-firmware */
+                },
+        }
+};
+
+static struct usb_driver dibusb_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "DiBcom based USB DVB-T devices (DiB3000M-B based)",
+        .probe          = dibusb_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table       = dibusb_dib3000mb_table,
+};
+
+/* module stuff */
+static int __init dibusb_module_init(void)
+{
+        int result;
+        if ((result = usb_register(&dibusb_driver))) {
+                err("usb_register failed. Error number %d",result);
+                return result;
+        }
+
+        return 0;
+}
+
+static void __exit dibusb_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&dibusb_driver);
+}
+
+module_init (dibusb_module_init);
+module_exit (dibusb_module_exit);
+
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_DESCRIPTION("Driver for DiBcom USB DVB-T devices (DiB3000M-B based)");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c
new file mode 100644
index 000000000000..aad8ed3fe005
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -0,0 +1,116 @@
+/* DVB USB compliant linux driver for mobile DVB-T USB devices based on
+ * reference designs made by DiBcom (http://www.dibcom.fr/) (DiB3000M-C/P)
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ *
+ * based on GPL code from DiBcom, which has
+ * Copyright (C) 2004 Amaury Demol for DiBcom (ademol@dibcom.fr)
+ *
+ *      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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "dibusb.h"
+
+/* USB Driver stuff */
+static struct dvb_usb_properties dibusb_mc_properties;
+
+static int dibusb_mc_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        return dvb_usb_device_init(intf,&dibusb_mc_properties,THIS_MODULE);
+}
+
+/* do not change the order of the ID table */
+static struct usb_device_id dibusb_dib3000mc_table [] = {
+/* 00 */        { USB_DEVICE(USB_VID_DIBCOM,            USB_PID_DIBCOM_MOD3001_COLD) },
+/* 01 */        { USB_DEVICE(USB_VID_DIBCOM,            USB_PID_DIBCOM_MOD3001_WARM) },
+/* 02 */        { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_USB2_COLD) },
+                        { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
+
+static struct dvb_usb_properties dibusb_mc_properties = {
+        .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
+        .pid_filter_count = 32,
+
+        .usb_ctrl = CYPRESS_FX2,
+        .firmware = "dvb-usb-dibusb-6.0.0.8.fw",
+
+        .size_of_priv     = sizeof(struct dibusb_state),
+
+        .streaming_ctrl   = dibusb2_0_streaming_ctrl,
+        .pid_filter       = dibusb_pid_filter,
+        .pid_filter_ctrl  = dibusb_pid_filter_ctrl,
+        .power_ctrl       = dibusb2_0_power_ctrl,
+        .frontend_attach  = dibusb_dib3000mc_frontend_attach,
+        .tuner_attach     = dibusb_dib3000mc_tuner_attach,
+
+        .rc_interval      = DEFAULT_RC_INTERVAL,
+        .rc_key_map       = dibusb_rc_keys,
+        .rc_key_map_size  = 63, /* FIXME */
+        .rc_query         = dibusb_rc_query,
+
+        .i2c_algo         = &dibusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        /* parameter for the MPEG2-data transfer */
+        .urb = {
+                .type = DVB_USB_BULK,
+                .count = 7,
+                .endpoint = 0x06,
+                .u = {
+                        .bulk = {
+                                .buffersize = 4096,
+                        }
+                }
+        },
+
+        .num_device_descs = 2,
+        .devices = {
+                {   "DiBcom USB2.0 DVB-T reference design (MOD3000P)",
+                        { &dibusb_dib3000mc_table[0], NULL },
+                        { &dibusb_dib3000mc_table[1], NULL },
+                },
+                {   "Artec T1 USB2.0 TVBOX (please report the warm ID)",
+                        { &dibusb_dib3000mc_table[2], NULL },
+                        { NULL },
+                },
+        }
+};
+
+static struct usb_driver dibusb_mc_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "DiBcom based USB2.0 DVB-T (DiB3000M-C/P based) devices",
+        .probe          = dibusb_mc_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table       = dibusb_dib3000mc_table,
+};
+
+/* module stuff */
+static int __init dibusb_mc_module_init(void)
+{
+        int result;
+        if ((result = usb_register(&dibusb_mc_driver))) {
+                err("usb_register failed. Error number %d",result);
+                return result;
+        }
+
+        return 0;
+}
+
+static void __exit dibusb_mc_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&dibusb_mc_driver);
+}
+
+module_init (dibusb_mc_module_init);
+module_exit (dibusb_mc_module_exit);
+
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_DESCRIPTION("Driver for DiBcom USB2.0 DVB-T (DiB3000M-C/P based) devices");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/dibusb.h b/drivers/media/dvb/dvb-usb/dibusb.h
new file mode 100644
index 000000000000..6611f62977c0
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dibusb.h
@@ -0,0 +1,122 @@
+/* Header file for all dibusb-based-receivers.
+ *
+ * Copyright (C) 2004-5 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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#ifndef _DVB_USB_DIBUSB_H_
+#define _DVB_USB_DIBUSB_H_
+
+#define DVB_USB_LOG_PREFIX "dibusb"
+#include "dvb-usb.h"
+
+#include "dib3000.h"
+
+/*
+ * protocol of all dibusb related devices
+ */
+
+/*
+ * bulk msg to/from endpoint 0x01
+ *
+ * general structure:
+ * request_byte parameter_bytes
+ */
+
+#define DIBUSB_REQ_START_READ                   0x00
+#define DIBUSB_REQ_START_DEMOD                  0x01
+
+/*
+ * i2c read
+ * bulk write: 0x02 ((7bit i2c_addr << 1) & 0x01) register_bytes length_word
+ * bulk read:  byte_buffer (length_word bytes)
+ */
+#define DIBUSB_REQ_I2C_READ                     0x02
+
+/*
+ * i2c write
+ * bulk write: 0x03 (7bit i2c_addr << 1) register_bytes value_bytes
+ */
+#define DIBUSB_REQ_I2C_WRITE                    0x03
+
+/*
+ * polling the value of the remote control
+ * bulk write: 0x04
+ * bulk read:  byte_buffer (5 bytes)
+ */
+#define DIBUSB_REQ_POLL_REMOTE       0x04
+
+/* additional status values for Hauppauge Remote Control Protocol */
+#define DIBUSB_RC_HAUPPAUGE_KEY_PRESSED 0x01
+#define DIBUSB_RC_HAUPPAUGE_KEY_EMPTY   0x03
+
+/* streaming mode:
+ * bulk write: 0x05 mode_byte
+ *
+ * mode_byte is mostly 0x00
+ */
+#define DIBUSB_REQ_SET_STREAMING_MODE   0x05
+
+/* interrupt the internal read loop, when blocking */
+#define DIBUSB_REQ_INTR_READ                    0x06
+
+/* io control
+ * 0x07 cmd_byte param_bytes
+ *
+ * param_bytes can be up to 32 bytes
+ *
+ * cmd_byte function    parameter name
+ * 0x00     power mode
+ *                      0x00      sleep
+ *                      0x01      wakeup
+ *
+ * 0x01     enable streaming
+ * 0x02     disable streaming
+ *
+ *
+ */
+#define DIBUSB_REQ_SET_IOCTL                    0x07
+
+/* IOCTL commands */
+
+/* change the power mode in firmware */
+#define DIBUSB_IOCTL_CMD_POWER_MODE             0x00
+#define DIBUSB_IOCTL_POWER_SLEEP                        0x00
+#define DIBUSB_IOCTL_POWER_WAKEUP                       0x01
+
+/* modify streaming of the FX2 */
+#define DIBUSB_IOCTL_CMD_ENABLE_STREAM  0x01
+#define DIBUSB_IOCTL_CMD_DISABLE_STREAM 0x02
+
+struct dibusb_state {
+        struct dib_fe_xfer_ops ops;
+
+        /* for RC5 remote control */
+        int old_toggle;
+        int last_repeat_count;
+};
+
+extern struct i2c_algorithm dibusb_i2c_algo;
+
+extern int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *);
+extern int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *);
+
+extern int dibusb_streaming_ctrl(struct dvb_usb_device *, int);
+extern int dibusb_pid_filter(struct dvb_usb_device *, int, u16, int);
+extern int dibusb_pid_filter_ctrl(struct dvb_usb_device *, int);
+extern int dibusb_power_ctrl(struct dvb_usb_device *, int);
+extern int dibusb2_0_streaming_ctrl(struct dvb_usb_device *, int);
+extern int dibusb2_0_power_ctrl(struct dvb_usb_device *, int);
+
+#define DEFAULT_RC_INTERVAL 150
+//#define DEFAULT_RC_INTERVAL 100000
+
+extern struct dvb_usb_rc_key dibusb_rc_keys[];
+extern int dibusb_rc_query(struct dvb_usb_device *, u32 *, int *);
+extern int dibusb_read_eeprom_byte(struct dvb_usb_device *, u8, u8 *);
+
+#endif
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
new file mode 100644
index 000000000000..5acf3fde9522
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -0,0 +1,282 @@
+/* DVB USB compliant linux driver for Nebula Electronics uDigiTV DVB-T USB2.0
+ * receiver
+ *
+ * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@desy.de) and
+ *                    Allan Third (allan.third@cs.man.ac.uk)
+ *
+ * partly based on the SDK published by Nebula Electronics (TODO do we want this line ?)
+ *
+ *      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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "digitv.h"
+
+#include "mt352.h"
+#include "nxt6000.h"
+
+/* debug */
+int dvb_usb_digitv_debug;
+module_param_named(debug,dvb_usb_digitv_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
+
+static int digitv_ctrl_msg(struct dvb_usb_device *d,
+                u8 cmd, u8 vv, u8 *wbuf, int wlen, u8 *rbuf, int rlen)
+{
+        int wo = (rbuf == NULL || rlen == 0); /* write-only */
+        u8 sndbuf[7],rcvbuf[7];
+        memset(sndbuf,0,7); memset(rcvbuf,0,7);
+
+        sndbuf[0] = cmd;
+        sndbuf[1] = vv;
+        sndbuf[2] = wo ? wlen : rlen;
+
+        if (!wo) {
+                memcpy(&sndbuf[3],wbuf,wlen);
+                dvb_usb_generic_write(d,sndbuf,7);
+        } else {
+                dvb_usb_generic_rw(d,sndbuf,7,rcvbuf,7,10);
+                memcpy(&rbuf,&rcvbuf[3],rlen);
+        }
+        return 0;
+}
+
+/* I2C */
+static int digitv_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int i;
+
+        if (down_interruptible(&d->i2c_sem) < 0)
+                return -EAGAIN;
+
+        if (num > 2)
+                warn("more than 2 i2c messages at a time is not handled yet. TODO.");
+
+        for (i = 0; i < num; i++) {
+                /* write/read request */
+                if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
+                        if (digitv_ctrl_msg(d, USB_READ_COFDM, msg[i].buf[0], NULL, 0,
+                                                msg[i+1].buf,msg[i+1].len) < 0)
+                                break;
+                        i++;
+                } else
+                        if (digitv_ctrl_msg(d,USB_WRITE_COFDM, msg[i].buf[0],
+                                                &msg[i].buf[1],msg[i].len-1,NULL,0) < 0)
+                                break;
+        }
+
+        up(&d->i2c_sem);
+        return i;
+}
+
+static u32 digitv_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm digitv_i2c_algo = {
+        .name          = "Nebula DigiTV USB I2C algorithm",
+        .id            = I2C_ALGO_BIT,
+        .master_xfer   = digitv_i2c_xfer,
+        .functionality = digitv_i2c_func,
+};
+
+/* Callbacks for DVB USB */
+static int digitv_identify_state (struct usb_device *udev, struct
+                dvb_usb_properties *props, struct dvb_usb_device_description **desc,
+                int *cold)
+{
+        *cold = udev->descriptor.iManufacturer == 0 && udev->descriptor.iProduct == 0;
+        return 0;
+}
+
+static int digitv_mt352_demod_init(struct dvb_frontend *fe)
+{
+        static u8 mt352_clock_config[] = { 0x89, 0x38, 0x2d };
+        static u8 mt352_reset[] = { 0x50, 0x80 };
+        static u8 mt352_mclk_ratio[] = { 0x8b, 0x00 };
+
+        static u8 mt352_agc_cfg[] = { 0x68, 0xa0 };
+        static u8 mt352_adc_ctl_1_cfg[] = { 0x8E, 0xa0 };
+        static u8 mt352_acq_ctl[] = { 0x53, 0x50 };
+        static u8 mt352_agc_target[] = { 0x67, 0x20 };
+
+        static u8 mt352_rs_err_per[] = { 0x7c, 0x00, 0x01 };
+        static u8 mt352_snr_select[] = { 0x79, 0x00, 0x20 };
+
+        static u8 mt352_input_freq_1[] = { 0x56, 0x31, 0x05 };
+
+        static u8 mt352_scan_ctl[] = { 0x88, 0x0f };
+        static u8 mt352_capt_range[] = { 0x75, 0x32 };
+
+        mt352_write(fe, mt352_clock_config, sizeof(mt352_clock_config));
+        mt352_write(fe, mt352_reset, sizeof(mt352_reset));
+        msleep(1);
+        mt352_write(fe, mt352_mclk_ratio, sizeof(mt352_mclk_ratio));
+
+        mt352_write(fe, mt352_agc_cfg, sizeof(mt352_agc_cfg));
+        mt352_write(fe, mt352_adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg));
+        mt352_write(fe, mt352_acq_ctl, sizeof(mt352_acq_ctl));
+        mt352_write(fe, mt352_agc_target, sizeof(mt352_agc_target));
+
+
+        mt352_write(fe, mt352_rs_err_per, sizeof(mt352_rs_err_per));
+        mt352_write(fe, mt352_snr_select, sizeof(mt352_snr_select));
+
+        mt352_write(fe, mt352_input_freq_1, sizeof(mt352_input_freq_1));
+
+        mt352_write(fe, mt352_scan_ctl, sizeof(mt352_scan_ctl));
+        mt352_write(fe, mt352_capt_range, sizeof(mt352_capt_range));
+
+        return 0;
+}
+
+static struct mt352_config digitv_mt352_config = {
+        .demod_address = 0x0, /* ignored by the digitv anyway */
+        .demod_init = digitv_mt352_demod_init,
+        .pll_set = NULL, /* TODO */
+};
+
+static struct nxt6000_config digitv_nxt6000_config = {
+        .demod_address = 0x0, /* ignored by the digitv anyway */
+        .clock_inversion = 0x0,
+
+        .pll_init = NULL,
+        .pll_set = NULL,
+};
+
+static int digitv_frontend_attach(struct dvb_usb_device *d)
+{
+        if ((d->fe = mt352_attach(&digitv_mt352_config, &d->i2c_adap)) == NULL)
+                return 0;
+        if ((d->fe = nxt6000_attach(&digitv_nxt6000_config, &d->i2c_adap)) == NULL) {
+
+                warn("nxt6000 support is not done yet, in fact you are one of the first "
+                                "person who wants to use this device in Linux. Please report to "
+                                "linux-dvb@linuxtv.org");
+
+                return 0;
+        }
+        return -EIO;
+}
+
+static struct dvb_usb_rc_key digitv_rc_keys[] = {
+        { 0x00, 0x16, KEY_POWER }, /* dummy key */
+};
+
+/* TODO is it really the NEC protocol ? */
+int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+        u8 key[5];
+
+        digitv_ctrl_msg(d,USB_READ_REMOTE,0,NULL,0,&key[1],4);
+        /* TODO state, maybe it is VV ? */
+        if (key[1] != 0)
+                key[0] = 0x01; /* if something is inside the buffer, simulate key press */
+
+        /* call the universal NEC remote processor, to find out the key's state and event */
+        dvb_usb_nec_rc_key_to_event(d,key,event,state);
+        if (key[0] != 0)
+                deb_rc("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]);
+        return 0;
+}
+
+
+/* DVB USB Driver stuff */
+static struct dvb_usb_properties digitv_properties;
+
+static int digitv_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        return dvb_usb_device_init(intf,&digitv_properties,THIS_MODULE);
+}
+
+static struct usb_device_id digitv_table [] = {
+                { USB_DEVICE(USB_VID_ANCHOR, USB_PID_NEBULA_DIGITV) },
+                { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, digitv_table);
+
+static struct dvb_usb_properties digitv_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl = CYPRESS_FX2,
+        .firmware = "dvb-usb-digitv-01.fw",
+
+        .size_of_priv     = 0,
+
+        .streaming_ctrl   = NULL,
+        .pid_filter       = NULL,
+        .pid_filter_ctrl  = NULL,
+        .power_ctrl       = NULL,
+        .frontend_attach  = digitv_frontend_attach,
+        .tuner_attach     = NULL, // digitv_tuner_attach,
+        .read_mac_address = NULL,
+
+        .rc_interval      = 1000,
+        .rc_key_map       = digitv_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(digitv_rc_keys),
+        .rc_query         = digitv_rc_query,
+
+        .identify_state   = digitv_identify_state,
+
+        .i2c_algo         = &digitv_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        /* parameter for the MPEG2-data transfer */
+        .urb = {
+                .type = DVB_USB_BULK,
+                .count = 7,
+                .endpoint = 0x02,
+                .u = {
+                        .bulk = {
+                                .buffersize = 4096,
+                        }
+                }
+        },
+
+        .num_device_descs = 2,
+        .devices = {
+                {   "Nebula Electronics uDigiTV DVB-T USB2.0)",
+                        { &digitv_table[0], NULL },
+                        { NULL },
+                },
+        }
+};
+
+static struct usb_driver digitv_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "Nebula Electronics uDigiTV DVB-T USB2.0 device",
+        .probe          = digitv_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table       = digitv_table,
+};
+
+/* module stuff */
+static int __init digitv_module_init(void)
+{
+        int result;
+        if ((result = usb_register(&digitv_driver))) {
+                err("usb_register failed. Error number %d",result);
+                return result;
+        }
+
+        return 0;
+}
+
+static void __exit digitv_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&digitv_driver);
+}
+
+module_init (digitv_module_init);
+module_exit (digitv_module_exit);
+
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_DESCRIPTION("Driver for Nebula Electronics uDigiTV DVB-T USB2.0");
+MODULE_VERSION("1.0-alpha");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/digitv.h b/drivers/media/dvb/dvb-usb/digitv.h
new file mode 100644
index 000000000000..477ee428a70e
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/digitv.h
@@ -0,0 +1,65 @@
+#ifndef _DVB_USB_DIGITV_H_
+#define _DVB_USB_DIGITV_H_
+
+#define DVB_USB_LOG_PREFIX "digitv"
+#include "dvb-usb.h"
+
+extern int dvb_usb_digitv_debug;
+#define deb_rc(args...)   dprintk(dvb_usb_digitv_debug,0x01,args)
+
+/* protocol (from usblogging and the SDK:
+ *
+ * Always 7 bytes bulk message(s) for controlling
+ *
+ * First byte describes the command. Reads are 2 consecutive transfer (as always).
+ *
+ * General structure:
+ *
+ * write or first message of a read:
+ * <cmdbyte> VV <len> B0 B1 B2 B3
+ *
+ * second message of a read
+ * <cmdbyte> VV <len> R0 R1 R2 R3
+ *
+ * whereas 0 < len <= 4
+ *
+ * I2C address is stored somewhere inside the device.
+ *
+ * 0x01 read from EEPROM
+ *  VV = offset; B* = 0; R* = value(s)
+ *
+ * 0x02 read register of the COFDM
+ *  VV = register; B* = 0; R* = value(s)
+ *
+ * 0x05 write register of the COFDM
+ *  VV = register; B* = value(s);
+ *
+ * 0x06 write to the tuner (only for NXT6000)
+ *  VV = 0; B* = PLL data; len = 4;
+ *
+ * 0x03 read remote control
+ *  VV = 0; B* = 0; len = 4; R* = key
+ *
+ * 0x07 write to the remote (don't know why one should this, resetting ?)
+ *  VV = 0; B* = key; len = 4;
+ *
+ * 0x08 write remote type
+ *  VV = 0; B[0] = 0x01, len = 4
+ *
+ * 0x09 write device init
+ *  TODO
+ */
+#define USB_READ_EEPROM         1
+
+#define USB_READ_COFDM          2
+#define USB_WRITE_COFDM         5
+
+#define USB_WRITE_TUNER         6
+
+#define USB_READ_REMOTE         3
+#define USB_WRITE_REMOTE        7
+#define USB_WRITE_REMOTE_TYPE   8
+
+#define USB_DEV_INIT            9
+
+#endif
diff --git a/drivers/media/dvb/dibusb/dvb-fe-dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
index 1872aa6d200a..d17d768038c6 100644
--- a/drivers/media/dvb/dibusb/dvb-fe-dtt200u.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
@@ -1,42 +1,18 @@
-/*
- * dvb-dtt200u-fe.c is a driver which implements the frontend-part of the
- * Yakumo/Typhoon/Hama USB2.0 boxes. It is hard-wired to the dibusb-driver as
- * it uses the usb-transfer functions directly (maybe creating a
- * generic-dvb-usb-lib for all usb-drivers will be reduce some more code.)
+/* Frontend part of the Linux driver for the Yakumo/Hama/Typhoon DVB-T
+ * USB2.0 receiver.
  *
  * Copyright (C) 2005 Patrick Boettcher <patrick.boettcher@desy.de>
  *
- * see dvb-dibusb-core.c for copyright details.
- */
-
-/* guessed protocol description (reverse engineered):
- * read
- *  00 - USB type 0x02 for usb2.0, 0x01 for usb1.1
- *  81 - <TS_LOCK> <current frequency divided by 250000>
- *  82 - crash - do not touch
- *  83 - crash - do not touch
- *  84 - remote control
- *  85 - crash - do not touch (OK, stop testing here)
- *  88 - locking 2 bytes (0x80 0x40 == no signal, 0x89 0x20 == nice signal)
- *  89 - noise-to-signal
- *      8a - unkown 1 byte - signal_strength
- *  8c - ber ???
- *  8d - ber
- *  8e - unc
+ *      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, version 2.
  *
- * write
- *  02 - bandwidth
- *  03 - frequency (divided by 250000)
- *  04 - pid table (index pid(7:0) pid(12:8))
- *  05 - reset the pid table
- *  08 - demod transfer enabled or not (FX2 transfer is enabled by default)
+ * see Documentation/dvb/README.dvb-usb for more information
  */
-
-#include "dvb-dibusb.h"
-#include "dvb_frontend.h"
+#include "dtt200u.h"
 
 struct dtt200u_fe_state {
-        struct usb_dibusb *dib;
+        struct dvb_usb_device *d;
 
         struct dvb_frontend_parameters fep;
         struct dvb_frontend frontend;
@@ -47,11 +23,11 @@ struct dtt200u_fe_state {
 static int dtt200u_fe_read_status(struct dvb_frontend* fe, fe_status_t *stat)
 {
         struct dtt200u_fe_state *state = fe->demodulator_priv;
-        u8 bw[1] = { 0x81 };
+        u8 bw = GET_TUNE_STAT;
         u8 br[3] = { 0 };
 //      u8 bdeb[5] = { 0 };
 
-        dibusb_readwrite_usb(state->dib,bw,1,br,3);
+        dvb_usb_generic_rw(state->d,&bw,1,br,3,0);
         switch (br[0]) {
                 case 0x01:
                         *stat = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
@@ -60,12 +36,12 @@ static int dtt200u_fe_read_status(struct dvb_frontend* fe, fe_status_t *stat)
                         *stat = 0;
                         break;
                 default:
-                        moan("br[0]",0x81);
+                        moan("br[0]",GET_TUNE_STAT);
                         break;
         }
 
 //      bw[0] = 0x88;
-//      dibusb_readwrite_usb(state->dib,bw,1,bdeb,5);
+//      dvb_usb_generic_rw(state->d,bw,1,bdeb,5,0);
 
 //      deb_info("%02x: %02x %02x %02x %02x %02x\n",bw[0],bdeb[0],bdeb[1],bdeb[2],bdeb[3],bdeb[4]);
 
@@ -74,27 +50,26 @@ static int dtt200u_fe_read_status(struct dvb_frontend* fe, fe_status_t *stat)
 static int dtt200u_fe_read_ber(struct dvb_frontend* fe, u32 *ber)
 {
         struct dtt200u_fe_state *state = fe->demodulator_priv;
-        u8 bw[1] = { 0x8d };
+        u8 bw = GET_BER;
         *ber = 0;
-        dibusb_readwrite_usb(state->dib,bw,1,(u8*) ber, 3);
+        dvb_usb_generic_rw(state->d,&bw,1,(u8*) ber,3,0);
         return 0;
 }
 
 static int dtt200u_fe_read_unc_blocks(struct dvb_frontend* fe, u32 *unc)
 {
         struct dtt200u_fe_state *state = fe->demodulator_priv;
-        u8 bw[1] = { 0x8c };
+        u8 bw = GET_UNK;
         *unc = 0;
-        dibusb_readwrite_usb(state->dib,bw,1,(u8*) unc, 3);
+        dvb_usb_generic_rw(state->d,&bw,1,(u8*) unc,3,0);
         return 0;
 }
 
 static int dtt200u_fe_read_signal_strength(struct dvb_frontend* fe, u16 *strength)
 {
         struct dtt200u_fe_state *state = fe->demodulator_priv;
-        u8 bw[1] = { 0x8a };
-        u8 b;
-        dibusb_readwrite_usb(state->dib,bw,1,&b, 1);
+        u8 bw = GET_SIG_STRENGTH, b;
+        dvb_usb_generic_rw(state->d,&bw,1,&b,1,0);
         *strength = (b << 8) | b;
         return 0;
 }
@@ -102,18 +77,17 @@ static int dtt200u_fe_read_signal_strength(struct dvb_frontend* fe, u16 *strengt
 static int dtt200u_fe_read_snr(struct dvb_frontend* fe, u16 *snr)
 {
         struct dtt200u_fe_state *state = fe->demodulator_priv;
-        u8 bw[1] = { 0x89 };
-        u8 br[1] = { 0 };
-        dibusb_readwrite_usb(state->dib,bw,1,br,1);
-        *snr = ((0xff - br[0]) << 8) | (0xff - br[0]);
+        u8 bw = GET_SNR,br;
+        dvb_usb_generic_rw(state->d,&bw,1,&br,1,0);
+        *snr = ~((br << 8) | br);
         return 0;
 }
 
 static int dtt200u_fe_init(struct dvb_frontend* fe)
 {
         struct dtt200u_fe_state *state = fe->demodulator_priv;
-        u8 b[] = { 0x01 };
-        return dibusb_write_usb(state->dib,b,1);
+        u8 b = RESET_DEMOD;
+        return dvb_usb_generic_write(state->d,&b,1);
 }
 
 static int dtt200u_fe_sleep(struct dvb_frontend* fe)
@@ -134,7 +108,7 @@ static int dtt200u_fe_set_frontend(struct dvb_frontend* fe,
 {
         struct dtt200u_fe_state *state = fe->demodulator_priv;
         u16 freq = fep->frequency / 250000;
-        u8 bw,bwbuf[2] = { 0x03, 0 }, freqbuf[3] = { 0x02, 0, 0 };
+        u8 bw,bwbuf[2] = { SET_BANDWIDTH, 0 }, freqbuf[3] = { SET_FREQUENCY, 0, 0 };
 
         switch (fep->u.ofdm.bandwidth) {
                 case BANDWIDTH_8_MHZ: bw = 8; break;
@@ -147,11 +121,11 @@ static int dtt200u_fe_set_frontend(struct dvb_frontend* fe,
         deb_info("set_frontend\n");
 
         bwbuf[1] = bw;
-        dibusb_write_usb(state->dib,bwbuf,2);
+        dvb_usb_generic_write(state->d,bwbuf,2);
 
         freqbuf[1] = freq & 0xff;
         freqbuf[2] = (freq >> 8) & 0xff;
-        dibusb_write_usb(state->dib,freqbuf,3);
+        dvb_usb_generic_write(state->d,freqbuf,3);
 
         memcpy(&state->fep,fep,sizeof(struct dvb_frontend_parameters));
 
@@ -172,37 +146,9 @@ static void dtt200u_fe_release(struct dvb_frontend* fe)
         kfree(state);
 }
 
-static int dtt200u_pid_control(struct dvb_frontend *fe,int index, int pid,int onoff)
-{
-        struct dtt200u_fe_state *state = (struct dtt200u_fe_state*) fe->demodulator_priv;
-        u8 b_pid[4];
-        pid = onoff ? pid : 0;
-
-        b_pid[0] = 0x04;
-        b_pid[1] = index;
-        b_pid[2] = pid & 0xff;
-        b_pid[3] = (pid >> 8) & 0xff;
-
-        dibusb_write_usb(state->dib,b_pid,4);
-        return 0;
-}
-
-static int dtt200u_fifo_control(struct dvb_frontend *fe, int onoff)
-{
-        struct dtt200u_fe_state *state = (struct dtt200u_fe_state*) fe->demodulator_priv;
-        u8 b_streaming[2] = { 0x08, onoff };
-        u8 b_rst_pid[1] = { 0x05 };
-
-        dibusb_write_usb(state->dib,b_streaming,2);
-
-        if (!onoff)
-                dibusb_write_usb(state->dib,b_rst_pid,1);
-        return 0;
-}
-
 static struct dvb_frontend_ops dtt200u_fe_ops;
 
-struct dvb_frontend* dtt200u_fe_attach(struct usb_dibusb *dib, struct dib_fe_xfer_ops *xfer_ops)
+struct dvb_frontend* dtt200u_fe_attach(struct dvb_usb_device *d)
 {
         struct dtt200u_fe_state* state = NULL;
 
@@ -214,14 +160,11 @@ struct dvb_frontend* dtt200u_fe_attach(struct usb_dibusb *dib, struct dib_fe_xfe
 
         deb_info("attaching frontend dtt200u\n");
 
-        state->dib = dib;
+        state->d = d;
 
         state->frontend.ops = &dtt200u_fe_ops;
         state->frontend.demodulator_priv = state;
 
-        xfer_ops->fifo_ctrl = dtt200u_fifo_control;
-        xfer_ops->pid_ctrl = dtt200u_pid_control;
-
         goto success;
 error:
         return NULL;
diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u.c
new file mode 100644
index 000000000000..fb2b5a2da137
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -0,0 +1,171 @@
+/* DVB USB library compliant Linux driver for the Yakumo/Hama/Typhoon DVB-T
+ * USB2.0 receiver.
+ *
+ * Copyright (C) 2004-5 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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "dtt200u.h"
+
+/* debug */
+int dvb_usb_dtt200u_debug;
+module_param_named(debug,dvb_usb_dtt200u_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2 (or-able))." DVB_USB_DEBUG_STATUS);
+
+static int dtt200u_streaming_ctrl(struct dvb_usb_device *d, int onoff)
+{
+        u8 b_streaming[2] = { SET_TS_CTRL, onoff };
+        u8 b_rst_pid = RESET_PID_FILTER;
+
+        dvb_usb_generic_write(d,b_streaming,2);
+
+        if (!onoff)
+                dvb_usb_generic_write(d,&b_rst_pid,1);
+        return 0;
+}
+
+static int dtt200u_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff)
+{
+        u8 b_pid[4];
+        pid = onoff ? pid : 0;
+
+        b_pid[0] = SET_PID_FILTER;
+        b_pid[1] = index;
+        b_pid[2] = pid & 0xff;
+        b_pid[3] = (pid >> 8) & 0xff;
+
+        return dvb_usb_generic_write(d,b_pid,4);
+}
+
+/* remote control */
+/* key list for the tiny remote control (Yakumo, don't know about the others) */
+static struct dvb_usb_rc_key dtt200u_rc_keys[] = {
+        { 0x80, 0x01, KEY_MUTE },
+        { 0x80, 0x02, KEY_CHANNELDOWN },
+        { 0x80, 0x03, KEY_VOLUMEDOWN },
+        { 0x80, 0x04, KEY_1 },
+        { 0x80, 0x05, KEY_2 },
+        { 0x80, 0x06, KEY_3 },
+        { 0x80, 0x07, KEY_4 },
+        { 0x80, 0x08, KEY_5 },
+        { 0x80, 0x09, KEY_6 },
+        { 0x80, 0x0a, KEY_7 },
+        { 0x00, 0x0c, KEY_ZOOM },
+        { 0x80, 0x0d, KEY_0 },
+        { 0x00, 0x0e, KEY_SELECT },
+        { 0x80, 0x12, KEY_POWER },
+        { 0x80, 0x1a, KEY_CHANNELUP },
+        { 0x80, 0x1b, KEY_8 },
+        { 0x80, 0x1e, KEY_VOLUMEUP },
+        { 0x80, 0x1f, KEY_9 },
+};
+
+static int dtt200u_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+        u8 key[5],cmd = GET_RC_KEY;
+        dvb_usb_generic_rw(d,&cmd,1,key,5,0);
+        dvb_usb_nec_rc_key_to_event(d,key,event,state);
+        if (key[0] != 0)
+                deb_info("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]);
+        return 0;
+}
+
+static int dtt200u_frontend_attach(struct dvb_usb_device *d)
+{
+        d->fe = dtt200u_fe_attach(d);
+        return 0;
+}
+
+static struct dvb_usb_properties dtt200u_properties;
+
+static int dtt200u_usb_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        return dvb_usb_device_init(intf,&dtt200u_properties,THIS_MODULE);
+}
+
+static struct usb_device_id dtt200u_usb_table [] = {
+            { USB_DEVICE(USB_VID_AVERMEDIA_UNK, USB_PID_DTT200U_COLD) },
+            { USB_DEVICE(USB_VID_AVERMEDIA_UNK, USB_PID_DTT200U_WARM) },
+            { 0 },
+};
+MODULE_DEVICE_TABLE(usb, dtt200u_usb_table);
+
+static struct dvb_usb_properties dtt200u_properties = {
+        .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_NEED_PID_FILTERING,
+        .pid_filter_count = 255, /* It is a guess, but there are at least 10 */
+
+        .usb_ctrl = CYPRESS_FX2,
+        .firmware = "dvb-usb-dtt200u-01.fw",
+
+        .streaming_ctrl  = dtt200u_streaming_ctrl,
+        .pid_filter      = dtt200u_pid_filter,
+        .frontend_attach = dtt200u_frontend_attach,
+
+        .rc_interval     = 200,
+        .rc_key_map      = dtt200u_rc_keys,
+        .rc_key_map_size = ARRAY_SIZE(dtt200u_rc_keys),
+        .rc_query        = dtt200u_rc_query,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+
+        /* parameter for the MPEG2-data transfer */
+        .urb = {
+                .type = DVB_USB_BULK,
+                .count = 7,
+                .endpoint = 0x02,
+                .u = {
+                        .bulk = {
+                                .buffersize = 4096,
+                        }
+                }
+        },
+
+        .num_device_descs = 1,
+        .devices = {
+                { .name = "Yakumo/Hama/Typhoon DVB-T USB2.0)",
+                  .cold_ids = { &dtt200u_usb_table[0], &dtt200u_usb_table[2] },
+                  .warm_ids = { &dtt200u_usb_table[1], NULL },
+                },
+                { 0 },
+        }
+};
+
+/* usb specific object needed to register this driver with the usb subsystem */
+static struct usb_driver dtt200u_usb_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "Yakumo/Hama/Typhoon DVB-T USB2.0",
+        .probe          = dtt200u_usb_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table       = dtt200u_usb_table,
+};
+
+/* module stuff */
+static int __init dtt200u_usb_module_init(void)
+{
+        int result;
+        if ((result = usb_register(&dtt200u_usb_driver))) {
+                err("usb_register failed. (%d)",result);
+                return result;
+        }
+
+        return 0;
+}
+
+static void __exit dtt200u_usb_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&dtt200u_usb_driver);
+}
+
+module_init(dtt200u_usb_module_init);
+module_exit(dtt200u_usb_module_exit);
+
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_DESCRIPTION("Driver for the Yakumo/Hama/Typhoon DVB-T USB2.0 device");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/dtt200u.h b/drivers/media/dvb/dvb-usb/dtt200u.h
new file mode 100644
index 000000000000..ed4142071518
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dtt200u.h
@@ -0,0 +1,66 @@
+/* Common header file of Linux driver for the Yakumo/Hama/Typhoon DVB-T
+ * USB2.0 receiver.
+ *
+ * Copyright (C) 2004-5 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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#ifndef _DVB_USB_DTT200U_H_
+#define _DVB_USB_DTT200U_H_
+
+#define DVB_USB_LOG_PREFIX "dtt200u"
+#include "dvb-usb.h"
+
+extern int dvb_usb_dtt200u_debug;
+#define deb_info(args...) dprintk(dvb_usb_dtt200u_debug,0x01,args)
+#define deb_xfer(args...) dprintk(dvb_usb_dtt200u_debug,0x02,args)
+
+/* guessed protocol description (reverse engineered):
+ * read
+ *  00 - USB type 0x02 for usb2.0, 0x01 for usb1.1
+ *  81 - <TS_LOCK> <current frequency divided by 250000>
+ *  82 - crash - do not touch
+ *  83 - crash - do not touch
+ *  84 - remote control
+ *  85 - crash - do not touch (OK, stop testing here)
+ *  88 - locking 2 bytes (0x80 0x40 == no signal, 0x89 0x20 == nice signal)
+ *  89 - noise-to-signal
+ *      8a - unkown 1 byte - signal_strength
+ *  8c - ber ???
+ *  8d - ber
+ *  8e - unc
+ */
+
+#define GET_SPEED        0x00
+#define GET_TUNE_STAT    0x81
+#define GET_RC_KEY       0x84
+#define GET_STATUS       0x88
+#define GET_SNR          0x89
+#define GET_SIG_STRENGTH 0x8a
+#define GET_UNK          0x8c
+#define GET_BER          0x8d
+#define GET_UNC          0x8e
+
+/* write
+ *  01 - reset the demod
+ *  02 - frequency (divided by 250000)
+ *  03 - bandwidth
+ *  04 - pid table (index pid(7:0) pid(12:8))
+ *  05 - reset the pid table
+ *  08 - demod transfer enabled or not (FX2 transfer is enabled by default)
+ */
+
+#define RESET_DEMOD      0x01
+#define SET_FREQUENCY    0x02
+#define SET_BANDWIDTH    0x03
+#define SET_PID_FILTER   0x04
+#define RESET_PID_FILTER 0x05
+#define SET_TS_CTRL      0x08
+
+extern struct dvb_frontend * dtt200u_fe_attach(struct dvb_usb_device *d);
+
+#endif
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-common.h b/drivers/media/dvb/dvb-usb/dvb-usb-common.h
new file mode 100644
index 000000000000..67e0d73fbceb
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-common.h
@@ -0,0 +1,44 @@
+/* dvb-usb-common.h is part of the DVB USB library.
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * see dvb-usb-init.c for copyright information.
+ *
+ * a header file containing prototypes and types for internal use of the dvb-usb-lib
+ */
+#ifndef _DVB_USB_COMMON_H_
+#define _DVB_USB_COMMON_H_
+
+#define DVB_USB_LOG_PREFIX "dvb-usb"
+#include "dvb-usb.h"
+
+extern int dvb_usb_debug;
+
+#define deb_info(args...) dprintk(dvb_usb_debug,0x01,args)
+#define deb_xfer(args...) dprintk(dvb_usb_debug,0x02,args)
+#define deb_pll(args...) dprintk(dvb_usb_debug,0x04,args)
+#define deb_ts(args...)   dprintk(dvb_usb_debug,0x08,args)
+#define deb_err(args...)  dprintk(dvb_usb_debug,0x10,args)
+#define deb_rc(args...)   dprintk(dvb_usb_debug,0x20,args)
+#define deb_fw(args...)   dprintk(dvb_usb_debug,0x40,args)
+
+/* commonly used  methods */
+extern int usb_cypress_load_firmware(struct usb_device *, const char *, int);
+
+extern int dvb_usb_urb_submit(struct dvb_usb_device *);
+extern int dvb_usb_urb_kill(struct dvb_usb_device *);
+extern int dvb_usb_urb_init(struct dvb_usb_device *);
+extern int dvb_usb_urb_exit(struct dvb_usb_device *);
+
+extern int dvb_usb_i2c_init(struct dvb_usb_device *);
+extern int dvb_usb_i2c_exit(struct dvb_usb_device *);
+
+extern int dvb_usb_dvb_init(struct dvb_usb_device *);
+extern int dvb_usb_dvb_exit(struct dvb_usb_device *);
+
+extern int dvb_usb_fe_init(struct dvb_usb_device *);
+extern int dvb_usb_fe_exit(struct dvb_usb_device *);
+
+extern int dvb_usb_remote_init(struct dvb_usb_device *);
+extern int dvb_usb_remote_exit(struct dvb_usb_device *);
+
+#endif
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
new file mode 100644
index 000000000000..bdd72f779707
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -0,0 +1,210 @@
+/* dvb-usb-dvb.c is part of the DVB USB library.
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * see dvb-usb-init.c for copyright information.
+ *
+ * This file contains functions for initializing and handling the
+ * linux-dvb API.
+ */
+#include "dvb-usb-common.h"
+
+static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
+{
+        struct dvb_usb_device *d = dvbdmxfeed->demux->priv;
+        int newfeedcount,ret;
+
+        if (d == NULL)
+                return -ENODEV;
+
+        newfeedcount = d->feedcount + (onoff ? 1 : -1);
+
+        /*
+         * stop feed before setting a new pid if there will be no pid anymore
+         */
+        if (newfeedcount == 0) {
+                deb_ts("stop feeding\n");
+
+                if (d->props.streaming_ctrl != NULL)
+                        if ((ret = d->props.streaming_ctrl(d,0)))
+                                err("error while stopping stream.");
+
+                dvb_usb_urb_kill(d);
+        }
+
+        d->feedcount = newfeedcount;
+
+        /* activate the pid on the device specific pid_filter */
+        deb_ts("setting pid: %5d %04x at index %d '%s'\n",dvbdmxfeed->pid,dvbdmxfeed->pid,dvbdmxfeed->index,onoff ? "on" : "off");
+        if (d->props.caps & DVB_USB_HAS_PID_FILTER &&
+                d->pid_filtering &&
+                d->props.pid_filter != NULL)
+                d->props.pid_filter(d,dvbdmxfeed->index,dvbdmxfeed->pid,onoff);
+
+        /* start the feed if this was the first feed and there is still a feed
+         * for reception.
+         */
+        if (d->feedcount == onoff && d->feedcount > 0) {
+
+                deb_ts("controlling pid parser\n");
+                if (d->props.caps & DVB_USB_HAS_PID_FILTER &&
+                        d->props.caps & DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF &&
+                        d->props.pid_filter_ctrl != NULL)
+                        if (d->props.pid_filter_ctrl(d,d->pid_filtering) < 0)
+                                err("could not handle pid_parser");
+
+                deb_ts("start feeding\n");
+                if (d->props.streaming_ctrl != NULL)
+                        if (d->props.streaming_ctrl(d,1)) {
+                                err("error while enabling fifo.");
+                                return -ENODEV;
+                        }
+
+                dvb_usb_urb_submit(d);
+        }
+        return 0;
+}
+
+static int dvb_usb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
+{
+        deb_ts("start pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid,dvbdmxfeed->type);
+        return dvb_usb_ctrl_feed(dvbdmxfeed,1);
+}
+
+static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
+{
+        deb_ts("stop pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type);
+        return dvb_usb_ctrl_feed(dvbdmxfeed,0);
+}
+
+int dvb_usb_dvb_init(struct dvb_usb_device *d)
+{
+        int ret;
+
+        if ((ret = dvb_register_adapter(&d->dvb_adap, d->desc->name,
+                        d->owner)) < 0) {
+                deb_info("dvb_register_adapter failed: error %d", ret);
+                goto err;
+        }
+        d->dvb_adap.priv = d;
+
+        if (d->props.read_mac_address) {
+                if (d->props.read_mac_address(d,d->dvb_adap.proposed_mac) == 0)
+                        info("MAC address: %02x:%02x:%02x:%02x:%02x:%02x",d->dvb_adap.proposed_mac[0],
+                                        d->dvb_adap.proposed_mac[1],d->dvb_adap.proposed_mac[2],
+                                        d->dvb_adap.proposed_mac[3],d->dvb_adap.proposed_mac[4],
+                                        d->dvb_adap.proposed_mac[5]);
+                else
+                        err("MAC address reading failed.");
+        }
+
+
+        d->demux.dmx.capabilities = DMX_TS_FILTERING | DMX_SECTION_FILTERING;
+        d->demux.priv = d;
+
+        d->demux.feednum = d->demux.filternum = d->max_feed_count;
+        d->demux.start_feed = dvb_usb_start_feed;
+        d->demux.stop_feed  = dvb_usb_stop_feed;
+        d->demux.write_to_decoder = NULL;
+        if ((ret = dvb_dmx_init(&d->demux)) < 0) {
+                err("dvb_dmx_init failed: error %d",ret);
+                goto err_dmx;
+        }
+
+        d->dmxdev.filternum = d->demux.filternum;
+        d->dmxdev.demux = &d->demux.dmx;
+        d->dmxdev.capabilities = 0;
+        if ((ret = dvb_dmxdev_init(&d->dmxdev, &d->dvb_adap)) < 0) {
+                err("dvb_dmxdev_init failed: error %d",ret);
+                goto err_dmx_dev;
+        }
+
+        dvb_net_init(&d->dvb_adap, &d->dvb_net, &d->demux.dmx);
+
+        goto success;
+err_dmx_dev:
+        dvb_dmx_release(&d->demux);
+err_dmx:
+        dvb_unregister_adapter(&d->dvb_adap);
+err:
+        return ret;
+success:
+        d->state |= DVB_USB_STATE_DVB;
+        return 0;
+}
+
+int dvb_usb_dvb_exit(struct dvb_usb_device *d)
+{
+        if (d->state & DVB_USB_STATE_DVB) {
+                deb_info("unregistering DVB part\n");
+                dvb_net_release(&d->dvb_net);
+                d->demux.dmx.close(&d->demux.dmx);
+                dvb_dmxdev_release(&d->dmxdev);
+                dvb_dmx_release(&d->demux);
+                dvb_unregister_adapter(&d->dvb_adap);
+                d->state &= ~DVB_USB_STATE_DVB;
+        }
+        return 0;
+}
+
+static int dvb_usb_fe_wakeup(struct dvb_frontend *fe)
+{
+        struct dvb_usb_device *d = fe->dvb->priv;
+
+        if (d->props.power_ctrl)
+                d->props.power_ctrl(d,1);
+
+        if (d->fe_init)
+                d->fe_init(fe);
+
+        return 0;
+}
+
+static int dvb_usb_fe_sleep(struct dvb_frontend *fe)
+{
+        struct dvb_usb_device *d = fe->dvb->priv;
+
+        if (d->fe_sleep)
+                d->fe_sleep(fe);
+
+        if (d->props.power_ctrl)
+                d->props.power_ctrl(d,0);
+
+        return 0;
+}
+
+int dvb_usb_fe_init(struct dvb_usb_device* d)
+{
+        if (d->props.frontend_attach == NULL) {
+                err("strange '%s' don't want to attach a frontend.",d->desc->name);
+                return 0;
+        }
+
+        d->props.frontend_attach(d);
+
+        /* re-assign sleep and wakeup functions */
+        if (d->fe != NULL) {
+                d->fe_init = d->fe->ops->init;   d->fe->ops->init  = dvb_usb_fe_wakeup;
+                d->fe_sleep = d->fe->ops->sleep; d->fe->ops->sleep = dvb_usb_fe_sleep;
+
+                if (dvb_register_frontend(&d->dvb_adap, d->fe)) {
+                        err("Frontend registration failed.");
+                        if (d->fe->ops->release)
+                                d->fe->ops->release(d->fe);
+                        d->fe = NULL;
+                        return -ENODEV;
+                }
+        } else
+                err("no frontend was attached by '%s'",d->desc->name);
+
+        if (d->props.tuner_attach != NULL)
+                d->props.tuner_attach(d);
+
+        return 0;
+}
+
+int dvb_usb_fe_exit(struct dvb_usb_device *d)
+{
+        if (d->fe != NULL)
+                dvb_unregister_frontend(d->fe);
+        return 0;
+}
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c b/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
new file mode 100644
index 000000000000..5244e39770a0
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
@@ -0,0 +1,100 @@
+/* dvb-usb-firmware.c is part of the DVB USB library.
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * see dvb-usb-init.c for copyright information.
+ *
+ * This file contains functions for downloading the firmware to Cypress FX 1 and 2 based devices.
+ *
+ * FIXME: This part does actually not belong to dvb-usb, but to the usb-subsystem.
+ */
+#include "dvb-usb-common.h"
+
+#include <linux/firmware.h>
+#include <linux/usb.h>
+
+struct usb_cypress_controller {
+        int id;
+        const char *name;       /* name of the usb controller */
+        u16 cpu_cs_register;    /* needs to be restarted, when the firmware has been downloaded. */
+};
+
+static struct usb_cypress_controller cypress[] = {
+        { .id = CYPRESS_AN2135, .name = "Cypress AN2135", .cpu_cs_register = 0x7f92 },
+        { .id = CYPRESS_AN2235, .name = "Cypress AN2235", .cpu_cs_register = 0x7f92 },
+        { .id = CYPRESS_FX2,    .name = "Cypress FX2",    .cpu_cs_register = 0xe600 },
+};
+
+/*
+ * load a firmware packet to the device
+ */
+static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 len)
+{
+        return usb_control_msg(udev, usb_sndctrlpipe(udev,0),
+                        0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5*HZ);
+}
+
+int usb_cypress_load_firmware(struct usb_device *udev, const char *filename, int type)
+{
+        const struct firmware *fw = NULL;
+        u16 addr;
+        u8 *b,*p;
+        int ret = 0,i;
+
+        if ((ret = request_firmware(&fw, filename, &udev->dev)) != 0) {
+                err("did not find the firmware file. (%s) "
+                        "Please see linux/Documentation/dvb/ for more details on firmware-problems.",
+                        filename);
+                return ret;
+        }
+
+        info("downloading firmware from file '%s' to the '%s'",filename,cypress[type].name);
+
+        p = kmalloc(fw->size,GFP_KERNEL);
+        if (p != NULL) {
+                u8 reset;
+                /*
+                 * you cannot use the fw->data as buffer for
+                 * usb_control_msg, a new buffer has to be
+                 * created
+                 */
+                memcpy(p,fw->data,fw->size);
+
+                /* stop the CPU */
+                reset = 1;
+                if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
+                        err("could not stop the USB controller CPU.");
+                for(i = 0; p[i+3] == 0 && i < fw->size; ) {
+                        b = (u8 *) &p[i];
+                        addr = cpu_to_le16( *((u16 *) &b[1]) );
+
+                        deb_fw("writing to address 0x%04x (buffer: 0x%02x%02x)\n",addr,b[1],b[2]);
+
+                        ret = usb_cypress_writemem(udev,addr,&b[4],b[0]);
+
+                        if (ret != b[0]) {
+                                err("error while transferring firmware "
+                                        "(transferred size: %d, block size: %d)",
+                                        ret,b[0]);
+                                ret = -EINVAL;
+                                break;
+                        }
+                        i += 5 + b[0];
+                }
+                /* length in ret */
+                if (ret > 0)
+                        ret = 0;
+                /* restart the CPU */
+                reset = 0;
+                if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
+                        err("could not restart the USB controller CPU.");
+                        ret = -EINVAL;
+                }
+
+                kfree(p);
+        } else {
+                ret = -ENOMEM;
+        }
+        release_firmware(fw);
+
+        return ret;
+}
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
new file mode 100644
index 000000000000..9f0a8d90d146
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -0,0 +1,118 @@
+/* dvb-usb-i2c.c is part of the DVB USB library.
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * see dvb-usb-init.c for copyright information.
+ *
+ * This file contains functions for (de-)initializing an I2C adapter.
+ */
+#include "dvb-usb-common.h"
+
+int dvb_usb_i2c_init(struct dvb_usb_device *d)
+{
+        int ret = 0;
+
+        if (!(d->props.caps & DVB_USB_IS_AN_I2C_ADAPTER))
+                return 0;
+
+        if (d->props.i2c_algo == NULL) {
+                err("no i2c algorithm specified");
+                return -EINVAL;
+        }
+
+        strncpy(d->i2c_adap.name,d->desc->name,I2C_NAME_SIZE);
+#ifdef I2C_ADAP_CLASS_TV_DIGITAL
+        d->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
+#else
+        d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
+#endif
+        d->i2c_adap.algo      = d->props.i2c_algo;
+        d->i2c_adap.algo_data = NULL;
+        d->i2c_adap.id        = I2C_ALGO_BIT;
+
+        i2c_set_adapdata(&d->i2c_adap, d);
+
+        if ((ret = i2c_add_adapter(&d->i2c_adap)) < 0)
+                err("could not add i2c adapter");
+
+        d->state |= DVB_USB_STATE_I2C;
+
+        return ret;
+}
+
+int dvb_usb_i2c_exit(struct dvb_usb_device *d)
+{
+        if (d->state & DVB_USB_STATE_I2C)
+                i2c_del_adapter(&d->i2c_adap);
+        d->state &= ~DVB_USB_STATE_I2C;
+        return 0;
+}
+
+int dvb_usb_pll_init_i2c(struct dvb_frontend *fe)
+{
+        struct dvb_usb_device *d = fe->dvb->priv;
+        struct i2c_msg msg = { .addr = d->pll_addr, .flags = 0, .buf = d->pll_init, .len = 4 };
+        int ret = 0;
+
+        /* if there is nothing to initialize */
+        if (d->pll_init[0] == 0x00 && d->pll_init[1] == 0x00 &&
+                d->pll_init[2] == 0x00 && d->pll_init[3] == 0x00)
+                return 0;
+
+        if (d->tuner_pass_ctrl)
+                d->tuner_pass_ctrl(fe,1,d->pll_addr);
+
+        deb_pll("pll init: %x\n",d->pll_addr);
+        deb_pll("pll-buf: %x %x %x %x\n",d->pll_init[0],d->pll_init[1],
+                        d->pll_init[2],d->pll_init[3]);
+
+        if (i2c_transfer (&d->i2c_adap, &msg, 1) != 1) {
+                err("tuner i2c write failed for pll_init.");
+                ret = -EREMOTEIO;
+        }
+        msleep(1);
+
+        if (d->tuner_pass_ctrl)
+                d->tuner_pass_ctrl(fe,0,d->pll_addr);
+        return ret;
+}
+EXPORT_SYMBOL(dvb_usb_pll_init_i2c);
+
+int dvb_usb_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep, u8 b[5])
+{
+        struct dvb_usb_device *d = fe->dvb->priv;
+
+        deb_pll("pll addr: %x, freq: %d %p\n",d->pll_addr,fep->frequency,d->pll_desc);
+
+        b[0] = d->pll_addr << 1;
+        dvb_pll_configure(d->pll_desc,&b[1],fep->frequency,fep->u.ofdm.bandwidth);
+
+        deb_pll("pll-buf: %x %x %x %x %x\n",b[0],b[1],b[2],b[3],b[4]);
+
+        return 0;
+}
+EXPORT_SYMBOL(dvb_usb_pll_set);
+
+int dvb_usb_pll_set_i2c(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
+{
+        struct dvb_usb_device *d = fe->dvb->priv;
+        int ret = 0;
+        u8 b[5];
+        struct i2c_msg msg = { .addr = d->pll_addr, .flags = 0, .buf = &b[1], .len = 4 };
+
+        dvb_usb_pll_set(fe,fep,b);
+
+        if (d->tuner_pass_ctrl)
+                d->tuner_pass_ctrl(fe,1,d->pll_addr);
+
+        if (i2c_transfer (&d->i2c_adap, &msg, 1) != 1) {
+                err("tuner i2c write failed for pll_set.");
+                ret = -EREMOTEIO;
+        }
+        msleep(1);
+
+        if (d->tuner_pass_ctrl)
+                d->tuner_pass_ctrl(fe,0,d->pll_addr);
+
+        return ret;
+}
+EXPORT_SYMBOL(dvb_usb_pll_set_i2c);
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
new file mode 100644
index 000000000000..bcb34191868b
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -0,0 +1,83 @@
+/* dvb-usb-ids.h is part of the DVB USB library.
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de) see
+ * dvb-usb-init.c for copyright information.
+ *
+ * a header file containing define's for the USB device supported by the
+ * various drivers.
+ */
+#ifndef _DVB_USB_IDS_H_
+#define _DVB_USB_IDS_H_
+
+/* Vendor IDs */
+#define USB_VID_ADSTECH                                         0x06e1
+#define USB_VID_ANCHOR                                          0x0547
+#define USB_VID_AVERMEDIA_UNK                           0x14aa
+#define USB_VID_AVERMEDIA                                       0x07ca
+#define USB_VID_COMPRO                                          0x185b
+#define USB_VID_COMPRO_UNK                                      0x145f
+#define USB_VID_CYPRESS                                         0x04b4
+#define USB_VID_DIBCOM                                          0x10b8
+#define USB_VID_DVICO                                           0x0fe9
+#define USB_VID_EMPIA                                           0xeb1a
+#define USB_VID_GRANDTEC                                        0x5032
+#define USB_VID_HANFTEK                                         0x15f4
+#define USB_VID_HAUPPAUGE                                       0x2040
+#define USB_VID_HYPER_PALTEK                            0x1025
+#define USB_VID_VISIONPLUS                                      0x13d3
+#define USB_VID_TWINHAN                                         0x1822
+#define USB_VID_ULTIMA_ELECTRONIC                       0x05d8
+
+/* Product IDs */
+#define USB_PID_ADSTECH_USB2_COLD                       0xa333
+#define USB_PID_ADSTECH_USB2_WARM                       0xa334
+#define USB_PID_AVERMEDIA_DVBT_USB_COLD         0x0001
+#define USB_PID_AVERMEDIA_DVBT_USB_WARM         0x0002
+#define USB_PID_AVERMEDIA_DVBT_USB2_COLD        0xa800
+#define USB_PID_AVERMEDIA_DVBT_USB2_WARM        0xa801
+#define USB_PID_COMPRO_DVBU2000_COLD            0xd000
+#define USB_PID_COMPRO_DVBU2000_WARM            0xd001
+#define USB_PID_COMPRO_DVBU2000_UNK_COLD        0x010c
+#define USB_PID_COMPRO_DVBU2000_UNK_WARM        0x010d
+#define USB_PID_DIBCOM_MOD3000_COLD                     0x0bb8
+#define USB_PID_DIBCOM_MOD3000_WARM                     0x0bb9
+#define USB_PID_DIBCOM_MOD3001_COLD                     0x0bc6
+#define USB_PID_DIBCOM_MOD3001_WARM                     0x0bc7
+#define USB_PID_DIBCOM_ANCHOR_2135_COLD         0x2131
+#define USB_PID_GRANDTEC_DVBT_USB_COLD          0x0fa0
+#define USB_PID_GRANDTEC_DVBT_USB_WARM          0x0fa1
+#define USB_PID_KWORLD_VSTREAM_COLD                     0x17de
+#define USB_PID_KWORLD_VSTREAM_WARM                     0x17df
+#define USB_PID_TWINHAN_VP7041_COLD                     0x3201
+#define USB_PID_TWINHAN_VP7041_WARM                     0x3202
+#define USB_PID_TWINHAN_VP7045_COLD                     0x3205
+#define USB_PID_TWINHAN_VP7045_WARM                     0x3206
+#define USB_PID_DNTV_TINYUSB2_COLD                      0x3223
+#define USB_PID_DNTV_TINYUSB2_WARM                      0x3224
+#define USB_PID_TWINHAN_VP7021_COLD                     0x3207
+#define USB_PID_TWINHAN_VP7021_WARM                     0x3208
+#define USB_PID_ULTIMA_TVBOX_COLD                       0x8105
+#define USB_PID_ULTIMA_TVBOX_WARM                       0x8106
+#define USB_PID_ULTIMA_TVBOX_AN2235_COLD        0x8107
+#define USB_PID_ULTIMA_TVBOX_AN2235_WARM        0x8108
+#define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD        0x2235
+#define USB_PID_ULTIMA_TVBOX_USB2_COLD          0x8109
+#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD       0x8613
+#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM       0x1002
+#define USB_PID_UNK_HYPER_PALTEK_COLD           0x005e
+#define USB_PID_UNK_HYPER_PALTEK_WARM           0x005f
+#define USB_PID_HANFTEK_UMT_010_COLD            0x0001
+#define USB_PID_HANFTEK_UMT_010_WARM            0x0015
+#define USB_PID_DTT200U_COLD                            0x0201
+#define USB_PID_DTT200U_WARM                            0x0301
+#define USB_PID_WINTV_NOVA_T_USB2_COLD          0x9300
+#define USB_PID_WINTV_NOVA_T_USB2_WARM          0x9301
+#define USB_PID_NEBULA_DIGITV                           0x0201
+#define USB_PID_DVICO_BLUEBIRD_LGZ201           0xdb00
+#define USB_PID_DVICO_BLUEBIRD_TH7579           0xdb10
+#define USB_PID_DVICO_BLUEBIRD_LGDT                     0xd820
+#define USB_PID_DVICO_BLUEBIRD_LGZ201_1         0xdb01
+#define USB_PID_DVICO_BLUEBIRD_TH7579_2         0xdb11
+
+
+#endif
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
new file mode 100644
index 000000000000..3aadec974cf1
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
@@ -0,0 +1,211 @@
+/*
+ * DVB USB library - provides a generic interface for a DVB USB device driver.
+ *
+ * dvb-usb-init.c
+ *
+ * Copyright (C) 2004-5 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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "dvb-usb-common.h"
+
+/* debug */
+int dvb_usb_debug;
+module_param_named(debug,dvb_usb_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,pll=4,ts=8,err=16,rc=32,fw=64 (or-able))." DVB_USB_DEBUG_STATUS);
+
+/* general initialization functions */
+int dvb_usb_exit(struct dvb_usb_device *d)
+{
+        deb_info("state before exiting everything: %x\n",d->state);
+        dvb_usb_remote_exit(d);
+        dvb_usb_fe_exit(d);
+        dvb_usb_i2c_exit(d);
+        dvb_usb_dvb_exit(d);
+        dvb_usb_urb_exit(d);
+        deb_info("state should be zero now: %x\n",d->state);
+        d->state = DVB_USB_STATE_INIT;
+        kfree(d->priv);
+        kfree(d);
+        return 0;
+}
+
+static int dvb_usb_init(struct dvb_usb_device *d)
+{
+        int ret = 0;
+
+        sema_init(&d->usb_sem, 1);
+        sema_init(&d->i2c_sem, 1);
+
+        d->state = DVB_USB_STATE_INIT;
+
+/* check the capabilites and set appropriate variables */
+
+/* speed - when running at FULL speed we need a HW PID filter */
+        if (d->udev->speed == USB_SPEED_FULL && !(d->props.caps & DVB_USB_HAS_PID_FILTER)) {
+                err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a HW PID filter)");
+                return -ENODEV;
+        }
+
+        if ((d->udev->speed == USB_SPEED_FULL && d->props.caps & DVB_USB_HAS_PID_FILTER) ||
+                (d->props.caps & DVB_USB_NEED_PID_FILTERING)) {
+                info("will use the device's hw PID filter.");
+                d->pid_filtering = 1;
+                d->max_feed_count = d->props.pid_filter_count;
+        } else {
+                info("will pass the complete MPEG2 transport stream to the demuxer.");
+                d->pid_filtering = 0;
+                d->max_feed_count = 255;
+        }
+
+        if (d->props.power_ctrl)
+                d->props.power_ctrl(d,1);
+
+        if ((ret = dvb_usb_urb_init(d)) ||
+                (ret = dvb_usb_dvb_init(d)) ||
+                (ret = dvb_usb_i2c_init(d)) ||
+                (ret = dvb_usb_fe_init(d))) {
+                dvb_usb_exit(d);
+                return ret;
+        }
+
+        if ((ret = dvb_usb_remote_init(d)))
+                err("could not initialize remote control.");
+
+        if (d->props.power_ctrl)
+                d->props.power_ctrl(d,0);
+
+        return 0;
+}
+
+/* determine the name and the state of the just found USB device */
+static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device *udev,struct dvb_usb_properties *props, int *cold)
+{
+        int i,j;
+        struct dvb_usb_device_description *desc = NULL;
+        *cold = -1;
+
+        for (i = 0; i < props->num_device_descs; i++) {
+
+                for (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].cold_ids[j] != NULL; j++) {
+                        deb_info("check for cold %x %x\n",props->devices[i].cold_ids[j]->idVendor, props->devices[i].cold_ids[j]->idProduct);
+                        if (props->devices[i].cold_ids[j]->idVendor  == le16_to_cpu(udev->descriptor.idVendor) &&
+                                props->devices[i].cold_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) {
+                                *cold = 1;
+                                desc = &props->devices[i];
+                                break;
+                        }
+                }
+
+                if (desc != NULL)
+                        break;
+
+                for (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].warm_ids[j] != NULL; j++) {
+                        deb_info("check for warm %x %x\n",props->devices[i].warm_ids[j]->idVendor, props->devices[i].warm_ids[j]->idProduct);
+                        if (props->devices[i].warm_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) &&
+                                props->devices[i].warm_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) {
+                                *cold = 0;
+                                desc = &props->devices[i];
+                                break;
+                        }
+                }
+        }
+
+        if (desc != NULL && props->identify_state != NULL)
+                props->identify_state(udev,props,&desc,cold);
+
+        return desc;
+}
+
+/*
+ * USB
+ */
+int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_properties *props, struct module *owner)
+{
+        struct usb_device *udev = interface_to_usbdev(intf);
+        struct dvb_usb_device *d = NULL;
+        struct dvb_usb_device_description *desc = NULL;
+
+        int ret = -ENOMEM,cold=0;
+
+        if ((desc = dvb_usb_find_device(udev,props,&cold)) == NULL) {
+                deb_err("something went very wrong, device was not found in current device list - let's see what comes next.\n");
+                return -ENODEV;
+        }
+
+        if (cold) {
+                info("found a '%s' in cold state, will try to load a firmware",desc->name);
+                ret = usb_cypress_load_firmware(udev,props->firmware,props->usb_ctrl);
+        } else {
+                info("found a '%s' in warm state.",desc->name);
+                d = kmalloc(sizeof(struct dvb_usb_device),GFP_KERNEL);
+                if (d == NULL) {
+                        err("no memory for 'struct dvb_usb_device'");
+                        return ret;
+                }
+                memset(d,0,sizeof(struct dvb_usb_device));
+
+                d->udev = udev;
+                memcpy(&d->props,props,sizeof(struct dvb_usb_properties));
+                d->desc = desc;
+                d->owner = owner;
+
+                if (d->props.size_of_priv > 0) {
+                        d->priv = kmalloc(d->props.size_of_priv,GFP_KERNEL);
+                        if (d->priv == NULL) {
+                                err("no memory for priv in 'struct dvb_usb_device'");
+                                kfree(d);
+                                return -ENOMEM;
+                        }
+                        memset(d->priv,0,d->props.size_of_priv);
+                }
+
+                usb_set_intfdata(intf, d);
+
+                ret = dvb_usb_init(d);
+        }
+
+        if (ret == 0)
+                info("%s successfully initialized and connected.",desc->name);
+        else
+                info("%s error while loading driver (%d)",desc->name,ret);
+        return ret;
+}
+EXPORT_SYMBOL(dvb_usb_device_init);
+
+void dvb_usb_device_exit(struct usb_interface *intf)
+{
+        struct dvb_usb_device *d = usb_get_intfdata(intf);
+        const char *name = "generic DVB-USB module";
+
+        usb_set_intfdata(intf,NULL);
+        if (d != NULL && d->desc != NULL) {
+                name = d->desc->name;
+                dvb_usb_exit(d);
+        }
+        info("%s successfully deinitialized and disconnected.",name);
+
+}
+EXPORT_SYMBOL(dvb_usb_device_exit);
+
+/* module stuff */
+static int __init dvb_usb_module_init(void)
+{
+        return 0;
+}
+
+static void __exit dvb_usb_module_exit(void)
+{
+}
+
+module_init (dvb_usb_module_init);
+module_exit (dvb_usb_module_exit);
+
+MODULE_VERSION("0.3");
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_DESCRIPTION("A library module containing commonly used USB and DVB function USB DVB devices");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
new file mode 100644
index 000000000000..9f1e23f82bae
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -0,0 +1,175 @@
+/* dvb-usb-remote.c is part of the DVB USB library.
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * see dvb-usb-init.c for copyright information.
+ *
+ * This file contains functions for initializing the the input-device and for handling remote-control-queries.
+ */
+#include "dvb-usb-common.h"
+
+/* Remote-control poll function - called every dib->rc_query_interval ms to see
+ * whether the remote control has received anything.
+ *
+ * TODO: Fix the repeat rate of the input device.
+ */
+static void dvb_usb_read_remote_control(void *data)
+{
+        struct dvb_usb_device *d = data;
+        u32 event;
+        int state;
+
+        /* TODO: need a lock here.  We can simply skip checking for the remote control
+           if we're busy. */
+
+        if (d->props.rc_query(d,&event,&state)) {
+                err("error while querying for an remote control event.");
+                goto schedule;
+        }
+
+
+        switch (state) {
+                case REMOTE_NO_KEY_PRESSED:
+                        break;
+                case REMOTE_KEY_PRESSED:
+                        deb_rc("key pressed\n");
+                        d->last_event = event;
+                case REMOTE_KEY_REPEAT:
+                        deb_rc("key repeated\n");
+                        input_event(&d->rc_input_dev, EV_KEY, event, 1);
+                        input_event(&d->rc_input_dev, EV_KEY, d->last_event, 0);
+                        input_sync(&d->rc_input_dev);
+                        break;
+                default:
+                        break;
+        }
+
+/* improved repeat handling ???
+        switch (state) {
+                case REMOTE_NO_KEY_PRESSED:
+                        deb_rc("NO KEY PRESSED\n");
+                        if (d->last_state != REMOTE_NO_KEY_PRESSED) {
+                                deb_rc("releasing event %d\n",d->last_event);
+                                input_event(&d->rc_input_dev, EV_KEY, d->last_event, 0);
+                                input_sync(&d->rc_input_dev);
+                        }
+                        d->last_state = REMOTE_NO_KEY_PRESSED;
+                        d->last_event = 0;
+                        break;
+                case REMOTE_KEY_PRESSED:
+                        deb_rc("KEY PRESSED\n");
+                        deb_rc("pressing event %d\n",event);
+
+                        input_event(&d->rc_input_dev, EV_KEY, event, 1);
+                        input_sync(&d->rc_input_dev);
+
+                        d->last_event = event;
+                        d->last_state = REMOTE_KEY_PRESSED;
+                        break;
+                case REMOTE_KEY_REPEAT:
+                        deb_rc("KEY_REPEAT\n");
+                        if (d->last_state != REMOTE_NO_KEY_PRESSED) {
+                                deb_rc("repeating event %d\n",d->last_event);
+                                input_event(&d->rc_input_dev, EV_KEY, d->last_event, 2);
+                                input_sync(&d->rc_input_dev);
+                                d->last_state = REMOTE_KEY_REPEAT;
+                        }
+                default:
+                        break;
+        }
+*/
+
+schedule:
+        schedule_delayed_work(&d->rc_query_work,msecs_to_jiffies(d->props.rc_interval));
+}
+
+int dvb_usb_remote_init(struct dvb_usb_device *d)
+{
+        int i;
+        if (d->props.rc_key_map == NULL)
+                return 0;
+
+        /* Initialise the remote-control structures.*/
+        init_input_dev(&d->rc_input_dev);
+
+        d->rc_input_dev.evbit[0] = BIT(EV_KEY);
+        d->rc_input_dev.keycodesize = sizeof(unsigned char);
+        d->rc_input_dev.keycodemax = KEY_MAX;
+        d->rc_input_dev.name = "IR-receiver inside an USB DVB receiver";
+
+        /* set the bits for the keys */
+        deb_rc("key map size: %d\n",d->props.rc_key_map_size);
+        for (i = 0; i < d->props.rc_key_map_size; i++) {
+                deb_rc("setting bit for event %d item %d\n",d->props.rc_key_map[i].event, i);
+                set_bit(d->props.rc_key_map[i].event, d->rc_input_dev.keybit);
+        }
+
+        /* Start the remote-control polling. */
+        if (d->props.rc_interval < 40)
+                d->props.rc_interval = 100; /* default */
+
+        /* setting these two values to non-zero, we have to manage key repeats */
+        d->rc_input_dev.rep[REP_PERIOD] = d->props.rc_interval;
+        d->rc_input_dev.rep[REP_DELAY]  = d->props.rc_interval + 150;
+
+        input_register_device(&d->rc_input_dev);
+
+        INIT_WORK(&d->rc_query_work, dvb_usb_read_remote_control, d);
+
+        info("schedule remote query interval to %d msecs.",d->props.rc_interval);
+        schedule_delayed_work(&d->rc_query_work,msecs_to_jiffies(d->props.rc_interval));
+
+        d->state |= DVB_USB_STATE_REMOTE;
+
+        return 0;
+}
+
+int dvb_usb_remote_exit(struct dvb_usb_device *d)
+{
+        if (d->state & DVB_USB_STATE_REMOTE) {
+                cancel_delayed_work(&d->rc_query_work);
+                flush_scheduled_work();
+                input_unregister_device(&d->rc_input_dev);
+        }
+        d->state &= ~DVB_USB_STATE_REMOTE;
+        return 0;
+}
+
+#define DVB_USB_RC_NEC_EMPTY           0x00
+#define DVB_USB_RC_NEC_KEY_PRESSED     0x01
+#define DVB_USB_RC_NEC_KEY_REPEATED    0x02
+int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *d,
+                u8 keybuf[5], u32 *event, int *state)
+{
+        int i;
+        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        *event = 0;
+        *state = REMOTE_NO_KEY_PRESSED;
+        switch (keybuf[0]) {
+                case DVB_USB_RC_NEC_EMPTY:
+                        break;
+                case DVB_USB_RC_NEC_KEY_PRESSED:
+                        if ((u8) ~keybuf[1] != keybuf[2] ||
+                                (u8) ~keybuf[3] != keybuf[4]) {
+                                deb_err("remote control checksum failed.\n");
+                                break;
+                        }
+                        /* See if we can match the raw key code. */
+                        for (i = 0; i < sizeof(keymap)/sizeof(struct dvb_usb_rc_key); i++)
+                                if (keymap[i].custom == keybuf[1] &&
+                                        keymap[i].data == keybuf[3]) {
+                                        *event = keymap[i].event;
+                                        *state = REMOTE_KEY_PRESSED;
+                                        break;
+                                }
+                        deb_err("key mapping failed - no appropriate key found in keymapping\n");
+                        break;
+                case DVB_USB_RC_NEC_KEY_REPEATED:
+                        *state = REMOTE_KEY_REPEAT;
+                        break;
+                default:
+                        deb_err("unkown type of remote status: %d\n",keybuf[0]);
+                        break;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(dvb_usb_nec_rc_key_to_event);
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
new file mode 100644
index 000000000000..83d476fb410a
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
@@ -0,0 +1,211 @@
+/* dvb-usb-urb.c is part of the DVB USB library.
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * see dvb-usb-init.c for copyright information.
+ *
+ * This file contains functions for initializing and handling the
+ * USB and URB stuff.
+ */
+#include "dvb-usb-common.h"
+
+int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
+        u16 rlen, int delay_ms)
+{
+        int actlen,ret = -ENOMEM;
+
+        if (d->props.generic_bulk_ctrl_endpoint == 0) {
+                err("endpoint for generic control not specified.");
+                return -EINVAL;
+        }
+
+        if (wbuf == NULL || wlen == 0)
+                return -EINVAL;
+
+        if ((ret = down_interruptible(&d->usb_sem)))
+                return ret;
+
+        debug_dump(wbuf,wlen,deb_xfer);
+
+        ret = usb_bulk_msg(d->udev,usb_sndbulkpipe(d->udev,
+                        d->props.generic_bulk_ctrl_endpoint), wbuf,wlen,&actlen,
+                        2*HZ);
+
+        if (ret)
+                err("bulk message failed: %d (%d/%d)",ret,wlen,actlen);
+        else
+                ret = actlen != wlen ? -1 : 0;
+
+        /* an answer is expected, and no error before */
+        if (!ret && rbuf && rlen) {
+                if (delay_ms)
+                        msleep(delay_ms);
+
+                ret = usb_bulk_msg(d->udev,usb_rcvbulkpipe(d->udev,
+                                d->props.generic_bulk_ctrl_endpoint),rbuf,rlen,&actlen,
+                                2*HZ);
+
+                if (ret)
+                        err("recv bulk message failed: %d",ret);
+                else
+                        debug_dump(rbuf,actlen,deb_xfer);
+        }
+
+        up(&d->usb_sem);
+        return ret;
+}
+EXPORT_SYMBOL(dvb_usb_generic_rw);
+
+int dvb_usb_generic_write(struct dvb_usb_device *d, u8 *buf, u16 len)
+{
+        return dvb_usb_generic_rw(d,buf,len,NULL,0,0);
+}
+EXPORT_SYMBOL(dvb_usb_generic_write);
+
+static void dvb_usb_bulk_urb_complete(struct urb *urb, struct pt_regs *ptregs)
+{
+        struct dvb_usb_device *d = urb->context;
+
+        deb_ts("bulk urb completed. feedcount: %d, status: %d, length: %d\n",d->feedcount,urb->status,
+                        urb->actual_length);
+
+        switch (urb->status) {
+                case 0:         /* success */
+                case -ETIMEDOUT:    /* NAK */
+                        break;
+                case -ECONNRESET:   /* kill */
+                case -ENOENT:
+                case -ESHUTDOWN:
+                        return;
+                default:        /* error */
+                        deb_ts("urb completition error %d.", urb->status);
+                        break;
+        }
+
+        if (d->feedcount > 0 && urb->actual_length > 0) {
+                if (d->state & DVB_USB_STATE_DVB)
+                        dvb_dmx_swfilter(&d->demux, (u8*) urb->transfer_buffer,urb->actual_length);
+        } else
+                deb_ts("URB dropped because of feedcount.\n");
+
+        usb_submit_urb(urb,GFP_ATOMIC);
+}
+
+int dvb_usb_urb_kill(struct dvb_usb_device *d)
+{
+        int i;
+        for (i = 0; i < d->urbs_submitted; i++) {
+                deb_info("killing URB no. %d.\n",i);
+
+                /* stop the URB */
+                usb_kill_urb(d->urb_list[i]);
+        }
+        d->urbs_submitted = 0;
+        return 0;
+}
+
+int dvb_usb_urb_submit(struct dvb_usb_device *d)
+{
+        int i,ret;
+        for (i = 0; i < d->urbs_initialized; i++) {
+                deb_info("submitting URB no. %d\n",i);
+                if ((ret = usb_submit_urb(d->urb_list[i],GFP_ATOMIC))) {
+                        err("could not submit URB no. %d - get them all back\n",i);
+                        dvb_usb_urb_kill(d);
+                        return ret;
+                }
+                d->urbs_submitted++;
+        }
+        return 0;
+}
+
+static int dvb_usb_bulk_urb_init(struct dvb_usb_device *d)
+{
+        int i,bufsize = d->props.urb.count * d->props.urb.u.bulk.buffersize;
+
+        deb_info("allocate %d bytes as buffersize for all URBs\n",bufsize);
+        /* allocate the actual buffer for the URBs */
+        if ((d->buffer =  usb_buffer_alloc(d->udev, bufsize, SLAB_ATOMIC, &d->dma_handle)) == NULL) {
+                deb_info("not enough memory for urb-buffer allocation.\n");
+                return -ENOMEM;
+        }
+        deb_info("allocation successful\n");
+        memset(d->buffer,0,bufsize);
+
+        d->state |= DVB_USB_STATE_URB_BUF;
+
+        /* allocate the URBs */
+        for (i = 0; i < d->props.urb.count; i++) {
+                if (!(d->urb_list[i] = usb_alloc_urb(0,GFP_ATOMIC))) {
+                        return -ENOMEM;
+                }
+
+                usb_fill_bulk_urb( d->urb_list[i], d->udev,
+                                usb_rcvbulkpipe(d->udev,d->props.urb.endpoint),
+                                &d->buffer[i*d->props.urb.u.bulk.buffersize],
+                                d->props.urb.u.bulk.buffersize,
+                                dvb_usb_bulk_urb_complete, d);
+
+                d->urb_list[i]->transfer_flags = 0;
+                d->urbs_initialized++;
+        }
+        return 0;
+}
+
+int dvb_usb_urb_init(struct dvb_usb_device *d)
+{
+        /*
+         * when reloading the driver w/o replugging the device
+         * sometimes a timeout occures, this helps
+         */
+        if (d->props.generic_bulk_ctrl_endpoint != 0) {
+                usb_clear_halt(d->udev,usb_sndbulkpipe(d->udev,d->props.generic_bulk_ctrl_endpoint));
+                usb_clear_halt(d->udev,usb_rcvbulkpipe(d->udev,d->props.generic_bulk_ctrl_endpoint));
+        }
+        usb_clear_halt(d->udev,usb_rcvbulkpipe(d->udev,d->props.urb.endpoint));
+
+        /* allocate the array for the data transfer URBs */
+        d->urb_list = kmalloc(d->props.urb.count * sizeof(struct urb *),GFP_KERNEL);
+        if (d->urb_list == NULL)
+                return -ENOMEM;
+        memset(d->urb_list,0,d->props.urb.count * sizeof(struct urb *));
+        d->state |= DVB_USB_STATE_URB_LIST;
+
+        switch (d->props.urb.type) {
+                case DVB_USB_BULK:
+                        return dvb_usb_bulk_urb_init(d);
+                case DVB_USB_ISOC:
+                        err("isochronous transfer not yet implemented in dvb-usb.");
+                        return -EINVAL;
+                default:
+                        err("unkown URB-type for data transfer.");
+                        return -EINVAL;
+        }
+}
+
+int dvb_usb_urb_exit(struct dvb_usb_device *d)
+{
+        int i;
+
+        dvb_usb_urb_kill(d);
+
+        if (d->state & DVB_USB_STATE_URB_LIST) {
+                for (i = 0; i < d->urbs_initialized; i++) {
+                        if (d->urb_list[i] != NULL) {
+                                deb_info("freeing URB no. %d.\n",i);
+                                /* free the URBs */
+                                usb_free_urb(d->urb_list[i]);
+                        }
+                }
+                d->urbs_initialized = 0;
+                /* free the urb array */
+                kfree(d->urb_list);
+                d->state &= ~DVB_USB_STATE_URB_LIST;
+        }
+
+        if (d->state & DVB_USB_STATE_URB_BUF)
+                usb_buffer_free(d->udev, d->props.urb.u.bulk.buffersize * d->props.urb.count,
+                                d->buffer, d->dma_handle);
+
+        d->state &= ~DVB_USB_STATE_URB_BUF;
+        return 0;
+}
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
new file mode 100644
index 000000000000..abcee1943f64
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -0,0 +1,315 @@
+/* dvb-usb.h is part of the DVB USB library.
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * see dvb-usb-init.c for copyright information.
+ *
+ * the headerfile, all dvb-usb-drivers have to include.
+ */
+#ifndef __DVB_USB_H__
+#define __DVB_USB_H__
+
+#include <linux/config.h>
+#include <linux/input.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+
+#include "dvb_frontend.h"
+#include "dvb_demux.h"
+#include "dvb_net.h"
+#include "dmxdev.h"
+
+#include "dvb-pll.h"
+
+#include "dvb-usb-ids.h"
+
+/* debug */
+#ifdef CONFIG_DVB_USB_DEBUG
+#define dprintk(var,level,args...) \
+            do { if ((var & level)) { printk(args); } } while (0)
+
+#define debug_dump(b,l,func) {\
+        int loop_; \
+        for (loop_ = 0; loop_ < l; loop_++) func("%02x ", b[loop_]); \
+        func("\n");\
+}
+#define DVB_USB_DEBUG_STATUS
+#else
+#define dprintk(args...)
+#define debug_dump(b,l,func)
+
+#define DVB_USB_DEBUG_STATUS " (debugging is not enabled)"
+
+#endif
+
+/* generic log methods - taken from usb.h */
+#ifndef DVB_USB_LOG_PREFIX
+ #define DVB_USB_LOG_PREFIX "dvb-usb (please define a log prefix)"
+#endif
+
+#undef err
+#define err(format, arg...)  printk(KERN_ERR     DVB_USB_LOG_PREFIX ": " format "\n" , ## arg)
+#undef info
+#define info(format, arg...) printk(KERN_INFO    DVB_USB_LOG_PREFIX ": " format "\n" , ## arg)
+#undef warn
+#define warn(format, arg...) printk(KERN_WARNING DVB_USB_LOG_PREFIX ": " format "\n" , ## arg)
+
+/**
+ * struct dvb_usb_device_description - name and its according USB IDs
+ * @name: real name of the box, regardless which DVB USB device class is in use
+ * @cold_ids: array of struct usb_device_id which describe the device in
+ *  pre-firmware state
+ * @warm_ids: array of struct usb_device_id which describe the device in
+ *  post-firmware state
+ *
+ * Each DVB USB device class can have one or more actual devices, this struct
+ * assigns a name to it.
+ */
+struct dvb_usb_device_description {
+        const char *name;
+
+#define DVB_USB_ID_MAX_NUM 15
+        struct usb_device_id *cold_ids[DVB_USB_ID_MAX_NUM];
+        struct usb_device_id *warm_ids[DVB_USB_ID_MAX_NUM];
+};
+
+/**
+ * struct dvb_usb_rc_key - a remote control key and its input-event
+ * @custom: the vendor/custom part of the key
+ * @data: the actual key part
+ * @event: the input event assigned to key identified by custom and data
+ */
+struct dvb_usb_rc_key {
+        u8 custom,data;
+        u32 event;
+};
+
+struct dvb_usb_device;
+
+/**
+ * struct dvb_usb_properties - properties of a dvb-usb-device
+ * @caps: capabilites of the DVB USB device.
+ * @pid_filter_count: number of PID filter position in the optional hardware
+ *  PID-filter.
+ *
+ * @usb_ctrl: which USB device-side controller is in use. Needed for firmware
+ *  download.
+ * @firmware: name of the firmware file.
+ *
+ * @size_of_priv: how many bytes shall be allocated for the private field
+ *  of struct dvb_usb_device.
+ *
+ * @power_ctrl: called to enable/disable power of the device.
+ * @streaming_crtl: called to start and stop the MPEG2-TS streaming of the
+ *  device (not URB submitting/killing).
+ * @pid_filter_ctrl: called to en/disable the PID filter, if any.
+ * @pid_filter: called to set/unset a PID for filtering.
+ *
+ * @read_mac_address: called to read the MAC address of the device.
+ *
+ * @frontend_attach: called to attach the possible frontends (fill fe-field
+ *  of struct dvb_usb_device).
+ * @tuner_attach: called to attach the correct tuner and to fill pll_addr,
+ *  pll_desc and pll_init_buf of struct dvb_usb_device).
+ * @identify_state: called to determine the state (cold or warm), when it
+ *  is not distinguishable by the USB IDs.
+ *
+ * @rc_key_map: a hard-wired array of struct dvb_usb_rc_key (NULL to disable
+ *  remote control handling).
+ * @rc_key_map_size: number of items in @rc_key_map.
+ * @rc_query: called to query an event event.
+ * @rc_interval: time in ms between two queries.
+ *
+ * @i2c_algo: i2c_algorithm if the device has I2CoverUSB.
+ *
+ * @generic_bulk_ctrl_endpoint: most of the DVB USB devices have a generic
+ *  endpoint which received control messages with bulk transfers. When this
+ *  is non-zero, one can use dvb_usb_generic_rw and dvb_usb_generic_write-
+ *  helper functions.
+ *
+ * @urb: describes the kind of USB transfer used for MPEG2-TS-streaming.
+ *  Currently only BULK is implemented
+ *
+ * @num_device_descs: number of struct dvb_usb_device_description in @devices
+ * @devices: array of struct dvb_usb_device_description compatibles with these
+ *  properties.
+ */
+struct dvb_usb_properties {
+
+#define DVB_USB_HAS_PID_FILTER               0x01
+#define DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF 0x02
+#define DVB_USB_NEED_PID_FILTERING           0x04
+#define DVB_USB_IS_AN_I2C_ADAPTER            0x08
+        int caps;
+        int pid_filter_count;
+
+#define CYPRESS_AN2135  0
+#define CYPRESS_AN2235  1
+#define CYPRESS_FX2     2
+        int usb_ctrl;
+        const char *firmware;
+
+        int size_of_priv;
+
+        int (*power_ctrl) (struct dvb_usb_device *, int);
+        int (*streaming_ctrl) (struct dvb_usb_device *, int);
+        int (*pid_filter_ctrl) (struct dvb_usb_device *, int);
+        int (*pid_filter) (struct dvb_usb_device *, int, u16, int);
+
+        int (*read_mac_address) (struct dvb_usb_device *, u8 []);
+        int (*frontend_attach) (struct dvb_usb_device *);
+        int (*tuner_attach) (struct dvb_usb_device *);
+
+        int (*identify_state) (struct usb_device *, struct dvb_usb_properties *,
+                        struct dvb_usb_device_description **, int *);
+
+/* remote control properties */
+#define REMOTE_NO_KEY_PRESSED      0x00
+#define REMOTE_KEY_PRESSED         0x01
+#define REMOTE_KEY_REPEAT          0x02
+        struct dvb_usb_rc_key *rc_key_map;
+        int rc_key_map_size;
+        int (*rc_query) (struct dvb_usb_device *, u32 *, int *);
+        int rc_interval;
+
+        struct i2c_algorithm *i2c_algo;
+
+        int generic_bulk_ctrl_endpoint;
+
+        struct {
+#define DVB_USB_BULK  1
+#define DVB_USB_ISOC  2
+                int type;
+                int count;
+                int endpoint;
+
+                union {
+                        struct {
+                                int buffersize; /* per URB */
+                        } bulk;
+                        struct {
+                                int framesperurb;
+                                int framesize;
+                        } isoc;
+                } u;
+        } urb;
+
+        int num_device_descs;
+        struct dvb_usb_device_description devices[8];
+};
+
+
+/**
+ * struct dvb_usb_device - object of a DVB USB device
+ * @props: copy of the struct dvb_usb_properties this device belongs to.
+ * @desc: pointer to the device's struct dvb_usb_device_description.
+ * @state: initialization and runtime state of the device.
+ *
+ * @udev: pointer to the device's struct usb_device.
+ * @urb_list: array of dynamically allocated struct urb for the MPEG2-TS-
+ *  streaming.
+ * @buffer: buffer used to streaming.
+ * @dma_handle: dma_addr_t for buffer.
+ * @urbs_initialized: number of URBs initialized.
+ * @urbs_submitted: number of URBs submitted.
+ * @feedcount: number of reqested feeds (used for streaming-activation)
+ * @pid_filtering: is hardware pid_filtering used or not.
+ * @usb_sem: semaphore of USB control messages (reading needs two messages)
+ * @i2c_sem: semaphore for i2c-transfers
+ * @i2c_adap: device's i2c_adapter if it uses I2CoverUSB
+ * @pll_addr: I2C address of the tuner for programming
+ * @pll_init: array containing the initialization buffer
+ * @pll_desc: pointer to the appropriate struct dvb_pll_desc
+ * @tuner_pass_ctrl: called to (de)activate tuner passthru of the demod
+ * @dvb_adap: device's dvb_adapter.
+ * @dmxdev: device's dmxdev.
+ * @demux: device's software demuxer.
+ * @dvb_net: device's dvb_net interfaces.
+ * @dvb_frontend: device's frontend.
+ * @max_feed_count: how many feeds can be handled simultaneously by this
+ *  device
+ * @fe_sleep: rerouted frontend-sleep function.
+ * @fe_init: rerouted frontend-init (wakeup) function.
+ * @rc_input_dev: input device for the remote control.
+ * @rc_query_work: struct work_struct frequent rc queries
+ * @last_event: last triggered event
+ * @last_state: last state (no, pressed, repeat)
+ * @owner: owner of the dvb_adapter
+ * @priv: private data of the actual driver (allocate by dvb-usb, size defined
+ *  in size_of_priv of dvb_usb_properties).
+ */
+struct dvb_usb_device {
+        struct dvb_usb_properties props;
+        struct dvb_usb_device_description *desc;
+
+#define DVB_USB_STATE_INIT        0x000
+#define DVB_USB_STATE_URB_LIST    0x001
+#define DVB_USB_STATE_URB_BUF     0x002
+#define DVB_USB_STATE_DVB         0x004
+#define DVB_USB_STATE_I2C         0x008
+#define DVB_USB_STATE_REMOTE      0x010
+#define DVB_USB_STATE_URB_SUBMIT  0x020
+        int state;
+
+        /* usb */
+        struct usb_device *udev;
+        struct urb **urb_list;
+        u8 *buffer;
+        dma_addr_t dma_handle;
+        int urbs_initialized;
+        int urbs_submitted;
+
+        int feedcount;
+        int pid_filtering;
+
+        /* locking */
+        struct semaphore usb_sem;
+
+        /* i2c */
+        struct semaphore i2c_sem;
+        struct i2c_adapter i2c_adap;
+
+        /* tuner programming information */
+        u8 pll_addr;
+        u8 pll_init[4];
+        struct dvb_pll_desc *pll_desc;
+        int (*tuner_pass_ctrl)(struct dvb_frontend *, int, u8);
+
+        /* dvb */
+        struct dvb_adapter dvb_adap;
+        struct dmxdev dmxdev;
+        struct dvb_demux demux;
+        struct dvb_net dvb_net;
+        struct dvb_frontend* fe;
+        int max_feed_count;
+
+        int (*fe_sleep) (struct dvb_frontend *);
+        int (*fe_init)  (struct dvb_frontend *);
+
+        /* remote control */
+        struct input_dev rc_input_dev;
+        struct work_struct rc_query_work;
+        u32 last_event;
+        int last_state;
+
+        struct module *owner;
+
+        void *priv;
+};
+
+extern int dvb_usb_device_init(struct usb_interface *, struct dvb_usb_properties *, struct module *);
+extern void dvb_usb_device_exit(struct usb_interface *);
+
+/* the generic read/write method for device control */
+extern int dvb_usb_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16,int);
+extern int dvb_usb_generic_write(struct dvb_usb_device *, u8 *, u16);
+
+/* commonly used remote control parsing */
+extern int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *, u8[], u32 *, int *);
+
+/* commonly used pll init and set functions */
+extern int dvb_usb_pll_init_i2c(struct dvb_frontend *);
+extern int dvb_usb_pll_set(struct dvb_frontend *, struct dvb_frontend_parameters *, u8[]);
+extern int dvb_usb_pll_set_i2c(struct dvb_frontend *, struct dvb_frontend_parameters *);
+
+
+#endif
diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
new file mode 100644
index 000000000000..9d83781aef95
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -0,0 +1,236 @@
+/* DVB USB framework compliant Linux driver for the Hauppauge WinTV-NOVA-T usb2
+ * DVB-T receiver.
+ *
+ * Copyright (C) 2004-5 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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "dibusb.h"
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=rc,2=eeprom (|-able))." DVB_USB_DEBUG_STATUS);
+
+#define deb_rc(args...) dprintk(debug,0x01,args)
+#define deb_ee(args...) dprintk(debug,0x02,args)
+
+/* Hauppauge NOVA-T USB2 keys */
+static struct dvb_usb_rc_key haupp_rc_keys [] = {
+        { 0x1e, 0x00, KEY_0 },
+        { 0x1e, 0x01, KEY_1 },
+        { 0x1e, 0x02, KEY_2 },
+        { 0x1e, 0x03, KEY_3 },
+        { 0x1e, 0x04, KEY_4 },
+        { 0x1e, 0x05, KEY_5 },
+        { 0x1e, 0x06, KEY_6 },
+        { 0x1e, 0x07, KEY_7 },
+        { 0x1e, 0x08, KEY_8 },
+        { 0x1e, 0x09, KEY_9 },
+        { 0x1e, 0x0a, KEY_KPASTERISK },
+        { 0x1e, 0x0b, KEY_RED },
+        { 0x1e, 0x0c, KEY_RADIO },
+        { 0x1e, 0x0d, KEY_MENU },
+        { 0x1e, 0x0e, KEY_GRAVE }, /* # */
+        { 0x1e, 0x0f, KEY_MUTE },
+        { 0x1e, 0x10, KEY_VOLUMEUP },
+        { 0x1e, 0x11, KEY_VOLUMEDOWN },
+        { 0x1e, 0x12, KEY_CHANNEL },
+        { 0x1e, 0x14, KEY_UP },
+        { 0x1e, 0x15, KEY_DOWN },
+        { 0x1e, 0x16, KEY_LEFT },
+        { 0x1e, 0x17, KEY_RIGHT },
+        { 0x1e, 0x18, KEY_VIDEO },
+        { 0x1e, 0x19, KEY_AUDIO },
+        { 0x1e, 0x1a, KEY_MEDIA },
+        { 0x1e, 0x1b, KEY_EPG },
+        { 0x1e, 0x1c, KEY_TV },
+        { 0x1e, 0x1e, KEY_NEXT },
+        { 0x1e, 0x1f, KEY_BACK },
+        { 0x1e, 0x20, KEY_CHANNELUP },
+        { 0x1e, 0x21, KEY_CHANNELDOWN },
+        { 0x1e, 0x24, KEY_LAST }, /* Skip backwards */
+        { 0x1e, 0x25, KEY_OK },
+        { 0x1e, 0x29, KEY_BLUE},
+        { 0x1e, 0x2e, KEY_GREEN },
+        { 0x1e, 0x30, KEY_PAUSE },
+        { 0x1e, 0x32, KEY_REWIND },
+        { 0x1e, 0x34, KEY_FASTFORWARD },
+        { 0x1e, 0x35, KEY_PLAY },
+        { 0x1e, 0x36, KEY_STOP },
+        { 0x1e, 0x37, KEY_RECORD },
+        { 0x1e, 0x38, KEY_YELLOW },
+        { 0x1e, 0x3b, KEY_GOTO },
+        { 0x1e, 0x3d, KEY_POWER },
+};
+
+/* Firmware bug? sometimes, when a new key is pressed, the previous pressed key
+ * is delivered. No workaround yet, maybe a new firmware.
+ */
+static int nova_t_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+        u8 key[5],cmd[2] = { DIBUSB_REQ_POLL_REMOTE, 0x35 }, data,toggle,custom;
+        u16 raw;
+        int i;
+        struct dibusb_state *st = d->priv;
+
+        dvb_usb_generic_rw(d,cmd,2,key,5,0);
+
+        *state = REMOTE_NO_KEY_PRESSED;
+        switch (key[0]) {
+                case DIBUSB_RC_HAUPPAUGE_KEY_PRESSED:
+                        raw = ((key[1] << 8) | key[2]) >> 3;
+                        toggle = !!(raw & 0x800);
+                        data = raw & 0x3f;
+                        custom = (raw >> 6) & 0x1f;
+
+                        deb_rc("raw key code 0x%02x, 0x%02x, 0x%02x to c: %02x d: %02x toggle: %d\n",key[1],key[2],key[3],custom,data,toggle);
+
+                        for (i = 0; i < ARRAY_SIZE(haupp_rc_keys); i++) {
+                                deb_rc("c: %x, d: %x\n",haupp_rc_keys[i].data,haupp_rc_keys[i].custom);
+                                if (haupp_rc_keys[i].data == data &&
+                                        haupp_rc_keys[i].custom == custom) {
+                                        *event = haupp_rc_keys[i].event;
+                                        *state = REMOTE_KEY_PRESSED;
+                                        if (st->old_toggle == toggle) {
+                                                if (st->last_repeat_count++ < 2)
+                                                        *state = REMOTE_NO_KEY_PRESSED;
+                                        } else {
+                                                st->last_repeat_count = 0;
+                                                st->old_toggle = toggle;
+                                        }
+                                        break;
+                                }
+                        }
+
+                        break;
+                case DIBUSB_RC_HAUPPAUGE_KEY_EMPTY:
+                default:
+                        break;
+        }
+
+        return 0;
+}
+
+static int nova_t_read_mac_address (struct dvb_usb_device *d, u8 mac[6])
+{
+        int i;
+        u8 b;
+
+        mac[0] = 0x00;
+        mac[1] = 0x0d;
+        mac[2] = 0xfe;
+
+        /* this is a complete guess, but works for my box */
+        for (i = 136; i < 139; i++) {
+                dibusb_read_eeprom_byte(d,i, &b);
+
+                mac[5 - (i - 136)] = b;
+
+/*              deb_ee("%02x ",b);
+                if ((i+1) % 16 == 0)
+                        deb_ee("\n");*/
+        }
+
+        return 0;
+}
+
+/* USB Driver stuff */
+static struct dvb_usb_properties nova_t_properties;
+
+static int nova_t_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        return dvb_usb_device_init(intf,&nova_t_properties,THIS_MODULE);
+}
+
+/* do not change the order of the ID table */
+static struct usb_device_id nova_t_table [] = {
+/* 00 */        { USB_DEVICE(USB_VID_HAUPPAUGE,     USB_PID_WINTV_NOVA_T_USB2_COLD) },
+/* 01 */        { USB_DEVICE(USB_VID_HAUPPAUGE,     USB_PID_WINTV_NOVA_T_USB2_WARM) },
+                        { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, nova_t_table);
+
+static struct dvb_usb_properties nova_t_properties = {
+        .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
+        .pid_filter_count = 32,
+
+        .usb_ctrl = CYPRESS_FX2,
+        .firmware = "dvb-usb-nova-t-usb2-01.fw",
+
+        .size_of_priv     = sizeof(struct dibusb_state),
+
+        .streaming_ctrl   = dibusb2_0_streaming_ctrl,
+        .pid_filter       = dibusb_pid_filter,
+        .pid_filter_ctrl  = dibusb_pid_filter_ctrl,
+        .power_ctrl       = dibusb2_0_power_ctrl,
+        .frontend_attach  = dibusb_dib3000mc_frontend_attach,
+        .tuner_attach     = dibusb_dib3000mc_tuner_attach,
+        .read_mac_address = nova_t_read_mac_address,
+
+        .rc_interval      = 100,
+        .rc_key_map       = haupp_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(haupp_rc_keys),
+        .rc_query         = nova_t_rc_query,
+
+        .i2c_algo         = &dibusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        /* parameter for the MPEG2-data transfer */
+        .urb = {
+                .type = DVB_USB_BULK,
+                .count = 7,
+                .endpoint = 0x06,
+                .u = {
+                        .bulk = {
+                                .buffersize = 4096,
+                        }
+                }
+        },
+
+        .num_device_descs = 1,
+        .devices = {
+                {   "Hauppauge WinTV-NOVA-T usb2",
+                        { &nova_t_table[0], NULL },
+                        { &nova_t_table[1], NULL },
+                },
+        }
+};
+
+static struct usb_driver nova_t_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "Hauppauge WinTV-NOVA-T usb2",
+        .probe          = nova_t_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table       = nova_t_table,
+};
+
+/* module stuff */
+static int __init nova_t_module_init(void)
+{
+        int result;
+        if ((result = usb_register(&nova_t_driver))) {
+                err("usb_register failed. Error number %d",result);
+                return result;
+        }
+
+        return 0;
+}
+
+static void __exit nova_t_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&nova_t_driver);
+}
+
+module_init (nova_t_module_init);
+module_exit (nova_t_module_exit);
+
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_DESCRIPTION("Hauppauge WinTV-NOVA-T usb2");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c
new file mode 100644
index 000000000000..aa560422ce7c
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/umt-010.c
@@ -0,0 +1,162 @@
+/* DVB USB framework compliant Linux driver for the HanfTek UMT-010 USB2.0
+ * DVB-T receiver.
+ *
+ * Copyright (C) 2004-5 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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "dibusb.h"
+
+#include "mt352.h"
+
+static int umt_mt352_demod_init(struct dvb_frontend *fe)
+{
+        static u8 mt352_clock_config[] = { 0x89, 0xb8, 0x2d };
+        static u8 mt352_reset[] = { 0x50, 0x80 };
+        static u8 mt352_mclk_ratio[] = { 0x8b, 0x00 };
+        static u8 mt352_adc_ctl_1_cfg[] = { 0x8E, 0x40 };
+        static u8 mt352_agc_cfg[] = { 0x67, 0x10, 0xa0 };
+
+        static u8 mt352_sec_agc_cfg1[] = { 0x6a, 0xff };
+        static u8 mt352_sec_agc_cfg2[] = { 0x6d, 0xff };
+        static u8 mt352_sec_agc_cfg3[] = { 0x70, 0x40 };
+        static u8 mt352_sec_agc_cfg4[] = { 0x7b, 0x03 };
+        static u8 mt352_sec_agc_cfg5[] = { 0x7d, 0x0f };
+
+        static u8 mt352_acq_ctl[] = { 0x53, 0x50 };
+        static u8 mt352_input_freq_1[] = { 0x56, 0x31, 0x06 };
+
+        mt352_write(fe, mt352_clock_config, sizeof(mt352_clock_config));
+        udelay(2000);
+        mt352_write(fe, mt352_reset, sizeof(mt352_reset));
+        mt352_write(fe, mt352_mclk_ratio, sizeof(mt352_mclk_ratio));
+
+        mt352_write(fe, mt352_adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg));
+        mt352_write(fe, mt352_agc_cfg, sizeof(mt352_agc_cfg));
+
+        mt352_write(fe, mt352_sec_agc_cfg1, sizeof(mt352_sec_agc_cfg1));
+        mt352_write(fe, mt352_sec_agc_cfg2, sizeof(mt352_sec_agc_cfg2));
+        mt352_write(fe, mt352_sec_agc_cfg3, sizeof(mt352_sec_agc_cfg3));
+        mt352_write(fe, mt352_sec_agc_cfg4, sizeof(mt352_sec_agc_cfg4));
+        mt352_write(fe, mt352_sec_agc_cfg5, sizeof(mt352_sec_agc_cfg5));
+
+        mt352_write(fe, mt352_acq_ctl, sizeof(mt352_acq_ctl));
+        mt352_write(fe, mt352_input_freq_1, sizeof(mt352_input_freq_1));
+
+        return 0;
+}
+
+static int umt_mt352_frontend_attach(struct dvb_usb_device *d)
+{
+        struct mt352_config umt_config;
+
+        memset(&umt_config,0,sizeof(struct mt352_config));
+        umt_config.demod_init = umt_mt352_demod_init;
+        umt_config.demod_address = 0xf;
+        umt_config.pll_set = dvb_usb_pll_set;
+
+        d->fe = mt352_attach(&umt_config, &d->i2c_adap);
+
+        return 0;
+}
+
+static int umt_tuner_attach (struct dvb_usb_device *d)
+{
+        d->pll_addr = 0x61;
+        d->pll_desc = &dvb_pll_tua6034;
+        return 0;
+}
+
+/* USB Driver stuff */
+static struct dvb_usb_properties umt_properties;
+
+static int umt_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        if (dvb_usb_device_init(intf,&umt_properties,THIS_MODULE) == 0)
+                return 0;
+        return -EINVAL;
+}
+
+/* do not change the order of the ID table */
+static struct usb_device_id umt_table [] = {
+/* 00 */        { USB_DEVICE(USB_VID_HANFTEK,           USB_PID_HANFTEK_UMT_010_COLD) },
+/* 01 */        { USB_DEVICE(USB_VID_HANFTEK,           USB_PID_HANFTEK_UMT_010_WARM) },
+                        { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, umt_table);
+
+static struct dvb_usb_properties umt_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl = CYPRESS_FX2,
+        .firmware = "dvb-usb-umt-010-02.fw",
+
+        .size_of_priv     = sizeof(struct dibusb_state),
+
+        .streaming_ctrl   = dibusb2_0_streaming_ctrl,
+        .power_ctrl       = dibusb_power_ctrl,
+        .frontend_attach  = umt_mt352_frontend_attach,
+        .tuner_attach     = umt_tuner_attach,
+
+        .i2c_algo         = &dibusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        /* parameter for the MPEG2-data transfer */
+        .urb = {
+                .type = DVB_USB_BULK,
+                .count = 20,
+                .endpoint = 0x06,
+                .u = {
+                        .bulk = {
+                                .buffersize = 512,
+                        }
+                }
+        },
+
+        .num_device_descs = 1,
+        .devices = {
+                {       "Hanftek UMT-010 DVB-T USB2.0",
+                        { &umt_table[0], NULL },
+                        { &umt_table[1], NULL },
+                },
+        }
+};
+
+static struct usb_driver umt_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "HanfTek UMT-010 USB2.0 DVB-T devices",
+        .probe          = umt_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table       = umt_table,
+};
+
+/* module stuff */
+static int __init umt_module_init(void)
+{
+        int result;
+        if ((result = usb_register(&umt_driver))) {
+                err("usb_register failed. Error number %d",result);
+                return result;
+        }
+
+        return 0;
+}
+
+static void __exit umt_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&umt_driver);
+}
+
+module_init (umt_module_init);
+module_exit (umt_module_exit);
+
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_DESCRIPTION("Driver for HanfTek UMT 010 USB2.0 DVB-T device");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c
new file mode 100644
index 000000000000..2746edfeccba
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c
@@ -0,0 +1,196 @@
+/* DVB frontend part of the Linux driver for TwinhanDTV Alpha/MagicBoxII USB2.0
+ * DVB-T receiver.
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ *
+ * Thanks to Twinhan who kindly provided hardware and information.
+ *
+ *      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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ *
+ */
+#include "vp7045.h"
+
+/* It is a Zarlink MT352 within a Samsung Tuner (DNOS404ZH102A) - 040929 - AAT
+ *
+ * Programming is hidden inside the firmware, so set_frontend is very easy.
+ * Even though there is a Firmware command that one can use to access the demod
+ * via its registers. This is used for status information.
+ */
+
+struct vp7045_fe_state {
+        struct dvb_frontend fe;
+        struct dvb_usb_device *d;
+};
+
+
+static int vp7045_fe_read_status(struct dvb_frontend* fe, fe_status_t *status)
+{
+        struct vp7045_fe_state *state = fe->demodulator_priv;
+        u8 s0 = vp7045_read_reg(state->d,0x00),
+           s1 = vp7045_read_reg(state->d,0x01),
+           s3 = vp7045_read_reg(state->d,0x03);
+
+        *status = 0;
+        if (s0 & (1 << 4))
+                *status |= FE_HAS_CARRIER;
+        if (s0 & (1 << 1))
+                *status |= FE_HAS_VITERBI;
+        if (s0 & (1 << 5))
+                *status |= FE_HAS_LOCK;
+        if (s1 & (1 << 1))
+                *status |= FE_HAS_SYNC;
+        if (s3 & (1 << 6))
+                *status |= FE_HAS_SIGNAL;
+
+        if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
+                        (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
+                *status &= ~FE_HAS_LOCK;
+
+        return 0;
+}
+
+static int vp7045_fe_read_ber(struct dvb_frontend* fe, u32 *ber)
+{
+        struct vp7045_fe_state *state = fe->demodulator_priv;
+        *ber = (vp7045_read_reg(state->d, 0x0D) << 16) |
+               (vp7045_read_reg(state->d, 0x0E) << 8) |
+                vp7045_read_reg(state->d, 0x0F);
+        return 0;
+}
+
+static int vp7045_fe_read_unc_blocks(struct dvb_frontend* fe, u32 *unc)
+{
+        struct vp7045_fe_state *state = fe->demodulator_priv;
+        *unc = (vp7045_read_reg(state->d, 0x10) << 8) |
+                    vp7045_read_reg(state->d, 0x11);
+        return 0;
+}
+
+static int vp7045_fe_read_signal_strength(struct dvb_frontend* fe, u16 *strength)
+{
+        struct vp7045_fe_state *state = fe->demodulator_priv;
+        u16 signal = (vp7045_read_reg(state->d, 0x14) << 8) |
+                vp7045_read_reg(state->d, 0x15);
+
+        *strength = ~signal;
+        return 0;
+}
+
+static int vp7045_fe_read_snr(struct dvb_frontend* fe, u16 *snr)
+{
+        struct vp7045_fe_state *state = fe->demodulator_priv;
+        u8 _snr = vp7045_read_reg(state->d, 0x09);
+        *snr = (_snr << 8) | _snr;
+        return 0;
+}
+
+static int vp7045_fe_init(struct dvb_frontend* fe)
+{
+        return 0;
+}
+
+static int vp7045_fe_sleep(struct dvb_frontend* fe)
+{
+        return 0;
+}
+
+static int vp7045_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)
+{
+        tune->min_delay_ms = 800;
+        return 0;
+}
+
+static int vp7045_fe_set_frontend(struct dvb_frontend* fe,
+                                  struct dvb_frontend_parameters *fep)
+{
+        struct vp7045_fe_state *state = fe->demodulator_priv;
+        u8 buf[5];
+        u32 freq = fep->frequency / 1000;
+
+        buf[0] = (freq >> 16) & 0xff;
+        buf[1] = (freq >>  8) & 0xff;
+        buf[2] =  freq        & 0xff;
+        buf[3] = 0;
+
+        switch (fep->u.ofdm.bandwidth) {
+                case BANDWIDTH_8_MHZ: buf[4] = 8; break;
+                case BANDWIDTH_7_MHZ: buf[4] = 7; break;
+                case BANDWIDTH_6_MHZ: buf[4] = 6; break;
+                case BANDWIDTH_AUTO: return -EOPNOTSUPP;
+                default:
+                        return -EINVAL;
+        }
+
+        vp7045_usb_op(state->d,LOCK_TUNER_COMMAND,buf,5,NULL,0,200);
+        return 0;
+}
+
+static int vp7045_fe_get_frontend(struct dvb_frontend* fe,
+                                  struct dvb_frontend_parameters *fep)
+{
+        return 0;
+}
+
+static void vp7045_fe_release(struct dvb_frontend* fe)
+{
+        struct vp7045_fe_state *state = fe->demodulator_priv;
+        kfree(state);
+}
+
+static struct dvb_frontend_ops vp7045_fe_ops;
+
+struct dvb_frontend * vp7045_fe_attach(struct dvb_usb_device *d)
+{
+        struct vp7045_fe_state *s = kmalloc(sizeof(struct vp7045_fe_state), GFP_KERNEL);
+        if (s == NULL)
+                goto error;
+        memset(s,0,sizeof(struct vp7045_fe_state));
+
+        s->d = d;
+        s->fe.ops = &vp7045_fe_ops;
+        s->fe.demodulator_priv = s;
+
+        goto success;
+error:
+        return NULL;
+success:
+        return &s->fe;
+}
+
+
+static struct dvb_frontend_ops vp7045_fe_ops = {
+        .info = {
+                .name                   = "Twinhan VP7045/46 USB DVB-T",
+                .type                   = FE_OFDM,
+                .frequency_min          = 44250000,
+                .frequency_max          = 867250000,
+                .frequency_stepsize     = 1000,
+                .caps = FE_CAN_INVERSION_AUTO |
+                                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 |
+                                FE_CAN_RECOVER |
+                                FE_CAN_HIERARCHY_AUTO,
+        },
+
+        .release = vp7045_fe_release,
+
+        .init = vp7045_fe_init,
+        .sleep = vp7045_fe_sleep,
+
+        .set_frontend = vp7045_fe_set_frontend,
+        .get_frontend = vp7045_fe_get_frontend,
+        .get_tune_settings = vp7045_fe_get_tune_settings,
+
+        .read_status = vp7045_fe_read_status,
+        .read_ber = vp7045_fe_read_ber,
+        .read_signal_strength = vp7045_fe_read_signal_strength,
+        .read_snr = vp7045_fe_read_snr,
+        .read_ucblocks = vp7045_fe_read_unc_blocks,
+};
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c
new file mode 100644
index 000000000000..02ecc9a8e3b6
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/vp7045.c
@@ -0,0 +1,263 @@
+/* DVB USB compliant Linux driver for the
+ *  - TwinhanDTV Alpha/MagicBoxII USB2.0 DVB-T receiver
+ *  - DigitalNow TinyUSB2 DVB-t receiver
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ *
+ * Thanks to Twinhan who kindly provided hardware and information.
+ *
+ *      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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "vp7045.h"
+
+/* debug */
+int dvb_usb_vp7045_debug;
+module_param_named(debug,dvb_usb_vp7045_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,rc=4 (or-able))." DVB_USB_DEBUG_STATUS);
+
+int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in, int inlen, int msec)
+{
+        int ret = 0;
+        u8 inbuf[12] = { 0 }, outbuf[20] = { 0 };
+
+        outbuf[0] = cmd;
+
+        if (outlen > 19)
+                outlen = 19;
+
+        if (inlen > 11)
+                inlen = 11;
+
+        if (out != NULL && outlen > 0)
+                memcpy(&outbuf[1], out, outlen);
+
+        deb_xfer("out buffer: ");
+        debug_dump(outbuf,outlen+1,deb_xfer);
+
+        if ((ret = down_interruptible(&d->usb_sem)))
+                return ret;
+
+        if (usb_control_msg(d->udev,
+                        usb_sndctrlpipe(d->udev,0),
+                        TH_COMMAND_OUT, USB_TYPE_VENDOR | USB_DIR_OUT, 0, 0,
+                        outbuf, 20, 2*HZ) != 20) {
+                err("USB control message 'out' went wrong.");
+                ret = -EIO;
+                goto unlock;
+        }
+
+        msleep(msec);
+
+        if (usb_control_msg(d->udev,
+                        usb_rcvctrlpipe(d->udev,0),
+                        TH_COMMAND_IN, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
+                        inbuf, 12, 2*HZ) != 12) {
+                err("USB control message 'in' went wrong.");
+                ret = -EIO;
+                goto unlock;
+        }
+
+        deb_xfer("in buffer: ");
+        debug_dump(inbuf,12,deb_xfer);
+
+        if (in != NULL && inlen > 0)
+                memcpy(in,&inbuf[1],inlen);
+
+unlock:
+        up(&d->usb_sem);
+
+        return ret;
+}
+
+u8 vp7045_read_reg(struct dvb_usb_device *d, u8 reg)
+{
+        u8 obuf[2] = { 0 },v;
+        obuf[1] = reg;
+
+        vp7045_usb_op(d,TUNER_REG_READ,obuf,2,&v,1,30);
+
+        return v;
+}
+
+static int vp7045_power_ctrl(struct dvb_usb_device *d, int onoff)
+{
+        u8 v = onoff;
+        return vp7045_usb_op(d,SET_TUNER_POWER,&v,1,NULL,0,150);
+}
+
+/* remote control stuff */
+
+/* The keymapping struct. Somehow this should be loaded to the driver, but
+ * currently it is hardcoded. */
+static struct dvb_usb_rc_key vp7045_rc_keys[] = {
+        /* insert the keys like this. to make the raw keys visible, enable
+         * debug=0x04 when loading dvb-usb-vp7045. */
+
+        /* these keys are probably wrong. I don't have a working IR-receiver on my
+         * vp7045, so I can't test it.  Patches are welcome. */
+        { 0x00, 0x01, KEY_1 },
+        { 0x00, 0x02, KEY_2 },
+};
+
+static int vp7045_rc_query(struct dvb_usb_device *d, u32 *key_buf, int *state)
+{
+        u8 key;
+        int i;
+        vp7045_usb_op(d,RC_VAL_READ,NULL,0,&key,1,20);
+
+        deb_rc("remote query key: %x %d\n",key,key);
+
+        if (key == 0x44) {
+                *state = REMOTE_NO_KEY_PRESSED;
+                return 0;
+        }
+
+        for (i = 0; i < sizeof(vp7045_rc_keys)/sizeof(struct dvb_usb_rc_key); i++)
+                if (vp7045_rc_keys[i].data == key) {
+                        *state = REMOTE_KEY_PRESSED;
+                        *key_buf = vp7045_rc_keys[i].event;
+                        break;
+                }
+        return 0;
+}
+
+static int vp7045_read_eeprom(struct dvb_usb_device *d,u8 *buf, int len, int offset)
+{
+        int i = 0;
+        u8 v,br[2];
+        for (i=0; i < len; i++) {
+                v = offset + i;
+                vp7045_usb_op(d,GET_EE_VALUE,&v,1,br,2,5);
+                buf[i] = br[1];
+        }
+        deb_info("VP7045 EEPROM read (offs: %d, len: %d) : ",offset, i);
+        debug_dump(buf,i,deb_info);
+        return 0;
+}
+
+
+static int vp7045_read_mac_addr(struct dvb_usb_device *d,u8 mac[6])
+{
+        return vp7045_read_eeprom(d,mac, 6, MAC_0_ADDR);
+}
+
+static int vp7045_frontend_attach(struct dvb_usb_device *d)
+{
+        u8 buf[255] = { 0 };
+
+        vp7045_usb_op(d,VENDOR_STRING_READ,NULL,0,buf,20,0);
+        buf[10] = '\0';
+        deb_info("firmware says: %s ",buf);
+
+        vp7045_usb_op(d,PRODUCT_STRING_READ,NULL,0,buf,20,0);
+        buf[10] = '\0';
+        deb_info("%s ",buf);
+
+        vp7045_usb_op(d,FW_VERSION_READ,NULL,0,buf,20,0);
+        buf[10] = '\0';
+        deb_info("v%s\n",buf);
+
+/*      Dump the EEPROM */
+/*      vp7045_read_eeprom(d,buf, 255, FX2_ID_ADDR); */
+
+        d->fe = vp7045_fe_attach(d);
+
+        return 0;
+}
+
+static struct dvb_usb_properties vp7045_properties;
+
+static int vp7045_usb_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        return dvb_usb_device_init(intf,&vp7045_properties,THIS_MODULE);
+}
+
+static struct usb_device_id vp7045_usb_table [] = {
+            { USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_TWINHAN_VP7045_COLD) },
+            { USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_TWINHAN_VP7045_WARM) },
+            { USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_DNTV_TINYUSB2_COLD) },
+            { USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_DNTV_TINYUSB2_WARM) },
+            { 0 },
+};
+MODULE_DEVICE_TABLE(usb, vp7045_usb_table);
+
+static struct dvb_usb_properties vp7045_properties = {
+        .caps = 0,
+
+        .usb_ctrl = CYPRESS_FX2,
+        .firmware = "dvb-usb-vp7045-01.fw",
+
+        .power_ctrl       = vp7045_power_ctrl,
+        .frontend_attach  = vp7045_frontend_attach,
+        .read_mac_address = vp7045_read_mac_addr,
+
+        .rc_interval      = 400,
+        .rc_key_map       = vp7045_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(vp7045_rc_keys),
+        .rc_query         = vp7045_rc_query,
+
+        /* parameter for the MPEG2-data transfer */
+        .urb = {
+                .type = DVB_USB_BULK,
+                .count = 7,
+                .endpoint = 0x02,
+                .u = {
+                        .bulk = {
+                                .buffersize = 4096,
+                        }
+                }
+        },
+
+        .num_device_descs = 2,
+        .devices = {
+                { .name = "Twinhan USB2.0 DVB-T receiver (TwinhanDTV Alpha/MagicBox II)",
+                  .cold_ids = { &vp7045_usb_table[0], NULL },
+                  .warm_ids = { &vp7045_usb_table[1], NULL },
+                },
+                { .name = "DigitalNow TinyUSB 2 DVB-t Receiver",
+                  .cold_ids = { &vp7045_usb_table[2], NULL },
+                  .warm_ids = { &vp7045_usb_table[3], NULL },
+                },
+                { 0 },
+        }
+};
+
+/* usb specific object needed to register this driver with the usb subsystem */
+static struct usb_driver vp7045_usb_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "dvb-usb-vp7045",
+        .probe          = vp7045_usb_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table       = vp7045_usb_table,
+};
+
+/* module stuff */
+static int __init vp7045_usb_module_init(void)
+{
+        int result;
+        if ((result = usb_register(&vp7045_usb_driver))) {
+                err("usb_register failed. (%d)",result);
+                return result;
+        }
+
+        return 0;
+}
+
+static void __exit vp7045_usb_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&vp7045_usb_driver);
+}
+
+module_init(vp7045_usb_module_init);
+module_exit(vp7045_usb_module_exit);
+
+MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+MODULE_DESCRIPTION("Driver for Twinhan MagicBox/Alpha and DNTV tinyUSB2 DVB-T USB2.0");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/vp7045.h b/drivers/media/dvb/dvb-usb/vp7045.h
new file mode 100644
index 000000000000..9ce21a20fa86
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/vp7045.h
@@ -0,0 +1,78 @@
+/* Common header-file of the Linux driver for the TwinhanDTV Alpha/MagicBoxII
+ * USB2.0 DVB-T receiver.
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ *
+ * Thanks to Twinhan who kindly provided hardware and information.
+ *
+ *      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, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#ifndef _DVB_USB_VP7045_H_
+#define _DVB_USB_VP7045_H_
+
+#define DVB_USB_LOG_PREFIX "vp7045"
+#include "dvb-usb.h"
+
+extern int dvb_usb_vp7045_debug;
+#define deb_info(args...) dprintk(dvb_usb_vp7045_debug,0x01,args)
+#define deb_xfer(args...) dprintk(dvb_usb_vp7045_debug,0x02,args)
+#define deb_rc(args...)   dprintk(dvb_usb_vp7045_debug,0x04,args)
+
+/* vp7045 commands */
+
+/* Twinhan Vendor requests */
+#define TH_COMMAND_IN                     0xC0
+#define TH_COMMAND_OUT                    0xC1
+
+/* command bytes */
+#define TUNER_REG_READ                    0x03
+#define TUNER_REG_WRITE                   0x04
+
+#define RC_VAL_READ                       0x05
+ #define RC_NO_KEY                        0x44
+
+#define SET_TUNER_POWER                   0x06
+#define CHECK_TUNER_POWER                 0x12
+ #define Tuner_Power_ON                   1
+ #define Tuner_Power_OFF                  0
+
+#define GET_USB_SPEED                     0x07
+ #define USB_SPEED_LOW                    0
+ #define USB_SPEED_FULL                   1
+ #define USB_SPEED_HIGH                   2
+
+#define LOCK_TUNER_COMMAND                0x09
+
+#define TUNER_SIGNAL_READ                 0x0A
+
+/* FX2 eeprom */
+#define SET_EE_VALUE                      0x10
+#define GET_EE_VALUE                      0x11
+ #define FX2_ID_ADDR                      0x00
+ #define VID_MSB_ADDR                     0x02
+ #define VID_LSB_ADDR                     0x01
+ #define PID_MSB_ADDR                     0x04
+ #define PID_LSB_ADDR                     0x03
+ #define MAC_0_ADDR                       0x07
+ #define MAC_1_ADDR                       0x08
+ #define MAC_2_ADDR                       0x09
+ #define MAC_3_ADDR                       0x0a
+ #define MAC_4_ADDR                       0x0b
+ #define MAC_5_ADDR                       0x0c
+
+#define RESET_FX2                         0x13
+
+#define FW_VERSION_READ                   0x0B
+#define VENDOR_STRING_READ                0x0C
+#define PRODUCT_STRING_READ               0x0D
+#define FW_BCD_VERSION_READ               0x14
+
+extern struct dvb_frontend * vp7045_fe_attach(struct dvb_usb_device *d);
+extern int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in, int inlen,int msec);
+extern u8 vp7045_read_reg(struct dvb_usb_device *d, u8 reg);
+
+#endif
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 0bfd4df17d08..b4fddf513ebe 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -12,10 +12,10 @@ config DVB_STV0299
 
 config DVB_CX24110
         tristate "Conexant CX24110 based"
-        depends on DVB_CORE
-        help
+        depends on DVB_CORE
+        help
           A DVB-S tuner module. Say Y when you want to support this frontend.
- 
+
 config DVB_TDA8083
         tristate "Philips TDA8083 based"
         depends on DVB_CORE
@@ -127,8 +127,8 @@ comment "DVB-C (cable) frontends"
 config DVB_ATMEL_AT76C651
         tristate "Atmel AT76C651 based"
         depends on DVB_CORE
-        help
-          A DVB-C tuner module. Say Y when you want to support this frontend.
+        help
+          A DVB-C tuner module. Say Y when you want to support this frontend.
 
 config DVB_VES1820
         tristate "VLSI VES1820 based"
@@ -158,10 +158,6 @@ config DVB_NXT2002
         help
           An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
 
-config DVB_OR51132
-        tristate "OR51132 based (pcHDTV)"
-        depends on DVB_CORE
-
 config DVB_OR51211
         tristate "or51211 based (pcHDTV HD2000 card)"
         depends on DVB_CORE
@@ -169,4 +165,20 @@ config DVB_OR51211
         help
           An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
 
+config DVB_OR51132
+        tristate "OR51132 based (pcHDTV HD3000 card)"
+        depends on DVB_CORE
+        select FW_LOADER
+        help
+          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/at76c651.c b/drivers/media/dvb/frontends/at76c651.c
index ce2eaa1640e8..72a2b5455b0b 100644
--- a/drivers/media/dvb/frontends/at76c651.c
+++ b/drivers/media/dvb/frontends/at76c651.c
@@ -259,7 +259,7 @@ static int at76c651_set_parameters(struct dvb_frontend* fe,
                                    struct dvb_frontend_parameters *p)
 {
         int ret;
-        struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
+        struct at76c651_state* state = fe->demodulator_priv;
 
         at76c651_writereg(state, 0x0c, 0xc3);
         state->config->pll_set(fe, p);
@@ -276,7 +276,7 @@ static int at76c651_set_parameters(struct dvb_frontend* fe,
 
 static int at76c651_set_defaults(struct dvb_frontend* fe)
 {
-        struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
+        struct at76c651_state* state = fe->demodulator_priv;
 
         at76c651_set_symbol_rate(state, 6900000);
         at76c651_set_qam(state, QAM_64);
@@ -294,7 +294,7 @@ static int at76c651_set_defaults(struct dvb_frontend* fe)
 
 static int at76c651_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
+        struct at76c651_state* state = fe->demodulator_priv;
         u8 sync;
 
         /*
@@ -319,7 +319,7 @@ static int at76c651_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int at76c651_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
+        struct at76c651_state* state = fe->demodulator_priv;
 
         *ber = (at76c651_readreg(state, 0x81) & 0x0F) << 16;
         *ber |= at76c651_readreg(state, 0x82) << 8;
@@ -331,7 +331,7 @@ static int at76c651_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int at76c651_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
+        struct at76c651_state* state = fe->demodulator_priv;
 
         u8 gain = ~at76c651_readreg(state, 0x91);
         *strength = (gain << 8) | gain;
@@ -341,7 +341,7 @@ static int at76c651_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int at76c651_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
+        struct at76c651_state* state = fe->demodulator_priv;
 
         *snr = 0xFFFF -
             ((at76c651_readreg(state, 0x8F) << 8) |
@@ -352,7 +352,7 @@ static int at76c651_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int at76c651_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
+        struct at76c651_state* state = fe->demodulator_priv;
 
         *ucblocks = at76c651_readreg(state, 0x82);
 
@@ -369,7 +369,7 @@ static int at76c651_get_tune_settings(struct dvb_frontend* fe, struct dvb_fronte
 
 static void at76c651_release(struct dvb_frontend* fe)
 {
-        struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
+        struct at76c651_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -381,7 +381,7 @@ struct dvb_frontend* at76c651_attach(const struct at76c651_config* config,
         struct at76c651_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct at76c651_state*) kmalloc(sizeof(struct at76c651_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct at76c651_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
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
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index a212279042b8..0c2ed4438618 100644
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -232,7 +232,7 @@ static int cx22700_get_tps (struct cx22700_state* state, struct dvb_ofdm_paramet
 
 static int cx22700_init (struct dvb_frontend* fe)
 
-{       struct cx22700_state* state = (struct cx22700_state*) fe->demodulator_priv;
+{       struct cx22700_state* state = fe->demodulator_priv;
         int i;
 
         dprintk("cx22700_init: init chip\n");
@@ -258,7 +258,7 @@ static int cx22700_init (struct dvb_frontend* fe)
 
 static int cx22700_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct cx22700_state* state = (struct cx22700_state*) fe->demodulator_priv;
+        struct cx22700_state* state = fe->demodulator_priv;
 
         u16 rs_ber = (cx22700_readreg (state, 0x0d) << 9)
                    | (cx22700_readreg (state, 0x0e) << 1);
@@ -286,7 +286,7 @@ static int cx22700_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int cx22700_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct cx22700_state* state = (struct cx22700_state*) fe->demodulator_priv;
+        struct cx22700_state* state = fe->demodulator_priv;
 
         *ber = cx22700_readreg (state, 0x0c) & 0x7f;
         cx22700_writereg (state, 0x0c, 0x00);
@@ -296,7 +296,7 @@ static int cx22700_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int cx22700_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)
 {
-        struct cx22700_state* state = (struct cx22700_state*) fe->demodulator_priv;
+        struct cx22700_state* state = fe->demodulator_priv;
 
         u16 rs_ber = (cx22700_readreg (state, 0x0d) << 9)
                    | (cx22700_readreg (state, 0x0e) << 1);
@@ -307,7 +307,7 @@ static int cx22700_read_signal_strength(struct dvb_frontend* fe, u16* signal_str
 
 static int cx22700_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct cx22700_state* state = (struct cx22700_state*) fe->demodulator_priv;
+        struct cx22700_state* state = fe->demodulator_priv;
 
         u16 rs_ber = (cx22700_readreg (state, 0x0d) << 9)
                    | (cx22700_readreg (state, 0x0e) << 1);
@@ -318,7 +318,7 @@ static int cx22700_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int cx22700_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct cx22700_state* state = (struct cx22700_state*) fe->demodulator_priv;
+        struct cx22700_state* state = fe->demodulator_priv;
 
         *ucblocks = cx22700_readreg (state, 0x0f);
         cx22700_writereg (state, 0x0f, 0x00);
@@ -328,7 +328,7 @@ static int cx22700_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int cx22700_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct cx22700_state* state = (struct cx22700_state*) fe->demodulator_priv;
+        struct cx22700_state* state = fe->demodulator_priv;
 
         cx22700_writereg (state, 0x00, 0x02); /* XXX CHECKME: soft reset*/
         cx22700_writereg (state, 0x00, 0x00);
@@ -346,7 +346,7 @@ static int cx22700_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int cx22700_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct cx22700_state* state = (struct cx22700_state*) fe->demodulator_priv;
+        struct cx22700_state* state = fe->demodulator_priv;
         u8 reg09 = cx22700_readreg (state, 0x09);
 
         p->inversion = reg09 & 0x1 ? INVERSION_ON : INVERSION_OFF;
@@ -363,7 +363,7 @@ static int cx22700_get_tune_settings(struct dvb_frontend* fe, struct dvb_fronten
 
 static void cx22700_release(struct dvb_frontend* fe)
 {
-        struct cx22700_state* state = (struct cx22700_state*) fe->demodulator_priv;
+        struct cx22700_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -375,7 +375,7 @@ struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,
         struct cx22700_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct cx22700_state*) kmalloc(sizeof(struct cx22700_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct cx22700_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index 011860ce36cc..f4aa44136c7c 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -200,7 +200,7 @@ static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_paramet
 static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
         u8 val;
-        struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
+        struct cx22702_state* state = fe->demodulator_priv;
 
         /* set PLL */
         cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) &0xfe);
@@ -338,7 +338,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
 static int cx22702_init (struct dvb_frontend* fe)
 {
         int i;
-        struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
+        struct cx22702_state* state = fe->demodulator_priv;
 
         cx22702_writereg (state, 0x00, 0x02);
 
@@ -360,7 +360,7 @@ static int cx22702_init (struct dvb_frontend* fe)
 
 static int cx22702_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
+        struct cx22702_state* state = fe->demodulator_priv;
         u8 reg0A;
         u8 reg23;
 
@@ -389,7 +389,7 @@ static int cx22702_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int cx22702_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
+        struct cx22702_state* state = fe->demodulator_priv;
 
         if(cx22702_readreg (state, 0xE4) & 0x02) {
                 /* Realtime statistics */
@@ -406,7 +406,7 @@ static int cx22702_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int cx22702_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)
 {
-        struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
+        struct cx22702_state* state = fe->demodulator_priv;
 
         *signal_strength = cx22702_readreg (state, 0x23);
 
@@ -415,7 +415,7 @@ static int cx22702_read_signal_strength(struct dvb_frontend* fe, u16* signal_str
 
 static int cx22702_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
+        struct cx22702_state* state = fe->demodulator_priv;
 
         u16 rs_ber=0;
         if(cx22702_readreg (state, 0xE4) & 0x02) {
@@ -434,7 +434,7 @@ static int cx22702_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int cx22702_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
+        struct cx22702_state* state = fe->demodulator_priv;
 
         u8 _ucblocks;
 
@@ -449,7 +449,7 @@ static int cx22702_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int cx22702_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
+        struct cx22702_state* state = fe->demodulator_priv;
 
         u8 reg0C = cx22702_readreg (state, 0x0C);
 
@@ -459,7 +459,7 @@ static int cx22702_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static void cx22702_release(struct dvb_frontend* fe)
 {
-        struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
+        struct cx22702_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -471,7 +471,7 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,
         struct cx22702_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct cx22702_state*) kmalloc(sizeof(struct cx22702_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct cx22702_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index ae16112a0653..8222b88cb486 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -315,7 +315,7 @@ dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate);
 
 int cx24110_pll_write (struct dvb_frontend* fe, u32 data)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
 /* tuner data is 21 bits long, must be left-aligned in data */
 /* tuner cx24108 is written through a dedicated 3wire interface on the demod chip */
@@ -356,7 +356,7 @@ int cx24110_pll_write (struct dvb_frontend* fe, u32 data)
 
 static int cx24110_initfe(struct dvb_frontend* fe)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 /* fixme (low): error handling */
         int i;
 
@@ -373,7 +373,7 @@ static int cx24110_initfe(struct dvb_frontend* fe)
 
 static int cx24110_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         switch (voltage) {
         case SEC_VOLTAGE_13:
@@ -385,8 +385,7 @@ static int cx24110_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
         };
 }
 
-static int cx24110_diseqc_send_burst(struct dvb_frontend* fe,
-                        fe_sec_mini_cmd_t burst)
+static int cx24110_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
 {
         int rv, bit, i;
         struct cx24110_state *state = fe->demodulator_priv;
@@ -413,7 +412,7 @@ static int cx24110_send_diseqc_msg(struct dvb_frontend* fe,
                                    struct dvb_diseqc_master_cmd *cmd)
 {
         int i, rv;
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         for (i = 0; i < cmd->msg_len; i++)
                 cx24110_writereg(state, 0x79 + i, cmd->msg[i]);
@@ -432,7 +431,7 @@ static int cx24110_send_diseqc_msg(struct dvb_frontend* fe,
 
 static int cx24110_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         int sync = cx24110_readreg (state, 0x55);
 
@@ -460,7 +459,7 @@ static int cx24110_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int cx24110_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         /* fixme (maybe): value range is 16 bit. Scale? */
         if(cx24110_readreg(state,0x24)&0x10) {
@@ -478,7 +477,7 @@ static int cx24110_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int cx24110_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
 /* no provision in hardware. Read the frontend AGC accumulator. No idea how to scale this, but I know it is 2s complement */
         u8 signal = cx24110_readreg (state, 0x27)+128;
@@ -489,7 +488,7 @@ static int cx24110_read_signal_strength(struct dvb_frontend* fe, u16* signal_str
 
 static int cx24110_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         /* no provision in hardware. Can be computed from the Es/N0 estimator, but I don't know how. */
         if(cx24110_readreg(state,0x6a)&0x80) {
@@ -505,7 +504,7 @@ static int cx24110_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int cx24110_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
         u32 lastbyer;
 
         if(cx24110_readreg(state,0x10)&0x40) {
@@ -527,7 +526,7 @@ static int cx24110_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         state->config->pll_set(fe, p);
         cx24110_set_inversion (state, p->inversion);
@@ -540,7 +539,7 @@ static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int cx24110_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
         s32 afc; unsigned sclk;
 
 /* cannot read back tuner settings (freq). Need to have some private storage */
@@ -567,14 +566,14 @@ static int cx24110_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int cx24110_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
-        struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state *state = fe->demodulator_priv;
 
         return cx24110_writereg(state,0x76,(cx24110_readreg(state,0x76)&~0x10)|(((tone==SEC_TONE_ON))?0x10:0));
 }
 
 static void cx24110_release(struct dvb_frontend* fe)
 {
-        struct cx24110_state* state = (struct cx24110_state*) fe->demodulator_priv;
+        struct cx24110_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -587,7 +586,7 @@ struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,
         int ret;
 
         /* allocate memory for the internal state */
-        state = (struct cx24110_state*) kmalloc(sizeof(struct cx24110_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct cx24110_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/frontends/dib3000-common.c b/drivers/media/dvb/frontends/dib3000-common.c
index 47ab02e133d1..1a4f1f7c228a 100644
--- a/drivers/media/dvb/frontends/dib3000-common.c
+++ b/drivers/media/dvb/frontends/dib3000-common.c
@@ -73,7 +73,7 @@ u16 dib3000_seq[2][2][2] =     /* fft,gua,   inv   */
         };
 
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de");
-MODULE_DESCRIPTION("Common functions for the dib3000mb/dib3000mc dvb-frontend drivers");
+MODULE_DESCRIPTION("Common functions for the dib3000mb/dib3000mc dvb frontend drivers");
 MODULE_LICENSE("GPL");
 
 EXPORT_SYMBOL(dib3000_seq);
diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
index 80687c130836..2d5475b5c063 100644
--- a/drivers/media/dvb/frontends/dib3000.h
+++ b/drivers/media/dvb/frontends/dib3000.h
@@ -32,9 +32,8 @@ struct dib3000_config
         u8 demod_address;
 
         /* PLL maintenance and the i2c address of the PLL */
-        u8 (*pll_addr)(struct dvb_frontend *fe);
-        int (*pll_init)(struct dvb_frontend *fe, u8 pll_buf[5]);
-        int (*pll_set)(struct dvb_frontend *fe, struct dvb_frontend_parameters* params, u8 pll_buf[5]);
+        int (*pll_init)(struct dvb_frontend *fe);
+        int (*pll_set)(struct dvb_frontend *fe, struct dvb_frontend_parameters* params);
 };
 
 struct dib_fe_xfer_ops
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c
index a853d12a26f1..cd434b7cf9db 100644
--- a/drivers/media/dvb/frontends/dib3000mb.c
+++ b/drivers/media/dvb/frontends/dib3000mb.c
@@ -48,23 +48,19 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-a
 #define deb_setf(args...) dprintk(0x04,args)
 #define deb_getf(args...) dprintk(0x08,args)
 
-static int dib3000mb_tuner_pass_ctrl(struct dvb_frontend *fe, int onoff, u8 pll_addr);
-
 static int dib3000mb_get_frontend(struct dvb_frontend* fe,
                                   struct dvb_frontend_parameters *fep);
 
 static int dib3000mb_set_frontend(struct dvb_frontend* fe,
                                   struct dvb_frontend_parameters *fep, int tuner)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
         struct dvb_ofdm_parameters *ofdm = &fep->u.ofdm;
         fe_code_rate_t fe_cr = FEC_NONE;
         int search_state, seq;
 
-        if (tuner) {
-                dib3000mb_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));
-                state->config.pll_set(fe, fep, NULL);
-                dib3000mb_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));
+        if (tuner && state->config.pll_set) {
+                state->config.pll_set(fe, fep);
 
                 deb_setf("bandwidth: ");
                 switch (ofdm->bandwidth) {
@@ -317,7 +313,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,
 
 static int dib3000mb_fe_init(struct dvb_frontend* fe, int mobile_mode)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
 
         deb_info("dib3000mb is getting up.\n");
         wr(DIB3000MB_REG_POWER_CONTROL, DIB3000MB_POWER_UP);
@@ -389,11 +385,8 @@ static int dib3000mb_fe_init(struct dvb_frontend* fe, int mobile_mode)
 
         wr(DIB3000MB_REG_DATA_IN_DIVERSITY, DIB3000MB_DATA_DIVERSITY_IN_OFF);
 
-        if (state->config.pll_init) {
-                dib3000mb_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));
-                state->config.pll_init(fe,NULL);
-                dib3000mb_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));
-        }
+        if (state->config.pll_init)
+                state->config.pll_init(fe);
 
         return 0;
 }
@@ -401,7 +394,7 @@ static int dib3000mb_fe_init(struct dvb_frontend* fe, int mobile_mode)
 static int dib3000mb_get_frontend(struct dvb_frontend* fe,
                                   struct dvb_frontend_parameters *fep)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
         struct dvb_ofdm_parameters *ofdm = &fep->u.ofdm;
         fe_code_rate_t *cr;
         u16 tps_val;
@@ -562,7 +555,7 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe,
 
 static int dib3000mb_read_status(struct dvb_frontend* fe, fe_status_t *stat)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
 
         *stat = 0;
 
@@ -594,7 +587,7 @@ static int dib3000mb_read_status(struct dvb_frontend* fe, fe_status_t *stat)
 
 static int dib3000mb_read_ber(struct dvb_frontend* fe, u32 *ber)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
 
         *ber = ((rd(DIB3000MB_REG_BER_MSB) << 16) | rd(DIB3000MB_REG_BER_LSB));
         return 0;
@@ -603,7 +596,7 @@ static int dib3000mb_read_ber(struct dvb_frontend* fe, u32 *ber)
 /* see dib3000-watch dvb-apps for exact calcuations of signal_strength and snr */
 static int dib3000mb_read_signal_strength(struct dvb_frontend* fe, u16 *strength)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
 
         *strength = rd(DIB3000MB_REG_SIGNAL_POWER) * 0xffff / 0x170;
         return 0;
@@ -611,7 +604,7 @@ static int dib3000mb_read_signal_strength(struct dvb_frontend* fe, u16 *strength
 
 static int dib3000mb_read_snr(struct dvb_frontend* fe, u16 *snr)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
         short sigpow = rd(DIB3000MB_REG_SIGNAL_POWER);
         int icipow = ((rd(DIB3000MB_REG_NOISE_POWER_MSB) & 0xff) << 16) |
                 rd(DIB3000MB_REG_NOISE_POWER_LSB);
@@ -621,15 +614,15 @@ static int dib3000mb_read_snr(struct dvb_frontend* fe, u16 *snr)
 
 static int dib3000mb_read_unc_blocks(struct dvb_frontend* fe, u32 *unc)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
 
-        *unc = rd(DIB3000MB_REG_UNC);
+        *unc = rd(DIB3000MB_REG_PACKET_ERROR_RATE);
         return 0;
 }
 
 static int dib3000mb_sleep(struct dvb_frontend* fe)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
         deb_info("dib3000mb is going to bed.\n");
         wr(DIB3000MB_REG_POWER_CONTROL, DIB3000MB_POWER_DOWN);
         return 0;
@@ -638,9 +631,6 @@ static int dib3000mb_sleep(struct dvb_frontend* fe)
 static int dib3000mb_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)
 {
         tune->min_delay_ms = 800;
-        tune->step_size = 166667;
-        tune->max_drift = 166667 * 2;
-
         return 0;
 }
 
@@ -656,7 +646,7 @@ static int dib3000mb_set_frontend_and_tuner(struct dvb_frontend* fe, struct dvb_
 
 static void dib3000mb_release(struct dvb_frontend* fe)
 {
-        struct dib3000_state *state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state *state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -671,7 +661,7 @@ static int dib3000mb_pid_control(struct dvb_frontend *fe,int index, int pid,int
 
 static int dib3000mb_fifo_control(struct dvb_frontend *fe, int onoff)
 {
-        struct dib3000_state *state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state *state = fe->demodulator_priv;
 
         deb_xfer("%s fifo\n",onoff ? "enabling" : "disabling");
         if (onoff) {
@@ -692,7 +682,7 @@ static int dib3000mb_pid_parse(struct dvb_frontend *fe, int onoff)
 
 static int dib3000mb_tuner_pass_ctrl(struct dvb_frontend *fe, int onoff, u8 pll_addr)
 {
-        struct dib3000_state *state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state *state = fe->demodulator_priv;
         if (onoff) {
                 wr(DIB3000MB_REG_TUNER, DIB3000_TUNER_WRITE_ENABLE(pll_addr));
         } else {
@@ -709,7 +699,7 @@ struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
         struct dib3000_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct dib3000_state*) kmalloc(sizeof(struct dib3000_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct dib3000_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
         memset(state,0,sizeof(struct dib3000_state));
diff --git a/drivers/media/dvb/frontends/dib3000mb_priv.h b/drivers/media/dvb/frontends/dib3000mb_priv.h
index 57e61aa5b07b..999b19047816 100644
--- a/drivers/media/dvb/frontends/dib3000mb_priv.h
+++ b/drivers/media/dvb/frontends/dib3000mb_priv.h
@@ -294,7 +294,7 @@ static u16 dib3000mb_reg_filter_coeffs[] = {
 
 static u16 dib3000mb_filter_coeffs[] = {
          226,  160,   29,
-         979,  998,   19,
+         979,  998,   19,
           22, 1019, 1006,
         1022,   12,    6,
         1017, 1017,    3,
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index 4a31c05eaecd..cd33705a4320 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -48,8 +48,6 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe,16=s
 #define deb_getf(args...) dprintk(0x08,args)
 #define deb_stat(args...) dprintk(0x10,args)
 
-static int dib3000mc_tuner_pass_ctrl(struct dvb_frontend *fe, int onoff, u8 pll_addr);
-
 static int dib3000mc_set_impulse_noise(struct dib3000_state * state, int mode,
         fe_transmit_mode_t transmission_mode, fe_bandwidth_t bandwidth)
 {
@@ -297,7 +295,7 @@ static int dib3000mc_set_general_cfg(struct dib3000_state *state, struct dvb_fro
 static int dib3000mc_get_frontend(struct dvb_frontend* fe,
                                   struct dvb_frontend_parameters *fep)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
         struct dvb_ofdm_parameters *ofdm = &fep->u.ofdm;
         fe_code_rate_t *cr;
         u16 tps_val,cr_val;
@@ -458,15 +456,13 @@ static int dib3000mc_get_frontend(struct dvb_frontend* fe,
 static int dib3000mc_set_frontend(struct dvb_frontend* fe,
                                   struct dvb_frontend_parameters *fep, int tuner)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
         struct dvb_ofdm_parameters *ofdm = &fep->u.ofdm;
         int search_state,auto_val;
         u16 val;
 
-        if (tuner) { /* initial call from dvb */
-                dib3000mc_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));
-                state->config.pll_set(fe,fep,NULL);
-                dib3000mc_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));
+        if (tuner && state->config.pll_set) { /* initial call from dvb */
+                state->config.pll_set(fe,fep);
 
                 state->last_tuned_freq = fep->frequency;
         //      if (!scanboost) {
@@ -554,19 +550,15 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe,
                         dib3000mc_set_adp_cfg(state,ofdm->constellation);
                 wr_foreach(dib3000mc_reg_offset,
                                 dib3000mc_offset[(ofdm->transmission_mode == TRANSMISSION_MODE_8K)+1]);
-
-
         }
         return 0;
 }
 
 static int dib3000mc_fe_init(struct dvb_frontend* fe, int mobile_mode)
 {
-        struct dib3000_state *state;
-
+        struct dib3000_state *state = fe->demodulator_priv;
         deb_info("init start\n");
 
-        state = fe->demodulator_priv;
         state->timing_offset = 0;
         state->timing_offset_comp_done = 0;
 
@@ -649,17 +641,15 @@ static int dib3000mc_fe_init(struct dvb_frontend* fe, int mobile_mode)
 
         set_or(DIB3000MC_REG_CLK_CFG_7,DIB3000MC_CLK_CFG_7_DIV_IN_OFF);
 
-/*      if (state->config->pll_init) {
-                dib3000mc_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));
-                state->config->pll_init(fe,NULL);
-                dib3000mc_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));
-        }*/
+        if (state->config.pll_init)
+                state->config.pll_init(fe);
+
         deb_info("init end\n");
         return 0;
 }
 static int dib3000mc_read_status(struct dvb_frontend* fe, fe_status_t *stat)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
         u16 lock = rd(DIB3000MC_REG_LOCKING);
 
         *stat = 0;
@@ -679,23 +669,23 @@ static int dib3000mc_read_status(struct dvb_frontend* fe, fe_status_t *stat)
 
 static int dib3000mc_read_ber(struct dvb_frontend* fe, u32 *ber)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
         *ber = ((rd(DIB3000MC_REG_BER_MSB) << 16) | rd(DIB3000MC_REG_BER_LSB));
         return 0;
 }
 
 static int dib3000mc_read_unc_blocks(struct dvb_frontend* fe, u32 *unc)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
 
-        *unc = rd(DIB3000MC_REG_PACKET_ERROR_COUNT);
+        *unc = rd(DIB3000MC_REG_PACKET_ERRORS);
         return 0;
 }
 
 /* see dib3000mb.c for calculation comments */
 static int dib3000mc_read_signal_strength(struct dvb_frontend* fe, u16 *strength)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
         u16 val = rd(DIB3000MC_REG_SIGNAL_NOISE_LSB);
         *strength = (((val >> 6) & 0xff) << 8) + (val & 0x3f);
 
@@ -706,7 +696,7 @@ static int dib3000mc_read_signal_strength(struct dvb_frontend* fe, u16 *strength
 /* see dib3000mb.c for calculation comments */
 static int dib3000mc_read_snr(struct dvb_frontend* fe, u16 *snr)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
         u16 val = rd(DIB3000MC_REG_SIGNAL_NOISE_LSB),
                 val2 = rd(DIB3000MC_REG_SIGNAL_NOISE_MSB);
         u16 sig,noise;
@@ -726,7 +716,7 @@ static int dib3000mc_read_snr(struct dvb_frontend* fe, u16 *snr)
 
 static int dib3000mc_sleep(struct dvb_frontend* fe)
 {
-        struct dib3000_state* state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state* state = fe->demodulator_priv;
 
         set_or(DIB3000MC_REG_CLK_CFG_7,DIB3000MC_CLK_CFG_7_PWR_DOWN);
         wr(DIB3000MC_REG_CLK_CFG_1,DIB3000MC_CLK_CFG_1_POWER_DOWN);
@@ -737,10 +727,7 @@ static int dib3000mc_sleep(struct dvb_frontend* fe)
 
 static int dib3000mc_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)
 {
-        tune->min_delay_ms = 2000;
-        tune->step_size = 166667;
-        tune->max_drift = 166667 * 2;
-
+        tune->min_delay_ms = 1000;
         return 0;
 }
 
@@ -756,7 +743,7 @@ static int dib3000mc_set_frontend_and_tuner(struct dvb_frontend* fe, struct dvb_
 
 static void dib3000mc_release(struct dvb_frontend* fe)
 {
-        struct dib3000_state *state = (struct dib3000_state *) fe->demodulator_priv;
+        struct dib3000_state *state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -771,7 +758,7 @@ static int dib3000mc_pid_control(struct dvb_frontend *fe,int index, int pid,int
 
 static int dib3000mc_fifo_control(struct dvb_frontend *fe, int onoff)
 {
-        struct dib3000_state *state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state *state = fe->demodulator_priv;
         u16 tmp = rd(DIB3000MC_REG_SMO_MODE);
 
         deb_xfer("%s fifo\n",onoff ? "enabling" : "disabling");
@@ -803,7 +790,7 @@ static int dib3000mc_pid_parse(struct dvb_frontend *fe, int onoff)
 
 static int dib3000mc_tuner_pass_ctrl(struct dvb_frontend *fe, int onoff, u8 pll_addr)
 {
-        struct dib3000_state *state = (struct dib3000_state*) fe->demodulator_priv;
+        struct dib3000_state *state = fe->demodulator_priv;
         if (onoff) {
                 wr(DIB3000MC_REG_TUNER, DIB3000_TUNER_WRITE_ENABLE(pll_addr));
         } else {
@@ -844,7 +831,7 @@ struct dvb_frontend* dib3000mc_attach(const struct dib3000_config* config,
         u16 devid;
 
         /* allocate memory for the internal state */
-        state = (struct dib3000_state*) kmalloc(sizeof(struct dib3000_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct dib3000_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
         memset(state,0,sizeof(struct dib3000_state));
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index 2a3c2ce7b2aa..f73b5f48e235 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -1,6 +1,4 @@
 /*
- * $Id: dvb-pll.c,v 1.7 2005/02/10 11:52:02 kraxel Exp $
- *
  * descriptions + helper functions for simple dvb plls.
  *
  * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
@@ -114,6 +112,92 @@ struct dvb_pll_desc dvb_pll_unknown_1 = {
 };
 EXPORT_SYMBOL(dvb_pll_unknown_1);
 
+/* Infineon TUA6010XS
+ * used in Thomson Cable Tuner
+ */
+struct dvb_pll_desc dvb_pll_tua6010xs = {
+        .name  = "Infineon TUA6010XS",
+        .min   =  44250000,
+        .max   = 858000000,
+        .count = 3,
+        .entries = {
+                {  115750000, 36125000, 62500, 0x8e, 0x03 },
+                {  403250000, 36125000, 62500, 0x8e, 0x06 },
+                {  999999999, 36125000, 62500, 0x8e, 0x85 },
+        },
+};
+EXPORT_SYMBOL(dvb_pll_tua6010xs);
+
+/* Panasonic env57h1xd5 (some Philips PLL ?) */
+struct dvb_pll_desc dvb_pll_env57h1xd5 = {
+        .name  = "Panasonic ENV57H1XD5",
+        .min   =  44250000,
+        .max   = 858000000,
+        .count = 4,
+        .entries = {
+                {  153000000, 36291666, 166666, 0xc2, 0x41 },
+                {  470000000, 36291666, 166666, 0xc2, 0x42 },
+                {  526000000, 36291666, 166666, 0xc2, 0x84 },
+                {  999999999, 36291666, 166666, 0xc2, 0xa4 },
+        },
+};
+EXPORT_SYMBOL(dvb_pll_env57h1xd5);
+
+/* Philips TDA6650/TDA6651
+ * used in Panasonic ENV77H11D5
+ */
+static void tda665x_bw(u8 *buf, int bandwidth)
+{
+        if (bandwidth == BANDWIDTH_8_MHZ)
+                buf[3] |= 0x08;
+}
+
+struct dvb_pll_desc dvb_pll_tda665x = {
+        .name  = "Philips TDA6650/TDA6651",
+        .min   =  44250000,
+        .max   = 858000000,
+        .setbw = tda665x_bw,
+        .count = 12,
+        .entries = {
+                {   93834000, 36249333, 166667, 0xca, 0x61 /* 011 0 0 0  01 */ },
+                {  123834000, 36249333, 166667, 0xca, 0xa1 /* 101 0 0 0  01 */ },
+                {  161000000, 36249333, 166667, 0xca, 0xa1 /* 101 0 0 0  01 */ },
+                {  163834000, 36249333, 166667, 0xca, 0xc2 /* 110 0 0 0  10 */ },
+                {  253834000, 36249333, 166667, 0xca, 0x62 /* 011 0 0 0  10 */ },
+                {  383834000, 36249333, 166667, 0xca, 0xa2 /* 101 0 0 0  10 */ },
+                {  443834000, 36249333, 166667, 0xca, 0xc2 /* 110 0 0 0  10 */ },
+                {  444000000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0  11 */ },
+                {  583834000, 36249333, 166667, 0xca, 0x63 /* 011 0 0 0  11 */ },
+                {  793834000, 36249333, 166667, 0xca, 0xa3 /* 101 0 0 0  11 */ },
+                {  444834000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0  11 */ },
+                {  861000000, 36249333, 166667, 0xca, 0xe3 /* 111 0 0 0  11 */ },
+        }
+};
+EXPORT_SYMBOL(dvb_pll_tda665x);
+
+/* Infineon TUA6034
+ * used in LG TDTP E102P
+ */
+static void tua6034_bw(u8 *buf, int bandwidth)
+{
+        if (BANDWIDTH_7_MHZ != bandwidth)
+                buf[3] |= 0x08;
+}
+
+struct dvb_pll_desc dvb_pll_tua6034 = {
+        .name  = "Infineon TUA6034",
+        .min   =  44250000,
+        .max   = 858000000,
+        .count = 3,
+        .setbw = tua6034_bw,
+        .entries = {
+                {  174500000, 36166667, 62500, 0xce, 0x01 },
+                {  230000000, 36166667, 62500, 0xce, 0x02 },
+                {  999999999, 36166667, 62500, 0xce, 0x04 },
+        },
+};
+EXPORT_SYMBOL(dvb_pll_tua6034);
+
 /* ----------------------------------------------------------- */
 /* code                                                        */
 
@@ -160,9 +244,3 @@ EXPORT_SYMBOL(dvb_pll_configure);
 MODULE_DESCRIPTION("dvb pll library");
 MODULE_AUTHOR("Gerd Knorr");
 MODULE_LICENSE("GPL");
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h
index 016c794a5677..b796778624b6 100644
--- a/drivers/media/dvb/frontends/dvb-pll.h
+++ b/drivers/media/dvb/frontends/dvb-pll.h
@@ -1,7 +1,10 @@
 /*
- * $Id: dvb-pll.h,v 1.2 2005/02/10 11:43:41 kraxel Exp $
+ * descriptions + helper functions for simple dvb plls.
  */
 
+#ifndef __DVB_PLL_H__
+#define __DVB_PLL_H__
+
 struct dvb_pll_desc {
         char *name;
         u32  min;
@@ -14,7 +17,7 @@ struct dvb_pll_desc {
                 u32 stepsize;
                 u8  cb1;
                 u8  cb2;
-        } entries[9];
+        } entries[12];
 };
 
 extern struct dvb_pll_desc dvb_pll_thomson_dtt7579;
@@ -23,12 +26,12 @@ extern struct dvb_pll_desc dvb_pll_thomson_dtt7610;
 extern struct dvb_pll_desc dvb_pll_lg_z201;
 extern struct dvb_pll_desc dvb_pll_unknown_1;
 
+extern struct dvb_pll_desc dvb_pll_tua6010xs;
+extern struct dvb_pll_desc dvb_pll_env57h1xd5;
+extern struct dvb_pll_desc dvb_pll_tua6034;
+extern struct dvb_pll_desc dvb_pll_tda665x;
+
 int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
                       u32 freq, int bandwidth);
 
-/*
- * Local variables:
- * c-basic-offset: 8
- * compile-command: "make DVB=1"
- * End:
- */
+#endif
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c
index c05a9b05600c..cff93b9d8ab2 100644
--- a/drivers/media/dvb/frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c
@@ -100,7 +100,7 @@ static int dvb_dummy_fe_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t vo
 
 static void dvb_dummy_fe_release(struct dvb_frontend* fe)
 {
-        struct dvb_dummy_fe_state* state = (struct dvb_dummy_fe_state*) fe->demodulator_priv;
+        struct dvb_dummy_fe_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -111,7 +111,7 @@ struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void)
         struct dvb_dummy_fe_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct dvb_dummy_fe_state*) kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
@@ -134,7 +134,7 @@ struct dvb_frontend* dvb_dummy_fe_qpsk_attach()
         struct dvb_dummy_fe_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct dvb_dummy_fe_state*) kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
@@ -157,7 +157,7 @@ struct dvb_frontend* dvb_dummy_fe_qam_attach()
         struct dvb_dummy_fe_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct dvb_dummy_fe_state*) kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c
index 9ac95de9834d..031a1ddc7d11 100644
--- a/drivers/media/dvb/frontends/l64781.c
+++ b/drivers/media/dvb/frontends/l64781.c
@@ -121,7 +121,7 @@ static int reset_and_configure (struct l64781_state* state)
 
 static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_parameters *param)
 {
-        struct l64781_state* state = (struct l64781_state*) fe->demodulator_priv;
+        struct l64781_state* state = fe->demodulator_priv;
         /* The coderates for FEC_NONE, FEC_4_5 and FEC_FEC_6_7 are arbitrary */
         static const u8 fec_tab[] = { 7, 0, 1, 2, 9, 3, 10, 4 };
         /* QPSK, QAM_16, QAM_64 */
@@ -234,7 +234,7 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa
 
 static int get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters* param)
 {
-        struct l64781_state* state = (struct l64781_state*) fe->demodulator_priv;
+        struct l64781_state* state = fe->demodulator_priv;
         int tmp;
 
 
@@ -352,7 +352,7 @@ static int get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters*
 
 static int l64781_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct l64781_state* state = (struct l64781_state*) fe->demodulator_priv;
+        struct l64781_state* state = fe->demodulator_priv;
         int sync = l64781_readreg (state, 0x32);
         int gain = l64781_readreg (state, 0x0e);
 
@@ -381,7 +381,7 @@ static int l64781_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int l64781_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct l64781_state* state = (struct l64781_state*) fe->demodulator_priv;
+        struct l64781_state* state = fe->demodulator_priv;
 
         /*   XXX FIXME: set up counting period (reg 0x26...0x28)
          */
@@ -393,7 +393,7 @@ static int l64781_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int l64781_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)
 {
-        struct l64781_state* state = (struct l64781_state*) fe->demodulator_priv;
+        struct l64781_state* state = fe->demodulator_priv;
 
         u8 gain = l64781_readreg (state, 0x0e);
         *signal_strength = (gain << 8) | gain;
@@ -403,7 +403,7 @@ static int l64781_read_signal_strength(struct dvb_frontend* fe, u16* signal_stre
 
 static int l64781_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct l64781_state* state = (struct l64781_state*) fe->demodulator_priv;
+        struct l64781_state* state = fe->demodulator_priv;
 
         u8 avg_quality = 0xff - l64781_readreg (state, 0x33);
         *snr = (avg_quality << 8) | avg_quality; /* not exact, but...*/
@@ -413,7 +413,7 @@ static int l64781_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int l64781_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct l64781_state* state = (struct l64781_state*) fe->demodulator_priv;
+        struct l64781_state* state = fe->demodulator_priv;
 
         *ucblocks = l64781_readreg (state, 0x37)
            | (l64781_readreg (state, 0x38) << 8);
@@ -423,7 +423,7 @@ static int l64781_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int l64781_sleep(struct dvb_frontend* fe)
 {
-        struct l64781_state* state = (struct l64781_state*) fe->demodulator_priv;
+        struct l64781_state* state = fe->demodulator_priv;
 
         /* Power down */
         return l64781_writereg (state, 0x3e, 0x5a);
@@ -431,7 +431,7 @@ static int l64781_sleep(struct dvb_frontend* fe)
 
 static int l64781_init(struct dvb_frontend* fe)
 {
-        struct l64781_state* state = (struct l64781_state*) fe->demodulator_priv;
+        struct l64781_state* state = fe->demodulator_priv;
 
         reset_and_configure (state);
 
@@ -484,7 +484,7 @@ static int l64781_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend
 
 static void l64781_release(struct dvb_frontend* fe)
 {
-        struct l64781_state* state = (struct l64781_state*) fe->demodulator_priv;
+        struct l64781_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -501,7 +501,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
                            { .addr = config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
 
         /* allocate memory for the internal state */
-        state = (struct l64781_state*) kmalloc(sizeof(struct l64781_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct l64781_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 176a22e3441b..e455aecd76b2 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -226,7 +226,7 @@ static int mt312_get_code_rate(struct mt312_state* state, fe_code_rate_t *cr)
 
 static int mt312_initfe(struct dvb_frontend* fe)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         int ret;
         u8 buf[2];
 
@@ -287,7 +287,7 @@ static int mt312_initfe(struct dvb_frontend* fe)
 static int mt312_send_master_cmd(struct dvb_frontend* fe,
                                  struct dvb_diseqc_master_cmd *c)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         int ret;
         u8 diseqc_mode;
 
@@ -318,7 +318,7 @@ static int mt312_send_master_cmd(struct dvb_frontend* fe,
 
 static int mt312_send_burst(struct dvb_frontend* fe, const fe_sec_mini_cmd_t c)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         const u8 mini_tab[2] = { 0x02, 0x03 };
 
         int ret;
@@ -340,7 +340,7 @@ static int mt312_send_burst(struct dvb_frontend* fe, const fe_sec_mini_cmd_t c)
 
 static int mt312_set_tone(struct dvb_frontend* fe, const fe_sec_tone_mode_t t)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         const u8 tone_tab[2] = { 0x01, 0x00 };
 
         int ret;
@@ -362,7 +362,7 @@ static int mt312_set_tone(struct dvb_frontend* fe, const fe_sec_tone_mode_t t)
 
 static int mt312_set_voltage(struct dvb_frontend* fe, const fe_sec_voltage_t v)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         const u8 volt_tab[3] = { 0x00, 0x40, 0x00 };
 
         if (v > SEC_VOLTAGE_OFF)
@@ -373,7 +373,7 @@ static int mt312_set_voltage(struct dvb_frontend* fe, const fe_sec_voltage_t v)
 
 static int mt312_read_status(struct dvb_frontend* fe, fe_status_t *s)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         int ret;
         u8 status[3];
 
@@ -400,7 +400,7 @@ static int mt312_read_status(struct dvb_frontend* fe, fe_status_t *s)
 
 static int mt312_read_ber(struct dvb_frontend* fe, u32 *ber)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         int ret;
         u8 buf[3];
 
@@ -414,7 +414,7 @@ static int mt312_read_ber(struct dvb_frontend* fe, u32 *ber)
 
 static int mt312_read_signal_strength(struct dvb_frontend* fe, u16 *signal_strength)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         int ret;
         u8 buf[3];
         u16 agc;
@@ -435,7 +435,7 @@ static int mt312_read_signal_strength(struct dvb_frontend* fe, u16 *signal_stren
 
 static int mt312_read_snr(struct dvb_frontend* fe, u16 *snr)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         int ret;
         u8 buf[2];
 
@@ -449,7 +449,7 @@ static int mt312_read_snr(struct dvb_frontend* fe, u16 *snr)
 
 static int mt312_read_ucblocks(struct dvb_frontend* fe, u32 *ubc)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         int ret;
         u8 buf[2];
 
@@ -464,7 +464,7 @@ static int mt312_read_ucblocks(struct dvb_frontend* fe, u32 *ubc)
 static int mt312_set_frontend(struct dvb_frontend* fe,
                               struct dvb_frontend_parameters *p)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         int ret;
         u8 buf[5], config_val;
         u16 sr;
@@ -560,7 +560,7 @@ static int mt312_set_frontend(struct dvb_frontend* fe,
 static int mt312_get_frontend(struct dvb_frontend* fe,
                               struct dvb_frontend_parameters *p)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         int ret;
 
         if ((ret = mt312_get_inversion(state, &p->inversion)) < 0)
@@ -577,7 +577,7 @@ static int mt312_get_frontend(struct dvb_frontend* fe,
 
 static int mt312_sleep(struct dvb_frontend* fe)
 {
-        struct mt312_state *state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state *state = fe->demodulator_priv;
         int ret;
         u8 config;
 
@@ -605,7 +605,7 @@ static int mt312_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_
 
 static void mt312_release(struct dvb_frontend* fe)
 {
-        struct mt312_state* state = (struct mt312_state*) fe->demodulator_priv;
+        struct mt312_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -617,7 +617,7 @@ struct dvb_frontend* vp310_attach(const struct mt312_config* config,
         struct mt312_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct mt312_state*) kmalloc(sizeof(struct mt312_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
 
@@ -651,7 +651,7 @@ struct dvb_frontend* mt312_attach(const struct mt312_config* config,
         struct mt312_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct mt312_state*) kmalloc(sizeof(struct mt312_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
 
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c
index 50326c7248fa..d32dc4de9e7f 100644
--- a/drivers/media/dvb/frontends/mt352.c
+++ b/drivers/media/dvb/frontends/mt352.c
@@ -46,7 +46,7 @@ struct mt352_state {
         struct dvb_frontend_ops ops;
 
         /* configuration settings */
-        const struct mt352_config* config;
+        struct mt352_config config;
 };
 
 static int debug;
@@ -59,7 +59,7 @@ static int mt352_single_write(struct dvb_frontend *fe, u8 reg, u8 val)
 {
         struct mt352_state* state = fe->demodulator_priv;
         u8 buf[2] = { reg, val };
-        struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0,
+        struct i2c_msg msg = { .addr = state->config.demod_address, .flags = 0,
                                .buf = buf, .len = 2 };
         int err = i2c_transfer(state->i2c, &msg, 1);
         if (err != 1) {
@@ -84,10 +84,10 @@ static int mt352_read_register(struct mt352_state* state, u8 reg)
         int ret;
         u8 b0 [] = { reg };
         u8 b1 [] = { 0 };
-        struct i2c_msg msg [] = { { .addr = state->config->demod_address,
+        struct i2c_msg msg [] = { { .addr = state->config.demod_address,
                                     .flags = 0,
                                     .buf = b0, .len = 1 },
-                                  { .addr = state->config->demod_address,
+                                  { .addr = state->config.demod_address,
                                     .flags = I2C_M_RD,
                                     .buf = b1, .len = 1 } };
 
@@ -102,11 +102,6 @@ static int mt352_read_register(struct mt352_state* state, u8 reg)
         return b1[0];
 }
 
-int mt352_read(struct dvb_frontend *fe, u8 reg)
-{
-        return mt352_read_register(fe->demodulator_priv,reg);
-}
-
 static int mt352_sleep(struct dvb_frontend* fe)
 {
         static u8 mt352_softdown[] = { CLOCK_CTL, 0x20, 0x08 };
@@ -134,8 +129,8 @@ static void mt352_calc_nominal_rate(struct mt352_state* state,
                 bw = 8;
                 break;
         }
-        if (state->config->adc_clock)
-                adc_clock = state->config->adc_clock;
+        if (state->config.adc_clock)
+                adc_clock = state->config.adc_clock;
 
         value = 64 * bw * (1<<16) / (7 * 8);
         value = value * 1000 / adc_clock;
@@ -152,10 +147,10 @@ static void mt352_calc_input_freq(struct mt352_state* state,
         int if2       = 36167; /* 36.166667 MHz */
         int ife,value;
 
-        if (state->config->adc_clock)
-                adc_clock = state->config->adc_clock;
-        if (state->config->if2)
-                if2 = state->config->if2;
+        if (state->config.adc_clock)
+                adc_clock = state->config.adc_clock;
+        if (state->config.if2)
+                if2 = state->config.if2;
 
         ife = (2*adc_clock - if2);
         value = -16374 * ife / adc_clock;
@@ -289,10 +284,10 @@ static int mt352_set_parameters(struct dvb_frontend* fe,
 
         mt352_calc_nominal_rate(state, op->bandwidth, buf+4);
         mt352_calc_input_freq(state, buf+6);
-        state->config->pll_set(fe, param, buf+8);
+        state->config.pll_set(fe, param, buf+8);
 
         mt352_write(fe, buf, sizeof(buf));
-        if (state->config->no_tuner) {
+        if (state->config.no_tuner) {
                 /* start decoding */
                 mt352_write(fe, fsm_go, 2);
         } else {
@@ -516,7 +511,7 @@ static int mt352_init(struct dvb_frontend* fe)
 
                 /* Do a "hard" reset */
                 mt352_write(fe, mt352_reset_attach, sizeof(mt352_reset_attach));
-                return state->config->demod_init(fe);
+                return state->config.demod_init(fe);
         }
 
         return 0;
@@ -541,8 +536,8 @@ struct dvb_frontend* mt352_attach(const struct mt352_config* config,
         memset(state,0,sizeof(*state));
 
         /* setup the state */
-        state->config = config;
         state->i2c = i2c;
+        memcpy(&state->config,config,sizeof(struct mt352_config));
         memcpy(&state->ops, &mt352_ops, sizeof(struct dvb_frontend_ops));
 
         /* check if the demod is there */
@@ -601,10 +596,3 @@ MODULE_LICENSE("GPL");
 
 EXPORT_SYMBOL(mt352_attach);
 EXPORT_SYMBOL(mt352_write);
-EXPORT_SYMBOL(mt352_read);
-/*
- * Local variables:
- * c-basic-offset: 8
- * compile-command: "make DVB=1"
- * End:
- */
diff --git a/drivers/media/dvb/frontends/mt352.h b/drivers/media/dvb/frontends/mt352.h
index f5d8a5aed8a9..03040cd595bb 100644
--- a/drivers/media/dvb/frontends/mt352.h
+++ b/drivers/media/dvb/frontends/mt352.h
@@ -61,12 +61,5 @@ extern struct dvb_frontend* mt352_attach(const struct mt352_config* config,
                                          struct i2c_adapter* i2c);
 
 extern int mt352_write(struct dvb_frontend* fe, u8* ibuf, int ilen);
-extern int mt352_read(struct dvb_frontend *fe, u8 reg);
 
 #endif // MT352_H
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
diff --git a/drivers/media/dvb/frontends/nxt2002.c b/drivers/media/dvb/frontends/nxt2002.c
index 4743aa17406e..35a1d60f1927 100644
--- a/drivers/media/dvb/frontends/nxt2002.c
+++ b/drivers/media/dvb/frontends/nxt2002.c
@@ -241,7 +241,7 @@ static void nxt2002_agc_reset(struct nxt2002_state* state)
 static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware *fw)
 {
 
-        struct nxt2002_state* state = (struct nxt2002_state*) fe->demodulator_priv;
+        struct nxt2002_state* state = fe->demodulator_priv;
         u8 buf[256],written = 0,chunkpos = 0;
         u16 rambase,position,crc = 0;
 
@@ -309,7 +309,7 @@ static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware
 static int nxt2002_setup_frontend_parameters (struct dvb_frontend* fe,
                                              struct dvb_frontend_parameters *p)
 {
-        struct nxt2002_state* state = (struct nxt2002_state*) fe->demodulator_priv;
+        struct nxt2002_state* state = fe->demodulator_priv;
         u32 freq = 0;
         u16 tunerfreq = 0;
         u8 buf[4];
@@ -343,8 +343,6 @@ static int nxt2002_setup_frontend_parameters (struct dvb_frontend* fe,
         /* reset the agc now that tuning has been completed */
         nxt2002_agc_reset(state);
 
-
-
         /* set target power level */
         switch (p->u.vsb.modulation) {
                 case QAM_64:
@@ -453,7 +451,7 @@ static int nxt2002_setup_frontend_parameters (struct dvb_frontend* fe,
 
 static int nxt2002_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct nxt2002_state* state = (struct nxt2002_state*) fe->demodulator_priv;
+        struct nxt2002_state* state = fe->demodulator_priv;
         u8 lock;
         i2c_readbytes(state,0x31,&lock,1);
 
@@ -470,7 +468,7 @@ static int nxt2002_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int nxt2002_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct nxt2002_state* state = (struct nxt2002_state*) fe->demodulator_priv;
+        struct nxt2002_state* state = fe->demodulator_priv;
         u8 b[3];
 
         nxt2002_readreg_multibyte(state,0xE6,b,3);
@@ -482,7 +480,7 @@ static int nxt2002_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int nxt2002_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct nxt2002_state* state = (struct nxt2002_state*) fe->demodulator_priv;
+        struct nxt2002_state* state = fe->demodulator_priv;
         u8 b[2];
         u16 temp = 0;
 
@@ -502,7 +500,7 @@ static int nxt2002_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 static int nxt2002_read_snr(struct dvb_frontend* fe, u16* snr)
 {
 
-        struct nxt2002_state* state = (struct nxt2002_state*) fe->demodulator_priv;
+        struct nxt2002_state* state = fe->demodulator_priv;
         u8 b[2];
         u16 temp = 0, temp2;
         u32 snrdb = 0;
@@ -536,7 +534,7 @@ static int nxt2002_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int nxt2002_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct nxt2002_state* state = (struct nxt2002_state*) fe->demodulator_priv;
+        struct nxt2002_state* state = fe->demodulator_priv;
         u8 b[3];
 
         nxt2002_readreg_multibyte(state,0xE6,b,3);
@@ -552,7 +550,7 @@ static int nxt2002_sleep(struct dvb_frontend* fe)
 
 static int nxt2002_init(struct dvb_frontend* fe)
 {
-        struct nxt2002_state* state = (struct nxt2002_state*) fe->demodulator_priv;
+        struct nxt2002_state* state = fe->demodulator_priv;
         const struct firmware *fw;
         int ret;
         u8 buf[2];
@@ -624,7 +622,7 @@ static int nxt2002_get_tune_settings(struct dvb_frontend* fe, struct dvb_fronten
 
 static void nxt2002_release(struct dvb_frontend* fe)
 {
-        struct nxt2002_state* state = (struct nxt2002_state*) fe->demodulator_priv;
+        struct nxt2002_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -637,7 +635,7 @@ struct dvb_frontend* nxt2002_attach(const struct nxt2002_config* config,
         u8 buf [] = {0,0,0,0,0};
 
         /* allocate memory for the internal state */
-        state = (struct nxt2002_state*) kmalloc(sizeof(struct nxt2002_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct nxt2002_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c
index a41f7da8b842..966de9853d18 100644
--- a/drivers/media/dvb/frontends/nxt6000.c
+++ b/drivers/media/dvb/frontends/nxt6000.c
@@ -176,11 +176,16 @@ static int nxt6000_set_transmission_mode(struct nxt6000_state* state, fe_transmi
 
 static void nxt6000_setup(struct dvb_frontend* fe)
 {
-        struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv;
+        struct nxt6000_state* state = fe->demodulator_priv;
 
         nxt6000_writereg(state, RS_COR_SYNC_PARAM, SYNC_PARAM);
         nxt6000_writereg(state, BER_CTRL, /*(1 << 2) | */ (0x01 << 1) | 0x01);
-        nxt6000_writereg(state, VIT_COR_CTL, VIT_COR_RESYNC);
+        nxt6000_writereg(state, VIT_BERTIME_2, 0x00);  // BER Timer = 0x000200 * 256 = 131072 bits
+        nxt6000_writereg(state, VIT_BERTIME_1, 0x02);  //
+        nxt6000_writereg(state, VIT_BERTIME_0, 0x00);  //
+        nxt6000_writereg(state, VIT_COR_INTEN, 0x98); // Enable BER interrupts
+        nxt6000_writereg(state, VIT_COR_CTL, 0x82);   // Enable BER measurement
+        nxt6000_writereg(state, VIT_COR_CTL, VIT_COR_RESYNC | 0x02 );
         nxt6000_writereg(state, OFDM_COR_CTL, (0x01 << 5) | (nxt6000_readreg(state, OFDM_COR_CTL) & 0x0F));
         nxt6000_writereg(state, OFDM_COR_MODEGUARD, FORCEMODE8K | 0x02);
         nxt6000_writereg(state, OFDM_AGC_CTL, AGCLAST | INITIAL_AGC_BW);
@@ -422,7 +427,7 @@ static void nxt6000_dump_status(struct nxt6000_state *state)
 static int nxt6000_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
         u8 core_status;
-        struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv;
+        struct nxt6000_state* state = fe->demodulator_priv;
 
         *status = 0;
 
@@ -451,7 +456,7 @@ static int nxt6000_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int nxt6000_init(struct dvb_frontend* fe)
 {
-        struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv;
+        struct nxt6000_state* state = fe->demodulator_priv;
 
         nxt6000_reset(state);
         nxt6000_setup(fe);
@@ -461,7 +466,7 @@ static int nxt6000_init(struct dvb_frontend* fe)
 
 static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *param)
 {
-        struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv;
+        struct nxt6000_state* state = fe->demodulator_priv;
         int result;
 
         nxt6000_writereg(state, ENABLE_TUNER_IIC, 0x01);        /* open i2c bus switch */
@@ -482,10 +487,44 @@ static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static void nxt6000_release(struct dvb_frontend* fe)
 {
-        struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv;
+        struct nxt6000_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
+static int nxt6000_read_snr(struct dvb_frontend* fe, u16* snr)
+{
+        struct nxt6000_state* state = fe->demodulator_priv;
+
+        *snr = nxt6000_readreg( state, OFDM_CHC_SNR) / 8;
+
+        return 0;
+}
+
+static int nxt6000_read_ber(struct dvb_frontend* fe, u32* ber)
+{
+        struct nxt6000_state* state = fe->demodulator_priv;
+
+        nxt6000_writereg( state, VIT_COR_INTSTAT, 0x18 );
+
+        *ber = (nxt6000_readreg( state, VIT_BER_1 ) << 8 ) |
+                nxt6000_readreg( state, VIT_BER_0 );
+
+        nxt6000_writereg( state, VIT_COR_INTSTAT, 0x18); // Clear BER Done interrupts
+
+        return 0;
+}
+
+static int nxt6000_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)
+{
+        struct nxt6000_state* state = fe->demodulator_priv;
+
+        *signal_strength = (short) (511 -
+                (nxt6000_readreg(state, AGC_GAIN_1) +
+                ((nxt6000_readreg(state, AGC_GAIN_2) & 0x03) << 8)));
+
+        return 0;
+}
+
 static struct dvb_frontend_ops nxt6000_ops;
 
 struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
@@ -494,7 +533,7 @@ struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
         struct nxt6000_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct nxt6000_state*) kmalloc(sizeof(struct nxt6000_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct nxt6000_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
@@ -542,6 +581,9 @@ static struct dvb_frontend_ops nxt6000_ops = {
         .set_frontend = nxt6000_set_frontend,
 
         .read_status = nxt6000_read_status,
+        .read_ber = nxt6000_read_ber,
+        .read_signal_strength = nxt6000_read_signal_strength,
+        .read_snr = nxt6000_read_snr,
 };
 
 module_param(debug, int, 0644);
diff --git a/drivers/media/dvb/frontends/nxt6000_priv.h b/drivers/media/dvb/frontends/nxt6000_priv.h
index 64b1a89b2a22..0422e580038a 100644
--- a/drivers/media/dvb/frontends/nxt6000_priv.h
+++ b/drivers/media/dvb/frontends/nxt6000_priv.h
@@ -65,12 +65,27 @@
 #define BER_DONE               (0x08)
 #define BER_OVERFLOW           (0x10)
 
+/* 0x38 VIT_BERTIME_2 */
+#define VIT_BERTIME_2      (0x38)
+
+/* 0x39 VIT_BERTIME_1 */
+#define VIT_BERTIME_1      (0x39)
+
+/* 0x3A VIT_BERTIME_0 */
+#define VIT_BERTIME_0      (0x3a)
+
                              /* 0x38 OFDM_BERTimer *//* Use the alias registers */
 #define A_VIT_BER_TIMER_0      (0x1D)
 
                              /* 0x3A VIT_BER_TIMER_0 *//* Use the alias registers */
 #define A_VIT_BER_0            (0x1B)
 
+/* 0x3B VIT_BER_1 */
+#define VIT_BER_1              (0x3b)
+
+/* 0x3C VIT_BER_0 */
+#define VIT_BER_0              (0x3c)
+
 /* 0x40 OFDM_COR_CTL */
 #define OFDM_COR_CTL           (0x40)
 #define COREACT                (0x20)
@@ -117,6 +132,12 @@
 #define OFDM_ITB_CTL           (0x4B)
 #define ITBINV                 (0x01)
 
+/* 0x49 AGC_GAIN_1 */
+#define AGC_GAIN_1             (0x49)
+
+/* 0x4A AGC_GAIN_2 */
+#define AGC_GAIN_2             (0x4A)
+
 /* 0x4C OFDM_ITB_FREQ_1 */
 #define OFDM_ITB_FREQ_1        (0x4C)
 
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index df5dee7760a3..cc0a77c790f1 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -102,7 +102,7 @@ static u8 i2c_readbytes (struct or51132_state* state, u8 reg, u8* buf, int len)
 
 static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware *fw)
 {
-        struct or51132_state* state = (struct or51132_state*) fe->demodulator_priv;
+        struct or51132_state* state = fe->demodulator_priv;
         static u8 run_buf[] = {0x7F,0x01};
         static u8 get_ver_buf[] = {0x04,0x00,0x30,0x00,0x00};
         u8 rec_buf[14];
@@ -240,7 +240,7 @@ static int or51132_sleep(struct dvb_frontend* fe)
 
 static int or51132_setmode(struct dvb_frontend* fe)
 {
-        struct or51132_state* state = (struct or51132_state*) fe->demodulator_priv;
+        struct or51132_state* state = fe->demodulator_priv;
         unsigned char cmd_buf[4];
 
         dprintk("setmode %d\n",(int)state->current_modulation);
@@ -316,7 +316,7 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
 {
         int ret;
         u8 buf[4];
-        struct or51132_state* state = (struct or51132_state*) fe->demodulator_priv;
+        struct or51132_state* state = fe->demodulator_priv;
         const struct firmware *fw;
 
         /* Change only if we are actually changing the modulation */
@@ -391,7 +391,7 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
 
 static int or51132_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct or51132_state* state = (struct or51132_state*) fe->demodulator_priv;
+        struct or51132_state* state = fe->demodulator_priv;
         unsigned char rec_buf[2];
         unsigned char snd_buf[2];
         *status = 0;
@@ -464,7 +464,7 @@ static unsigned int i20Log10(unsigned short val)
 
 static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct or51132_state* state = (struct or51132_state*) fe->demodulator_priv;
+        struct or51132_state* state = fe->demodulator_priv;
         unsigned char rec_buf[2];
         unsigned char snd_buf[2];
         u8 rcvr_stat;
@@ -512,7 +512,7 @@ static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int or51132_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct or51132_state* state = (struct or51132_state*) fe->demodulator_priv;
+        struct or51132_state* state = fe->demodulator_priv;
         unsigned char rec_buf[2];
         unsigned char snd_buf[2];
         u16 snr_equ;
@@ -549,7 +549,7 @@ static int or51132_get_tune_settings(struct dvb_frontend* fe, struct dvb_fronten
 
 static void or51132_release(struct dvb_frontend* fe)
 {
-        struct or51132_state* state = (struct or51132_state*) fe->demodulator_priv;
+        struct or51132_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index 58ad34ef0a00..764a95a2e212 100644
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -248,7 +248,7 @@ static int sp8870_wake_up(struct sp8870_state* state)
 static int sp8870_set_frontend_parameters (struct dvb_frontend* fe,
                                            struct dvb_frontend_parameters *p)
 {
-        struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv;
+        struct sp8870_state* state = fe->demodulator_priv;
         int  err;
         u16 reg0xc05;
 
@@ -302,7 +302,7 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe,
 
 static int sp8870_init (struct dvb_frontend* fe)
 {
-        struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv;
+        struct sp8870_state* state = fe->demodulator_priv;
         const struct firmware *fw = NULL;
 
         sp8870_wake_up(state);
@@ -358,7 +358,7 @@ static int sp8870_init (struct dvb_frontend* fe)
 
 static int sp8870_read_status (struct dvb_frontend* fe, fe_status_t * fe_status)
 {
-        struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv;
+        struct sp8870_state* state = fe->demodulator_priv;
         int status;
         int signal;
 
@@ -384,7 +384,7 @@ static int sp8870_read_status (struct dvb_frontend* fe, fe_status_t * fe_status)
 
 static int sp8870_read_ber (struct dvb_frontend* fe, u32 * ber)
 {
-        struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv;
+        struct sp8870_state* state = fe->demodulator_priv;
         int ret;
         u32 tmp;
 
@@ -412,7 +412,7 @@ static int sp8870_read_ber (struct dvb_frontend* fe, u32 * ber)
 
 static int sp8870_read_signal_strength(struct dvb_frontend* fe,  u16 * signal)
 {
-        struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv;
+        struct sp8870_state* state = fe->demodulator_priv;
         int ret;
         u16 tmp;
 
@@ -438,7 +438,7 @@ static int sp8870_read_signal_strength(struct dvb_frontend* fe,  u16 * signal)
 
 static int sp8870_read_uncorrected_blocks (struct dvb_frontend* fe, u32* ublocks)
 {
-        struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv;
+        struct sp8870_state* state = fe->demodulator_priv;
         int ret;
 
         *ublocks = 0;
@@ -467,7 +467,7 @@ static int switches = 0;
 
 static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv;
+        struct sp8870_state* state = fe->demodulator_priv;
 
         /*
             The firmware of the sp8870 sometimes locks up after setting frontend parameters.
@@ -524,7 +524,7 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int sp8870_sleep(struct dvb_frontend* fe)
 {
-        struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv;
+        struct sp8870_state* state = fe->demodulator_priv;
 
         // tristate TS output and disable interface pins
         return sp8870_writereg(state, 0xC18, 0x000);
@@ -540,7 +540,7 @@ static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend
 
 static void sp8870_release(struct dvb_frontend* fe)
 {
-        struct sp8870_state* state = (struct sp8870_state*) fe->demodulator_priv;
+        struct sp8870_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -552,7 +552,7 @@ struct dvb_frontend* sp8870_attach(const struct sp8870_config* config,
         struct sp8870_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct sp8870_state*) kmalloc(sizeof(struct sp8870_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct sp8870_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index 7eae833ece49..d868a6927a16 100644
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -135,7 +135,7 @@ static void sp887x_setup_agc (struct sp887x_state* state)
  */
 static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware *fw)
 {
-        struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
+        struct sp887x_state* state = fe->demodulator_priv;
         u8 buf [BLOCKSIZE+2];
         int i;
         int fw_size = fw->size;
@@ -344,7 +344,7 @@ static void sp887x_correct_offsets (struct sp887x_state* state,
 static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,
                                              struct dvb_frontend_parameters *p)
 {
-        struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
+        struct sp887x_state* state = fe->demodulator_priv;
         int actual_freq, err;
         u16 val, reg0xc05;
 
@@ -405,7 +405,7 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,
 
 static int sp887x_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
+        struct sp887x_state* state = fe->demodulator_priv;
         u16 snr12 = sp887x_readreg(state, 0xf16);
         u16 sync0x200 = sp887x_readreg(state, 0x200);
         u16 sync0xf17 = sp887x_readreg(state, 0xf17);
@@ -439,7 +439,7 @@ static int sp887x_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int sp887x_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
+        struct sp887x_state* state = fe->demodulator_priv;
 
         *ber = (sp887x_readreg(state, 0xc08) & 0x3f) |
                (sp887x_readreg(state, 0xc07) << 6);
@@ -453,7 +453,7 @@ static int sp887x_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int sp887x_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
+        struct sp887x_state* state = fe->demodulator_priv;
 
         u16 snr12 = sp887x_readreg(state, 0xf16);
         u32 signal = 3 * (snr12 << 4);
@@ -464,7 +464,7 @@ static int sp887x_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int sp887x_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
+        struct sp887x_state* state = fe->demodulator_priv;
 
         u16 snr12 = sp887x_readreg(state, 0xf16);
         *snr = (snr12 << 4) | (snr12 >> 8);
@@ -474,7 +474,7 @@ static int sp887x_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int sp887x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
+        struct sp887x_state* state = fe->demodulator_priv;
 
         *ucblocks = sp887x_readreg(state, 0xc0c);
         if (*ucblocks == 0xfff)
@@ -485,7 +485,7 @@ static int sp887x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int sp887x_sleep(struct dvb_frontend* fe)
 {
-        struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
+        struct sp887x_state* state = fe->demodulator_priv;
 
         /* tristate TS output and disable interface pins */
         sp887x_writereg(state, 0xc18, 0x000);
@@ -495,7 +495,7 @@ static int sp887x_sleep(struct dvb_frontend* fe)
 
 static int sp887x_init(struct dvb_frontend* fe)
 {
-        struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
+        struct sp887x_state* state = fe->demodulator_priv;
         const struct firmware *fw = NULL;
         int ret;
 
@@ -534,7 +534,7 @@ static int sp887x_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend
 
 static void sp887x_release(struct dvb_frontend* fe)
 {
-        struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
+        struct sp887x_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -546,7 +546,7 @@ struct dvb_frontend* sp887x_attach(const struct sp887x_config* config,
         struct sp887x_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct sp887x_state*) kmalloc(sizeof(struct sp887x_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct sp887x_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 502c6403dfc6..e681263bf079 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -365,7 +365,7 @@ static int stv0297_set_inversion(struct stv0297_state *state, fe_spectral_invers
 
 int stv0297_enable_plli2c(struct dvb_frontend *fe)
 {
-        struct stv0297_state *state = (struct stv0297_state *) fe->demodulator_priv;
+        struct stv0297_state *state = fe->demodulator_priv;
 
         stv0297_writereg(state, 0x87, 0x78);
         stv0297_writereg(state, 0x86, 0xc8);
@@ -375,7 +375,7 @@ int stv0297_enable_plli2c(struct dvb_frontend *fe)
 
 static int stv0297_init(struct dvb_frontend *fe)
 {
-        struct stv0297_state *state = (struct stv0297_state *) fe->demodulator_priv;
+        struct stv0297_state *state = fe->demodulator_priv;
         int i;
 
         /* soft reset */
@@ -416,7 +416,7 @@ static int stv0297_init(struct dvb_frontend *fe)
 
 static int stv0297_sleep(struct dvb_frontend *fe)
 {
-        struct stv0297_state *state = (struct stv0297_state *) fe->demodulator_priv;
+        struct stv0297_state *state = fe->demodulator_priv;
 
         stv0297_writereg_mask(state, 0x80, 1, 1);
 
@@ -425,7 +425,7 @@ static int stv0297_sleep(struct dvb_frontend *fe)
 
 static int stv0297_read_status(struct dvb_frontend *fe, fe_status_t * status)
 {
-        struct stv0297_state *state = (struct stv0297_state *) fe->demodulator_priv;
+        struct stv0297_state *state = fe->demodulator_priv;
 
         u8 sync = stv0297_readreg(state, 0xDF);
 
@@ -438,7 +438,7 @@ static int stv0297_read_status(struct dvb_frontend *fe, fe_status_t * status)
 
 static int stv0297_read_ber(struct dvb_frontend *fe, u32 * ber)
 {
-        struct stv0297_state *state = (struct stv0297_state *) fe->demodulator_priv;
+        struct stv0297_state *state = fe->demodulator_priv;
         u8 BER[3];
 
         stv0297_writereg(state, 0xA0, 0x80);    // Start Counting bit errors for 4096 Bytes
@@ -453,7 +453,7 @@ static int stv0297_read_ber(struct dvb_frontend *fe, u32 * ber)
 
 static int stv0297_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
 {
-        struct stv0297_state *state = (struct stv0297_state *) fe->demodulator_priv;
+        struct stv0297_state *state = fe->demodulator_priv;
         u8 STRENGTH[2];
 
         stv0297_readregs(state, 0x41, STRENGTH, 2);
@@ -464,7 +464,7 @@ static int stv0297_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
 
 static int stv0297_read_snr(struct dvb_frontend *fe, u16 * snr)
 {
-        struct stv0297_state *state = (struct stv0297_state *) fe->demodulator_priv;
+        struct stv0297_state *state = fe->demodulator_priv;
         u8 SNR[2];
 
         stv0297_readregs(state, 0x07, SNR, 2);
@@ -475,7 +475,7 @@ static int stv0297_read_snr(struct dvb_frontend *fe, u16 * snr)
 
 static int stv0297_read_ucblocks(struct dvb_frontend *fe, u32 * ucblocks)
 {
-        struct stv0297_state *state = (struct stv0297_state *) fe->demodulator_priv;
+        struct stv0297_state *state = fe->demodulator_priv;
 
         *ucblocks = (stv0297_readreg(state, 0xD5) << 8)
                 | stv0297_readreg(state, 0xD4);
@@ -485,7 +485,7 @@ static int stv0297_read_ucblocks(struct dvb_frontend *fe, u32 * ucblocks)
 
 static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
 {
-        struct stv0297_state *state = (struct stv0297_state *) fe->demodulator_priv;
+        struct stv0297_state *state = fe->demodulator_priv;
         int u_threshold;
         int initial_u;
         int blind_u;
@@ -689,7 +689,7 @@ timeout:
 
 static int stv0297_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
 {
-        struct stv0297_state *state = (struct stv0297_state *) fe->demodulator_priv;
+        struct stv0297_state *state = fe->demodulator_priv;
         int reg_00, reg_83;
 
         reg_00 = stv0297_readreg(state, 0x00);
@@ -725,7 +725,7 @@ static int stv0297_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
 
 static void stv0297_release(struct dvb_frontend *fe)
 {
-        struct stv0297_state *state = (struct stv0297_state *) fe->demodulator_priv;
+        struct stv0297_state *state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -737,7 +737,7 @@ struct dvb_frontend *stv0297_attach(const struct stv0297_config *config,
         struct stv0297_state *state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct stv0297_state *) kmalloc(sizeof(struct stv0297_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct stv0297_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
 
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index 15b40541b62d..cfa3928bb487 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -70,6 +70,7 @@ struct stv0299_state {
 #define STATUS_UCBLOCKS 1
 
 static int debug;
+static int debug_legacy_dish_switch;
 #define dprintk(args...) \
         do { \
                 if (debug) printk(KERN_DEBUG "stv0299: " args); \
@@ -93,7 +94,7 @@ static int stv0299_writeregI (struct stv0299_state* state, u8 reg, u8 data)
 
 int stv0299_writereg (struct dvb_frontend* fe, u8 reg, u8 data)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
 
         return stv0299_writeregI(state, reg, data);
 }
@@ -218,7 +219,7 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout)
 
 static int stv0299_set_symbolrate (struct dvb_frontend* fe, u32 srate)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
         u64 big = srate;
         u32 ratio;
 
@@ -269,7 +270,7 @@ static int stv0299_get_symbolrate (struct stv0299_state* state)
 static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
                                     struct dvb_diseqc_master_cmd *m)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
         u8 val;
         int i;
 
@@ -299,7 +300,7 @@ static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
 
 static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
         u8 val;
 
         dprintk ("%s\n", __FUNCTION__);
@@ -326,7 +327,7 @@ static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t
 
 static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
         u8 val;
 
         if (stv0299_wait_diseqc_idle (state, 100) < 0)
@@ -348,7 +349,7 @@ static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 
 static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
         u8 reg0x08;
         u8 reg0x0c;
 
@@ -385,34 +386,84 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
         };
 }
 
-static int stv0299_send_legacy_dish_cmd(struct dvb_frontend* fe, u32 cmd)
+static inline s32 stv0299_calc_usec_delay (struct timeval lasttime, struct timeval curtime)
 {
+        return ((curtime.tv_usec < lasttime.tv_usec) ?
+                1000000 - lasttime.tv_usec + curtime.tv_usec :
+                curtime.tv_usec - lasttime.tv_usec);
+}
+
+static void stv0299_sleep_until (struct timeval *waketime, u32 add_usec)
+{
+        struct timeval lasttime;
+        s32 delta, newdelta;
+
+        waketime->tv_usec += add_usec;
+        if (waketime->tv_usec >= 1000000) {
+                waketime->tv_usec -= 1000000;
+                waketime->tv_sec++;
+        }
+
+        do_gettimeofday (&lasttime);
+        delta = stv0299_calc_usec_delay (lasttime, *waketime);
+        if (delta > 2500) {
+                msleep ((delta - 1500) / 1000);
+                do_gettimeofday (&lasttime);
+                newdelta = stv0299_calc_usec_delay (lasttime, *waketime);
+                delta = (newdelta > delta) ? 0 : newdelta;
+        }
+        if (delta > 0)
+                udelay (delta);
+}
+
+static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd)
+{
+        struct stv0299_state* state = fe->demodulator_priv;
+        u8 reg0x08;
+        u8 reg0x0c;
+        u8 lv_mask = 0x40;
         u8 last = 1;
         int i;
+        struct timeval nexttime;
+        struct timeval tv[10];
 
-        /* reset voltage at the end
-        if((0x50 & stv0299_readreg (i2c, 0x0c)) == 0x50)
-                cmd |= 0x80;
-        else
-                cmd &= 0x7F;
-        */
+        reg0x08 = stv0299_readreg (state, 0x08);
+        reg0x0c = stv0299_readreg (state, 0x0c);
+        reg0x0c &= 0x0f;
+        stv0299_writeregI (state, 0x08, (reg0x08 & 0x3f) | (state->config->lock_output << 6));
+        if (state->config->volt13_op0_op1 == STV0299_VOLT13_OP0)
+                lv_mask = 0x10;
 
         cmd = cmd << 1;
-        dprintk("%s switch command: 0x%04x\n",__FUNCTION__, cmd);
+        if (debug_legacy_dish_switch)
+                printk ("%s switch command: 0x%04x\n",__FUNCTION__, cmd);
+
+        do_gettimeofday (&nexttime);
+        if (debug_legacy_dish_switch)
+                memcpy (&tv[0], &nexttime, sizeof (struct timeval));
+        stv0299_writeregI (state, 0x0c, reg0x0c | 0x50); /* set LNB to 18V */
 
-        stv0299_set_voltage(fe,SEC_VOLTAGE_18);
-        msleep(32);
+        stv0299_sleep_until (&nexttime, 32000);
 
         for (i=0; i<9; i++) {
+                if (debug_legacy_dish_switch)
+                        do_gettimeofday (&tv[i+1]);
                 if((cmd & 0x01) != last) {
-                        stv0299_set_voltage(fe, last ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18);
+                        /* set voltage to (last ? 13V : 18V) */
+                        stv0299_writeregI (state, 0x0c, reg0x0c | (last ? lv_mask : 0x50));
                         last = (last) ? 0 : 1;
                 }
 
                 cmd = cmd >> 1;
 
                 if (i != 8)
-                        msleep(8);
+                        stv0299_sleep_until (&nexttime, 8000);
+        }
+        if (debug_legacy_dish_switch) {
+                printk ("%s(%d): switch delay (should be 32k followed by all 8k\n",
+                        __FUNCTION__, fe->dvb->num);
+                for (i=1; i < 10; i++)
+                        printk ("%d: %d\n", i, stv0299_calc_usec_delay (tv[i-1] , tv[i]));
         }
 
         return 0;
@@ -420,7 +471,7 @@ static int stv0299_send_legacy_dish_cmd(struct dvb_frontend* fe, u32 cmd)
 
 static int stv0299_init (struct dvb_frontend* fe)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
         int i;
 
         dprintk("stv0299: init chip\n");
@@ -439,7 +490,7 @@ static int stv0299_init (struct dvb_frontend* fe)
 
 static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
 
         u8 signal = 0xff - stv0299_readreg (state, 0x18);
         u8 sync = stv0299_readreg (state, 0x1b);
@@ -467,7 +518,7 @@ static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
 
         if (state->errmode != STATUS_BER) return 0;
         *ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
@@ -477,7 +528,7 @@ static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
 
         s32 signal =  0xffff - ((stv0299_readreg (state, 0x18) << 8)
                                | stv0299_readreg (state, 0x19));
@@ -494,7 +545,7 @@ static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
 
         s32 xsnr = 0xffff - ((stv0299_readreg (state, 0x24) << 8)
                            | stv0299_readreg (state, 0x25));
@@ -506,7 +557,7 @@ static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
 
         if (state->errmode != STATUS_UCBLOCKS) *ucblocks = 0;
         else *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
@@ -516,7 +567,7 @@ static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
         int invval = 0;
 
         dprintk ("%s : FE_SET_FRONTEND\n", __FUNCTION__);
@@ -584,7 +635,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
         s32 derot_freq;
         int invval;
 
@@ -609,7 +660,7 @@ static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int stv0299_sleep(struct dvb_frontend* fe)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
 
         stv0299_writeregI(state, 0x02, 0x80);
         state->initialised = 0;
@@ -619,7 +670,7 @@ static int stv0299_sleep(struct dvb_frontend* fe)
 
 static int stv0299_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
 
         fesettings->min_delay_ms = state->config->min_delay_ms;
         if (fesettings->parameters.u.qpsk.symbol_rate < 10000000) {
@@ -634,7 +685,7 @@ static int stv0299_get_tune_settings(struct dvb_frontend* fe, struct dvb_fronten
 
 static void stv0299_release(struct dvb_frontend* fe)
 {
-        struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
+        struct stv0299_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -647,7 +698,7 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
         int id;
 
         /* allocate memory for the internal state */
-        state = (struct stv0299_state*) kmalloc(sizeof(struct stv0299_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct stv0299_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
@@ -719,6 +770,9 @@ static struct dvb_frontend_ops stv0299_ops = {
         .dishnetwork_send_legacy_command = stv0299_send_legacy_dish_cmd,
 };
 
+module_param(debug_legacy_dish_switch, int, 0444);
+MODULE_PARM_DESC(debug_legacy_dish_switch, "Enable timing analysis for Dish Network legacy switches");
+
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
 
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index 4e40d95ee95d..87d5f4d8790f 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -205,7 +205,7 @@ static int tda10021_set_symbolrate (struct tda10021_state* state, u32 symbolrate
 
 static int tda10021_init (struct dvb_frontend *fe)
 {
-        struct tda10021_state* state = (struct tda10021_state*) fe->demodulator_priv;
+        struct tda10021_state* state = fe->demodulator_priv;
         int i;
 
         dprintk("DVB: TDA10021(%d): init chip\n", fe->adapter->num);
@@ -238,7 +238,7 @@ static int tda10021_init (struct dvb_frontend *fe)
 static int tda10021_set_parameters (struct dvb_frontend *fe,
                             struct dvb_frontend_parameters *p)
 {
-        struct tda10021_state* state = (struct tda10021_state*) fe->demodulator_priv;
+        struct tda10021_state* state = fe->demodulator_priv;
 
         //table for QAM4-QAM256 ready  QAM4  QAM16 QAM32 QAM64 QAM128 QAM256
         //CONF
@@ -278,7 +278,7 @@ static int tda10021_set_parameters (struct dvb_frontend *fe,
 
 static int tda10021_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct tda10021_state* state = (struct tda10021_state*) fe->demodulator_priv;
+        struct tda10021_state* state = fe->demodulator_priv;
         int sync;
 
         *status = 0;
@@ -303,7 +303,7 @@ static int tda10021_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int tda10021_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct tda10021_state* state = (struct tda10021_state*) fe->demodulator_priv;
+        struct tda10021_state* state = fe->demodulator_priv;
 
         u32 _ber = tda10021_readreg(state, 0x14) |
                 (tda10021_readreg(state, 0x15) << 8) |
@@ -315,7 +315,7 @@ static int tda10021_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int tda10021_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct tda10021_state* state = (struct tda10021_state*) fe->demodulator_priv;
+        struct tda10021_state* state = fe->demodulator_priv;
 
         u8 gain = tda10021_readreg(state, 0x17);
         *strength = (gain << 8) | gain;
@@ -325,7 +325,7 @@ static int tda10021_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int tda10021_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct tda10021_state* state = (struct tda10021_state*) fe->demodulator_priv;
+        struct tda10021_state* state = fe->demodulator_priv;
 
         u8 quality = ~tda10021_readreg(state, 0x18);
         *snr = (quality << 8) | quality;
@@ -335,7 +335,7 @@ static int tda10021_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int tda10021_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct tda10021_state* state = (struct tda10021_state*) fe->demodulator_priv;
+        struct tda10021_state* state = fe->demodulator_priv;
 
         *ucblocks = tda10021_readreg (state, 0x13) & 0x7f;
         if (*ucblocks == 0x7f)
@@ -350,7 +350,7 @@ static int tda10021_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int tda10021_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct tda10021_state* state = (struct tda10021_state*) fe->demodulator_priv;
+        struct tda10021_state* state = fe->demodulator_priv;
         int sync;
         s8 afc = 0;
 
@@ -378,7 +378,7 @@ static int tda10021_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa
 
 static int tda10021_sleep(struct dvb_frontend* fe)
 {
-        struct tda10021_state* state = (struct tda10021_state*) fe->demodulator_priv;
+        struct tda10021_state* state = fe->demodulator_priv;
 
         tda10021_writereg (state, 0x1b, 0x02);  /* pdown ADC */
         tda10021_writereg (state, 0x00, 0x80);  /* standby */
@@ -388,7 +388,7 @@ static int tda10021_sleep(struct dvb_frontend* fe)
 
 static void tda10021_release(struct dvb_frontend* fe)
 {
-        struct tda10021_state* state = (struct tda10021_state*) fe->demodulator_priv;
+        struct tda10021_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -401,7 +401,7 @@ struct dvb_frontend* tda10021_attach(const struct tda10021_config* config,
         struct tda10021_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct tda10021_state*) kmalloc(sizeof(struct tda10021_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct tda10021_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index 687ad9cf3384..0beb370792ae 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -35,9 +35,10 @@
 #include "dvb_frontend.h"
 #include "tda1004x.h"
 
-#define TDA1004X_DEMOD_TDA10045 0
-#define TDA1004X_DEMOD_TDA10046 1
-
+enum tda1004x_demod {
+        TDA1004X_DEMOD_TDA10045,
+        TDA1004X_DEMOD_TDA10046,
+};
 
 struct tda1004x_state {
         struct i2c_adapter* i2c;
@@ -46,8 +47,9 @@ struct tda1004x_state {
         struct dvb_frontend frontend;
 
         /* private demod data */
-        u8 initialised:1;
-        u8 demod_type;
+        u8 initialised;
+        enum tda1004x_demod demod_type;
+        u8 fw_version;
 };
 
 
@@ -139,7 +141,7 @@ static int tda1004x_write_byteI(struct tda1004x_state *state, int reg, int data)
 {
         int ret;
         u8 buf[] = { reg, data };
-        struct i2c_msg msg = { .addr=0, .flags=0, .buf=buf, .len=2 };
+        struct i2c_msg msg = { .flags = 0, .buf = buf, .len = 2 };
 
         dprintk("%s: reg=0x%x, data=0x%x\n", __FUNCTION__, reg, data);
 
@@ -160,8 +162,8 @@ static int tda1004x_read_byte(struct tda1004x_state *state, int reg)
         int ret;
         u8 b0[] = { reg };
         u8 b1[] = { 0 };
-        struct i2c_msg msg[] = {{ .addr=0, .flags=0, .buf=b0, .len=1},
-                                { .addr=0, .flags=I2C_M_RD, .buf=b1, .len = 1}};
+        struct i2c_msg msg[] = {{ .flags = 0, .buf = b0, .len = 1 },
+                                { .flags = I2C_M_RD, .buf = b1, .len = 1 }};
 
         dprintk("%s: reg=0x%x\n", __FUNCTION__, reg);
 
@@ -294,7 +296,7 @@ static int tda1004x_do_upload(struct tda1004x_state *state,
                               u8 dspCodeCounterReg, u8 dspCodeInReg)
 {
         u8 buf[65];
-        struct i2c_msg fw_msg = {.addr = 0,.flags = 0,.buf = buf,.len = 0 };
+        struct i2c_msg fw_msg = { .flags = 0, .buf = buf, .len = 0 };
         int tx_size;
         int pos = 0;
 
@@ -304,12 +306,10 @@ static int tda1004x_do_upload(struct tda1004x_state *state,
 
         buf[0] = dspCodeInReg;
         while (pos != len) {
-
                 // work out how much to send this time
                 tx_size = len - pos;
-                if (tx_size > 0x10) {
+                if (tx_size > 0x10)
                         tx_size = 0x10;
-                }
 
                 // send the chunk
                 memcpy(buf + 1, mem + pos, tx_size);
@@ -322,6 +322,7 @@ static int tda1004x_do_upload(struct tda1004x_state *state,
 
                 dprintk("%s: fw_pos=0x%x\n", __FUNCTION__, pos);
         }
+
         return 0;
 }
 
@@ -335,9 +336,8 @@ static int tda1004x_check_upload_ok(struct tda1004x_state *state, u8 dspVersion)
 
         data1 = tda1004x_read_byte(state, TDA1004X_DSP_DATA1);
         data2 = tda1004x_read_byte(state, TDA1004X_DSP_DATA2);
-        if (data1 != 0x67 || data2 != dspVersion) {
+        if ((data1 != 0x67) || (data2 != dspVersion))
                 return -EIO;
-        }
 
         return 0;
 }
@@ -348,9 +348,9 @@ static int tda10045_fwupload(struct dvb_frontend* fe)
         int ret;
         const struct firmware *fw;
 
-
         /* don't re-upload unless necessary */
-        if (tda1004x_check_upload_ok(state, 0x2c) == 0) return 0;
+        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 (%s)...\n", TDA10045_DEFAULT_FIRMWARE);
@@ -381,6 +381,25 @@ static int tda10045_fwupload(struct dvb_frontend* fe)
         return tda1004x_check_upload_ok(state, 0x2c);
 }
 
+static int tda10046_get_fw_version(struct tda1004x_state *state,
+                                   const struct firmware *fw)
+{
+        const unsigned char pattern[] = { 0x67, 0x00, 0x50, 0x62, 0x5e, 0x18, 0x67 };
+        unsigned int i;
+
+        /* area guessed from firmware v20, v21 and v25 */
+        for (i = 0x660; i < 0x700; i++) {
+                if (!memcmp(&fw->data[i], pattern, sizeof(pattern))) {
+                        state->fw_version = fw->data[i + sizeof(pattern)];
+                        printk(KERN_INFO "tda1004x: using firmware v%02x\n",
+                                        state->fw_version);
+                        return 0;
+                }
+        }
+
+        return -EINVAL;
+}
+
 static int tda10046_fwupload(struct dvb_frontend* fe)
 {
         struct tda1004x_state* state = fe->demodulator_priv;
@@ -394,7 +413,8 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
         msleep(100);
 
         /* don't re-upload unless necessary */
-        if (tda1004x_check_upload_ok(state, 0x20) == 0) return 0;
+        if (tda1004x_check_upload_ok(state, state->fw_version) == 0)
+                return 0;
 
         /* request the firmware, this will block until someone uploads it */
         printk("tda1004x: waiting for firmware upload (%s)...\n", TDA10046_DEFAULT_FIRMWARE);
@@ -404,9 +424,20 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
                 return ret;
         }
 
+        if (fw->size < 24478) { /* size of firmware v20, which is the smallest of v20, v21 and v25 */
+                printk("tda1004x: firmware file seems to be too small (%d bytes)\n", fw->size);
+                return -EINVAL;
+        }
+
+        ret = tda10046_get_fw_version(state, fw);
+        if (ret < 0) {
+                printk("tda1004x: unable to find firmware version\n");
+                return ret;
+        }
+
         /* set parameters */
         tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 10);
-        tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 0);
+        tda1004x_write_byteI(state, TDA10046H_CONFPLL3, state->config->n_i2c);
         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);
@@ -419,7 +450,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
 
         /* wait for DSP to initialise */
         timeout = jiffies + HZ;
-        while(!(tda1004x_read_byte(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;
@@ -427,7 +458,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe)
                 msleep(1);
         }
 
-        return tda1004x_check_upload_ok(state, 0x20);
+        return tda1004x_check_upload_ok(state, state->fw_version);
 }
 
 static int tda1004x_encode_fec(int fec)
@@ -483,7 +514,8 @@ static int tda10045_init(struct dvb_frontend* fe)
 
         dprintk("%s\n", __FUNCTION__);
 
-        if (state->initialised) return 0;
+        if (state->initialised)
+                return 0;
 
         if (tda10045_fwupload(fe)) {
                 printk("tda1004x: firmware upload failed\n");
@@ -523,7 +555,8 @@ static int tda10046_init(struct dvb_frontend* fe)
         struct tda1004x_state* state = fe->demodulator_priv;
         dprintk("%s\n", __FUNCTION__);
 
-        if (state->initialised) return 0;
+        if (state->initialised)
+                return 0;
 
         if (tda10046_fwupload(fe)) {
                 printk("tda1004x: firmware upload failed\n");
@@ -545,7 +578,7 @@ static int tda10046_init(struct dvb_frontend* fe)
         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_CONFPLL3, state->config->n_i2c); // 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); // }
@@ -621,12 +654,14 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,
 
                 // set HP FEC
                 tmp = tda1004x_encode_fec(fe_params->u.ofdm.code_rate_HP);
-                if (tmp < 0) return tmp;
+                if (tmp < 0)
+                        return 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;
+                if (tmp < 0)
+                        return tmp;
                 tda1004x_write_mask(state, TDA1004X_IN_CONF2, 0x38, tmp << 3);
 
                 // set constellation
@@ -671,7 +706,7 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,
         }
 
         // set bandwidth
-        switch(state->demod_type) {
+        switch (state->demod_type) {
         case TDA1004X_DEMOD_TDA10045:
                 tda10045h_set_bandwidth(state, fe_params->u.ofdm.bandwidth);
                 break;
@@ -683,7 +718,8 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,
 
         // set inversion
         inversion = fe_params->inversion;
-        if (state->config->invert) inversion = inversion ? INVERSION_OFF : INVERSION_ON;
+        if (state->config->invert)
+                inversion = inversion ? INVERSION_OFF : INVERSION_ON;
         switch (inversion) {
         case INVERSION_OFF:
                 tda1004x_write_mask(state, TDA1004X_CONFC1, 0x20, 0);
@@ -750,19 +786,19 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,
         }
 
         // start the lock
-        switch(state->demod_type) {
+        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 TDA1004X_DEMOD_TDA10046:
                 tda1004x_write_mask(state, TDA1004X_AUTO, 0x40, 0x40);
-                msleep(10);
                 break;
         }
 
+        msleep(10);
+
         return 0;
 }
 
@@ -773,13 +809,13 @@ static int tda1004x_get_fe(struct dvb_frontend* fe, struct dvb_frontend_paramete
 
         // inversion status
         fe_params->inversion = INVERSION_OFF;
-        if (tda1004x_read_byte(state, TDA1004X_CONFC1) & 0x20) {
+        if (tda1004x_read_byte(state, TDA1004X_CONFC1) & 0x20)
                 fe_params->inversion = INVERSION_ON;
-        }
-        if (state->config->invert) 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(state->demod_type) {
+        switch (state->demod_type) {
         case TDA1004X_DEMOD_TDA10045:
                 switch (tda1004x_read_byte(state, TDA10045H_WREF_LSB)) {
                 case 0x14:
@@ -830,9 +866,8 @@ static int tda1004x_get_fe(struct dvb_frontend* fe, struct dvb_frontend_paramete
 
         // transmission mode
         fe_params->u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;
-        if (tda1004x_read_byte(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(state, TDA1004X_OUT_CONF1) & 0x0c) >> 2) {
@@ -880,30 +915,33 @@ static int tda1004x_read_status(struct dvb_frontend* fe, fe_status_t * fe_status
 
         // read status
         status = tda1004x_read_byte(state, TDA1004X_STATUS_CD);
-        if (status == -1) {
+        if (status == -1)
                 return -EIO;
-        }
 
         // decode
         *fe_status = 0;
-        if (status & 4) *fe_status |= FE_HAS_SIGNAL;
-        if (status & 2) *fe_status |= FE_HAS_CARRIER;
-        if (status & 8) *fe_status |= FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
+        if (status & 4)
+                *fe_status |= FE_HAS_SIGNAL;
+        if (status & 2)
+                *fe_status |= FE_HAS_CARRIER;
+        if (status & 8)
+                *fe_status |= FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
 
         // if we don't already have VITERBI (i.e. not LOCKED), see if the viterbi
         // is getting anything valid
         if (!(*fe_status & FE_HAS_VITERBI)) {
                 // read the CBER
                 cber = tda1004x_read_byte(state, TDA1004X_CBER_LSB);
-                if (cber == -1) return -EIO;
+                if (cber == -1)
+                        return -EIO;
                 status = tda1004x_read_byte(state, TDA1004X_CBER_MSB);
-                if (status == -1) return -EIO;
+                if (status == -1)
+                        return -EIO;
                 cber |= (status << 8);
                 tda1004x_read_byte(state, TDA1004X_CBER_RESET);
 
-                if (cber != 65535) {
+                if (cber != 65535)
                         *fe_status |= FE_HAS_VITERBI;
-                }
         }
 
         // if we DO have some valid VITERBI output, but don't already have SYNC
@@ -911,20 +949,22 @@ static int tda1004x_read_status(struct dvb_frontend* fe, fe_status_t * fe_status
         if ((*fe_status & FE_HAS_VITERBI) && (!(*fe_status & FE_HAS_SYNC))) {
                 // read the VBER
                 vber = tda1004x_read_byte(state, TDA1004X_VBER_LSB);
-                if (vber == -1) return -EIO;
+                if (vber == -1)
+                        return -EIO;
                 status = tda1004x_read_byte(state, TDA1004X_VBER_MID);
-                if (status == -1) return -EIO;
+                if (status == -1)
+                        return -EIO;
                 vber |= (status << 8);
                 status = tda1004x_read_byte(state, TDA1004X_VBER_MSB);
-                if (status == -1) return -EIO;
+                if (status == -1)
+                        return -EIO;
                 vber |= ((status << 16) & 0x0f);
                 tda1004x_read_byte(state, TDA1004X_CVBER_LUT);
 
                 // if RS has passed some valid TS packets, then we must be
                 // getting some SYNC bytes
-                if (vber < 16632) {
+                if (vber < 16632)
                         *fe_status |= FE_HAS_SYNC;
-                }
         }
 
         // success
@@ -941,7 +981,7 @@ static int tda1004x_read_signal_strength(struct dvb_frontend* fe, u16 * signal)
         dprintk("%s\n", __FUNCTION__);
 
         // determine the register to use
-        switch(state->demod_type) {
+        switch (state->demod_type) {
         case TDA1004X_DEMOD_TDA10045:
                 reg = TDA10045H_S_AGC;
                 break;
@@ -972,9 +1012,8 @@ static int tda1004x_read_snr(struct dvb_frontend* fe, u16 * snr)
         tmp = tda1004x_read_byte(state, TDA1004X_SNR);
         if (tmp < 0)
                 return -EIO;
-        if (tmp) {
+        if (tmp)
                 tmp = 255 - tmp;
-        }
 
         *snr = ((tmp << 8) | tmp);
         dprintk("%s: snr=0x%x\n", __FUNCTION__, *snr);
@@ -1009,11 +1048,11 @@ static int tda1004x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
                         break;
         }
 
-        if (tmp != 0x7f) {
+        if (tmp != 0x7f)
                 *ucblocks = tmp;
-        } else {
+        else
                 *ucblocks = 0xffffffff;
-        }
+
         dprintk("%s: ucblocks=0x%x\n", __FUNCTION__, *ucblocks);
         return 0;
 }
@@ -1027,10 +1066,12 @@ static int tda1004x_read_ber(struct dvb_frontend* fe, u32* ber)
 
         // read it in
         tmp = tda1004x_read_byte(state, TDA1004X_CBER_LSB);
-        if (tmp < 0) return -EIO;
+        if (tmp < 0)
+                return -EIO;
         *ber = tmp << 1;
         tmp = tda1004x_read_byte(state, TDA1004X_CBER_MSB);
-        if (tmp < 0) return -EIO;
+        if (tmp < 0)
+                return -EIO;
         *ber |= (tmp << 9);
         tda1004x_read_byte(state, TDA1004X_CBER_RESET);
 
@@ -1042,7 +1083,7 @@ static int tda1004x_sleep(struct dvb_frontend* fe)
 {
         struct tda1004x_state* state = fe->demodulator_priv;
 
-        switch(state->demod_type) {
+        switch (state->demod_type) {
         case TDA1004X_DEMOD_TDA10045:
                 tda1004x_write_mask(state, TDA1004X_CONFADC1, 0x10, 0x10);
                 break;
@@ -1066,74 +1107,11 @@ static int tda1004x_get_tune_settings(struct dvb_frontend* fe, struct dvb_fronte
 
 static void tda1004x_release(struct dvb_frontend* fe)
 {
-        struct tda1004x_state* state = (struct tda1004x_state*) fe->demodulator_priv;
-        kfree(state);
-}
-
-static struct dvb_frontend_ops tda10045_ops;
-
-struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
-                                     struct i2c_adapter* i2c)
-{
-        struct tda1004x_state* state = NULL;
-
-        /* allocate memory for the internal state */
-        state = (struct tda1004x_state*) kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL);
-        if (state == NULL) goto error;
-
-        /* 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;
-
-        /* check if the demod is there */
-        if (tda1004x_read_byte(state, TDA1004X_CHIPID) != 0x25) goto error;
-
-        /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
-        state->frontend.demodulator_priv = state;
-        return &state->frontend;
-
-error:
+        struct tda1004x_state *state = fe->demodulator_priv;
         kfree(state);
-        return NULL;
-}
-
-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 = NULL;
-
-        /* allocate memory for the internal state */
-        state = (struct tda1004x_state*) kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL);
-        if (state == NULL) goto error;
-
-        /* 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;
-
-        /* check if the demod is there */
-        if (tda1004x_read_byte(state, TDA1004X_CHIPID) != 0x46) goto error;
-
-        /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
-        state->frontend.demodulator_priv = state;
-        return &state->frontend;
-
-error:
-        if (state) kfree(state);
-        return NULL;
 }
 
 static struct dvb_frontend_ops tda10045_ops = {
-
         .info = {
                 .name = "Philips TDA10045H DVB-T",
                 .type = FE_OFDM,
@@ -1163,8 +1141,36 @@ static struct dvb_frontend_ops tda10045_ops = {
         .read_ucblocks = tda1004x_read_ucblocks,
 };
 
-static struct dvb_frontend_ops tda10046_ops = {
+struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
+                                     struct i2c_adapter* i2c)
+{
+        struct tda1004x_state *state;
+
+        /* allocate memory for the internal state */
+        state = kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL);
+        if (!state)
+                return NULL;
+
+        /* 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;
+
+        /* check if the demod is there */
+        if (tda1004x_read_byte(state, TDA1004X_CHIPID) != 0x25) {
+                kfree(state);
+                return NULL;
+        }
 
+        /* create dvb_frontend */
+        state->frontend.ops = &state->ops;
+        state->frontend.demodulator_priv = state;
+        return &state->frontend;
+}
+
+static struct dvb_frontend_ops tda10046_ops = {
         .info = {
                 .name = "Philips TDA10046H DVB-T",
                 .type = FE_OFDM,
@@ -1194,6 +1200,36 @@ static struct dvb_frontend_ops tda10046_ops = {
         .read_ucblocks = tda1004x_read_ucblocks,
 };
 
+struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
+                                     struct i2c_adapter* i2c)
+{
+        struct tda1004x_state *state;
+
+        /* allocate memory for the internal state */
+        state = kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL);
+        if (!state)
+                return NULL;
+
+        /* 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;
+        state->fw_version = 0x20;       /* dummy default value */
+
+        /* check if the demod is there */
+        if (tda1004x_read_byte(state, TDA1004X_CHIPID) != 0x46) {
+                kfree(state);
+                return NULL;
+        }
+
+        /* create dvb_frontend */
+        state->frontend.ops = &state->ops;
+        state->frontend.demodulator_priv = state;
+        return &state->frontend;
+}
+
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
 
diff --git a/drivers/media/dvb/frontends/tda1004x.h b/drivers/media/dvb/frontends/tda1004x.h
index e452fc0bad11..c8e1d54ff262 100644
--- a/drivers/media/dvb/frontends/tda1004x.h
+++ b/drivers/media/dvb/frontends/tda1004x.h
@@ -32,10 +32,13 @@ struct tda1004x_config
         u8 demod_address;
 
         /* does the "inversion" need inverted? */
-        u8 invert:1;
+        u8 invert;
 
         /* Does the OCLK signal need inverted? */
-        u8 invert_oclk:1;
+        u8 invert_oclk;
+
+        /* value of N_I2C of the CONF_PLL3 register */
+        u8 n_i2c;
 
         /* PLL maintenance */
         int (*pll_init)(struct dvb_frontend* fe);
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c
index da82e90d6d13..168e013d23bd 100644
--- a/drivers/media/dvb/frontends/tda8083.c
+++ b/drivers/media/dvb/frontends/tda8083.c
@@ -226,7 +226,7 @@ static int tda8083_send_diseqc_burst (struct tda8083_state* state, fe_sec_mini_c
 static int tda8083_send_diseqc_msg (struct dvb_frontend* fe,
                                     struct dvb_diseqc_master_cmd *m)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
         int i;
 
         tda8083_writereg (state, 0x29, (m->msg_len - 3) | (1 << 2)); /* enable */
@@ -243,7 +243,7 @@ static int tda8083_send_diseqc_msg (struct dvb_frontend* fe,
 
 static int tda8083_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
 
         u8 signal = ~tda8083_readreg (state, 0x01);
         u8 sync = tda8083_readreg (state, 0x02);
@@ -270,7 +270,7 @@ static int tda8083_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int tda8083_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
 
         u8 signal = ~tda8083_readreg (state, 0x01);
         *strength = (signal << 8) | signal;
@@ -280,7 +280,7 @@ static int tda8083_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int tda8083_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
 
         u8 _snr = tda8083_readreg (state, 0x08);
         *snr = (_snr << 8) | _snr;
@@ -290,7 +290,7 @@ static int tda8083_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
 
         state->config->pll_set(fe, p);
         tda8083_set_inversion (state, p->inversion);
@@ -305,7 +305,7 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int tda8083_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
 
         /*  FIXME: get symbolrate & frequency offset...*/
         /*p->frequency = ???;*/
@@ -319,7 +319,7 @@ static int tda8083_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int tda8083_sleep(struct dvb_frontend* fe)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
 
         tda8083_writereg (state, 0x00, 0x02);
         return 0;
@@ -327,7 +327,7 @@ static int tda8083_sleep(struct dvb_frontend* fe)
 
 static int tda8083_init(struct dvb_frontend* fe)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
         int i;
 
         for (i=0; i<44; i++)
@@ -343,7 +343,7 @@ static int tda8083_init(struct dvb_frontend* fe)
 
 static int tda8083_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
 
         tda8083_send_diseqc_burst (state, burst);
         tda8083_writereg (state, 0x00, 0x3c);
@@ -354,7 +354,7 @@ static int tda8083_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t
 
 static int tda8083_diseqc_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
 
         tda8083_set_tone (state, tone);
         tda8083_writereg (state, 0x00, 0x3c);
@@ -365,7 +365,7 @@ static int tda8083_diseqc_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t t
 
 static int tda8083_diseqc_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
 
         tda8083_set_voltage (state, voltage);
         tda8083_writereg (state, 0x00, 0x3c);
@@ -376,7 +376,7 @@ static int tda8083_diseqc_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t
 
 static void tda8083_release(struct dvb_frontend* fe)
 {
-        struct tda8083_state* state = (struct tda8083_state*) fe->demodulator_priv;
+        struct tda8083_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -388,7 +388,7 @@ struct dvb_frontend* tda8083_attach(const struct tda8083_config* config,
         struct tda8083_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct tda8083_state*) kmalloc(sizeof(struct tda8083_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct tda8083_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/frontends/tda80xx.c b/drivers/media/dvb/frontends/tda80xx.c
index c99632114283..032d348dafb7 100644
--- a/drivers/media/dvb/frontends/tda80xx.c
+++ b/drivers/media/dvb/frontends/tda80xx.c
@@ -27,7 +27,7 @@
 #include <linux/spinlock.h>
 #include <linux/threads.h>
 #include <linux/interrupt.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -400,7 +400,7 @@ static void tda80xx_wait_diseqc_fifo(struct tda80xx_state* state)
 
 static int tda8044_init(struct dvb_frontend* fe)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
         int ret;
 
         /*
@@ -432,7 +432,7 @@ static int tda8044_init(struct dvb_frontend* fe)
 
 static int tda8083_init(struct dvb_frontend* fe)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         tda80xx_write(state, 0x00, tda8083_inittab, sizeof(tda8083_inittab));
 
@@ -447,7 +447,7 @@ static int tda8083_init(struct dvb_frontend* fe)
 
 static int tda80xx_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         switch (voltage) {
         case SEC_VOLTAGE_13:
@@ -463,7 +463,7 @@ static int tda80xx_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage
 
 static int tda80xx_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         switch (tone) {
         case SEC_TONE_OFF:
@@ -477,7 +477,7 @@ static int tda80xx_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 
 static int tda80xx_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd *cmd)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         if (cmd->msg_len > 6)
                 return -EINVAL;
@@ -492,7 +492,7 @@ static int tda80xx_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_ma
 
 static int tda80xx_send_diseqc_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t cmd)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         switch (cmd) {
         case SEC_MINI_A:
@@ -512,7 +512,7 @@ static int tda80xx_send_diseqc_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t
 
 static int tda80xx_sleep(struct dvb_frontend* fe)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         tda80xx_writereg(state, 0x00, 0x02);    /* enter standby */
 
@@ -521,7 +521,7 @@ static int tda80xx_sleep(struct dvb_frontend* fe)
 
 static int tda80xx_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         tda80xx_writereg(state, 0x1c, 0x80);
         state->config->pll_set(fe, p);
@@ -537,7 +537,7 @@ static int tda80xx_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int tda80xx_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         if (!state->config->irq)
                 tda80xx_read_status_int(state);
@@ -550,7 +550,7 @@ static int tda80xx_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int tda80xx_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         if (!state->config->irq)
                 tda80xx_read_status_int(state);
@@ -561,7 +561,7 @@ static int tda80xx_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int tda80xx_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
         int ret;
         u8 buf[3];
 
@@ -575,7 +575,7 @@ static int tda80xx_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int tda80xx_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         u8 gain = ~tda80xx_readreg(state, 0x01);
         *strength = (gain << 8) | gain;
@@ -585,7 +585,7 @@ static int tda80xx_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int tda80xx_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         u8 quality = tda80xx_readreg(state, 0x08);
         *snr = (quality << 8) | quality;
@@ -595,7 +595,7 @@ static int tda80xx_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int tda80xx_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         *ucblocks = tda80xx_readreg(state, 0x0f);
         if (*ucblocks == 0xff)
@@ -606,7 +606,7 @@ static int tda80xx_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int tda80xx_init(struct dvb_frontend* fe)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         switch(state->id) {
         case ID_TDA8044:
@@ -620,7 +620,7 @@ static int tda80xx_init(struct dvb_frontend* fe)
 
 static void tda80xx_release(struct dvb_frontend* fe)
 {
-        struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;
+        struct tda80xx_state* state = fe->demodulator_priv;
 
         if (state->config->irq)
                 free_irq(state->config->irq, &state->worklet);
@@ -637,7 +637,7 @@ struct dvb_frontend* tda80xx_attach(const struct tda80xx_config* config,
         int ret;
 
         /* allocate memory for the internal state */
-        state = (struct tda80xx_state*) kmalloc(sizeof(struct tda80xx_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct tda80xx_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index 9c0d23e1d9e5..70fb44b391a7 100644
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -70,7 +70,6 @@ static int ves1820_writereg(struct ves1820_state *state, u8 reg, u8 data)
                 printk("ves1820: %s(): writereg error (reg == 0x%02x,"
                         "val == 0x%02x, ret == %i)\n", __FUNCTION__, reg, data, ret);
 
-        msleep(10);
         return (ret != 1) ? -EREMOTEIO : 0;
 }
 
@@ -193,7 +192,7 @@ static int ves1820_set_symbolrate(struct ves1820_state *state, u32 symbolrate)
 
 static int ves1820_init(struct dvb_frontend* fe)
 {
-        struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
+        struct ves1820_state* state = fe->demodulator_priv;
         int i;
         int val;
 
@@ -214,7 +213,7 @@ static int ves1820_init(struct dvb_frontend* fe)
 
 static int ves1820_set_parameters(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
+        struct ves1820_state* state = fe->demodulator_priv;
         static const u8 reg0x00[] = { 0x00, 0x04, 0x08, 0x0c, 0x10 };
         static const u8 reg0x01[] = { 140, 140, 106, 100, 92 };
         static const u8 reg0x05[] = { 135, 100, 70, 54, 38 };
@@ -241,7 +240,7 @@ static int ves1820_set_parameters(struct dvb_frontend* fe, struct dvb_frontend_p
 
 static int ves1820_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
+        struct ves1820_state* state = fe->demodulator_priv;
         int sync;
 
         *status = 0;
@@ -267,7 +266,7 @@ static int ves1820_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int ves1820_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
+        struct ves1820_state* state = fe->demodulator_priv;
 
         u32 _ber = ves1820_readreg(state, 0x14) |
                         (ves1820_readreg(state, 0x15) << 8) |
@@ -279,7 +278,7 @@ static int ves1820_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int ves1820_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
+        struct ves1820_state* state = fe->demodulator_priv;
 
         u8 gain = ves1820_readreg(state, 0x17);
         *strength = (gain << 8) | gain;
@@ -289,7 +288,7 @@ static int ves1820_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int ves1820_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
+        struct ves1820_state* state = fe->demodulator_priv;
 
         u8 quality = ~ves1820_readreg(state, 0x18);
         *snr = (quality << 8) | quality;
@@ -299,7 +298,7 @@ static int ves1820_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int ves1820_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
+        struct ves1820_state* state = fe->demodulator_priv;
 
         *ucblocks = ves1820_readreg(state, 0x13) & 0x7f;
         if (*ucblocks == 0x7f)
@@ -314,7 +313,7 @@ static int ves1820_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int ves1820_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
+        struct ves1820_state* state = fe->demodulator_priv;
         int sync;
         s8 afc = 0;
 
@@ -345,7 +344,7 @@ static int ves1820_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int ves1820_sleep(struct dvb_frontend* fe)
 {
-        struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
+        struct ves1820_state* state = fe->demodulator_priv;
 
         ves1820_writereg(state, 0x1b, 0x02);    /* pdown ADC */
         ves1820_writereg(state, 0x00, 0x80);    /* standby */
@@ -364,7 +363,7 @@ static int ves1820_get_tune_settings(struct dvb_frontend* fe, struct dvb_fronten
 
 static void ves1820_release(struct dvb_frontend* fe)
 {
-        struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
+        struct ves1820_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -377,7 +376,7 @@ struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
         struct ves1820_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct ves1820_state*) kmalloc(sizeof(struct ves1820_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct ves1820_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
 
diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c
index edcad283aa86..821df8e839d0 100644
--- a/drivers/media/dvb/frontends/ves1x93.c
+++ b/drivers/media/dvb/frontends/ves1x93.c
@@ -263,7 +263,7 @@ static int ves1x93_set_symbolrate (struct ves1x93_state* state, u32 srate)
 
 static int ves1x93_init (struct dvb_frontend* fe)
 {
-        struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+        struct ves1x93_state* state = fe->demodulator_priv;
         int i;
         int val;
 
@@ -289,7 +289,7 @@ static int ves1x93_init (struct dvb_frontend* fe)
 
 static int ves1x93_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+        struct ves1x93_state* state = fe->demodulator_priv;
 
         switch (voltage) {
         case SEC_VOLTAGE_13:
@@ -305,7 +305,7 @@ static int ves1x93_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
 
 static int ves1x93_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+        struct ves1x93_state* state = fe->demodulator_priv;
 
         u8 sync = ves1x93_readreg (state, 0x0e);
 
@@ -346,7 +346,7 @@ static int ves1x93_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int ves1x93_read_ber(struct dvb_frontend* fe, u32* ber)
 {
-        struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+        struct ves1x93_state* state = fe->demodulator_priv;
 
         *ber = ves1x93_readreg (state, 0x15);
         *ber |= (ves1x93_readreg (state, 0x16) << 8);
@@ -358,7 +358,7 @@ static int ves1x93_read_ber(struct dvb_frontend* fe, u32* ber)
 
 static int ves1x93_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+        struct ves1x93_state* state = fe->demodulator_priv;
 
         u8 signal = ~ves1x93_readreg (state, 0x0b);
         *strength = (signal << 8) | signal;
@@ -368,7 +368,7 @@ static int ves1x93_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int ves1x93_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+        struct ves1x93_state* state = fe->demodulator_priv;
 
         u8 _snr = ~ves1x93_readreg (state, 0x1c);
         *snr = (_snr << 8) | _snr;
@@ -378,7 +378,7 @@ static int ves1x93_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int ves1x93_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
-        struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+        struct ves1x93_state* state = fe->demodulator_priv;
 
         *ucblocks = ves1x93_readreg (state, 0x18) & 0x7f;
 
@@ -393,7 +393,7 @@ static int ves1x93_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
 static int ves1x93_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+        struct ves1x93_state* state = fe->demodulator_priv;
 
         ves1x93_writereg(state, 0x00, 0x11);
         state->config->pll_set(fe, p);
@@ -408,7 +408,7 @@ static int ves1x93_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int ves1x93_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+        struct ves1x93_state* state = fe->demodulator_priv;
         int afc;
 
         afc = ((int)((char)(ves1x93_readreg (state, 0x0a) << 1)))/2;
@@ -431,14 +431,14 @@ static int ves1x93_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 static int ves1x93_sleep(struct dvb_frontend* fe)
 {
-        struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+        struct ves1x93_state* state = fe->demodulator_priv;
 
         return ves1x93_writereg (state, 0x00, 0x08);
 }
 
 static void ves1x93_release(struct dvb_frontend* fe)
 {
-        struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+        struct ves1x93_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -451,7 +451,7 @@ struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,
         u8 identity;
 
         /* allocate memory for the internal state */
-        state = (struct ves1x93_state*) kmalloc(sizeof(struct ves1x93_state), GFP_KERNEL);
+        state = kmalloc(sizeof(struct ves1x93_state), GFP_KERNEL);
         if (state == NULL) goto error;
 
         /* setup the state */
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 922c205a2652..8e33a850e13e 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -130,7 +130,7 @@ static void init_av7110_av(struct av7110 *av7110)
         av7110->current_input = 0;
         if (i2c_writereg(av7110, 0x20, 0x00, 0x00) == 1) {
                 printk ("dvb-ttpci: Crystal audio DAC @ card %d detected\n",
-                        av7110->dvb_adapter->num);
+                        av7110->dvb_adapter.num);
                 av7110->adac_type = DVB_ADAC_CRYSTAL;
                 i2c_writereg(av7110, 0x20, 0x01, 0xd2);
                 i2c_writereg(av7110, 0x20, 0x02, 0x49);
@@ -145,13 +145,13 @@ static void init_av7110_av(struct av7110 *av7110)
         }
         else if (dev->pci->subsystem_vendor == 0x110a) {
                 printk("dvb-ttpci: DVB-C w/o analog module @ card %d detected\n",
-                        av7110->dvb_adapter->num);
+                        av7110->dvb_adapter.num);
                 av7110->adac_type = DVB_ADAC_NONE;
         }
         else {
                 av7110->adac_type = adac;
                 printk("dvb-ttpci: adac type set to %d @ card %d\n",
-                        av7110->dvb_adapter->num, av7110->adac_type);
+                        av7110->dvb_adapter.num, av7110->adac_type);
         }
 
         if (av7110->adac_type == DVB_ADAC_NONE || av7110->adac_type == DVB_ADAC_MSP) {
@@ -231,7 +231,7 @@ static int arm_thread(void *data)
 
                 if (newloops == av7110->arm_loops) {
                         printk(KERN_ERR "dvb-ttpci: ARM crashed @ card %d\n",
-                               av7110->dvb_adapter->num);
+                               av7110->dvb_adapter.num);
 
                         arm_error(av7110);
                         av7710_set_video_mode(av7110, vidmode);
@@ -1282,7 +1282,7 @@ static int av7110_register(struct av7110 *av7110)
         av7110->dmxdev.demux = &dvbdemux->dmx;
         av7110->dmxdev.capabilities = 0;
 
-        dvb_dmxdev_init(&av7110->dmxdev, av7110->dvb_adapter);
+        dvb_dmxdev_init(&av7110->dmxdev, &av7110->dvb_adapter);
 
         av7110->hw_frontend.source = DMX_FRONTEND_0;
 
@@ -1307,11 +1307,11 @@ static int av7110_register(struct av7110 *av7110)
         av7110_ca_register(av7110);
 
 #ifdef CONFIG_DVB_AV7110_OSD
-        dvb_register_device(av7110->dvb_adapter, &av7110->osd_dev,
+        dvb_register_device(&av7110->dvb_adapter, &av7110->osd_dev,
                             &dvbdev_osd, av7110, DVB_DEVICE_OSD);
 #endif
 
-        dvb_net_init(av7110->dvb_adapter, &av7110->dvb_net, &dvbdemux->dmx);
+        dvb_net_init(&av7110->dvb_adapter, &av7110->dvb_net, &dvbdemux->dmx);
 
         if (budgetpatch) {
                 /* initialize software demux1 without its own frontend
@@ -1334,9 +1334,9 @@ static int av7110_register(struct av7110 *av7110)
                 av7110->dmxdev1.demux = &dvbdemux1->dmx;
                 av7110->dmxdev1.capabilities = 0;
 
-                dvb_dmxdev_init(&av7110->dmxdev1, av7110->dvb_adapter);
+                dvb_dmxdev_init(&av7110->dmxdev1, &av7110->dvb_adapter);
 
-                dvb_net_init(av7110->dvb_adapter, &av7110->dvb_net1, &dvbdemux1->dmx);
+                dvb_net_init(&av7110->dvb_adapter, &av7110->dvb_net1, &dvbdemux1->dmx);
                 printk("dvb-ttpci: additional demux1 for budget-patch registered\n");
         }
         return 0;
@@ -1673,6 +1673,106 @@ static struct stv0299_config alps_bsru6_config = {
 };
 
 
+static u8 alps_bsbe1_inittab[] = {
+        0x01, 0x15,
+        0x02, 0x30,
+        0x03, 0x00,
+        0x04, 0x7d,   /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
+        0x05, 0x35,   /* I2CT = 0, SCLT = 1, SDAT = 1 */
+        0x06, 0x40,   /* DAC not used, set to high impendance mode */
+        0x07, 0x00,   /* DAC LSB */
+        0x08, 0x40,   /* DiSEqC off, LNB power on OP2/LOCK pin on */
+        0x09, 0x00,   /* FIFO */
+        0x0c, 0x51,   /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
+        0x0d, 0x82,   /* DC offset compensation = ON, beta_agc1 = 2 */
+        0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
+        0x10, 0x3f,   // AGC2  0x3d
+        0x11, 0x84,
+        0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+        0x15, 0xc9,   // lock detector threshold
+        0x16, 0x00,
+        0x17, 0x00,
+        0x18, 0x00,
+        0x19, 0x00,
+        0x1a, 0x00,
+        0x1f, 0x50,
+        0x20, 0x00,
+        0x21, 0x00,
+        0x22, 0x00,
+        0x23, 0x00,
+        0x28, 0x00,  // out imp: normal  out type: parallel FEC mode:0
+        0x29, 0x1e,  // 1/2 threshold
+        0x2a, 0x14,  // 2/3 threshold
+        0x2b, 0x0f,  // 3/4 threshold
+        0x2c, 0x09,  // 5/6 threshold
+        0x2d, 0x05,  // 7/8 threshold
+        0x2e, 0x01,
+        0x31, 0x1f,  // test all FECs
+        0x32, 0x19,  // viterbi and synchro search
+        0x33, 0xfc,  // rs control
+        0x34, 0x93,  // error control
+        0x0f, 0x92,
+        0xff, 0xff
+};
+
+static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+{
+        struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
+        int ret;
+        u8 data[4];
+        u32 div;
+        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
+
+        if ((params->frequency < 950000) || (params->frequency > 2150000))
+                return -EINVAL;
+
+        div = (params->frequency + (125 - 1)) / 125; // round correctly
+        data[0] = (div >> 8) & 0x7f;
+        data[1] = div & 0xff;
+        data[2] = 0x80 | ((div & 0x18000) >> 10) | 4;
+        data[3] = (params->frequency > 1530000) ? 0xE0 : 0xE4;
+
+        ret = i2c_transfer(&av7110->i2c_adap, &msg, 1);
+        return (ret != 1) ? -EIO : 0;
+}
+
+static struct stv0299_config alps_bsbe1_config = {
+        .demod_address = 0x68,
+        .inittab = alps_bsbe1_inittab,
+        .mclk = 88000000UL,
+        .invert = 1,
+        .enhanced_tuning = 0,
+        .skip_reinit = 0,
+        .min_delay_ms = 100,
+        .set_symbol_rate = alps_bsru6_set_symbol_rate,
+        .pll_set = alps_bsbe1_pll_set,
+};
+
+static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
+{
+        struct av7110* av7110 = (struct av7110*) fe->dvb->priv;
+        int ret;
+        u8 data[1];
+        struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = data, .len = sizeof(data) };
+
+        switch(voltage) {
+        case SEC_VOLTAGE_OFF:
+                data[0] = 0x00;
+                break;
+        case SEC_VOLTAGE_13:
+                data[0] = 0x44;
+                break;
+        case SEC_VOLTAGE_18:
+                data[0] = 0x4c;
+                break;
+        default:
+                return -EINVAL;
+        };
+
+        ret = i2c_transfer(&av7110->i2c_adap, &msg, 1);
+        return (ret != 1) ? -EIO : 0;
+}
+
 
 static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
@@ -2116,6 +2216,14 @@ static int frontend_init(struct av7110 *av7110)
                                 av7110->dev->i2c_bitrate = SAA7146_I2C_BUS_BIT_RATE_240;
                                 break;
                         }
+                        break;
+
+                case 0x000E: /* Hauppauge/TT Nexus-S rev 2.3 */
+                        /* ALPS BSBE1 */
+                        av7110->fe = stv0299_attach(&alps_bsbe1_config, &av7110->i2c_adap);
+                        if (av7110->fe)
+                                av7110->fe->ops->set_voltage = lnbp21_set_voltage;
+                        break;
                 }
         }
 
@@ -2138,7 +2246,7 @@ static int frontend_init(struct av7110 *av7110)
                 FE_FUNC_OVERRIDE(av7110->fe->ops->dishnetwork_send_legacy_command, av7110->fe_dishnetwork_send_legacy_command, av7110_fe_dishnetwork_send_legacy_command);
                 FE_FUNC_OVERRIDE(av7110->fe->ops->set_frontend, av7110->fe_set_frontend, av7110_fe_set_frontend);
 
-                ret = dvb_register_frontend(av7110->dvb_adapter, av7110->fe);
+                ret = dvb_register_frontend(&av7110->dvb_adapter, av7110->fe);
                 if (ret < 0) {
                         printk("av7110: Frontend registration failed!\n");
                         if (av7110->fe->ops->release)
@@ -2352,7 +2460,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
                 goto err_dvb_unregister_adapter_2;
 
         ttpci_eeprom_parse_mac(&av7110->i2c_adap,
-                               av7110->dvb_adapter->proposed_mac);
+                               av7110->dvb_adapter.proposed_mac);
         ret = -ENOMEM;
 
         if (budgetpatch) {
@@ -2523,7 +2631,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
         if (ret < 0)
                 goto err_av7110_unregister_11;
 
-        av7110->dvb_adapter->priv = av7110;
+        av7110->dvb_adapter.priv = av7110;
         ret = frontend_init(av7110);
         if (ret < 0)
                 goto err_av7110_exit_v4l_12;
@@ -2558,7 +2666,7 @@ err_saa71466_vfree_4:
 err_i2c_del_3:
         i2c_del_adapter(&av7110->i2c_adap);
 err_dvb_unregister_adapter_2:
-        dvb_unregister_adapter(av7110->dvb_adapter);
+        dvb_unregister_adapter(&av7110->dvb_adapter);
 err_put_firmware_1:
         put_firmware(av7110);
 err_kfree_0:
@@ -2604,7 +2712,7 @@ static int av7110_detach(struct saa7146_dev* saa)
 
         i2c_del_adapter(&av7110->i2c_adap);
 
-        dvb_unregister_adapter (av7110->dvb_adapter);
+        dvb_unregister_adapter (&av7110->dvb_adapter);
 
         av7110_num--;
 
@@ -2672,21 +2780,23 @@ MAKE_AV7110_INFO(ttt_1_X,    "Technotrend/Hauppauge WinTV DVB-T rev1.X");
 MAKE_AV7110_INFO(ttc_1_X,    "Technotrend/Hauppauge WinTV Nexus-CA rev1.X");
 MAKE_AV7110_INFO(ttc_2_X,    "Technotrend/Hauppauge WinTV DVB-C rev2.X");
 MAKE_AV7110_INFO(tts_2_X,    "Technotrend/Hauppauge WinTV Nexus-S rev2.X");
+MAKE_AV7110_INFO(tts_2_3,    "Technotrend/Hauppauge WinTV Nexus-S rev2.3");
 MAKE_AV7110_INFO(tts_1_3se,  "Technotrend/Hauppauge WinTV DVB-S rev1.3 SE");
 MAKE_AV7110_INFO(ttt,        "Technotrend/Hauppauge DVB-T");
 MAKE_AV7110_INFO(fsc,        "Fujitsu Siemens DVB-C");
 MAKE_AV7110_INFO(fss,        "Fujitsu Siemens DVB-S rev1.6");
 
 static struct pci_device_id pci_tbl[] = {
+        MAKE_EXTENSION_PCI(fsc,       0x110a, 0x0000),
         MAKE_EXTENSION_PCI(tts_1_X,   0x13c2, 0x0000),
         MAKE_EXTENSION_PCI(ttt_1_X,   0x13c2, 0x0001),
         MAKE_EXTENSION_PCI(ttc_2_X,   0x13c2, 0x0002),
         MAKE_EXTENSION_PCI(tts_2_X,   0x13c2, 0x0003),
-        MAKE_EXTENSION_PCI(tts_1_3se, 0x13c2, 0x1002),
-        MAKE_EXTENSION_PCI(fsc,       0x110a, 0x0000),
-        MAKE_EXTENSION_PCI(ttc_1_X,   0x13c2, 0x000a),
         MAKE_EXTENSION_PCI(fss,       0x13c2, 0x0006),
         MAKE_EXTENSION_PCI(ttt,       0x13c2, 0x0008),
+        MAKE_EXTENSION_PCI(ttc_1_X,   0x13c2, 0x000a),
+        MAKE_EXTENSION_PCI(tts_2_3,   0x13c2, 0x000e),
+        MAKE_EXTENSION_PCI(tts_1_3se, 0x13c2, 0x1002),
 
 /*      MAKE_EXTENSION_PCI(???, 0x13c2, 0x0004), UNDEFINED CARD */ // Galaxis DVB PC-Sat-Carte
 /*      MAKE_EXTENSION_PCI(???, 0x13c2, 0x0005), UNDEFINED CARD */ // Technisat SkyStar1
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index 5070e0523da7..4f69b4d01479 100644
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -220,7 +220,7 @@ struct av7110 {
 
         struct audio_mixer      mixer;
 
-        struct dvb_adapter       *dvb_adapter;
+        struct dvb_adapter       dvb_adapter;
         struct dvb_device        *video_dev;
         struct dvb_device        *audio_dev;
         struct dvb_device        *ca_dev;
@@ -274,7 +274,6 @@ extern void av7110_ir_exit (void);
 extern int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val);
 extern u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg);
 extern int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val);
-extern int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val);
 
 
 extern int av7110_init_analog_module(struct av7110 *av7110);
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index d77e8a00688f..ccf946125d02 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -1075,7 +1075,7 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file,
                 }
                 if (ret < 0)
                         break;
-                av7110->videostate.video_format = format;
+                av7110->videostate.display_format = format;
                 ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetPanScanType,
                                     1, (u16) val);
                 break;
@@ -1230,14 +1230,20 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file,
                 switch(av7110->audiostate.channel_select) {
                 case AUDIO_STEREO:
                         audcom(av7110, AUDIO_CMD_STEREO);
+                        if (av7110->adac_type == DVB_ADAC_CRYSTAL)
+                                i2c_writereg(av7110, 0x20, 0x02, 0x49);
                         break;
 
                 case AUDIO_MONO_LEFT:
                         audcom(av7110, AUDIO_CMD_MONO_L);
+                        if (av7110->adac_type == DVB_ADAC_CRYSTAL)
+                                i2c_writereg(av7110, 0x20, 0x02, 0x4a);
                         break;
 
                 case AUDIO_MONO_RIGHT:
                         audcom(av7110, AUDIO_CMD_MONO_R);
+                        if (av7110->adac_type == DVB_ADAC_CRYSTAL)
+                                i2c_writereg(av7110, 0x20, 0x02, 0x45);
                         break;
 
                 default:
@@ -1409,10 +1415,10 @@ int av7110_av_register(struct av7110 *av7110)
         av7110->video_events.overflow = 0;
         memset(&av7110->video_size, 0, sizeof (video_size_t));
 
-        dvb_register_device(av7110->dvb_adapter, &av7110->video_dev,
+        dvb_register_device(&av7110->dvb_adapter, &av7110->video_dev,
                             &dvbdev_video, av7110, DVB_DEVICE_VIDEO);
 
-        dvb_register_device(av7110->dvb_adapter, &av7110->audio_dev,
+        dvb_register_device(&av7110->dvb_adapter, &av7110->audio_dev,
                             &dvbdev_audio, av7110, DVB_DEVICE_AUDIO);
 
         return 0;
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
index 21f7aacf7726..c3801e328fe9 100644
--- a/drivers/media/dvb/ttpci/av7110_ca.c
+++ b/drivers/media/dvb/ttpci/av7110_ca.c
@@ -123,7 +123,7 @@ static void ci_ll_release(struct dvb_ringbuffer *cirbuf, struct dvb_ringbuffer *
 }
 
 static int ci_ll_reset(struct dvb_ringbuffer *cibuf, struct file *file,
-                int slots, ca_slot_info_t *slot)
+                       int slots, ca_slot_info_t *slot)
 {
         int i;
         int len = 0;
@@ -370,7 +370,7 @@ static struct dvb_device dvbdev_ca = {
 
 int av7110_ca_register(struct av7110 *av7110)
 {
-        return dvb_register_device(av7110->dvb_adapter, &av7110->ca_dev,
+        return dvb_register_device(&av7110->dvb_adapter, &av7110->ca_dev,
                                    &dvbdev_ca, av7110, DVB_DEVICE_CA);
 }
 
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index bd6e5ea4aefe..7fa4a0ebe133 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -104,7 +104,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count)
 
 
 /* av7110 ARM core boot stuff */
-
+#if 0
 void av7110_reset_arm(struct av7110 *av7110)
 {
         saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTLO);
@@ -124,7 +124,7 @@ void av7110_reset_arm(struct av7110 *av7110)
         av7110->arm_ready = 1;
         dprintk(1, "reset ARM\n");
 }
-
+#endif  /*  0  */
 
 static int waitdebi(struct av7110 *av7110, int adr, int state)
 {
@@ -335,7 +335,7 @@ int av7110_wait_msgstate(struct av7110 *av7110, u16 flags)
         return 0;
 }
 
-int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
+static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
 {
         int i;
         unsigned long start;
@@ -455,7 +455,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
         return 0;
 }
 
-int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
+static int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
 {
         int ret;
 
@@ -500,6 +500,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...)
         return ret;
 }
 
+#if 0
 int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len)
 {
         int i, ret;
@@ -521,6 +522,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len)
                 printk(KERN_ERR "dvb-ttpci: av7110_send_ci_cmd error %d\n", ret);
         return ret;
 }
+#endif  /*  0  */
 
 int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
                       int request_buf_len, u16 *reply_buf, int reply_buf_len)
@@ -593,7 +595,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
         return 0;
 }
 
-int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* buf, s16 length)
+static int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* buf, s16 length)
 {
         int ret;
         ret = av7110_fw_request(av7110, &tag, 0, buf, length);
@@ -617,7 +619,7 @@ int av7110_firmversion(struct av7110 *av7110)
 
         if (av7110_fw_query(av7110, tag, buf, 16)) {
                 printk("dvb-ttpci: failed to boot firmware @ card %d\n",
-                       av7110->dvb_adapter->num);
+                       av7110->dvb_adapter.num);
                 return -EIO;
         }
 
@@ -628,16 +630,16 @@ int av7110_firmversion(struct av7110 *av7110)
         av7110->avtype = (buf[8] << 16) + buf[9];
 
         printk("dvb-ttpci: info @ card %d: firm %08x, rtsl %08x, vid %08x, app %08x\n",
-               av7110->dvb_adapter->num, av7110->arm_fw,
+               av7110->dvb_adapter.num, av7110->arm_fw,
                av7110->arm_rtsl, av7110->arm_vid, av7110->arm_app);
 
         /* print firmware capabilities */
         if (FW_CI_LL_SUPPORT(av7110->arm_app))
                 printk("dvb-ttpci: firmware @ card %d supports CI link layer interface\n",
-                       av7110->dvb_adapter->num);
+                       av7110->dvb_adapter.num);
         else
                 printk("dvb-ttpci: no firmware support for CI link layer interface @ card %d\n",
-                       av7110->dvb_adapter->num);
+                       av7110->dvb_adapter.num);
 
         return 0;
 }
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h
index bf901c624682..52061e17c6dd 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.h
+++ b/drivers/media/dvb/ttpci/av7110_hw.h
@@ -364,7 +364,6 @@ enum av7110_command_type {
 
 
 
-extern void av7110_reset_arm(struct av7110 *av7110);
 extern int av7110_bootarm(struct av7110 *av7110);
 extern int av7110_firmversion(struct av7110 *av7110);
 #define FW_CI_LL_SUPPORT(arm_app) ((arm_app) & 0x80000000)
@@ -373,12 +372,8 @@ extern int av7110_firmversion(struct av7110 *av7110);
 
 extern int av7110_wait_msgstate(struct av7110 *av7110, u16 flags);
 extern int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...);
-extern int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length);
-extern int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length);
-extern int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len);
 extern int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
                              int request_buf_len, u16 *reply_buf, int reply_buf_len);
-extern int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* Buff, s16 length);
 
 
 /* DEBI (saa7146 data extension bus interface) access */
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index 6d2256f1e354..665cdb8a3f71 100644
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -10,7 +10,7 @@
 
 #define UP_TIMEOUT (HZ/4)
 
-/* enable ir debugging by or'ing av7110_debug with 16 */
+/* enable ir debugging by or'ing debug with 16 */
 
 static int ir_initialized;
 static struct input_dev input_dev;
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index eb84fb08d95c..e65fc36e2ce8 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -46,13 +46,13 @@ int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val)
 
         if (i2c_transfer(&av7110->i2c_adap, &msgs, 1) != 1) {
                 dprintk(1, "dvb-ttpci: failed @ card %d, %u = %u\n",
-                       av7110->dvb_adapter->num, reg, val);
+                       av7110->dvb_adapter.num, reg, val);
                 return -EIO;
         }
         return 0;
 }
 
-int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
+static int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
 {
         u8 msg1[3] = { dev, reg >> 8, reg & 0xff };
         u8 msg2[2];
@@ -63,7 +63,7 @@ int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
 
         if (i2c_transfer(&av7110->i2c_adap, &msgs[0], 2) != 2) {
                 dprintk(1, "dvb-ttpci: failed @ card %d, %u\n",
-                       av7110->dvb_adapter->num, reg);
+                       av7110->dvb_adapter.num, reg);
                 return -EIO;
         }
         *val = (msg2[0] << 8) | msg2[1];
@@ -552,13 +552,13 @@ int av7110_init_analog_module(struct av7110 *av7110)
                 return -ENODEV;
 
         printk("dvb-ttpci: DVB-C analog module @ card %d detected, initializing MSP3400\n",
-                av7110->dvb_adapter->num);
+                av7110->dvb_adapter.num);
         av7110->adac_type = DVB_ADAC_MSP;
         msleep(100); // the probing above resets the msp...
         msp_readreg(av7110, MSP_RD_DSP, 0x001e, &version1);
         msp_readreg(av7110, MSP_RD_DSP, 0x001f, &version2);
         dprintk(1, "dvb-ttpci: @ card %d MSP3400 version 0x%04x 0x%04x\n",
-                av7110->dvb_adapter->num, version1, version2);
+                av7110->dvb_adapter.num, version1, version2);
         msp_writereg(av7110, MSP_WR_DSP, 0x0013, 0x0c00);
         msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x7f00); // loudspeaker + headphone
         msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0220); // loudspeaker source
@@ -596,7 +596,7 @@ int av7110_init_analog_module(struct av7110 *av7110)
                 /* init the saa7113 */
                 while (*i != 0xff) {
                         if (i2c_writereg(av7110, 0x48, i[0], i[1]) != 1) {
-                                dprintk(1, "saa7113 initialization failed @ card %d", av7110->dvb_adapter->num);
+                                dprintk(1, "saa7113 initialization failed @ card %d", av7110->dvb_adapter.num);
                                 break;
                         }
                         i += 2;
@@ -726,11 +726,11 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
 {
         struct av7110 *av7110 = (struct av7110*) dev->ext_priv;
 
-        if (std->id == V4L2_STD_PAL) {
+        if (std->id & V4L2_STD_PAL) {
                 av7110->vidmode = VIDEO_MODE_PAL;
                 av7110_set_vidmode(av7110, av7110->vidmode);
         }
-        else if (std->id == V4L2_STD_NTSC) {
+        else if (std->id & V4L2_STD_NTSC) {
                 av7110->vidmode = VIDEO_MODE_NTSC;
                 av7110_set_vidmode(av7110, av7110->vidmode);
         }
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 14e963206b89..6e0f5d307c52 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -59,8 +59,12 @@ struct budget_av {
         struct dvb_ca_en50221 ca;
 };
 
-static int enable_ci = 0;
-
+/* GPIO CI Connections:
+ * 0 - Vcc/Reset (Reset is controlled by capacitor)
+ * 1 - Attribute Memory
+ * 2 - Card Enable (Active Low)
+ * 3 - Card Detect
+ */
 
 /****************************************************************************
  * INITIALIZATION
@@ -188,22 +192,35 @@ static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot)
 {
         struct budget_av *budget_av = (struct budget_av *) ca->data;
         struct saa7146_dev *saa = budget_av->budget.dev;
-        int max = 20;
+        int timeout = 50; // 5 seconds (4.4.6 Ready)
 
         if (slot != 0)
                 return -EINVAL;
 
         dprintk(1, "ciintf_slot_reset\n");
 
-        /* reset the card */
-        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI);
-        msleep(100);
-        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);
+        saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */
 
-        while (--max > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
+        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI); /* Vcc off */
+        msleep(2);
+        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO); /* Vcc on */
+        msleep(20); /* 20 ms Vcc settling time */
+
+        saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTLO); /* enable card */
+
+        /* This should have been based on pin 16 READY of the pcmcia port,
+         * but AFAICS it is not routed to the saa7146 */
+        while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
                 msleep(100);
 
-        ttpci_budget_set_video_port(saa, BUDGET_VIDEO_PORTB);
+        if (timeout <= 0)
+        {
+                printk(KERN_ERR "budget-av: cam reset failed (timeout).\n");
+                saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */
+                saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI); /* Vcc off */
+                return -ETIMEDOUT;
+        }
+
         return 0;
 }
 
@@ -240,7 +257,6 @@ static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open
 {
         struct budget_av *budget_av = (struct budget_av *) ca->data;
         struct saa7146_dev *saa = budget_av->budget.dev;
-        int cam = 0;
 
         if (slot != 0)
                 return -EINVAL;
@@ -248,15 +264,21 @@ static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open
         if (!budget_av->slot_status) {
                 saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT);
                 udelay(1);
-                cam = saa7146_read(saa, PSR) & MASK_06;
-                saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
-
-                if (cam)
+                if (saa7146_read(saa, PSR) & MASK_06)
+                {
+                        printk(KERN_INFO "budget-av: cam inserted\n");
                         budget_av->slot_status = 1;
+                }
+                saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
         } else if (!open) {
                 saa7146_setgpio(budget_av->budget.dev, 1, SAA7146_GPIO_OUTLO);
                 if (ttpci_budget_debiread(&budget_av->budget, DEBICICAM, 0, 1, 0, 1) == -ETIMEDOUT)
+                {
+                        printk(KERN_INFO "budget-av: cam ejected\n");
+                        saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */
+                        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI); /* Vcc off */
                         budget_av->slot_status = 0;
+                }
         }
 
         if (budget_av->slot_status == 1)
@@ -272,17 +294,11 @@ static int ciintf_init(struct budget_av *budget_av)
 
         memset(&budget_av->ca, 0, sizeof(struct dvb_ca_en50221));
 
-        /* setup GPIOs */
-        saa7146_setgpio(saa, 1, SAA7146_GPIO_OUTHI);
+        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);
+        saa7146_setgpio(saa, 1, SAA7146_GPIO_OUTLO);
         saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTLO);
         saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
 
-        /* Reset the card */
-        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI);
-        msleep(50);
-        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);
-        msleep(100);
-
         /* Enable DEBI pins */
         saa7146_write(saa, MC1, saa7146_read(saa, MC1) | (0x800 << 16) | 0x800);
 
@@ -297,13 +313,14 @@ static int ciintf_init(struct budget_av *budget_av)
         budget_av->ca.slot_ts_enable = ciintf_slot_ts_enable;
         budget_av->ca.poll_slot_status = ciintf_poll_slot_status;
         budget_av->ca.data = budget_av;
-        if ((result = dvb_ca_en50221_init(budget_av->budget.dvb_adapter,
+
+        if ((result = dvb_ca_en50221_init(&budget_av->budget.dvb_adapter,
                                           &budget_av->ca, 0, 1)) != 0) {
-                printk("budget_av: CI interface detected, but initialisation failed.\n");
+                printk(KERN_ERR "budget-av: ci initialisation failed.\n");
                 goto error;
         }
-        // success!
-        printk("ciintf_init: CI interface initialised\n");
+
+        printk(KERN_INFO "budget-av: ci interface initialised.\n");
         budget_av->budget.ci_present = 1;
         return 0;
 
@@ -361,8 +378,12 @@ static const u8 saa7113_tab[] = {
 static int saa7113_init(struct budget_av *budget_av)
 {
         struct budget *budget = &budget_av->budget;
+        struct saa7146_dev *saa = budget->dev;
         const u8 *data = saa7113_tab;
 
+        saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI);
+        msleep(200);
+
         if (i2c_writereg(&budget->i2c_adap, 0x4a, 0x01, 0x08) != 1) {
                 dprintk(1, "saa7113 not found on KNC card\n");
                 return -ENODEV;
@@ -697,75 +718,90 @@ static u8 read_pwm(struct budget_av *budget_av)
         return pwm;
 }
 
+#define SUBID_DVBS_KNC1         0x0010
+#define SUBID_DVBS_KNC1_PLUS    0x0011
+#define SUBID_DVBS_TYPHOON      0x4f56
+#define SUBID_DVBS_CINERGY1200  0x1154
+
+#define SUBID_DVBC_KNC1         0x0020
+#define SUBID_DVBC_KNC1_PLUS    0x0021
+#define SUBID_DVBC_CINERGY1200  0x1156
+
+#define SUBID_DVBT_KNC1_PLUS    0x0031
+#define SUBID_DVBT_KNC1         0x0030
+#define SUBID_DVBT_CINERGY1200  0x1157
 
 static void frontend_init(struct budget_av *budget_av)
 {
-        switch (budget_av->budget.dev->pci->subsystem_device) {
-        case 0x4f56:            // Typhoon/KNC1 DVB-S budget (stv0299/Philips SU1278(tsa5059))
-                budget_av->budget.dvb_frontend =
-                        stv0299_attach(&typhoon_config, &budget_av->budget.i2c_adap);
-                if (budget_av->budget.dvb_frontend != NULL) {
+        struct saa7146_dev * saa = budget_av->budget.dev;
+        struct dvb_frontend * fe = NULL;
+
+        switch (saa->pci->subsystem_device) {
+                case SUBID_DVBS_KNC1_PLUS:
+                case SUBID_DVBC_KNC1_PLUS:
+                case SUBID_DVBT_KNC1_PLUS:
+                        // Enable / PowerON Frontend
+                        saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTHI);
                         break;
-                }
+        }
+
+        switch (saa->pci->subsystem_device) {
+
+        case SUBID_DVBS_KNC1:
+        case SUBID_DVBS_KNC1_PLUS:
+        case SUBID_DVBS_TYPHOON:
+                fe = stv0299_attach(&typhoon_config,
+                                    &budget_av->budget.i2c_adap);
                 break;
 
-        case 0x0020:            // KNC1 DVB-C budget (tda10021/Philips CU1216(tua6034))
-                budget_av->budget.dvb_frontend =
-                        tda10021_attach(&philips_cu1216_config,
-                                        &budget_av->budget.i2c_adap, read_pwm(budget_av));
-                if (budget_av->budget.dvb_frontend != NULL) {
-                        break;
-                }
+        case SUBID_DVBS_CINERGY1200:
+                fe = stv0299_attach(&cinergy_1200s_config,
+                                    &budget_av->budget.i2c_adap);
                 break;
 
-        case 0x0030:            // KNC1 DVB-T budget (tda10046/Philips TU1216(tda6651tt))
-                budget_av->budget.dvb_frontend =
-                        tda10046_attach(&philips_tu1216_config, &budget_av->budget.i2c_adap);
-                if (budget_av->budget.dvb_frontend != NULL) {
-                        break;
-                }
+        case SUBID_DVBC_KNC1:
+        case SUBID_DVBC_KNC1_PLUS:
+                fe = tda10021_attach(&philips_cu1216_config,
+                                     &budget_av->budget.i2c_adap,
+                                     read_pwm(budget_av));
                 break;
 
-        case 0x1154:            // TerraTec Cinergy 1200 DVB-S (stv0299/Philips SU1278(tsa5059))
-                budget_av->budget.dvb_frontend =
-                        stv0299_attach(&cinergy_1200s_config, &budget_av->budget.i2c_adap);
-                if (budget_av->budget.dvb_frontend != NULL) {
-                        break;
-                }
+        case SUBID_DVBT_KNC1:
+        case SUBID_DVBT_KNC1_PLUS:
+                fe = tda10046_attach(&philips_tu1216_config,
+                                     &budget_av->budget.i2c_adap);
                 break;
 
-        case 0x1156:            // Terratec Cinergy 1200 DVB-C (tda10021/Philips CU1216(tua6034))
-                budget_av->budget.dvb_frontend =
-                        tda10021_attach(&philips_cu1216_config,
-                                        &budget_av->budget.i2c_adap, read_pwm(budget_av));
-                if (budget_av->budget.dvb_frontend) {
-                        break;
-                }
+        case SUBID_DVBC_CINERGY1200:
+                fe = tda10021_attach(&philips_cu1216_config,
+                                     &budget_av->budget.i2c_adap,
+                                     read_pwm(budget_av));
                 break;
 
-        case 0x1157:            // Terratec Cinergy 1200 DVB-T (tda10046/Philips TU1216(tda6651tt))
-                budget_av->budget.dvb_frontend =
-                        tda10046_attach(&philips_tu1216_config, &budget_av->budget.i2c_adap);
-                if (budget_av->budget.dvb_frontend) {
-                        break;
-                }
+        case SUBID_DVBT_CINERGY1200:
+                fe = tda10046_attach(&philips_tu1216_config,
+                                     &budget_av->budget.i2c_adap);
                 break;
         }
 
-        if (budget_av->budget.dvb_frontend == NULL) {
-                printk("budget_av: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
-                       budget_av->budget.dev->pci->vendor,
-                       budget_av->budget.dev->pci->device,
-                       budget_av->budget.dev->pci->subsystem_vendor,
-                       budget_av->budget.dev->pci->subsystem_device);
-        } else {
-                if (dvb_register_frontend
-                    (budget_av->budget.dvb_adapter, budget_av->budget.dvb_frontend)) {
-                        printk("budget-av: Frontend registration failed!\n");
-                        if (budget_av->budget.dvb_frontend->ops->release)
-                                budget_av->budget.dvb_frontend->ops->release(budget_av->budget.dvb_frontend);
-                        budget_av->budget.dvb_frontend = NULL;
-                }
+        if (fe == NULL) {
+                printk(KERN_ERR "budget-av: A frontend driver was not found "
+                                "for device %04x/%04x subsystem %04x/%04x\n",
+                       saa->pci->vendor,
+                       saa->pci->device,
+                       saa->pci->subsystem_vendor,
+                       saa->pci->subsystem_device);
+                return;
+        }
+
+        budget_av->budget.dvb_frontend = fe;
+
+        if (dvb_register_frontend(&budget_av->budget.dvb_adapter,
+                                  budget_av->budget.dvb_frontend)) {
+                printk(KERN_ERR "budget-av: Frontend registration failed!\n");
+                if (budget_av->budget.dvb_frontend->ops->release)
+                        budget_av->budget.dvb_frontend->ops->release(budget_av->budget.dvb_frontend);
+                budget_av->budget.dvb_frontend = NULL;
         }
 }
 
@@ -822,6 +858,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
 
         memset(budget_av, 0, sizeof(struct budget_av));
 
+        budget_av->has_saa7113 = 0;
         budget_av->budget.ci_present = 0;
 
         dev->ext_priv = budget_av;
@@ -836,10 +873,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
         saa7146_write(dev, DD1_INIT, 0x07000600);
         saa7146_write(dev, MC2, MASK_09 | MASK_25 | MASK_10 | MASK_26);
 
-        saa7146_setgpio(dev, 0, SAA7146_GPIO_OUTHI);
-        msleep(500);
-
-        if (0 == saa7113_init(budget_av)) {
+        if (saa7113_init(budget_av) == 0) {
                 budget_av->has_saa7113 = 1;
 
                 if (0 != saa7146_vv_init(dev, &vv_data)) {
@@ -860,31 +894,26 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
 
                 saa7113_setinput(budget_av, 0);
         } else {
-                budget_av->has_saa7113 = 0;
-
-                saa7146_setgpio(dev, 0, SAA7146_GPIO_OUTLO);
+                ciintf_init(budget_av);
         }
 
         /* fixme: find some sane values here... */
         saa7146_write(dev, PCI_BT_V1, 0x1c00101f);
 
-        mac = budget_av->budget.dvb_adapter->proposed_mac;
+        mac = budget_av->budget.dvb_adapter.proposed_mac;
         if (i2c_readregs(&budget_av->budget.i2c_adap, 0xa0, 0x30, mac, 6)) {
-                printk("KNC1-%d: Could not read MAC from KNC1 card\n",
-                       budget_av->budget.dvb_adapter->num);
+                printk(KERN_ERR "KNC1-%d: Could not read MAC from KNC1 card\n",
+                       budget_av->budget.dvb_adapter.num);
                 memset(mac, 0, 6);
         } else {
-                printk("KNC1-%d: MAC addr = %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
-                       budget_av->budget.dvb_adapter->num,
+                printk(KERN_INFO "KNC1-%d: MAC addr = %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
+                       budget_av->budget.dvb_adapter.num,
                        mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
         }
 
-        budget_av->budget.dvb_adapter->priv = budget_av;
+        budget_av->budget.dvb_adapter.priv = budget_av;
         frontend_init(budget_av);
 
-        if (enable_ci)
-                ciintf_init(budget_av);
-
         return 0;
 }
 
@@ -963,14 +992,21 @@ static struct saa7146_extension budget_extension;
 MAKE_BUDGET_INFO(knc1s, "KNC1 DVB-S", BUDGET_KNC1S);
 MAKE_BUDGET_INFO(knc1c, "KNC1 DVB-C", BUDGET_KNC1C);
 MAKE_BUDGET_INFO(knc1t, "KNC1 DVB-T", BUDGET_KNC1T);
+MAKE_BUDGET_INFO(knc1sp, "KNC1 DVB-S Plus", BUDGET_KNC1SP);
+MAKE_BUDGET_INFO(knc1cp, "KNC1 DVB-C Plus", BUDGET_KNC1CP);
+MAKE_BUDGET_INFO(knc1tp, "KNC1 DVB-T Plus", BUDGET_KNC1TP);
 MAKE_BUDGET_INFO(cin1200s, "TerraTec Cinergy 1200 DVB-S", BUDGET_CIN1200S);
 MAKE_BUDGET_INFO(cin1200c, "Terratec Cinergy 1200 DVB-C", BUDGET_CIN1200C);
 MAKE_BUDGET_INFO(cin1200t, "Terratec Cinergy 1200 DVB-T", BUDGET_CIN1200T);
 
 static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(knc1s, 0x1131, 0x4f56),
+        MAKE_EXTENSION_PCI(knc1s, 0x1131, 0x0010),
+        MAKE_EXTENSION_PCI(knc1sp, 0x1131, 0x0011),
         MAKE_EXTENSION_PCI(knc1c, 0x1894, 0x0020),
+        MAKE_EXTENSION_PCI(knc1cp, 0x1894, 0x0021),
         MAKE_EXTENSION_PCI(knc1t, 0x1894, 0x0030),
+        MAKE_EXTENSION_PCI(knc1tp, 0x1894, 0x0031),
         MAKE_EXTENSION_PCI(cin1200s, 0x153b, 0x1154),
         MAKE_EXTENSION_PCI(cin1200c, 0x153b, 0x1156),
         MAKE_EXTENSION_PCI(cin1200t, 0x153b, 0x1157),
@@ -1010,5 +1046,3 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ralph Metzler, Marcus Metzler, Michael Hunold, others");
 MODULE_DESCRIPTION("driver for the SAA7146 based so-called "
                    "budget PCI DVB w/ analog input and CI-module (e.g. the KNC cards)");
-module_param_named(enable_ci, enable_ci, int, 0644);
-MODULE_PARM_DESC(enable_ci, "Turn on/off CI module (default:off).");
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 521111be3558..dce116111376 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -395,7 +395,7 @@ static int ciintf_init(struct budget_ci *budget_ci)
         budget_ci->ca.slot_shutdown = ciintf_slot_shutdown;
         budget_ci->ca.slot_ts_enable = ciintf_slot_ts_enable;
         budget_ci->ca.data = budget_ci;
-        if ((result = dvb_ca_en50221_init(budget_ci->budget.dvb_adapter,
+        if ((result = dvb_ca_en50221_init(&budget_ci->budget.dvb_adapter,
                                           &budget_ci->ca,
                                           DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE |
                                           DVB_CA_EN50221_FLAG_IRQ_FR |
@@ -881,7 +881,7 @@ static void frontend_init(struct budget_ci *budget_ci)
                        budget_ci->budget.dev->pci->subsystem_device);
         } else {
                 if (dvb_register_frontend
-                    (budget_ci->budget.dvb_adapter, budget_ci->budget.dvb_frontend)) {
+                    (&budget_ci->budget.dvb_adapter, budget_ci->budget.dvb_frontend)) {
                         printk("budget-ci: Frontend registration failed!\n");
                         if (budget_ci->budget.dvb_frontend->ops->release)
                                 budget_ci->budget.dvb_frontend->ops->release(budget_ci->budget.dvb_frontend);
@@ -916,7 +916,7 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
 
         ciintf_init(budget_ci);
 
-        budget_ci->budget.dvb_adapter->priv = budget_ci;
+        budget_ci->budget.dvb_adapter.priv = budget_ci;
         frontend_init(budget_ci);
 
         return 0;
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 93a9b40917e4..0498a055a4cd 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -298,7 +298,7 @@ static int budget_register(struct budget *budget)
         budget->dmxdev.demux = &dvbdemux->dmx;
         budget->dmxdev.capabilities = 0;
 
-        dvb_dmxdev_init(&budget->dmxdev, budget->dvb_adapter);
+        dvb_dmxdev_init(&budget->dmxdev, &budget->dvb_adapter);
 
         budget->hw_frontend.source = DMX_FRONTEND_0;
 
@@ -316,7 +316,7 @@ static int budget_register(struct budget *budget)
         if (ret < 0)
                 return ret;
 
-        dvb_net_init(budget->dvb_adapter, &budget->dvb_net, &dvbdemux->dmx);
+        dvb_net_init(&budget->dvb_adapter, &budget->dvb_net, &dvbdemux->dmx);
 
         return 0;
 }
@@ -385,11 +385,11 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
         strcpy(budget->i2c_adap.name, budget->card->name);
 
         if (i2c_add_adapter(&budget->i2c_adap) < 0) {
-                dvb_unregister_adapter(budget->dvb_adapter);
+                dvb_unregister_adapter(&budget->dvb_adapter);
                 return -ENOMEM;
         }
 
-        ttpci_eeprom_parse_mac(&budget->i2c_adap, budget->dvb_adapter->proposed_mac);
+        ttpci_eeprom_parse_mac(&budget->i2c_adap, budget->dvb_adapter.proposed_mac);
 
         if (NULL ==
             (budget->grabbing = saa7146_vmalloc_build_pgtable(dev->pci, length, &budget->pt))) {
@@ -417,7 +417,7 @@ err:
 
         vfree(budget->grabbing);
 
-        dvb_unregister_adapter(budget->dvb_adapter);
+        dvb_unregister_adapter(&budget->dvb_adapter);
 
         return ret;
 }
@@ -432,7 +432,7 @@ int ttpci_budget_deinit(struct budget *budget)
 
         i2c_del_adapter(&budget->i2c_adap);
 
-        dvb_unregister_adapter(budget->dvb_adapter);
+        dvb_unregister_adapter(&budget->dvb_adapter);
 
         tasklet_kill(&budget->vpe_tasklet);
 
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 5d524a4f213f..8142e26b47f5 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -453,7 +453,7 @@ static void frontend_init(struct budget_patch* budget)
                        budget->dev->pci->subsystem_vendor,
                        budget->dev->pci->subsystem_device);
         } else {
-                if (dvb_register_frontend(budget->dvb_adapter, budget->dvb_frontend)) {
+                if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend)) {
                         printk("budget-av: Frontend registration failed!\n");
                         if (budget->dvb_frontend->ops->release)
                                 budget->dvb_frontend->ops->release(budget->dvb_frontend);
@@ -702,7 +702,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
 
         dev->ext_priv = budget;
 
-        budget->dvb_adapter->priv = budget;
+        budget->dvb_adapter.priv = budget;
         frontend_init(budget);
 
         return 0;
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 5e6a10f4ad95..083fd44e5f90 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -468,7 +468,7 @@ static void frontend_init(struct budget *budget)
                        budget->dev->pci->subsystem_vendor,
                        budget->dev->pci->subsystem_device);
         } else {
-                if (dvb_register_frontend(budget->dvb_adapter, budget->dvb_frontend)) {
+                if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend)) {
                         printk("budget: Frontend registration failed!\n");
                         if (budget->dvb_frontend->ops->release)
                                 budget->dvb_frontend->ops->release(budget->dvb_frontend);
@@ -497,7 +497,7 @@ static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_
                 return err;
         }
 
-        budget->dvb_adapter->priv = budget;
+        budget->dvb_adapter.priv = budget;
         frontend_init(budget);
 
         return 0;
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index 10bd41f0363b..c6ef496ba70a 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -64,7 +64,7 @@ struct budget {
 
         spinlock_t debilock;
 
-        struct dvb_adapter *dvb_adapter;
+        struct dvb_adapter dvb_adapter;
         struct dvb_frontend *dvb_frontend;
         void *priv;
 };
@@ -92,6 +92,9 @@ static struct saa7146_pci_extension_data x_var = { \
 #define BUDGET_KNC1S               8
 #define BUDGET_KNC1C               9
 #define BUDGET_KNC1T               10
+#define BUDGET_KNC1SP              11
+#define BUDGET_KNC1CP              12
+#define BUDGET_KNC1TP              13
 
 #define BUDGET_VIDEO_PORTA         0
 #define BUDGET_VIDEO_PORTB         1
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 4c046ece883a..afa0e7a0e506 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -84,7 +84,7 @@ struct ttusb {
         struct semaphore semi2c;
         struct semaphore semusb;
 
-        struct dvb_adapter *adapter;
+        struct dvb_adapter adapter;
         struct usb_device *dev;
 
         struct i2c_adapter i2c_adap;
@@ -1065,7 +1065,7 @@ static int alps_tdmb7_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
         return 0;
 }
 
-struct cx22700_config alps_tdmb7_config = {
+static struct cx22700_config alps_tdmb7_config = {
         .demod_address = 0x43,
         .pll_set = alps_tdmb7_pll_set,
 };
@@ -1412,7 +1412,7 @@ static void frontend_init(struct ttusb* ttusb)
                        le16_to_cpu(ttusb->dev->descriptor.idVendor),
                        le16_to_cpu(ttusb->dev->descriptor.idProduct));
         } else {
-                if (dvb_register_frontend(ttusb->adapter, ttusb->fe)) {
+                if (dvb_register_frontend(&ttusb->adapter, ttusb->fe)) {
                         printk("dvb-ttusb-budget: Frontend registration failed!\n");
                         if (ttusb->fe->ops->release)
                                 ttusb->fe->ops->release(ttusb->fe);
@@ -1462,7 +1462,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
         up(&ttusb->semi2c);
 
         dvb_register_adapter(&ttusb->adapter, "Technotrend/Hauppauge Nova-USB", THIS_MODULE);
-        ttusb->adapter->priv = ttusb;
+        ttusb->adapter.priv = ttusb;
 
         /* i2c */
         memset(&ttusb->i2c_adap, 0, sizeof(struct i2c_adapter));
@@ -1481,7 +1481,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         result = i2c_add_adapter(&ttusb->i2c_adap);
         if (result) {
-                dvb_unregister_adapter (ttusb->adapter);
+                dvb_unregister_adapter (&ttusb->adapter);
                 return result;
         }
 
@@ -1503,7 +1503,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
         if ((result = dvb_dmx_init(&ttusb->dvb_demux)) < 0) {
                 printk("ttusb_dvb: dvb_dmx_init failed (errno = %d)\n", result);
                 i2c_del_adapter(&ttusb->i2c_adap);
-                dvb_unregister_adapter (ttusb->adapter);
+                dvb_unregister_adapter (&ttusb->adapter);
                 return -ENODEV;
         }
 //FIXME dmxdev (nur WAS?)
@@ -1511,21 +1511,21 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
         ttusb->dmxdev.demux = &ttusb->dvb_demux.dmx;
         ttusb->dmxdev.capabilities = 0;
 
-        if ((result = dvb_dmxdev_init(&ttusb->dmxdev, ttusb->adapter)) < 0) {
+        if ((result = dvb_dmxdev_init(&ttusb->dmxdev, &ttusb->adapter)) < 0) {
                 printk("ttusb_dvb: dvb_dmxdev_init failed (errno = %d)\n",
                        result);
                 dvb_dmx_release(&ttusb->dvb_demux);
                 i2c_del_adapter(&ttusb->i2c_adap);
-                dvb_unregister_adapter (ttusb->adapter);
+                dvb_unregister_adapter (&ttusb->adapter);
                 return -ENODEV;
         }
 
-        if (dvb_net_init(ttusb->adapter, &ttusb->dvbnet, &ttusb->dvb_demux.dmx)) {
+        if (dvb_net_init(&ttusb->adapter, &ttusb->dvbnet, &ttusb->dvb_demux.dmx)) {
                 printk("ttusb_dvb: dvb_net_init failed!\n");
                 dvb_dmxdev_release(&ttusb->dmxdev);
                 dvb_dmx_release(&ttusb->dvb_demux);
                 i2c_del_adapter(&ttusb->i2c_adap);
-                dvb_unregister_adapter (ttusb->adapter);
+                dvb_unregister_adapter (&ttusb->adapter);
                 return -ENODEV;
         }
 
@@ -1559,7 +1559,7 @@ static void ttusb_disconnect(struct usb_interface *intf)
         dvb_dmx_release(&ttusb->dvb_demux);
         if (ttusb->fe != NULL) dvb_unregister_frontend(ttusb->fe);
         i2c_del_adapter(&ttusb->i2c_adap);
-        dvb_unregister_adapter(ttusb->adapter);
+        dvb_unregister_adapter(&ttusb->adapter);
 
         ttusb_free_iso_urbs(ttusb);
 
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 64e771bd8907..505bdaff5a7e 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -98,7 +98,7 @@ struct ttusb_dec {
         int                             can_playback;
 
         /* DVB bits */
-        struct dvb_adapter              *adapter;
+        struct dvb_adapter              adapter;
         struct dmxdev                   dmxdev;
         struct dvb_demux                demux;
         struct dmx_frontend             frontend;
@@ -1435,7 +1435,7 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec)
                 printk("%s: dvb_dmx_init failed: error %d\n", __FUNCTION__,
                        result);
 
-                dvb_unregister_adapter(dec->adapter);
+                dvb_unregister_adapter(&dec->adapter);
 
                 return result;
         }
@@ -1444,12 +1444,12 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec)
         dec->dmxdev.demux = &dec->demux.dmx;
         dec->dmxdev.capabilities = 0;
 
-        if ((result = dvb_dmxdev_init(&dec->dmxdev, dec->adapter)) < 0) {
+        if ((result = dvb_dmxdev_init(&dec->dmxdev, &dec->adapter)) < 0) {
                 printk("%s: dvb_dmxdev_init failed: error %d\n",
                        __FUNCTION__, result);
 
                 dvb_dmx_release(&dec->demux);
-                dvb_unregister_adapter(dec->adapter);
+                dvb_unregister_adapter(&dec->adapter);
 
                 return result;
         }
@@ -1463,7 +1463,7 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec)
 
                 dvb_dmxdev_release(&dec->dmxdev);
                 dvb_dmx_release(&dec->demux);
-                dvb_unregister_adapter(dec->adapter);
+                dvb_unregister_adapter(&dec->adapter);
 
                 return result;
         }
@@ -1476,12 +1476,12 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec)
                 dec->demux.dmx.remove_frontend(&dec->demux.dmx, &dec->frontend);
                 dvb_dmxdev_release(&dec->dmxdev);
                 dvb_dmx_release(&dec->demux);
-                dvb_unregister_adapter(dec->adapter);
+                dvb_unregister_adapter(&dec->adapter);
 
                 return result;
         }
 
-        dvb_net_init(dec->adapter, &dec->dvb_net, &dec->demux.dmx);
+        dvb_net_init(&dec->adapter, &dec->dvb_net, &dec->demux.dmx);
 
         return 0;
 }
@@ -1496,7 +1496,7 @@ static void ttusb_dec_exit_dvb(struct ttusb_dec *dec)
         dvb_dmxdev_release(&dec->dmxdev);
         dvb_dmx_release(&dec->demux);
         if (dec->fe) dvb_unregister_frontend(dec->fe);
-        dvb_unregister_adapter(dec->adapter);
+        dvb_unregister_adapter(&dec->adapter);
 }
 
 static void ttusb_dec_exit_rc(struct ttusb_dec *dec)
@@ -1565,15 +1565,15 @@ static void ttusb_dec_exit_filters(struct ttusb_dec *dec)
         }
 }
 
-int fe_send_command(struct dvb_frontend* fe, const u8 command,
-                    int param_length, const u8 params[],
-                    int *result_length, u8 cmd_result[])
+static int fe_send_command(struct dvb_frontend* fe, const u8 command,
+                           int param_length, const u8 params[],
+                           int *result_length, u8 cmd_result[])
 {
         struct ttusb_dec* dec = (struct ttusb_dec*) fe->dvb->priv;
         return ttusb_dec_send_command(dec, command, param_length, params, result_length, cmd_result);
 }
 
-struct ttusbdecfe_config fe_config = {
+static struct ttusbdecfe_config fe_config = {
         .send_command = fe_send_command
 };
 
@@ -1620,7 +1620,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,
         }
         ttusb_dec_init_dvb(dec);
 
-        dec->adapter->priv = dec;
+        dec->adapter.priv = dec;
         switch (le16_to_cpu(id->idProduct)) {
         case 0x1006:
                 dec->fe = ttusbdecfe_dvbs_attach(&fe_config);
@@ -1637,7 +1637,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,
                        le16_to_cpu(dec->udev->descriptor.idVendor),
                        le16_to_cpu(dec->udev->descriptor.idProduct));
         } else {
-                if (dvb_register_frontend(dec->adapter, dec->fe)) {
+                if (dvb_register_frontend(&dec->adapter, dec->fe)) {
                         printk("budget-ci: Frontend registration failed!\n");
                         if (dec->fe->ops->release)
                                 dec->fe->ops->release(dec->fe);
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index d3dd4228b72d..f9383e7f34ff 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -7,6 +7,19 @@ menu "Video For Linux"
 
 comment "Video Adapters"
 
+config CONFIG_TUNER_MULTI_I2C
+        bool "Enable support for multiple I2C devices on Video Adapters (EXPERIMENTAL)"
+        depends on VIDEO_DEV && EXPERIMENTAL
+        ---help---
+          Some video adapters have more than one tuner inside. This patch
+          enables support for using more than one tuner. This is required
+          for some cards to allow tunning  both video and radio.
+          It also improves I2C autodetection for these cards.
+
+          Only few tuners currently is supporting this. More to come.
+
+          It is safe to say 'Y' here even if your card has only one I2C tuner.
+
 config VIDEO_BT848
         tristate "BT848 Video For Linux"
         depends on VIDEO_DEV && PCI && I2C
@@ -240,6 +253,7 @@ config VIDEO_SAA7134
         select VIDEO_BUF
         select VIDEO_IR
         select VIDEO_TUNER
+        select CRC32
         ---help---
           This is a video4linux driver for Philips SAA7130/7134 based
           TV cards.
@@ -329,6 +343,7 @@ config VIDEO_CX88_DVB
         select VIDEO_BUF_DVB
         select DVB_MT352
         select DVB_OR51132
+        select DVB_CX22702
         ---help---
           This adds support for DVB/ATSC cards based on the
           Connexant 2388x chip.
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 80254caa444c..48989eda2400 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -384,22 +384,14 @@ static unsigned short normal_i2c[] =
         I2C_ADV7171 >> 1, (I2C_ADV7171 >> 1) + 1,
         I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_adv7170;
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 95d0974b0ab5..f898b6586374 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -434,22 +434,14 @@ static unsigned short normal_i2c[] =
         I2C_ADV7176 >> 1, (I2C_ADV7176 >> 1) + 1,
         I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_adv7175;
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index cf0db2554a80..8733588f6db3 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -500,22 +500,14 @@ static unsigned short normal_i2c[] = {
         I2C_BT819 >> 1,
         I2C_CLIENT_END,
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_bt819;
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index efe605a113a1..9a642c7de545 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -6,7 +6,7 @@
   It outputs an 8-bit 4:2:2 YUV or YCrCb video signal which can be directly
   connected to bt848/bt878 GPIO pins on this purpose.
   (see: VLSI Vision Ltd. www.vvl.co.uk for camera datasheets)
-  
+
   Supported Cards:
   -  Pixelview Rev.4E: 0x8a
                 GPIO 0x400000 toggles Bt832 RESET, and the chip changes to i2c 0x88 !
@@ -31,16 +31,16 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 
-#include "id.h"
-#include "audiochip.h"
+#include <media/audiochip.h>
+#include <media/id.h>
 #include "bttv.h"
 #include "bt832.h"
 
 MODULE_LICENSE("GPL");
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = {I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {I2C_BT832_ALT1>>1,I2C_BT832_ALT2>>1,I2C_CLIENT_END};
+static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1,
+                                       I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 /* ---------------------------------------------------------------------- */
@@ -95,7 +95,7 @@ int bt832_init(struct i2c_client *i2c_client_s)
 
         buf=kmalloc(65,GFP_KERNEL);
         bt832_hexdump(i2c_client_s,buf);
-        
+
         if(buf[0x40] != 0x31) {
                 printk("bt832: this i2c chip is no bt832 (id=%02x). Detaching.\n",buf[0x40]);
                 kfree(buf);
@@ -135,7 +135,7 @@ int bt832_init(struct i2c_client *i2c_client_s)
         buf[1]= 0x27 & (~0x01); // Default | !skip
         if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
                 printk("bt832: i2c i/o error EO: rc == %d (should be 2)\n",rc);
-        
+
         bt832_hexdump(i2c_client_s,buf);
 
 #if 0
@@ -168,8 +168,7 @@ int bt832_init(struct i2c_client *i2c_client_s)
 
 
 
-static int bt832_attach(struct i2c_adapter *adap, int addr,
-                          unsigned short flags, int kind)
+static int bt832_attach(struct i2c_adapter *adap, int addr, int kind)
 {
         struct bt832 *t;
 
@@ -184,27 +183,32 @@ static int bt832_attach(struct i2c_adapter *adap, int addr,
                 return -ENOMEM;
         memset(t,0,sizeof(*t));
         t->client = client_template;
-        t->client.data = t;
+        i2c_set_clientdata(&t->client, t);
         i2c_attach_client(&t->client);
 
         if(! bt832_init(&t->client)) {
                 bt832_detach(&t->client);
                 return -1;
         }
-        
+
         return 0;
 }
 
 static int bt832_probe(struct i2c_adapter *adap)
 {
+#ifdef I2C_CLASS_TV_ANALOG
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, bt832_attach);
+#else
+        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+                return i2c_probe(adap, &addr_data, bt832_attach);
+#endif
         return 0;
 }
 
 static int bt832_detach(struct i2c_client *client)
 {
-        struct bt832 *t = (struct bt832*)client->data;
+        struct bt832 *t = i2c_get_clientdata(client);
 
         printk("bt832: detach.\n");
         i2c_detach_client(client);
@@ -215,7 +219,7 @@ static int bt832_detach(struct i2c_client *client)
 static int
 bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
-        struct bt832 *t = (struct bt832*)client->data;
+        struct bt832 *t = i2c_get_clientdata(client);
 
         printk("bt832: command %x\n",cmd);
 
@@ -249,19 +253,18 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template =
 {
-        .name   = "bt832",
-        .flags  = I2C_CLIENT_ALLOW_USE,
-        .driver = &driver,
+        I2C_DEVNAME("bt832"),
+        .flags      = I2C_CLIENT_ALLOW_USE,
+        .driver     = &driver,
 };
 
 
-int bt832_init_module(void)
+static int __init bt832_init_module(void)
 {
-        i2c_add_driver(&driver);
-        return 0;
+        return i2c_add_driver(&driver);
 }
 
-static void bt832_cleanup_module(void)
+static void __exit bt832_cleanup_module(void)
 {
         i2c_del_driver(&driver);
 }
@@ -269,3 +272,10 @@ static void bt832_cleanup_module(void)
 module_init(bt832_init_module);
 module_exit(bt832_cleanup_module);
 
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/media/video/bt832.h b/drivers/media/video/bt832.h
index 7a98c06e0e34..9b6a8d2c96b5 100644
--- a/drivers/media/video/bt832.h
+++ b/drivers/media/video/bt832.h
@@ -1,6 +1,6 @@
 /* Bt832 CMOS Camera Video Processor (VP)
 
- The Bt832 CMOS Camera Video Processor chip connects a Quartsight CMOS 
+ The Bt832 CMOS Camera Video Processor chip connects a Quartsight CMOS
   color digital camera directly to video capture devices via an 8-bit,
   4:2:2 YUV or YCrCb video interface.
 
@@ -85,7 +85,7 @@
 #define BT832_DEVICE_ID         63
 # define BT832_DEVICE_ID__31            0x31 // Bt832 has ID 0x31
 
-/* STMicroelectronivcs VV5404 camera module 
+/* STMicroelectronivcs VV5404 camera module
    i2c: 0x20: sensor address
    i2c: 0xa0: eeprom for ccd defect map
  */
@@ -256,26 +256,26 @@ For the CCIR-601 standards, the sampling is based on a static orthogonal samplin
 //===========================================================================
 // Timing generator SRAM table values for CCIR601 720x480 NTSC
 //===========================================================================
-// For NTSC CCIR656 
+// For NTSC CCIR656
 BYTE BtCard::SRAMTable_NTSC[] =
 {
     // SRAM Timing Table for NTSC
-    0x0c, 0xc0, 0x00, 
-    0x00, 0x90, 0xc2, 
-    0x03, 0x10, 0x03, 
-    0x06, 0x10, 0x34, 
-    0x12, 0x12, 0x65, 
-    0x02, 0x13, 0x24, 
-    0x19, 0x00, 0x24, 
-    0x39, 0x00, 0x96, 
-    0x59, 0x08, 0x93, 
+    0x0c, 0xc0, 0x00,
+    0x00, 0x90, 0xc2,
+    0x03, 0x10, 0x03,
+    0x06, 0x10, 0x34,
+    0x12, 0x12, 0x65,
+    0x02, 0x13, 0x24,
+    0x19, 0x00, 0x24,
+    0x39, 0x00, 0x96,
+    0x59, 0x08, 0x93,
     0x83, 0x08, 0x97,
-    0x03, 0x50, 0x30, 
-    0xc0, 0x40, 0x30, 
-    0x86, 0x01, 0x01, 
-    0xa6, 0x0d, 0x62, 
-    0x03, 0x11, 0x61, 
-    0x05, 0x37, 0x30, 
+    0x03, 0x50, 0x30,
+    0xc0, 0x40, 0x30,
+    0x86, 0x01, 0x01,
+    0xa6, 0x0d, 0x62,
+    0x03, 0x11, 0x61,
+    0x05, 0x37, 0x30,
     0xac, 0x21, 0x50
 };
 
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 72c7eb0f8c24..a5d529ccf3ad 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -288,22 +288,14 @@ bt856_command (struct i2c_client *client,
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 static unsigned short normal_i2c[] = { I2C_BT856 >> 1, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_bt856;
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 85224b90e394..251092e7f19f 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-cards.c,v 1.47 2005/02/22 14:06:32 kraxel Exp $
+    $Id: bttv-cards.c,v 1.49 2005/06/10 17:20:24 mchehab Exp $
 
     bttv-cards.c
 
@@ -51,6 +51,7 @@ static void avermedia_eeprom(struct bttv *btv);
 static void osprey_eeprom(struct bttv *btv);
 static void modtec_eeprom(struct bttv *btv);
 static void init_PXC200(struct bttv *btv);
+static void init_RTV24(struct bttv *btv);
 
 static void winview_audio(struct bttv *btv, struct video_audio *v, int set);
 static void lt9415_audio(struct bttv *btv, struct video_audio *v, int set);
@@ -1946,7 +1947,6 @@ struct tvcard bttv_tvcards[] = {
         .no_tda9875     = 1,
         .no_tda7432     = 1,
         .tuner_type     = TUNER_ABSENT,
-        .no_video       = 1,
         .pll            = PLL_28,
 },{
         .name           = "Teppro TEV-560/InterVision IV-560",
@@ -2252,6 +2252,20 @@ struct tvcard bttv_tvcards[] = {
         .no_tda7432     = 1,
         .no_tda9875     = 1,
         .muxsel_hook    = kodicom4400r_muxsel,
+},
+{
+        /* ---- card 0x85---------------------------------- */
+        /* Michael Henson <mhenson@clarityvi.com> */
+        /* Adlink RTV24 with special unlock codes */
+        .name           = "Adlink RTV24",
+        .video_inputs   = 4,
+        .audio_inputs   = 1,
+        .tuner          = 0,
+        .svhs           = 2,
+        .muxsel         = { 2, 3, 1, 0},
+        .tuner_type     = -1,
+        .pll            = PLL_28,
+
 }};
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
@@ -2637,6 +2651,10 @@ void __devinit bttv_init_card1(struct bttv *btv)
         case BTTV_AVDVBT_771:
                 btv->use_i2c_hw = 1;
                 break;
+        case BTTV_ADLINK_RTV24:
+                init_RTV24( btv );
+                break;
+
         }
         if (!bttv_tvcards[btv->c.type].has_dvb)
                 bttv_reset_audio(btv);
@@ -2785,6 +2803,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
         }
         btv->pll.pll_current = -1;
 
+        bttv_reset_audio(btv);
+
         /* tuner configuration (from card list / autodetect / insmod option) */
         if (UNSET != bttv_tvcards[btv->c.type].tuner_type)
                 if(UNSET == btv->tuner_type)
@@ -3305,6 +3325,83 @@ static void __devinit init_PXC200(struct bttv *btv)
 }
 
 
+
+/* ----------------------------------------------------------------------- */
+/*
+ *  The Adlink RTV-24 (aka Angelo) has some special initialisation to unlock
+ *  it. This apparently involves the following procedure for each 878 chip:
+ *
+ *  1) write 0x00C3FEFF to the GPIO_OUT_EN register
+ *
+ *  2)  write to GPIO_DATA
+ *      - 0x0E
+ *      - sleep 1ms
+ *      - 0x10 + 0x0E
+ *      - sleep 10ms
+ *      - 0x0E
+ *     read from GPIO_DATA into buf (uint_32)
+ *      - if ( data>>18 & 0x01 != 0) || ( buf>>19 & 0x01 != 1 )
+ *                 error. ERROR_CPLD_Check_Failed stop.
+ *
+ *  3) write to GPIO_DATA
+ *      - write 0x4400 + 0x0E
+ *      - sleep 10ms
+ *      - write 0x4410 + 0x0E
+ *      - sleep 1ms
+ *      - write 0x0E
+ *     read from GPIO_DATA into buf (uint_32)
+ *      - if ( buf>>18 & 0x01 ) || ( buf>>19 && 0x01 != 0 )
+ *                error. ERROR_CPLD_Check_Failed.
+ */
+/* ----------------------------------------------------------------------- */
+void
+init_RTV24 (struct bttv *btv)
+{
+        uint32_t dataRead = 0;
+        long watchdog_value = 0x0E;
+
+        printk (KERN_INFO
+                "bttv%d: Adlink RTV-24 initialisation in progress ...\n",
+                btv->c.nr);
+
+        btwrite (0x00c3feff, BT848_GPIO_OUT_EN);
+
+        btwrite (0 + watchdog_value, BT848_GPIO_DATA);
+        msleep (1);
+        btwrite (0x10 + watchdog_value, BT848_GPIO_DATA);
+        msleep (10);
+        btwrite (0 + watchdog_value, BT848_GPIO_DATA);
+
+        dataRead = btread (BT848_GPIO_DATA);
+
+        if ((((dataRead >> 18) & 0x01) != 0) || (((dataRead >> 19) & 0x01) != 1)) {
+                printk (KERN_INFO
+                        "bttv%d: Adlink RTV-24 initialisation(1) ERROR_CPLD_Check_Failed (read %d)\n",
+                        btv->c.nr, dataRead);
+        }
+
+        btwrite (0x4400 + watchdog_value, BT848_GPIO_DATA);
+        msleep (10);
+        btwrite (0x4410 + watchdog_value, BT848_GPIO_DATA);
+        msleep (1);
+        btwrite (watchdog_value, BT848_GPIO_DATA);
+        msleep (1);
+        dataRead = btread (BT848_GPIO_DATA);
+
+        if ((((dataRead >> 18) & 0x01) != 0) || (((dataRead >> 19) & 0x01) != 0)) {
+                printk (KERN_INFO
+                        "bttv%d: Adlink RTV-24 initialisation(2) ERROR_CPLD_Check_Failed (read %d)\n",
+                        btv->c.nr, dataRead);
+
+                return;
+        }
+
+        printk (KERN_INFO
+                "bttv%d: Adlink RTV-24 initialisation complete.\n", btv->c.nr);
+}
+
+
+
 /* ----------------------------------------------------------------------- */
 /* Miro Pro radio stuff -- the tea5757 is connected to some GPIO ports     */
 /*
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index 033cc5498f23..290289a99757 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-driver.c,v 1.37 2005/02/21 13:57:59 kraxel Exp $
+    $Id: bttv-driver.c,v 1.38 2005/06/10 17:20:24 mchehab Exp $
 
     bttv - Bt848 frame grabber driver
 
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index e3f477dff827..da448a5f9e9c 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-i2c.c,v 1.18 2005/02/16 12:14:10 kraxel Exp $
+    $Id: bttv-i2c.c,v 1.21 2005/06/10 17:20:24 mchehab Exp $
 
     bttv-i2c.c  --  all the i2c code is here
 
@@ -363,6 +363,9 @@ int bttv_I2CWrite(struct bttv *btv, unsigned char addr, unsigned char b1,
 /* read EEPROM content */
 void __devinit bttv_readee(struct bttv *btv, unsigned char *eedata, int addr)
 {
+        memset(eedata, 0, 256);
+        if (0 != btv->i2c_rc)
+                return;
         btv->i2c_client.addr = addr >> 1;
         tveeprom_read(&btv->i2c_client, eedata, 256);
 }
diff --git a/drivers/media/video/bttv.h b/drivers/media/video/bttv.h
index 8322b66e0905..191eaf1714ba 100644
--- a/drivers/media/video/bttv.h
+++ b/drivers/media/video/bttv.h
@@ -1,5 +1,5 @@
 /*
- * $Id: bttv.h,v 1.17 2005/02/22 14:06:32 kraxel Exp $
+ * $Id: bttv.h,v 1.18 2005/05/24 23:41:42 nsh Exp $
  *
  *  bttv - Bt848 frame grabber driver
  *
@@ -135,6 +135,7 @@
 #define BTTV_DVICO_DVBT_LITE  0x80
 #define BTTV_TIBET_CS16  0x83
 #define BTTV_KODICOM_4400R  0x84
+#define BTTV_ADLINK_RTV24   0x85
 
 /* i2c address list */
 #define I2C_TSA5522        0xc2
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h
index 1a9ba7e1cf51..7b6f1e856028 100644
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bttvp.h
@@ -226,10 +226,6 @@ extern int fini_bttv_i2c(struct bttv *btv);
 #define dprintk  if (bttv_debug >= 1) printk
 #define d2printk if (bttv_debug >= 2) printk
 
-/* our devices */
-#define BTTV_MAX 16
-extern unsigned int bttv_num;
-
 #define BTTV_MAX_FBUF   0x208000
 #define VBIBUF_SIZE     (2048*VBI_MAXLINES*2)
 #define BTTV_TIMEOUT    (HZ/2) /* 0.5 seconds */
@@ -375,6 +371,10 @@ struct bttv {
         unsigned int users;
         struct bttv_fh init;
 };
+
+/* our devices */
+#define BTTV_MAX 16
+extern unsigned int bttv_num;
 extern struct bttv bttvs[BTTV_MAX];
 
 /* private ioctls */
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 46d6778b863b..91f8afeded88 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-blackbird.c,v 1.26 2005/03/07 15:58:05 kraxel Exp $
+ * $Id: cx88-blackbird.c,v 1.27 2005/06/03 13:31:50 mchehab Exp $
  *
  *  Support for a cx23416 mpeg encoder via cx2388x host port.
  *  "blackbird" reference design.
@@ -61,37 +61,304 @@ static LIST_HEAD(cx8802_devlist);
 
 #define IVTV_CMD_HW_BLOCKS_RST 0xFFFFFFFF
 
-/*Firmware API commands*/
-#define IVTV_API_ENC_PING_FW 0x00000080
-#define IVTV_API_ENC_GETVER 0x000000C4
-#define IVTV_API_ENC_HALT_FW 0x000000C3
-#define IVTV_API_STD_TIMEOUT 0x00010000 /*units??*/
-//#define IVTV_API_ASSIGN_PGM_INDEX_INFO 0x000000c7
-#define IVTV_API_ASSIGN_STREAM_TYPE 0x000000b9
-#define IVTV_API_ASSIGN_OUTPUT_PORT 0x000000bb
-#define IVTV_API_ASSIGN_FRAMERATE 0x0000008f
-#define IVTV_API_ASSIGN_FRAME_SIZE 0x00000091
-#define IVTV_API_ASSIGN_ASPECT_RATIO 0x00000099
-#define IVTV_API_ASSIGN_BITRATES 0x00000095
-#define IVTV_API_ASSIGN_GOP_PROPERTIES 0x00000097
-#define IVTV_API_ASSIGN_3_2_PULLDOWN 0x000000b1
-#define IVTV_API_ASSIGN_GOP_CLOSURE 0x000000c5
-#define IVTV_API_ASSIGN_AUDIO_PROPERTIES 0x000000bd
-#define IVTV_API_ASSIGN_DNR_FILTER_MODE 0x0000009b
-#define IVTV_API_ASSIGN_DNR_FILTER_PROPS 0x0000009d
-#define IVTV_API_ASSIGN_CORING_LEVELS 0x0000009f
-#define IVTV_API_ASSIGN_SPATIAL_FILTER_TYPE 0x000000a1
-#define IVTV_API_ASSIGN_FRAME_DROP_RATE 0x000000d0
-#define IVTV_API_ASSIGN_PLACEHOLDER 0x000000d8
-#define IVTV_API_MUTE_VIDEO 0x000000d9
-#define IVTV_API_MUTE_AUDIO 0x000000da
-#define IVTV_API_INITIALIZE_INPUT 0x000000cd
-#define IVTV_API_REFRESH_INPUT 0x000000d3
-#define IVTV_API_ASSIGN_NUM_VSYNC_LINES 0x000000d6
-#define IVTV_API_BEGIN_CAPTURE 0x00000081
-//#define IVTV_API_PAUSE_ENCODER 0x000000d2
-//#define IVTV_API_EVENT_NOTIFICATION 0x000000d5
-#define IVTV_API_END_CAPTURE 0x00000082
+/* Firmware API commands */
+/* #define IVTV_API_STD_TIMEOUT 0x00010000 // 65536, units?? */
+#define IVTV_API_STD_TIMEOUT 500
+
+#define BLACKBIRD_API_PING               0x80
+#define BLACKBIRD_API_BEGIN_CAPTURE      0x81
+enum blackbird_capture_type {
+        BLACKBIRD_MPEG_CAPTURE,
+        BLACKBIRD_RAW_CAPTURE,
+        BLACKBIRD_RAW_PASSTHRU_CAPTURE
+};
+enum blackbird_capture_bits {
+        BLACKBIRD_RAW_BITS_NONE             = 0x00,
+        BLACKBIRD_RAW_BITS_YUV_CAPTURE      = 0x01,
+        BLACKBIRD_RAW_BITS_PCM_CAPTURE      = 0x02,
+        BLACKBIRD_RAW_BITS_VBI_CAPTURE      = 0x04,
+        BLACKBIRD_RAW_BITS_PASSTHRU_CAPTURE = 0x08,
+        BLACKBIRD_RAW_BITS_TO_HOST_CAPTURE  = 0x10
+};
+#define BLACKBIRD_API_END_CAPTURE        0x82
+enum blackbird_capture_end {
+        BLACKBIRD_END_AT_GOP, /* stop at the end of gop, generate irq */
+        BLACKBIRD_END_NOW, /* stop immediately, no irq */
+};
+#define BLACKBIRD_API_SET_AUDIO_ID       0x89
+#define BLACKBIRD_API_SET_VIDEO_ID       0x8B
+#define BLACKBIRD_API_SET_PCR_ID         0x8D
+#define BLACKBIRD_API_SET_FRAMERATE      0x8F
+enum blackbird_framerate {
+        BLACKBIRD_FRAMERATE_NTSC_30, /* NTSC: 30fps */
+        BLACKBIRD_FRAMERATE_PAL_25   /* PAL: 25fps */
+};
+#define BLACKBIRD_API_SET_RESOLUTION     0x91
+#define BLACKBIRD_API_SET_VIDEO_BITRATE  0x95
+enum blackbird_video_bitrate_type {
+        BLACKBIRD_VIDEO_VBR,
+        BLACKBIRD_VIDEO_CBR
+};
+#define BLACKBIRD_PEAK_RATE_DIVISOR 400
+enum blackbird_mux_rate {
+        BLACKBIRD_MUX_RATE_DEFAULT,
+         /* dvd mux rate: multiply by 400 to get the actual rate */
+        BLACKBIRD_MUX_RATE_DVD = 25200
+};
+#define BLACKBIRD_API_SET_GOP_STRUCTURE  0x97
+#define BLACKBIRD_API_SET_ASPECT_RATIO   0x99
+enum blackbird_aspect_ratio {
+        BLACKBIRD_ASPECT_RATIO_FORBIDDEN,
+        BLACKBIRD_ASPECT_RATIO_1_1_SQUARE,
+        BLACKBIRD_ASPECT_RATIO_4_3,
+        BLACKBIRD_ASPECT_RATIO_16_9,
+        BLACKBIRD_ASPECT_RATIO_221_100,
+        BLACKBIRD_ASPECT_RATIO_RESERVED
+};
+#define BLACKBIRD_API_SET_DNR_MODE       0x9B
+enum blackbird_dnr_bits {
+        BLACKBIRD_DNR_BITS_MANUAL,
+        BLACKBIRD_DNR_BITS_AUTO_SPATIAL,
+        BLACKBIRD_DNR_BITS_AUTO_TEMPORAL,
+        BLACKBIRD_DNR_BITS_AUTO
+};
+enum blackbird_median_filter {
+        BLACKBIRD_MEDIAN_FILTER_DISABLED,
+        BLACKBIRD_MEDIAN_FILTER_HORIZONTAL,
+        BLACKBIRD_MEDIAN_FILTER_VERTICAL,
+        BLACKBIRD_MEDIAN_FILTER_HV,
+        BLACKBIRD_MEDIAN_FILTER_DIAGONAL
+};
+#define BLACKBIRD_API_SET_MANUAL_DNR     0x9D
+#define BLACKBIRD_API_SET_DNR_MEDIAN     0x9F
+#define BLACKBIRD_API_SET_SPATIAL_FILTER 0xA1
+enum blackbird_spatial_filter_luma {
+        BLACKBIRD_SPATIAL_FILTER_LUMA_DISABLED,
+        BLACKBIRD_SPATIAL_FILTER_LUMA_1D_HORIZ,
+        BLACKBIRD_SPATIAL_FILTER_LUMA_1D_VERT,
+        BLACKBIRD_SPATIAL_FILTER_LUMA_2D_HV, /* separable, default */
+        BLACKBIRD_SPATIAL_FILTER_LUMA_2D_SYMM /* symmetric non-separable */
+};
+enum blackbird_spatial_filter_chroma {
+        BLACKBIRD_SPATIAL_FILTER_CHROMA_DISABLED,
+        BLACKBIRD_SPATIAL_FILTER_CHROMA_1D_HORIZ /* default */
+};
+#define BLACKBIRD_API_SET_3_2_PULLDOWN   0xB1
+enum blackbird_pulldown {
+        BLACKBIRD_3_2_PULLDOWN_DISABLED,
+        BLACKBIRD_3_2_PULLDOWN_ENABLED
+};
+#define BLACKBIRD_API_SET_VBI_LINE_NO    0xB7
+enum blackbird_vbi_line_bits {
+        BLACKBIRD_VBI_LINE_BITS_TOP_FIELD,
+        BLACKBIRD_VBI_LINE_BITS_BOT_FIELD = (1 << 31),
+        BLACKBIRD_VBI_LINE_BITS_ALL_LINES = 0xFFFFFFFF
+};
+enum blackbird_vbi_line {
+        BLACKBIRD_VBI_LINE_DISABLED,
+        BLACKBIRD_VBI_LINE_ENABLED
+};
+enum blackbird_vbi_slicing {
+        BLACKBIRD_VBI_SLICING_NONE,
+        BLACKBIRD_VBI_SLICING_CLOSED_CAPTION
+};
+#define BLACKBIRD_API_SET_STREAM_TYPE    0xB9
+enum blackbird_stream_type {
+        BLACKBIRD_STREAM_PROGRAM,
+        BLACKBIRD_STREAM_TRANSPORT,
+        BLACKBIRD_STREAM_MPEG1,
+        BLACKBIRD_STREAM_PES_AV,
+        BLACKBIRD_STREAM_UNKNOWN4,
+        BLACKBIRD_STREAM_PES_VIDEO,
+        BLACKBIRD_STREAM_UNKNOWN6,
+        BLACKBIRD_STREAM_PES_AUDIO,
+        BLACKBIRD_STREAM_UNKNOWN8,
+        BLACKBIRD_STREAM_UNKNOWN9, /* audio/pcm ? */
+        BLACKBIRD_STREAM_DVD,
+        BLACKBIRD_STREAM_VCD,
+        BLACKBIRD_STREAM_UNKNOWN12 /* svcd/xvcd ? */
+};
+#define BLACKBIRD_API_SET_OUTPUT_PORT    0xBB
+enum blackbird_stream_port {
+        BLACKBIRD_OUTPUT_PORT_MEMORY,
+        BLACKBIRD_OUTPUT_PORT_STREAMING,
+        BLACKBIRD_OUTPUT_PORT_SERIAL
+};
+#define BLACKBIRD_API_SET_AUDIO_PARAMS   0xBD
+enum blackbird_audio_bits_sample_rate {
+        BLACKBIRD_AUDIO_BITS_44100HZ,
+        BLACKBIRD_AUDIO_BITS_48000HZ,
+        BLACKBIRD_AUDIO_BITS_32000HZ,
+        BLACKBIRD_AUDIO_BITS_RESERVED_HZ,
+};
+enum blackbird_audio_bits_encoding {
+        BLACKBIRD_AUDIO_BITS_LAYER_1 = 0x1 << 2,
+        BLACKBIRD_AUDIO_BITS_LAYER_2 = 0x2 << 2,
+};
+enum blackbird_audio_bits_bitrate_layer_1 {
+        BLACKBIRD_AUDIO_BITS_LAYER_1_FREE_FORMAT,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_32  = 0x01 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_64  = 0x02 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_96  = 0x03 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_128 = 0x04 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_160 = 0x05 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_192 = 0x06 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_224 = 0x07 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_256 = 0x08 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_288 = 0x09 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_320 = 0x0A << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_352 = 0x0B << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_384 = 0x0C << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_416 = 0x0D << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_1_448 = 0x0E << 4,
+};
+enum blackbird_audio_bits_bitrate_layer_2 {
+        BLACKBIRD_AUDIO_BITS_LAYER_2_FREE_FORMAT,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_32  = 0x01 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_48  = 0x02 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_56  = 0x03 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_64  = 0x04 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_80  = 0x05 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_96  = 0x06 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_112 = 0x07 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_128 = 0x08 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_160 = 0x09 << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_192 = 0x0A << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_224 = 0x0B << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_256 = 0x0C << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_320 = 0x0D << 4,
+        BLACKBIRD_AUDIO_BITS_LAYER_2_384 = 0x0E << 4,
+};
+enum blackbird_audio_bits_mode {
+        BLACKBIRD_AUDIO_BITS_STEREO,
+        BLACKBIRD_AUDIO_BITS_JOINT_STEREO = 0x1 << 8,
+        BLACKBIRD_AUDIO_BITS_DUAL         = 0x2 << 8,
+        BLACKBIRD_AUDIO_BITS_MONO         = 0x3 << 8,
+};
+enum blackbird_audio_bits_mode_extension {
+        BLACKBIRD_AUDIO_BITS_BOUND_4,
+        BLACKBIRD_AUDIO_BITS_BOUND_8  = 0x1 << 10,
+        BLACKBIRD_AUDIO_BITS_BOUND_12 = 0x2 << 10,
+        BLACKBIRD_AUDIO_BITS_BOUND_16 = 0x3 << 10,
+};
+enum blackbird_audio_bits_emphasis {
+        BLACKBIRD_AUDIO_BITS_EMPHASIS_NONE,
+        BLACKBIRD_AUDIO_BITS_EMPHASIS_50_15     = 0x1 << 12,
+        BLACKBIRD_AUDIO_BITS_EMPHASIS_RESERVED  = 0x2 << 12,
+        BLACKBIRD_AUDIO_BITS_EMPHASIS_CCITT_J17 = 0x3 << 12,
+};
+enum blackbird_audio_bits_crc {
+        BLACKBIRD_AUDIO_BITS_CRC_OFF,
+        BLACKBIRD_AUDIO_BITS_CRC_ON = 0x1 << 14,
+};
+enum blackbird_audio_bits_copyright {
+        BLACKBIRD_AUDIO_BITS_COPYRIGHT_OFF,
+        BLACKBIRD_AUDIO_BITS_COPYRIGHT_ON = 0x1 << 15,
+};
+enum blackbird_audio_bits_original {
+        BLACKBIRD_AUDIO_BITS_COPY,
+        BLACKBIRD_AUDIO_BITS_ORIGINAL = 0x1 << 16,
+};
+#define BLACKBIRD_API_HALT               0xC3
+#define BLACKBIRD_API_GET_VERSION        0xC4
+#define BLACKBIRD_API_SET_GOP_CLOSURE    0xC5
+enum blackbird_gop_closure {
+        BLACKBIRD_GOP_CLOSURE_OFF,
+        BLACKBIRD_GOP_CLOSURE_ON,
+};
+#define BLACKBIRD_API_DATA_XFER_STATUS   0xC6
+enum blackbird_data_xfer_status {
+        BLACKBIRD_MORE_BUFFERS_FOLLOW,
+        BLACKBIRD_LAST_BUFFER,
+};
+#define BLACKBIRD_API_PROGRAM_INDEX_INFO 0xC7
+enum blackbird_picture_mask {
+        BLACKBIRD_PICTURE_MASK_NONE,
+        BLACKBIRD_PICTURE_MASK_I_FRAMES,
+        BLACKBIRD_PICTURE_MASK_I_P_FRAMES = 0x3,
+        BLACKBIRD_PICTURE_MASK_ALL_FRAMES = 0x7,
+};
+#define BLACKBIRD_API_SET_VBI_PARAMS     0xC8
+enum blackbird_vbi_mode_bits {
+        BLACKBIRD_VBI_BITS_SLICED,
+        BLACKBIRD_VBI_BITS_RAW,
+};
+enum blackbird_vbi_insertion_bits {
+        BLACKBIRD_VBI_BITS_INSERT_IN_XTENSION_USR_DATA,
+        BLACKBIRD_VBI_BITS_INSERT_IN_PRIVATE_PACKETS = 0x1 << 1,
+        BLACKBIRD_VBI_BITS_SEPARATE_STREAM = 0x2 << 1,
+        BLACKBIRD_VBI_BITS_SEPARATE_STREAM_USR_DATA = 0x4 << 1,
+        BLACKBIRD_VBI_BITS_SEPARATE_STREAM_PRV_DATA = 0x5 << 1,
+};
+#define BLACKBIRD_API_SET_DMA_BLOCK_SIZE 0xC9
+enum blackbird_dma_unit {
+        BLACKBIRD_DMA_BYTES,
+        BLACKBIRD_DMA_FRAMES,
+};
+#define BLACKBIRD_API_DMA_TRANSFER_INFO  0xCA
+#define BLACKBIRD_API_DMA_TRANSFER_STAT  0xCB
+enum blackbird_dma_transfer_status_bits {
+        BLACKBIRD_DMA_TRANSFER_BITS_DONE = 0x01,
+        BLACKBIRD_DMA_TRANSFER_BITS_ERROR = 0x04,
+        BLACKBIRD_DMA_TRANSFER_BITS_LL_ERROR = 0x10,
+};
+#define BLACKBIRD_API_SET_DMA2HOST_ADDR  0xCC
+#define BLACKBIRD_API_INIT_VIDEO_INPUT   0xCD
+#define BLACKBIRD_API_SET_FRAMESKIP      0xD0
+#define BLACKBIRD_API_PAUSE              0xD2
+enum blackbird_pause {
+        BLACKBIRD_PAUSE_ENCODING,
+        BLACKBIRD_RESUME_ENCODING,
+};
+#define BLACKBIRD_API_REFRESH_INPUT      0xD3
+#define BLACKBIRD_API_SET_COPYRIGHT      0xD4
+enum blackbird_copyright {
+        BLACKBIRD_COPYRIGHT_OFF,
+        BLACKBIRD_COPYRIGHT_ON,
+};
+#define BLACKBIRD_API_SET_NOTIFICATION   0xD5
+enum blackbird_notification_type {
+        BLACKBIRD_NOTIFICATION_REFRESH,
+};
+enum blackbird_notification_status {
+        BLACKBIRD_NOTIFICATION_OFF,
+        BLACKBIRD_NOTIFICATION_ON,
+};
+enum blackbird_notification_mailbox {
+        BLACKBIRD_NOTIFICATION_NO_MAILBOX = -1,
+};
+#define BLACKBIRD_API_SET_CAPTURE_LINES  0xD6
+enum blackbird_field1_lines {
+        BLACKBIRD_FIELD1_SAA7114 = 0x00EF, /* 239 */
+        BLACKBIRD_FIELD1_SAA7115 = 0x00F0, /* 240 */
+        BLACKBIRD_FIELD1_MICRONAS = 0x0105, /* 261 */
+};
+enum blackbird_field2_lines {
+        BLACKBIRD_FIELD2_SAA7114 = 0x00EF, /* 239 */
+        BLACKBIRD_FIELD2_SAA7115 = 0x00F0, /* 240 */
+        BLACKBIRD_FIELD2_MICRONAS = 0x0106, /* 262 */
+};
+#define BLACKBIRD_API_SET_CUSTOM_DATA    0xD7
+enum blackbird_custom_data_type {
+        BLACKBIRD_CUSTOM_EXTENSION_USR_DATA,
+        BLACKBIRD_CUSTOM_PRIVATE_PACKET,
+};
+#define BLACKBIRD_API_MUTE_VIDEO         0xD9
+enum blackbird_mute {
+        BLACKBIRD_UNMUTE,
+        BLACKBIRD_MUTE,
+};
+enum blackbird_mute_video_mask {
+        BLACKBIRD_MUTE_VIDEO_V_MASK = 0x0000FF00,
+        BLACKBIRD_MUTE_VIDEO_U_MASK = 0x00FF0000,
+        BLACKBIRD_MUTE_VIDEO_Y_MASK = 0xFF000000,
+};
+enum blackbird_mute_video_shift {
+        BLACKBIRD_MUTE_VIDEO_V_SHIFT = 8,
+        BLACKBIRD_MUTE_VIDEO_U_SHIFT = 16,
+        BLACKBIRD_MUTE_VIDEO_Y_SHIFT = 24,
+};
+#define BLACKBIRD_API_MUTE_AUDIO         0xDA
 
 /* Registers */
 #define IVTV_REG_ENC_SDRAM_REFRESH (0x07F8 /*| IVTV_REG_OFFSET*/)
@@ -405,68 +672,100 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
         return 0;
 }
 
+/**
+ Settings used by the windows tv app for PVR2000:
+=================================================================================================================
+Profile | Codec | Resolution | CBR/VBR | Video Qlty   | V. Bitrate | Frmrate | Audio Codec | A. Bitrate | A. Mode
+-----------------------------------------------------------------------------------------------------------------
+MPEG-1  | MPEG1 | 352x288PAL | (CBR)   | 1000:Optimal | 2000 Kbps  | 25fps   | MPG1 Layer2 | 224kbps    | Stereo
+MPEG-2  | MPEG2 | 720x576PAL | VBR     | 600 :Good    | 4000 Kbps  | 25fps   | MPG1 Layer2 | 224kbps    | Stereo
+VCD     | MPEG1 | 352x288PAL | (CBR)   | 1000:Optimal | 1150 Kbps  | 25fps   | MPG1 Layer2 | 224kbps    | Stereo
+DVD     | MPEG2 | 720x576PAL | VBR     | 600 :Good    | 6000 Kbps  | 25fps   | MPG1 Layer2 | 224kbps    | Stereo
+DB* DVD | MPEG2 | 720x576PAL | CBR     | 600 :Good    | 6000 Kbps  | 25fps   | MPG1 Layer2 | 224kbps    | Stereo
+=================================================================================================================
+*DB: "DirectBurn"
+*/
 static void blackbird_codec_settings(struct cx8802_dev *dev)
 {
         int bitrate_mode = 1;
         int bitrate = 7500000;
         int bitrate_peak = 7500000;
+#if 1
+        bitrate_mode = BLACKBIRD_VIDEO_CBR;
+        bitrate = 4000*1024;
+        bitrate_peak = 4000*1024;
+#endif
 
         /* assign stream type */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_STREAM_TYPE, 1, 0, 0); /* program stream */
-        //blackbird_api_cmd(dev, IVTV_API_ASSIGN_STREAM_TYPE, 1, 0, 2); /* MPEG1 stream */
-        //blackbird_api_cmd(dev, IVTV_API_ASSIGN_STREAM_TYPE, 1, 0, 3); /* PES A/V */
-        //blackbird_api_cmd(dev, IVTV_API_ASSIGN_STREAM_TYPE, 1, 0, 10); /* DVD stream */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_STREAM_TYPE, 1, 0, BLACKBIRD_STREAM_PROGRAM);
+        /* blackbird_api_cmd(dev, BLACKBIRD_API_SET_STREAM_TYPE, 1, 0, BLACKBIRD_STREAM_TRANSPORT); */
 
-        /* assign output port */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_OUTPUT_PORT, 1, 0, 1); /* 1 = Host */
+        /* assign output port */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_OUTPUT_PORT, 1, 0, BLACKBIRD_OUTPUT_PORT_STREAMING); /* Host */
 
-        /* assign framerate */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_FRAMERATE, 1, 0, 0);
+        /* assign framerate */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0, BLACKBIRD_FRAMERATE_PAL_25);
 
-        /* assign frame size */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_FRAME_SIZE, 2, 0,
+        /* assign frame size */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_RESOLUTION, 2, 0,
                           dev->height, dev->width);
 
-        /* assign aspect ratio */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_ASPECT_RATIO, 1, 0, 2);
+        /* assign aspect ratio */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_ASPECT_RATIO, 1, 0, BLACKBIRD_ASPECT_RATIO_4_3);
 
-        /* assign bitrates */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_BITRATES, 5, 0,
+        /* assign bitrates */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_VIDEO_BITRATE, 5, 0,
                          bitrate_mode,         /* mode */
                          bitrate,              /* bps */
-                         bitrate_peak / 400,   /* peak/400 */
-                         0, 0x70);             /* encoding buffer, ckennedy */
-
-        /* assign gop properties */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_GOP_PROPERTIES, 2, 0, 15, 3);
-        //blackbird_api_cmd(dev, IVTV_API_ASSIGN_GOP_PROPERTIES, 2, 0, 2, 1);
-
-        /* assign 3 2 pulldown */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_3_2_PULLDOWN, 1, 0, 0);
-
-        /* note: it's not necessary to set the samplerate, the mpeg encoder seems to autodetect/adjust */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_AUDIO_PROPERTIES, 1, 0, (2<<2) | (8<<4));
+                         bitrate_peak / BLACKBIRD_PEAK_RATE_DIVISOR,   /* peak/400 */
+                         BLACKBIRD_MUX_RATE_DEFAULT /*, 0x70*/);             /* encoding buffer, ckennedy */
+
+        /* assign gop properties */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_STRUCTURE, 2, 0, 15, 3);
+
+        /* assign 3 2 pulldown */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_3_2_PULLDOWN, 1, 0, BLACKBIRD_3_2_PULLDOWN_DISABLED);
+
+        /* assign audio properties */
+        /* note: it's not necessary to set the samplerate, the mpeg encoder seems to autodetect/adjust */
+        /* blackbird_api_cmd(dev, IVTV_API_ASSIGN_AUDIO_PROPERTIES, 1, 0, (2<<2) | (8<<4));
+           blackbird_api_cmd(dev, IVTV_API_ASSIGN_AUDIO_PROPERTIES, 1, 0, 0 | (2 << 2) | (14 << 4)); */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_AUDIO_PARAMS, 1, 0,
+                        BLACKBIRD_AUDIO_BITS_44100HZ |
+                        BLACKBIRD_AUDIO_BITS_LAYER_2 |
+                        BLACKBIRD_AUDIO_BITS_LAYER_2_224 |
+                        BLACKBIRD_AUDIO_BITS_STEREO |
+                        /* BLACKBIRD_AUDIO_BITS_BOUND_4 | */
+                        BLACKBIRD_AUDIO_BITS_EMPHASIS_NONE |
+                        BLACKBIRD_AUDIO_BITS_CRC_OFF |
+                        BLACKBIRD_AUDIO_BITS_COPYRIGHT_OFF |
+                        BLACKBIRD_AUDIO_BITS_COPY
+                );
 
         /* assign gop closure */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_GOP_CLOSURE, 1, 0, 0);
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_CLOSURE, 1, 0, BLACKBIRD_GOP_CLOSURE_OFF);
 
-        /* assign audio properties */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_AUDIO_PROPERTIES, 1, 0, 0 | (2 << 2) | (14 << 4));
 
-        /* assign dnr filter mode */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_DNR_FILTER_MODE, 2, 0, 0, 0);
+        /* assign dnr filter mode */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_DNR_MODE, 2, 0,
+                        BLACKBIRD_DNR_BITS_MANUAL,
+                        BLACKBIRD_MEDIAN_FILTER_DISABLED
+                );
 
-        /* assign dnr filter props*/
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_DNR_FILTER_PROPS, 2, 0, 0, 0);
+        /* assign dnr filter props*/
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_MANUAL_DNR, 2, 0, 0, 0);
 
-        /* assign coring levels (luma_h, luma_l, chroma_h, chroma_l) */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_CORING_LEVELS, 4, 0, 0, 255, 0, 255);
+        /* assign coring levels (luma_h, luma_l, chroma_h, chroma_l) */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_DNR_MEDIAN, 4, 0, 0, 255, 0, 255);
 
-        /* assign spatial filter type: luma_t: 1 = horiz_only, chroma_t: 1 = horiz_only */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_SPATIAL_FILTER_TYPE, 2, 0, 1, 1);
+        /* assign spatial filter type: luma_t: horiz_only, chroma_t: horiz_only */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_SPATIAL_FILTER, 2, 0,
+                        BLACKBIRD_SPATIAL_FILTER_LUMA_1D_HORIZ,
+                        BLACKBIRD_SPATIAL_FILTER_CHROMA_1D_HORIZ
+                );
 
-        /* assign frame drop rate */
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_FRAME_DROP_RATE, 1, 0, 0);
+        /* assign frame drop rate */
+        /* blackbird_api_cmd(dev, IVTV_API_ASSIGN_FRAME_DROP_RATE, 1, 0, 0); */
 }
 
 static int blackbird_initialize_codec(struct cx8802_dev *dev)
@@ -476,7 +775,7 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
         int retval;
 
         dprintk(1,"Initialize codec\n");
-        retval = blackbird_api_cmd(dev, IVTV_API_ENC_PING_FW, 0, 0); /* ping */
+        retval = blackbird_api_cmd(dev, BLACKBIRD_API_PING, 0, 0); /* ping */
         if (retval < 0) {
                 /* ping was not successful, reset and upload firmware */
                 cx_write(MO_SRST_IO, 0); /* SYS_RSTO=0 */
@@ -491,13 +790,13 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
                 if (dev->mailbox < 0)
                         return -1;
 
-                retval = blackbird_api_cmd(dev, IVTV_API_ENC_PING_FW, 0, 0); /* ping */
+                retval = blackbird_api_cmd(dev, BLACKBIRD_API_PING, 0, 0); /* ping */
                 if (retval < 0) {
                         dprintk(0, "ERROR: Firmware ping failed!\n");
                         return -1;
                 }
 
-                retval = blackbird_api_cmd(dev, IVTV_API_ENC_GETVER, 0, 1, &version);
+                retval = blackbird_api_cmd(dev, BLACKBIRD_API_GET_VERSION, 0, 1, &version);
                 if (retval < 0) {
                         dprintk(0, "ERROR: Firmware get encoder version failed!\n");
                         return -1;
@@ -517,25 +816,36 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
         blackbird_codec_settings(dev);
         msleep(1);
 
-        //blackbird_api_cmd(dev, IVTV_API_ASSIGN_NUM_VSYNC_LINES, 4, 0, 0xef, 0xef);
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_NUM_VSYNC_LINES, 4, 0, 0xf0, 0xf0);
-        //blackbird_api_cmd(dev, IVTV_API_ASSIGN_NUM_VSYNC_LINES, 4, 0, 0x180, 0x180);
-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_PLACEHOLDER, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        /* blackbird_api_cmd(dev, IVTV_API_ASSIGN_NUM_VSYNC_LINES, 4, 0, 0xef, 0xef);
+           blackbird_api_cmd(dev, IVTV_API_ASSIGN_NUM_VSYNC_LINES, 4, 0, 0xf0, 0xf0);
+           blackbird_api_cmd(dev, IVTV_API_ASSIGN_NUM_VSYNC_LINES, 4, 0, 0x180, 0x180); */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_CAPTURE_LINES, 2, 0,
+                        BLACKBIRD_FIELD1_SAA7115,
+                        BLACKBIRD_FIELD1_SAA7115
+                );
+
+        /* blackbird_api_cmd(dev, IVTV_API_ASSIGN_PLACEHOLDER, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); */
+        blackbird_api_cmd(dev, BLACKBIRD_API_SET_CUSTOM_DATA, 12, 0,
+                        BLACKBIRD_CUSTOM_EXTENSION_USR_DATA,
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
-        blackbird_api_cmd(dev, IVTV_API_INITIALIZE_INPUT, 0, 0); /* initialize the video input */
+        blackbird_api_cmd(dev, BLACKBIRD_API_INIT_VIDEO_INPUT, 0, 0); /* initialize the video input */
 
         msleep(1);
 
-        blackbird_api_cmd(dev, IVTV_API_MUTE_VIDEO, 1, 0, 0);
+        blackbird_api_cmd(dev, BLACKBIRD_API_MUTE_VIDEO, 1, 0, BLACKBIRD_UNMUTE);
         msleep(1);
-        blackbird_api_cmd(dev, IVTV_API_MUTE_AUDIO, 1, 0, 0);
+        blackbird_api_cmd(dev, BLACKBIRD_API_MUTE_AUDIO, 1, 0, BLACKBIRD_UNMUTE);
         msleep(1);
 
-        blackbird_api_cmd(dev, IVTV_API_BEGIN_CAPTURE, 2, 0, 0, 0x13); /* start capturing to the host interface */
-        //blackbird_api_cmd(dev, IVTV_API_BEGIN_CAPTURE, 2, 0, 0, 0); /* start capturing to the host interface */
-        msleep(1);
+        /* blackbird_api_cmd(dev, BLACKBIRD_API_BEGIN_CAPTURE, 2, 0, 0, 0x13); // start capturing to the host interface */
+        blackbird_api_cmd(dev, BLACKBIRD_API_BEGIN_CAPTURE, 2, 0,
+                        BLACKBIRD_MPEG_CAPTURE,
+                        BLACKBIRD_RAW_BITS_NONE
+                ); /* start capturing to the host interface */
+        msleep(10);
 
-        blackbird_api_cmd(dev, IVTV_API_REFRESH_INPUT, 0,0);
+        blackbird_api_cmd(dev, BLACKBIRD_API_REFRESH_INPUT, 0,0);
         return 0;
 }
 
@@ -709,7 +1019,12 @@ static int mpeg_release(struct inode *inode, struct file *file)
 {
         struct cx8802_fh  *fh  = file->private_data;
 
-        blackbird_api_cmd(fh->dev, IVTV_API_END_CAPTURE, 3, 0, 1, 0, 0x13);
+        /* blackbird_api_cmd(fh->dev, BLACKBIRD_API_END_CAPTURE, 3, 0, BLACKBIRD_END_NOW, 0, 0x13); */
+        blackbird_api_cmd(fh->dev, BLACKBIRD_API_END_CAPTURE, 3, 0,
+                        BLACKBIRD_END_NOW,
+                        BLACKBIRD_MPEG_CAPTURE,
+                        BLACKBIRD_RAW_BITS_NONE
+                );
 
         /* stop mpeg capture */
         if (fh->mpegq.streaming)
@@ -908,4 +1223,5 @@ module_exit(blackbird_fini);
  * Local variables:
  * c-basic-offset: 8
  * End:
+ * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
  */
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 367624822d77..b3fb04356b71 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-cards.c,v 1.66 2005/03/04 09:12:23 kraxel Exp $
+ * $Id: cx88-cards.c,v 1.76 2005/06/08 01:28:09 mchehab Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * card-specific stuff.
@@ -35,6 +35,9 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_UNKNOWN] = {
                 .name           = "UNKNOWN/GENERIC",
                 .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 0,
@@ -52,6 +55,9 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_HAUPPAUGE] = {
                 .name           = "Hauppauge WinTV 34xxx models",
                 .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
@@ -78,6 +84,9 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_GDI] = {
                 .name           = "GDI Black Gold",
                 .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
@@ -85,7 +94,10 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_PIXELVIEW] = {
                 .name           = "PixelView",
-                .tuner_type     = 5,
+                .tuner_type     = TUNER_PHILIPS_PAL,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
@@ -104,7 +116,10 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_ATI_WONDER_PRO] = {
                 .name           = "ATI TV Wonder Pro",
-                .tuner_type     = 44,
+                .tuner_type     = TUNER_PHILIPS_4IN1,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
@@ -122,7 +137,10 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_WINFAST2000XP_EXPERT] = {
                 .name           = "Leadtek Winfast 2000XP Expert",
-                .tuner_type     = 44,
+                .tuner_type     = TUNER_PHILIPS_4IN1,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
@@ -156,7 +174,10 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_AVERTV_303] = {
                 .name           = "AverTV Studio 303 (M126)",
-                .tuner_type     = 38,
+                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
@@ -179,7 +200,10 @@ struct cx88_board cx88_boards[] = {
                 // added gpio values thanks to Michal
                 // values for PAL from DScaler
                 .name           = "MSI TV-@nywhere Master",
-                .tuner_type     = 33,
+                .tuner_type     = TUNER_MT2032,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
@@ -206,7 +230,10 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_WINFAST_DV2000] = {
                 .name           = "Leadtek Winfast DV2000",
-                .tuner_type     = 38,
+                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
@@ -239,34 +266,40 @@ struct cx88_board cx88_boards[] = {
                         .gpio3  = 0x02000000,
                  },
         },
-        [CX88_BOARD_LEADTEK_PVR2000] = {
+        [CX88_BOARD_LEADTEK_PVR2000] = {
                 // gpio values for PAL version from regspy by DScaler
-                .name           = "Leadtek PVR 2000",
-                .tuner_type     = 38,
+                .name           = "Leadtek PVR 2000",
+                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
-                .input          = {{
-                        .type   = CX88_VMUX_TELEVISION,
-                        .vmux   = 0,
-                        .gpio0  = 0x0000bde6,
-                },{
-                        .type   = CX88_VMUX_COMPOSITE1,
-                        .vmux   = 1,
-                        .gpio0  = 0x0000bde6,
-                },{
-                        .type   = CX88_VMUX_SVIDEO,
-                        .vmux   = 2,
-                        .gpio0  = 0x0000bde6,
-                }},
-                .radio = {
-                        .type   = CX88_RADIO,
-                        .gpio0  = 0x0000bd62,
-                },
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x0000bde2,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x0000bde6,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x0000bde6,
+                }},
+                .radio = {
+                        .type   = CX88_RADIO,
+                        .gpio0  = 0x0000bd62,
+                },
                 .blackbird = 1,
-        },
+        },
         [CX88_BOARD_IODATA_GVVCP3PCI] = {
                 .name           = "IODATA GV-VCP3/PCI",
                 .tuner_type     = TUNER_ABSENT,
-                .input          = {{
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 0,
                 },{
@@ -279,7 +312,10 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_PROLINK_PLAYTVPVR] = {
                 .name           = "Prolink PlayTV PVR",
-                .tuner_type     = 43,
+                .tuner_type     = TUNER_PHILIPS_FM1236_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
@@ -301,8 +337,11 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_ASUS_PVR_416] = {
                 .name           = "ASUS PVR-416",
-                .tuner_type     = 43,
-                .tda9887_conf   = TDA9887_PRESENT,
+                .tuner_type     = TUNER_PHILIPS_FM1236_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
@@ -320,7 +359,10 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_MSI_TVANYWHERE] = {
                 .name           = "MSI TV-@nywhere",
-                .tuner_type     = 33,
+                .tuner_type     = TUNER_MT2032,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
@@ -342,6 +384,9 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_KWORLD_DVB_T] = {
                 .name           = "KWorld/VStream XPert DVB-T",
                 .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
@@ -358,6 +403,9 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1] = {
                 .name           = "DVICO FusionHDTV DVB-T1",
                 .tuner_type     = TUNER_ABSENT, /* No analog tuner */
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
@@ -371,7 +419,10 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_KWORLD_LTV883] = {
                 .name           = "KWorld LTV883RF",
-                .tuner_type     = 48,
+                .tuner_type     = TUNER_TNF_8831BGFF,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
@@ -397,6 +448,9 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD] = {
                 .name           = "DViCO - FusionHDTV 3 Gold",
                 .tuner_type     = TUNER_MICROTUNE_4042FI5,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 /*
                    GPIO[0] resets DT3302 DTV receiver
                     0 - reset asserted
@@ -428,17 +482,14 @@ struct cx88_board cx88_boards[] = {
                         .vmux   = 2,
                         .gpio0  = 0x0f00,
                 }},
-#if 0
-                .ts             = {
-                         .type   = CX88_TS,
-                         .gpio0  = 0x00000f01,   /* Hooked to tuner reset bit */
-                 }
-#endif
         },
         [CX88_BOARD_HAUPPAUGE_DVB_T1] = {
-                .name           = "Hauppauge Nova-T DVB-T",
+                .name           = "Hauppauge Nova-T DVB-T",
                 .tuner_type     = TUNER_ABSENT,
-                .input          = {{
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
                         .type   = CX88_VMUX_DVB,
                         .vmux   = 0,
                 }},
@@ -447,6 +498,9 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_CONEXANT_DVB_T1] = {
                 .name           = "Conexant DVB-T reference design",
                 .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_DVB,
                         .vmux   = 0,
@@ -456,6 +510,9 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_PROVIDEO_PV259] = {
                 .name           = "Provideo PV259",
                 .tuner_type     = TUNER_PHILIPS_FQ1216ME,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
@@ -465,6 +522,9 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS] = {
                 .name           = "DVICO FusionHDTV DVB-T Plus",
                 .tuner_type     = TUNER_ABSENT, /* No analog tuner */
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
@@ -479,6 +539,9 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_DNTV_LIVE_DVB_T] = {
                 .name           = "digitalnow DNTV Live! DVB-T",
                 .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
@@ -495,6 +558,9 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_PCHDTV_HD3000] = {
                 .name           = "pcHDTV HD3000 HDTV",
                 .tuner_type     = TUNER_THOMSON_DTT7610,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
@@ -530,8 +596,11 @@ struct cx88_board cx88_boards[] = {
         [CX88_BOARD_HAUPPAUGE_ROSLYN] = {
                 // entry added by Kaustubh D. Bhalerao <bhalerao.1@osu.edu>
                 // GPIO values obtained from regspy, courtesy Sean Covel
-                .name        = "Hauppauge WinTV 28xxx (Roslyn) models",
-                .tuner_type  = UNSET,
+                .name           = "Hauppauge WinTV 28xxx (Roslyn) models",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
@@ -559,33 +628,37 @@ struct cx88_board cx88_boards[] = {
                 .blackbird = 1,
         },
         [CX88_BOARD_DIGITALLOGIC_MEC] = {
-                /* params copied over from Leadtek PVR 2000 */
                 .name           = "Digital-Logic MICROSPACE Entertainment Center (MEC)",
-                /* not sure yet about the tuner type */
-                .tuner_type     = 38,
+                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
-                        .gpio0  = 0x0000bde6,
+                        .gpio0  = 0x00009d80,
                 },{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
-                        .gpio0  = 0x0000bde6,
+                        .gpio0  = 0x00009d76,
                 },{
                         .type   = CX88_VMUX_SVIDEO,
                         .vmux   = 2,
-                        .gpio0  = 0x0000bde6,
+                        .gpio0  = 0x00009d76,
                 }},
                 .radio = {
                         .type   = CX88_RADIO,
-                        .gpio0  = 0x0000bd62,
+                        .gpio0  = 0x00009d00,
                 },
                 .blackbird = 1,
         },
         [CX88_BOARD_IODATA_GVBCTV7E] = {
                 .name           = "IODATA GV/BCTV7E",
                 .tuner_type     = TUNER_PHILIPS_FQ1286,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
@@ -601,6 +674,56 @@ struct cx88_board cx88_boards[] = {
                         .gpio1  = 0x0000e07f,
                 }}
         },
+        [CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO] = {
+                .name           = "PixelView PlayTV Ultra Pro (Stereo)",
+                /* May be also TUNER_YMEC_TVF_5533MF for NTSC/M or PAL/M */
+                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+                .radio_type     = TUNER_TEA5767,
+                .tuner_addr     = 0xc2>>1,
+                .radio_addr     = 0xc0>>1,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0xbf61,  /* internal decoder */
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0xbf63,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0xbf63,
+                }},
+                .radio = {
+                         .type  = CX88_RADIO,
+                         .gpio0 = 0xbf60,
+                 },
+        },
+        [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = {
+                .name           = "DViCO - FusionHDTV 3 Gold-T",
+                .tuner_type     = TUNER_THOMSON_DTT7611,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                /*  See DViCO FusionHDTV 3 Gold for GPIO documentation.  */
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x0f0d,
+                },{
+                        .type   = CX88_VMUX_CABLE,
+                        .vmux   = 0,
+                        .gpio0  = 0x0f05,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0x0f00,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0x0f00,
+                }},
+        },
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -673,6 +796,10 @@ struct cx88_subid cx88_subids[] = {
                 .subdevice = 0xd810,
                 .card      = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD,
         },{
+                .subvendor = 0x18ac,
+                .subdevice = 0xd820,
+                .card      = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T,
+        },{
                 .subvendor = 0x18AC,
                 .subdevice = 0xDB00,
                 .card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1,
@@ -935,4 +1062,5 @@ EXPORT_SYMBOL(cx88_card_setup);
  * Local variables:
  * c-basic-offset: 8
  * End:
+ * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
  */
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 1ff79b5a8835..c046a23537d3 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-core.c,v 1.24 2005/01/19 12:01:55 kraxel Exp $
+ * $Id: cx88-core.c,v 1.28 2005/06/12 04:19:19 mchehab Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * driver core
@@ -51,12 +51,15 @@ module_param(latency,int,0444);
 MODULE_PARM_DESC(latency,"pci latency timer");
 
 static unsigned int tuner[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
+static unsigned int radio[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
 static unsigned int card[]  = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
 
 module_param_array(tuner, int, NULL, 0444);
+module_param_array(radio, int, NULL, 0444);
 module_param_array(card,  int, NULL, 0444);
 
 MODULE_PARM_DESC(tuner,"tuner type");
+MODULE_PARM_DESC(radio,"radio tuner type");
 MODULE_PARM_DESC(card,"card type");
 
 static unsigned int nicam = 0;
@@ -429,7 +432,7 @@ int cx88_sram_channel_setup(struct cx88_core *core,
 /* ------------------------------------------------------------------ */
 /* debug helper code                                                  */
 
-static int cx88_risc_decode(u32 risc)
+int cx88_risc_decode(u32 risc)
 {
         static char *instr[16] = {
                 [ RISC_SYNC    >> 28 ] = "sync",
@@ -736,6 +739,10 @@ static unsigned int inline norm_fsc8(struct cx88_tvnorm *norm)
 {
         static const unsigned int ntsc = 28636360;
         static const unsigned int pal  = 35468950;
+        static const unsigned int palm  = 28604892;
+
+        if (norm->id & V4L2_STD_PAL_M)
+                return palm;
 
         return (norm->id & V4L2_STD_625_50) ? pal : ntsc;
 }
@@ -749,6 +756,11 @@ static unsigned int inline norm_notchfilter(struct cx88_tvnorm *norm)
 
 static unsigned int inline norm_htotal(struct cx88_tvnorm *norm)
 {
+        /* Should always be Line Draw Time / (4*FSC) */
+
+        if (norm->id & V4L2_STD_PAL_M)
+                return 909;
+
         return (norm->id & V4L2_STD_625_50) ? 1135 : 910;
 }
 
@@ -1164,8 +1176,20 @@ struct cx88_core* cx88_core_get(struct pci_dev *pci)
                "insmod option" : "autodetected");
 
         core->tuner_type = tuner[core->nr];
+        core->radio_type = radio[core->nr];
         if (UNSET == core->tuner_type)
                 core->tuner_type = cx88_boards[core->board].tuner_type;
+        if (UNSET == core->radio_type)
+                core->radio_type = cx88_boards[core->board].radio_type;
+        if (!core->tuner_addr)
+                core->tuner_addr = cx88_boards[core->board].tuner_addr;
+        if (!core->radio_addr)
+                core->radio_addr = cx88_boards[core->board].radio_addr;
+
+        printk(KERN_INFO "TV tuner %d at 0x%02x, Radio tuner %d at 0x%02x\n",
+                core->tuner_type, core->tuner_addr<<1,
+                core->radio_type, core->radio_addr<<1);
+
         core->tda9887_conf = cx88_boards[core->board].tda9887_conf;
 
         /* init hardware */
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 9d15d3d5a2b7..1a259c3966cd 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-dvb.c,v 1.31 2005/03/07 15:58:05 kraxel Exp $
+ * $Id: cx88-dvb.c,v 1.33 2005/06/12 04:19:19 mchehab Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 0725b1288f4f..e20adefcfc6c 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cx88-i2c.c,v 1.20 2005/02/15 15:59:35 kraxel Exp $
+    $Id: cx88-i2c.c,v 1.23 2005/06/12 04:19:19 mchehab Exp $
 
     cx88-i2c.c  --  all the i2c code is here
 
@@ -91,6 +91,7 @@ static int cx8800_bit_getsda(void *data)
 
 static int attach_inform(struct i2c_client *client)
 {
+        struct tuner_addr tun_addr;
         struct cx88_core *core = i2c_get_adapdata(client->adapter);
 
         dprintk(1, "i2c attach [addr=0x%x,client=%s]\n",
@@ -98,8 +99,19 @@ static int attach_inform(struct i2c_client *client)
         if (!client->driver->command)
                 return 0;
 
-        if (core->tuner_type != UNSET)
-                client->driver->command(client, TUNER_SET_TYPE, &core->tuner_type);
+        if (core->radio_type != UNSET) {
+                tun_addr.v4l2_tuner = V4L2_TUNER_RADIO;
+                tun_addr.type = core->radio_type;
+                tun_addr.addr = core->radio_addr;
+                client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_addr);
+        }
+        if (core->tuner_type != UNSET) {
+                tun_addr.v4l2_tuner = V4L2_TUNER_ANALOG_TV;
+                tun_addr.type = core->tuner_type;
+                tun_addr.addr = core->tuner_addr;
+                client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_addr);
+        }
+
         if (core->tda9887_conf)
                 client->driver->command(client, TDA9887_SET_CONFIG, &core->tda9887_conf);
         return 0;
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index af6ad8cdbdb7..dc0dcf249aac 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-input.c,v 1.9 2005/03/04 09:12:23 kraxel Exp $
+ * $Id: cx88-input.c,v 1.11 2005/05/22 20:57:56 nsh Exp $
  *
  * Device driver for GPIO attached remote control interfaces
  * on Conexant 2388x based TV/DVB cards.
@@ -235,6 +235,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         /* detect & configure */
         switch (core->board) {
         case CX88_BOARD_DNTV_LIVE_DVB_T:
+        case CX88_BOARD_KWORLD_DVB_T:
                 ir_codes         = ir_codes_dntv_live_dvb_t;
                 ir->gpio_addr    = MO_GP1_IO;
                 ir->mask_keycode = 0x1f;
@@ -261,7 +262,15 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 ir->mask_keydown = 0x02;
                 ir->polling      = 5; // ms
                 break;
+        case CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO:
+                ir_codes         = ir_codes_pixelview;
+                ir->gpio_addr    = MO_GP1_IO;
+                ir->mask_keycode = 0x1f;
+                ir->mask_keyup   = 0x80;
+                ir->polling      = 1; // ms
+                break;
         }
+
         if (NULL == ir_codes) {
                 kfree(ir);
                 return -ENODEV;
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 07aae1899e17..9ade2ae91e9b 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-mpeg.c,v 1.25 2005/03/07 14:18:00 kraxel Exp $
+ * $Id: cx88-mpeg.c,v 1.26 2005/06/03 13:31:51 mchehab Exp $
  *
  *  Support for the mpeg transport stream transfers
  *  PCI function #2 of the cx2388x.
@@ -55,7 +55,7 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,
 {
         struct cx88_core *core = dev->core;
 
-        dprintk(1, "cx8802_start_mpegport_dma %d\n", buf->vb.width);
+        dprintk(0, "cx8802_start_dma %d\n", buf->vb.width);
 
         /* setup fifo + format */
         cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH28],
@@ -100,18 +100,21 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,
         q->count = 1;
 
         /* enable irqs */
+        dprintk( 0, "setting the interrupt mask\n" );
         cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x04);
-        cx_write(MO_TS_INTMSK,  0x1f0011);
+        cx_set(MO_TS_INTMSK,  0x1f0011);
+        //cx_write(MO_TS_INTMSK,  0x0f0011);
 
         /* start dma */
-        cx_write(MO_DEV_CNTRL2, (1<<5)); /* FIXME: s/write/set/ ??? */
-        cx_write(MO_TS_DMACNTRL, 0x11);
+        cx_set(MO_DEV_CNTRL2, (1<<5));
+        cx_set(MO_TS_DMACNTRL, 0x11);
         return 0;
 }
 
 static int cx8802_stop_dma(struct cx8802_dev *dev)
 {
         struct cx88_core *core = dev->core;
+        dprintk( 0, "cx8802_stop_dma\n" );
 
         /* stop dma */
         cx_clear(MO_TS_DMACNTRL, 0x11);
@@ -131,8 +134,12 @@ static int cx8802_restart_queue(struct cx8802_dev    *dev,
         struct cx88_buffer *buf;
         struct list_head *item;
 
+        dprintk( 0, "cx8802_restart_queue\n" );
         if (list_empty(&q->active))
+        {
+                dprintk( 0, "cx8802_restart_queue: queue is empty\n" );
                 return 0;
+        }
 
         buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
         dprintk(2,"restart_queue [%p/%d]: restart dma\n",
@@ -182,27 +189,32 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
         struct cx88_buffer    *prev;
         struct cx88_dmaqueue  *q    = &dev->mpegq;
 
+        dprintk( 1, "cx8802_buf_queue\n" );
         /* add jump to stopper */
         buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
         buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
 
         if (list_empty(&q->active)) {
+                dprintk( 0, "queue is empty - first active\n" );
                 list_add_tail(&buf->vb.queue,&q->active);
                 cx8802_start_dma(dev, q, buf);
                 buf->vb.state = STATE_ACTIVE;
                 buf->count    = q->count++;
                 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
-                dprintk(2,"[%p/%d] %s - first active\n",
+                dprintk(0,"[%p/%d] %s - first active\n",
                         buf, buf->vb.i, __FUNCTION__);
+                //udelay(100);
 
         } else {
+                dprintk( 1, "queue is not empty - append to active\n" );
                 prev = list_entry(q->active.prev, struct cx88_buffer, vb.queue);
                 list_add_tail(&buf->vb.queue,&q->active);
                 buf->vb.state = STATE_ACTIVE;
                 buf->count    = q->count++;
                 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
-                dprintk(2,"[%p/%d] %s - append to active\n",
+                dprintk( 1, "[%p/%d] %s - append to active\n",
                         buf, buf->vb.i, __FUNCTION__);
+                //udelay(100);
         }
 }
 
@@ -224,7 +236,10 @@ static void do_cancel_buffers(struct cx8802_dev *dev, char *reason, int restart)
                         buf, buf->vb.i, reason, (unsigned long)buf->risc.dma);
         }
         if (restart)
+        {
+                dprintk(0, "restarting queue\n" );
                 cx8802_restart_queue(dev,q);
+        }
         spin_unlock_irqrestore(&dev->slock,flags);
 }
 
@@ -232,6 +247,7 @@ void cx8802_cancel_buffers(struct cx8802_dev *dev)
 {
         struct cx88_dmaqueue *q = &dev->mpegq;
 
+        dprintk( 1, "cx8802_cancel_buffers" );
         del_timer_sync(&q->timeout);
         cx8802_stop_dma(dev);
         do_cancel_buffers(dev,"cancel",0);
@@ -241,7 +257,7 @@ static void cx8802_timeout(unsigned long data)
 {
         struct cx8802_dev *dev = (struct cx8802_dev*)data;
 
-        dprintk(1, "%s\n",__FUNCTION__);
+        dprintk(0, "%s\n",__FUNCTION__);
 
         if (debug)
                 cx88_sram_channel_dump(dev->core, &cx88_sram_channels[SRAM_CH28]);
@@ -254,12 +270,17 @@ static void cx8802_mpeg_irq(struct cx8802_dev *dev)
         struct cx88_core *core = dev->core;
         u32 status, mask, count;
 
+        dprintk( 1, "cx8802_mpeg_irq\n" );
         status = cx_read(MO_TS_INTSTAT);
         mask   = cx_read(MO_TS_INTMSK);
         if (0 == (status & mask))
                 return;
 
         cx_write(MO_TS_INTSTAT, status);
+#if 0
+        cx88_print_irqbits(core->name, "irq mpeg ",
+                        cx88_mpeg_irqs, status, mask);
+#endif
         if (debug || (status & mask & ~0xff))
                 cx88_print_irqbits(core->name, "irq mpeg ",
                                    cx88_mpeg_irqs, status, mask);
@@ -273,6 +294,7 @@ static void cx8802_mpeg_irq(struct cx8802_dev *dev)
 
         /* risc1 y */
         if (status & 0x01) {
+                dprintk( 1, "wake up\n" );
                 spin_lock(&dev->slock);
                 count = cx_read(MO_TS_GPCNT);
                 cx88_wakeup(dev->core, &dev->mpegq, count);
@@ -288,6 +310,7 @@ static void cx8802_mpeg_irq(struct cx8802_dev *dev)
 
         /* other general errors */
         if (status & 0x1f0100) {
+                dprintk( 0, "general errors: 0x%08x\n", status & 0x1f0100 );
                 spin_lock(&dev->slock);
                 cx8802_stop_dma(dev);
                 cx8802_restart_queue(dev,&dev->mpegq);
@@ -295,6 +318,8 @@ static void cx8802_mpeg_irq(struct cx8802_dev *dev)
         }
 }
 
+#define MAX_IRQ_LOOP 10
+
 static irqreturn_t cx8802_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
         struct cx8802_dev *dev = dev_id;
@@ -302,10 +327,13 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id, struct pt_regs *regs)
         u32 status;
         int loop, handled = 0;
 
-        for (loop = 0; loop < 10; loop++) {
+        for (loop = 0; loop < MAX_IRQ_LOOP; loop++) {
                 status = cx_read(MO_PCI_INTSTAT) & (core->pci_irqmask | 0x04);
                 if (0 == status)
                         goto out;
+                dprintk( 1, "cx8802_irq\n" );
+                dprintk( 1, "    loop: %d/%d\n", loop, MAX_IRQ_LOOP );
+                dprintk( 1, "    status: %d\n", status );
                 handled = 1;
                 cx_write(MO_PCI_INTSTAT, status);
 
@@ -314,7 +342,8 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id, struct pt_regs *regs)
                 if (status & 0x04)
                         cx8802_mpeg_irq(dev);
         };
-        if (10 == loop) {
+        if (MAX_IRQ_LOOP == loop) {
+                dprintk( 0, "clearing mask\n" );
                 printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n",
                        core->name);
                 cx_write(MO_PCI_INTMSK,0);
@@ -378,6 +407,7 @@ int cx8802_init_common(struct cx8802_dev *dev)
 
 void cx8802_fini_common(struct cx8802_dev *dev)
 {
+        dprintk( 2, "cx8802_fini_common\n" );
         cx8802_stop_dma(dev);
         pci_disable_device(dev->pci);
 
@@ -399,6 +429,7 @@ int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state)
         /* stop mpeg dma */
         spin_lock(&dev->slock);
         if (!list_empty(&dev->mpegq.active)) {
+                dprintk( 2, "suspend\n" );
                 printk("%s: suspend mpeg\n", core->name);
                 cx8802_stop_dma(dev);
                 del_timer(&dev->mpegq.timeout);
@@ -463,4 +494,5 @@ EXPORT_SYMBOL(cx8802_resume_common);
  * Local variables:
  * c-basic-offset: 8
  * End:
+ * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
  */
diff --git a/drivers/media/video/cx88/cx88-reg.h b/drivers/media/video/cx88/cx88-reg.h
index 8638ce57d84c..63ad33f5818b 100644
--- a/drivers/media/video/cx88/cx88-reg.h
+++ b/drivers/media/video/cx88/cx88-reg.h
@@ -1,5 +1,5 @@
 /*
-    $Id: cx88-reg.h,v 1.6 2004/10/13 10:39:00 kraxel Exp $
+    $Id: cx88-reg.h,v 1.7 2005/06/03 13:31:51 mchehab Exp $
 
     cx88x-hw.h - CX2388x register offsets
 
@@ -397,6 +397,7 @@
 #define AUD_RATE_ADJ4            0x3205e4
 #define AUD_RATE_ADJ5            0x3205e8
 #define AUD_APB_IN_RATE_ADJ      0x3205ec
+#define AUD_I2SCNTL              0x3205ec
 #define AUD_PHASE_FIX_CTL        0x3205f0
 #define AUD_PLL_PRESCALE         0x320600
 #define AUD_PLL_DDS              0x320604
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index f2a9475a2fee..46d78b1dc9b2 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cx88-tvaudio.c,v 1.34 2005/03/07 16:10:51 kraxel Exp $
+    $Id: cx88-tvaudio.c,v 1.36 2005/06/05 05:53:45 mchehab Exp $
 
     cx88x-audio.c - Conexant CX23880/23881 audio downstream driver driver
 
@@ -127,7 +127,8 @@ static void set_audio_start(struct cx88_core *core,
         cx_write(AUD_VOL_CTL,       (1 << 6));
 
         //  increase level of input by 12dB
-        cx_write(AUD_AFE_12DB_EN,   0x0001);
+//      cx_write(AUD_AFE_12DB_EN,   0x0001);
+        cx_write(AUD_AFE_12DB_EN,   0x0000);
 
         // start programming
         cx_write(AUD_CTL,           0x0000);
@@ -143,9 +144,15 @@ static void set_audio_finish(struct cx88_core *core)
         u32 volume;
 
         if (cx88_boards[core->board].blackbird) {
+                // sets sound input from external adc
+                cx_set(AUD_CTL, EN_I2SIN_ENABLE);
+                //cx_write(AUD_I2SINPUTCNTL, 0);
+                cx_write(AUD_I2SINPUTCNTL, 4);
+                cx_write(AUD_BAUDRATE, 1);
                 // 'pass-thru mode': this enables the i2s output to the mpeg encoder
-                cx_set(AUD_CTL, 0x2000);
+                cx_set(AUD_CTL, EN_I2SOUT_ENABLE);
                 cx_write(AUD_I2SOUTPUTCNTL, 1);
+                cx_write(AUD_I2SCNTL, 0);
                 //cx_write(AUD_APB_IN_RATE_ADJ, 0);
         }
 
@@ -707,50 +714,65 @@ static void set_audio_standard_EIAJ(struct cx88_core *core)
         set_audio_finish(core);
 }
 
-static void set_audio_standard_FM(struct cx88_core *core)
+static void set_audio_standard_FM(struct cx88_core *core, enum cx88_deemph_type deemph)
 {
-#if 0 /* FIXME */
-        switch (dev->audio_properties.FM_deemphasis)
-        {
-                case WW_FM_DEEMPH_50:
-                        //Set De-emphasis filter coefficients for 50 usec
-                        cx_write(AUD_DEEMPH0_G0, 0x0C45);
-                        cx_write(AUD_DEEMPH0_A0, 0x6262);
-                        cx_write(AUD_DEEMPH0_B0, 0x1C29);
-                        cx_write(AUD_DEEMPH0_A1, 0x3FC66);
-                        cx_write(AUD_DEEMPH0_B1, 0x399A);
-
-                        cx_write(AUD_DEEMPH1_G0, 0x0D80);
-                        cx_write(AUD_DEEMPH1_A0, 0x6262);
-                        cx_write(AUD_DEEMPH1_B0, 0x1C29);
-                        cx_write(AUD_DEEMPH1_A1, 0x3FC66);
-                        cx_write(AUD_DEEMPH1_B1, 0x399A);
+        static const struct rlist fm_deemph_50[] = {
+                { AUD_DEEMPH0_G0,       0x0C45 },
+                { AUD_DEEMPH0_A0,       0x6262 },
+                { AUD_DEEMPH0_B0,       0x1C29 },
+                { AUD_DEEMPH0_A1,       0x3FC66},
+                { AUD_DEEMPH0_B1,       0x399A },
+
+                { AUD_DEEMPH1_G0,       0x0D80 },
+                { AUD_DEEMPH1_A0,       0x6262 },
+                { AUD_DEEMPH1_B0,       0x1C29 },
+                { AUD_DEEMPH1_A1,       0x3FC66},
+                { AUD_DEEMPH1_B1,       0x399A},
+
+                { AUD_POLYPH80SCALEFAC, 0x0003},
+                { /* end of list */ },
+        };
+        static const struct rlist fm_deemph_75[] = {
+                { AUD_DEEMPH0_G0,       0x091B },
+                { AUD_DEEMPH0_A0,       0x6B68 },
+                { AUD_DEEMPH0_B0,       0x11EC },
+                { AUD_DEEMPH0_A1,       0x3FC66},
+                { AUD_DEEMPH0_B1,       0x399A },
+
+                { AUD_DEEMPH1_G0,       0x0AA0 },
+                { AUD_DEEMPH1_A0,       0x6B68 },
+                { AUD_DEEMPH1_B0,       0x11EC },
+                { AUD_DEEMPH1_A1,       0x3FC66},
+                { AUD_DEEMPH1_B1,       0x399A},
+
+                { AUD_POLYPH80SCALEFAC, 0x0003},
+                { /* end of list */ },
+        };
 
-                        break;
+        /* It is enough to leave default values? */
+        static const struct rlist fm_no_deemph[] = {
 
-                case WW_FM_DEEMPH_75:
-                        //Set De-emphasis filter coefficients for 75 usec
-                        cx_write(AUD_DEEMPH0_G0, 0x91B );
-                        cx_write(AUD_DEEMPH0_A0, 0x6B68);
-                        cx_write(AUD_DEEMPH0_B0, 0x11EC);
-                        cx_write(AUD_DEEMPH0_A1, 0x3FC66);
-                        cx_write(AUD_DEEMPH0_B1, 0x399A);
+                { AUD_POLYPH80SCALEFAC, 0x0003},
+                { /* end of list */ },
+        };
 
-                        cx_write(AUD_DEEMPH1_G0, 0xAA0 );
-                        cx_write(AUD_DEEMPH1_A0, 0x6B68);
-                        cx_write(AUD_DEEMPH1_B0, 0x11EC);
-                        cx_write(AUD_DEEMPH1_A1, 0x3FC66);
-                        cx_write(AUD_DEEMPH1_B1, 0x399A);
+        dprintk("%s (status: unknown)\n",__FUNCTION__);
+        set_audio_start(core, 0x0020, EN_FMRADIO_AUTO_STEREO);
 
+        switch (deemph)
+        {
+                case FM_NO_DEEMPH:
+                        set_audio_registers(core, fm_no_deemph);
                         break;
-        }
-#endif
 
-        dprintk("%s (status: unknown)\n",__FUNCTION__);
-        set_audio_start(core, 0x0020, EN_FMRADIO_AUTO_STEREO);
+                case FM_DEEMPH_50:
+                        set_audio_registers(core, fm_deemph_50);
+                        break;
 
-        // AB: 10/2/01: this register is not being reset appropriately on occasion.
-        cx_write(AUD_POLYPH80SCALEFAC,3);
+                case FM_DEEMPH_75:
+                        set_audio_registers(core, fm_deemph_75);
+                        break;
+        }
 
         set_audio_finish(core);
 }
@@ -778,7 +800,7 @@ void cx88_set_tvaudio(struct cx88_core *core)
                 set_audio_standard_EIAJ(core);
                 break;
         case WW_FM:
-                set_audio_standard_FM(core);
+                set_audio_standard_FM(core,FM_NO_DEEMPH);
                 break;
         case WW_SYSTEM_L_AM:
                 set_audio_standard_NICAM_L(core, 1);
@@ -1029,4 +1051,5 @@ EXPORT_SYMBOL(cx88_audio_thread);
  * Local variables:
  * c-basic-offset: 8
  * End:
+ * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
  */
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c
index 0584ff476387..320d57888bbd 100644
--- a/drivers/media/video/cx88/cx88-vbi.c
+++ b/drivers/media/video/cx88/cx88-vbi.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-vbi.c,v 1.16 2004/12/10 12:33:39 kraxel Exp $
+ * $Id: cx88-vbi.c,v 1.17 2005/06/12 04:19:19 mchehab Exp $
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -47,8 +47,8 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f)
 }
 
 static int cx8800_start_vbi_dma(struct cx8800_dev    *dev,
-                                struct cx88_dmaqueue *q,
-                                struct cx88_buffer   *buf)
+                         struct cx88_dmaqueue *q,
+                         struct cx88_buffer   *buf)
 {
         struct cx88_core *core = dev->core;
 
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index d1f5c92f0ce5..e4ca7350df15 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-video.c,v 1.58 2005/03/07 15:58:05 kraxel Exp $
+ * $Id: cx88-video.c,v 1.63 2005/06/12 04:19:19 mchehab Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * video4linux video interface
@@ -1187,9 +1187,24 @@ static void init_controls(struct cx8800_dev *dev)
                 .id    = V4L2_CID_AUDIO_VOLUME,
                 .value = 0x3f,
         };
+        static struct v4l2_control hue = {
+                .id    = V4L2_CID_HUE,
+                .value = 0x80,
+        };
+        static struct v4l2_control contrast = {
+                .id    = V4L2_CID_CONTRAST,
+                .value = 0x80,
+        };
+        static struct v4l2_control brightness = {
+                .id    = V4L2_CID_BRIGHTNESS,
+                .value = 0x80,
+        };
 
         set_control(dev,&mute);
         set_control(dev,&volume);
+        set_control(dev,&hue);
+        set_control(dev,&contrast);
+        set_control(dev,&brightness);
 }
 
 /* ------------------------------------------------------------------ */
@@ -1336,6 +1351,9 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                         V4L2_CAP_STREAMING     |
                         V4L2_CAP_VBI_CAPTURE   |
 #if 0
+                        V4L2_TUNER_CAP_LOW     |
+#endif
+#if 0
                         V4L2_CAP_VIDEO_OVERLAY |
 #endif
                         0;
@@ -1696,7 +1714,11 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
                         sizeof(cap->card));
                 sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));
                 cap->version = CX88_VERSION_CODE;
-                cap->capabilities = V4L2_CAP_TUNER;
+                cap->capabilities = V4L2_CAP_TUNER
+#if 0
+                                    | V4L2_TUNER_CAP_LOW
+#endif
+                                    ;
                 return 0;
         }
         case VIDIOC_G_TUNER:
@@ -1992,6 +2014,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 {
         struct cx8800_dev *dev;
         struct cx88_core *core;
+        struct tuner_addr tun_addr;
         int err;
 
         dev = kmalloc(sizeof(*dev),GFP_KERNEL);
@@ -2065,8 +2088,19 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
                 request_module("tuner");
         if (core->tda9887_conf)
                 request_module("tda9887");
-        if (core->tuner_type != UNSET)
-                cx88_call_i2c_clients(dev->core,TUNER_SET_TYPE,&core->tuner_type);
+        if (core->radio_type != UNSET) {
+                tun_addr.v4l2_tuner = V4L2_TUNER_RADIO;
+                tun_addr.type = core->radio_type;
+                tun_addr.addr = core->radio_addr;
+                cx88_call_i2c_clients(dev->core,TUNER_SET_TYPE_ADDR, &tun_addr);
+        }
+        if (core->tuner_type != UNSET) {
+                tun_addr.v4l2_tuner = V4L2_TUNER_ANALOG_TV;
+                tun_addr.type = core->tuner_type;
+                tun_addr.addr = core->tuner_addr;
+                cx88_call_i2c_clients(dev->core,TUNER_SET_TYPE_ADDR, &tun_addr);
+        }
+
         if (core->tda9887_conf)
                 cx88_call_i2c_clients(dev->core,TDA9887_SET_CONFIG,&core->tda9887_conf);
 
@@ -2162,7 +2196,7 @@ static void __devexit cx8800_finidev(struct pci_dev *pci_dev)
 
 static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state)
 {
-        struct cx8800_dev *dev = pci_get_drvdata(pci_dev);
+        struct cx8800_dev *dev = pci_get_drvdata(pci_dev);
         struct cx88_core *core = dev->core;
 
         /* stop video+vbi capture */
@@ -2194,7 +2228,7 @@ static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state)
 
 static int cx8800_resume(struct pci_dev *pci_dev)
 {
-        struct cx8800_dev *dev = pci_get_drvdata(pci_dev);
+        struct cx8800_dev *dev = pci_get_drvdata(pci_dev);
         struct cx88_core *core = dev->core;
 
         if (dev->state.disabled) {
@@ -2230,8 +2264,8 @@ static struct pci_device_id cx8800_pci_tbl[] = {
         {
                 .vendor       = 0x14f1,
                 .device       = 0x8800,
-                .subvendor    = PCI_ANY_ID,
-                .subdevice    = PCI_ANY_ID,
+                .subvendor    = PCI_ANY_ID,
+                .subdevice    = PCI_ANY_ID,
         },{
                 /* --- end of list --- */
         }
@@ -2239,10 +2273,10 @@ static struct pci_device_id cx8800_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, cx8800_pci_tbl);
 
 static struct pci_driver cx8800_pci_driver = {
-        .name     = "cx8800",
-        .id_table = cx8800_pci_tbl,
-        .probe    = cx8800_initdev,
-        .remove   = __devexit_p(cx8800_finidev),
+        .name     = "cx8800",
+        .id_table = cx8800_pci_tbl,
+        .probe    = cx8800_initdev,
+        .remove   = __devexit_p(cx8800_finidev),
 
         .suspend  = cx8800_suspend,
         .resume   = cx8800_resume,
@@ -2274,4 +2308,5 @@ module_exit(cx8800_fini);
  * Local variables:
  * c-basic-offset: 8
  * End:
+ * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
  */
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 88eaaaba5ad8..867e988a5a93 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88.h,v 1.56 2005/03/04 09:12:23 kraxel Exp $
+ * $Id: cx88.h,v 1.62 2005/06/12 04:19:19 mchehab Exp $
  *
  * v4l2 device driver for cx2388x based TV cards
  *
@@ -64,6 +64,13 @@
 #define SHADOW_AUD_BAL_CTL           2
 #define SHADOW_MAX                   2
 
+/* FM Radio deemphasis type */
+enum cx88_deemph_type {
+        FM_NO_DEEMPH = 0,
+        FM_DEEMPH_50,
+        FM_DEEMPH_75
+};
+
 /* ----------------------------------------------------------- */
 /* tv norms                                                    */
 
@@ -162,6 +169,8 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_HAUPPAUGE_ROSLYN        24
 #define CX88_BOARD_DIGITALLOGIC_MEC            25
 #define CX88_BOARD_IODATA_GVBCTV7E         26
+#define CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO 27
+#define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T  28
 
 enum cx88_itype {
         CX88_VMUX_COMPOSITE1 = 1,
@@ -185,6 +194,9 @@ struct cx88_input {
 struct cx88_board {
         char                    *name;
         unsigned int            tuner_type;
+        unsigned int            radio_type;
+        unsigned char           tuner_addr;
+        unsigned char           radio_addr;
         int                     tda9887_conf;
         struct cx88_input       input[8];
         struct cx88_input       radio;
@@ -255,6 +267,9 @@ struct cx88_core {
         /* config info -- analog */
         unsigned int               board;
         unsigned int               tuner_type;
+        unsigned int               radio_type;
+        unsigned char              tuner_addr;
+        unsigned char              radio_addr;
         unsigned int               tda9887_conf;
         unsigned int               has_radio;
 
@@ -471,6 +486,11 @@ extern void cx88_core_put(struct cx88_core *core,
 /* cx88-vbi.c                                                  */
 
 void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f);
+/*
+int cx8800_start_vbi_dma(struct cx8800_dev    *dev,
+                         struct cx88_dmaqueue *q,
+                         struct cx88_buffer   *buf);
+*/
 int cx8800_stop_vbi_dma(struct cx8800_dev *dev);
 int cx8800_restart_vbi_queue(struct cx8800_dev    *dev,
                              struct cx88_dmaqueue *q);
diff --git a/drivers/media/video/ir-kbd-gpio.c b/drivers/media/video/ir-kbd-gpio.c
index ab6620de4b3b..a565823330aa 100644
--- a/drivers/media/video/ir-kbd-gpio.c
+++ b/drivers/media/video/ir-kbd-gpio.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ir-kbd-gpio.c,v 1.12 2005/02/22 12:28:40 kraxel Exp $
+ * $Id: ir-kbd-gpio.c,v 1.13 2005/05/15 19:01:26 mchehab Exp $
  *
  * Copyright (c) 2003 Gerd Knorr
  * Copyright (c) 2003 Pavel Machek
@@ -114,38 +114,6 @@ static IR_KEYTAB_TYPE ir_codes_avermedia_dvbt[IR_KEYTAB_SIZE] = {
         [ 0x3e ] = KEY_VOLUMEUP,    // 'volume +'
 };
 
-static IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE] = {
-        [  2 ] = KEY_KP0,
-        [  1 ] = KEY_KP1,
-        [ 11 ] = KEY_KP2,
-        [ 27 ] = KEY_KP3,
-        [  5 ] = KEY_KP4,
-        [  9 ] = KEY_KP5,
-        [ 21 ] = KEY_KP6,
-        [  6 ] = KEY_KP7,
-        [ 10 ] = KEY_KP8,
-        [ 18 ] = KEY_KP9,
-
-        [  3 ] = KEY_TUNER,       // TV/FM
-        [  7 ] = KEY_SEARCH,      // scan
-        [ 28 ] = KEY_ZOOM,        // full screen
-        [ 30 ] = KEY_POWER,
-        [ 23 ] = KEY_VOLUMEDOWN,
-        [ 31 ] = KEY_VOLUMEUP,
-        [ 20 ] = KEY_CHANNELDOWN,
-        [ 22 ] = KEY_CHANNELUP,
-        [ 24 ] = KEY_MUTE,
-
-        [  0 ] = KEY_LIST,        // source
-        [ 19 ] = KEY_INFO,        // loop
-        [ 16 ] = KEY_LAST,        // +100
-        [ 13 ] = KEY_CLEAR,       // reset
-        [ 12 ] = BTN_RIGHT,       // fun++
-        [  4 ] = BTN_LEFT,        // fun--
-        [ 14 ] = KEY_GOTO,        // function
-        [ 15 ] = KEY_STOP,         // freeze
-};
-
 /* Attila Kondoros <attila.kondoros@chello.hu> */
 static IR_KEYTAB_TYPE ir_codes_apac_viewcomp[IR_KEYTAB_SIZE] = {
 
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 7fbb8581a87d..b4ee9dfe6d42 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -147,7 +147,6 @@ static unsigned short normal_i2c[] = {
         I2C_MSP3400C_ALT  >> 1,
         I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};
 I2C_CLIENT_INSMOD;
 
 /* ----------------------------------------------------------------------- */
@@ -736,7 +735,6 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout)
 {
         DECLARE_WAITQUEUE(wait, current);
 
-again:
         add_wait_queue(&msp->wq, &wait);
         if (!kthread_should_stop()) {
                 if (timeout < 0) {
@@ -752,12 +750,8 @@ again:
 #endif
                 }
         }
-
+        try_to_freeze();
         remove_wait_queue(&msp->wq, &wait);
-
-        if (try_to_freeze(PF_FREEZE))
-                goto again;
-
         return msp->restart;
 }
 
@@ -1437,7 +1431,7 @@ static int msp_detach(struct i2c_client *client);
 static int msp_probe(struct i2c_adapter *adap);
 static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
-static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
+static int msp_suspend(struct device * dev, u32 state, u32 level);
 static int msp_resume(struct device * dev, u32 level);
 
 static void msp_wake_thread(struct i2c_client *client);
@@ -1842,7 +1836,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return 0;
 }
 
-static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
+static int msp_suspend(struct device * dev, u32 state, u32 level)
 {
         struct i2c_client *c = container_of(dev, struct i2c_client, dev);
 
diff --git a/drivers/media/video/msp3400.h b/drivers/media/video/msp3400.h
index d70a954e13aa..023f33056a4f 100644
--- a/drivers/media/video/msp3400.h
+++ b/drivers/media/video/msp3400.h
@@ -1,3 +1,7 @@
+/*
+ * $Id: msp3400.h,v 1.3 2005/06/12 04:19:19 mchehab Exp $
+ */
+
 #ifndef MSP3400_H
 #define MSP3400_H
 
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index ba69f09cbdd1..b8054da31ffd 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -64,7 +64,6 @@ static struct video_device saa_template;	/* Declared near bottom */
 
 /* Addresses to scan */
 static unsigned short normal_i2c[]       = { I2C_ADDRESS, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 static struct i2c_client client_template;
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index d74caa139f0a..7ffa2e9a9bf3 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -132,7 +132,6 @@ static struct video_device saa_template;	/* Declared near bottom */
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {34>>1,I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
 I2C_CLIENT_INSMOD;
 
 static struct i2c_client client_template;
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 64273b438530..22d055d8a695 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -463,22 +463,14 @@ static unsigned short normal_i2c[] = {
         (I2C_SAA7110 >> 1) + 1,
         I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7110;
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 0a873112ae23..fcd897382fcf 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -482,22 +482,14 @@ saa7111_command (struct i2c_client *client,
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 static unsigned short normal_i2c[] = { I2C_SAA7111 >> 1, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7111;
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index e73023695e58..2ba997f5ef1d 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -820,22 +820,14 @@ saa7114_command (struct i2c_client *client,
  */
 static unsigned short normal_i2c[] =
     { I2C_SAA7114 >> 1, I2C_SAA7114A >> 1, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7114;
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index fe6abe34168c..e6d0a18833d6 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -22,7 +22,6 @@
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
 I2C_CLIENT_INSMOD;
 
 MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");
@@ -42,16 +41,16 @@ enum saa6752hs_videoformat {
 
 static const struct v4l2_format v4l2_format_table[] =
 {
-        [SAA6752HS_VF_D1] = {
-                .fmt.pix.width = 720, .fmt.pix.height = 576 },
-        [SAA6752HS_VF_2_3_D1] = {
-                .fmt.pix.width = 480, .fmt.pix.height = 576 },
-        [SAA6752HS_VF_1_2_D1] = {
-                .fmt.pix.width = 352, .fmt.pix.height = 576 },
-        [SAA6752HS_VF_SIF] = {
-                .fmt.pix.width = 352, .fmt.pix.height = 288 },
-        [SAA6752HS_VF_UNKNOWN] = {
-                .fmt.pix.width = 0, .fmt.pix.height = 0},
+        [SAA6752HS_VF_D1] =
+                { .fmt = { .pix = { .width = 720, .height = 576 }}},
+        [SAA6752HS_VF_2_3_D1] =
+                { .fmt = { .pix = { .width = 480, .height = 576 }}},
+        [SAA6752HS_VF_1_2_D1] =
+                { .fmt = { .pix = { .width = 352, .height = 576 }}},
+        [SAA6752HS_VF_SIF] =
+                { .fmt = { .pix = { .width = 352, .height = 288 }}},
+        [SAA6752HS_VF_UNKNOWN] =
+                { .fmt = { .pix = { .width = 0, .height = 0}}},
 };
 
 struct saa6752hs_state {
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index c51eb7f078d3..0c781e24c446 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: saa7134-cards.c,v 1.54 2005/03/07 12:01:51 kraxel Exp $
+ * $Id: saa7134-cards.c,v 1.58 2005/06/07 18:05:00 nsh Exp $
  *
  * device driver for philips saa7134 based TV cards
  * card-specific stuff.
@@ -165,7 +165,7 @@ struct saa7134_board saa7134_boards[] = {
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
-                        .amux = LINE2,
+                        .amux = TV,
                         .tv   = 1,
                 },{
                         .name = name_comp1,
@@ -878,7 +878,7 @@ struct saa7134_board saa7134_boards[] = {
         },
         [SAA7134_BOARD_MANLI_MTV002] = {
                 /* Ognjen Nastic <ognjen@logosoft.ba> */
-                .name           = "Manli MuchTV M-TV002",
+                .name           = "Manli MuchTV M-TV002/Behold TV 403 FM",
                 .audio_clock    = 0x00200000,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .inputs         = {{
@@ -899,14 +899,10 @@ struct saa7134_board saa7134_boards[] = {
                         .name = name_radio,
                         .amux = LINE2,
                 },
-                .mute = {
-                        .name = name_mute,
-                        .amux = LINE1,
-                },
         },
         [SAA7134_BOARD_MANLI_MTV001] = {
                 /* Ognjen Nastic <ognjen@logosoft.ba> UNTESTED */
-                .name           = "Manli MuchTV M-TV001",
+                .name           = "Manli MuchTV M-TV001/Behold TV 401",
                 .audio_clock    = 0x00200000,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .inputs         = {{
@@ -923,6 +919,10 @@ struct saa7134_board saa7134_boards[] = {
                         .amux = LINE2,
                         .tv   = 1,
                 }},
+                .mute = {
+                        .name = name_mute,
+                        .amux = LINE1,
+                },
         },
         [SAA7134_BOARD_TG3000TV] = {
                 /* TransGear 3000TV */
@@ -1078,7 +1078,6 @@ struct saa7134_board saa7134_boards[] = {
                 .audio_clock    = 0x00187de7,
                 .tuner_type     = TUNER_PHILIPS_FM1256_IH3,
                 .tda9887_conf   = TDA9887_PRESENT,
-                .gpiomask = 0x3,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
@@ -1285,7 +1284,7 @@ struct saa7134_board saa7134_boards[] = {
                          .gpio =0x8000,
                  }
         },
-        [SAA7134_BOARD_AVERMEDIA_307] = {
+        [SAA7134_BOARD_AVERMEDIA_STUDIO_307] = {
                 /*
                 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
                 Lots of thanks to Andrey Zolotarev <zolotarev_andrey@mail.ru>
@@ -1323,6 +1322,35 @@ struct saa7134_board saa7134_boards[] = {
                         .gpio = 0x01,
                 },
         },
+        [SAA7134_BOARD_AVERMEDIA_GO_007_FM] = {
+                .name           = "Avermedia AVerTV GO 007 FM",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .gpiomask       = 0x00300003,
+//              .gpiomask       = 0x8c240003,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                        .gpio = 0x01,
+                },{
+                        .name = name_comp1,
+                        .vmux = 0,
+                        .amux = LINE2,
+                        .gpio = 0x02,
+                },{
+                        .name = name_svideo,
+                        .vmux = 6,
+                        .amux = LINE2,
+                        .gpio = 0x02,
+                }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = LINE1,
+                        .gpio = 0x00300001,
+                },
+        },
         [SAA7134_BOARD_AVERMEDIA_CARDBUS] = {
                 /* Jon Westgate <oryn@oryn.fsck.tv> */
                 .name           = "AVerMedia Cardbus TV/Radio",
@@ -1492,7 +1520,6 @@ struct saa7134_board saa7134_boards[] = {
                 .audio_clock    = 0x00187de7,
                 .tuner_type     = TUNER_PHILIPS_FQ1216ME,
                 .tda9887_conf   = TDA9887_PRESENT,
-                .gpiomask = 0x3,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
@@ -1546,7 +1573,82 @@ struct saa7134_board saa7134_boards[] = {
 //                      .gpio = 0x4000,
                 }},
         },
-};
+        [SAA7134_BOARD_AVERMEDIA_307] = {
+               /*
+                 Davydov Vladimir <vladimir@iqmedia.com>
+               */
+               .name           = "Avermedia AVerTV 307",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_PHILIPS_FQ1216ME,
+               .tda9887_conf   = TDA9887_PRESENT,
+               .inputs         = {{
+                       .name = name_tv,
+                       .vmux = 1,
+                       .amux = TV,
+                       .tv   = 1,
+               },{
+                       .name = name_comp1,
+                       .vmux = 0,
+                       .amux = LINE1,
+               },{
+                       .name = name_comp2,
+                       .vmux = 3,
+                       .amux = LINE1,
+               },{
+                       .name = name_svideo,
+                       .vmux = 8,
+                       .amux = LINE1,
+               }},
+        },
+        [SAA7134_BOARD_ADS_INSTANT_TV] = {
+                .name           = "ADS Tech Instant TV (saa7135)",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE2,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                }},
+        },
+        [SAA7134_BOARD_KWORLD_VSTREAM_XPERT] = {
+                .name           = "Kworld/Tevion V-Stream Xpert TV PVR7134",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_PAL_I,
+                .gpiomask       = 0x0700,
+                .inputs = {{
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = TV,
+                        .tv     = 1,
+                        .gpio   = 0x000,
+                },{
+                        .name   = name_comp1,
+                        .vmux   = 3,
+                        .amux   = LINE1,
+                        .gpio   = 0x200,                //gpio by DScaler
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 0,
+                        .amux   = LINE1,
+                        .gpio   = 0x200,
+                }},
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = LINE1,
+                        .gpio   = 0x100,
+                },
+        },
+ };
+
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
 
 /* ------------------------------------------------------------------ */
@@ -1663,7 +1765,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .driver_data  = SAA7134_BOARD_ASUSTeK_TVFM7134,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
-                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7135,
                 .subvendor    = PCI_VENDOR_ID_ASUSTEK,
                 .subdevice    = 0x4845,
                 .driver_data  = SAA7135_BOARD_ASUSTeK_TVFM7135,
@@ -1824,6 +1926,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
                 .subvendor    = 0x1461, /* Avermedia Technologies Inc */
                 .subdevice    = 0x9715,
+                .driver_data  = SAA7134_BOARD_AVERMEDIA_STUDIO_307,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x1461, /* Avermedia Technologies Inc */
+                .subdevice    = 0xa70a,
                 .driver_data  = SAA7134_BOARD_AVERMEDIA_307,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -1844,6 +1952,26 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subvendor    = 0x5168,
                 .subdevice    = 0x0306,
                 .driver_data  = SAA7134_BOARD_FLYDVBTDUO,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1461, /* Avermedia Technologies Inc */
+                .subdevice    = 0xf31f,
+                .driver_data  = SAA7134_BOARD_AVERMEDIA_GO_007_FM,
+
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7135,
+                .subvendor    = 0x1421,
+                .subdevice    = 0x0350,         /* PCI version */
+                .driver_data  = SAA7134_BOARD_ADS_INSTANT_TV,
+
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7135,
+                .subvendor    = 0x1421,
+                .subdevice    = 0x0370,         /* cardbus version */
+                .driver_data  = SAA7134_BOARD_ADS_INSTANT_TV,
 
         },{
                 /* --- boards without eeprom + subsystem ID --- */
@@ -1954,20 +2082,23 @@ int saa7134_board_init1(struct saa7134_dev *dev)
                 dev->has_remote = 1;
                 board_flyvideo(dev);
                 break;
-        case SAA7134_BOARD_FLYTVPLATINUM_FM:
+        case SAA7134_BOARD_FLYTVPLATINUM_FM:
         case SAA7134_BOARD_CINERGY400:
         case SAA7134_BOARD_CINERGY600:
         case SAA7134_BOARD_CINERGY600_MK3:
         case SAA7134_BOARD_ECS_TVP3XP:
         case SAA7134_BOARD_ECS_TVP3XP_4CB5:
         case SAA7134_BOARD_MD2819:
+        case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:
         case SAA7134_BOARD_AVERMEDIA_STUDIO_305:
         case SAA7134_BOARD_AVERMEDIA_305:
+        case SAA7134_BOARD_AVERMEDIA_STUDIO_307:
         case SAA7134_BOARD_AVERMEDIA_307:
+        case SAA7134_BOARD_AVERMEDIA_GO_007_FM:
 //      case SAA7134_BOARD_SABRENT_SBTTVFM:  /* not finished yet */
         case SAA7134_BOARD_VIDEOMATE_TV_PVR:
-                dev->has_remote = 1;
-                break;
+        case SAA7134_BOARD_MANLI_MTV001:
+        case SAA7134_BOARD_MANLI_MTV002:
         case SAA7134_BOARD_AVACSSMARTTV:
                 dev->has_remote = 1;
                 break;
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index d506cafba8ff..f61ed1849a2a 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-core.c,v 1.28 2005/02/22 09:56:29 kraxel Exp $
+ * $Id: saa7134-core.c,v 1.30 2005/05/22 19:23:39 nsh Exp $
  *
  * device driver for philips saa7134 based TV cards
  * driver core
@@ -316,7 +316,7 @@ unsigned long saa7134_buffer_base(struct saa7134_buf *buf)
 
 int saa7134_pgtable_alloc(struct pci_dev *pci, struct saa7134_pgtable *pt)
 {
-        u32          *cpu;
+        __le32       *cpu;
         dma_addr_t   dma_addr;
 
         cpu = pci_alloc_consistent(pci, SAA7134_PGTABLE_SIZE, &dma_addr);
@@ -332,7 +332,7 @@ int saa7134_pgtable_build(struct pci_dev *pci, struct saa7134_pgtable *pt,
                           struct scatterlist *list, unsigned int length,
                           unsigned int startpage)
 {
-        u32           *ptr;
+        __le32        *ptr;
         unsigned int  i,p;
 
         BUG_ON(NULL == pt || NULL == pt->cpu);
@@ -340,7 +340,7 @@ int saa7134_pgtable_build(struct pci_dev *pci, struct saa7134_pgtable *pt,
         ptr = pt->cpu + startpage;
         for (i = 0; i < length; i++, list++)
                 for (p = 0; p * 4096 < list->length; p++, ptr++)
-                        *ptr = sg_dma_address(list) - list->offset;
+                        *ptr = cpu_to_le32(sg_dma_address(list) - list->offset);
         return 0;
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index c2873ae029f9..aa8e2cf62d55 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-dvb.c,v 1.12 2005/02/18 12:28:29 kraxel Exp $
+ * $Id: saa7134-dvb.c,v 1.13 2005/06/12 04:19:19 mchehab Exp $
  *
  * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
  *
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index fa1357336907..c85348d0239f 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-empress.c,v 1.10 2005/02/03 10:24:33 kraxel Exp $
+ * $Id: saa7134-empress.c,v 1.11 2005/05/22 19:23:39 nsh Exp $
  *
  * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
  *
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 702bb63d9813..b6f002e8421d 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-i2c.c,v 1.10 2005/01/24 17:37:23 kraxel Exp $
+ * $Id: saa7134-i2c.c,v 1.11 2005/06/12 01:36:14 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * i2c interface support
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index ca50cf531f20..aba2b9de60de 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-input.c,v 1.16 2004/12/10 12:33:39 kraxel Exp $
+ * $Id: saa7134-input.c,v 1.19 2005/06/07 18:02:26 nsh Exp $
  *
  * handle saa7134 IR remotes via linux kernel input layer.
  *
@@ -308,6 +308,102 @@ static IR_KEYTAB_TYPE videomate_tv_pvr_codes[IR_KEYTAB_SIZE] = {
         [ 32 ] = KEY_LANGUAGE,
         [ 33 ] = KEY_SLEEP,
 };
+
+/* Michael Tokarev <mjt@tls.msk.ru>
+   http://www.corpit.ru/mjt/beholdTV/remote_control.jpg
+   keytable is used by MANLI MTV00[12] and BeholdTV 40[13] at
+   least, and probably other cards too.
+   The "ascii-art picture" below (in comments, first row
+   is the keycode in hex, and subsequent row(s) shows
+   the button labels (several variants when appropriate)
+   helps to descide which keycodes to assign to the buttons.
+ */
+static IR_KEYTAB_TYPE manli_codes[IR_KEYTAB_SIZE] = {
+
+        /*  0x1c            0x12  *
+         * FUNCTION         POWER *
+         *   FM              (|)  *
+         *                        */
+        [ 0x1c ] = KEY_RADIO,   /*XXX*/
+        [ 0x12 ] = KEY_POWER,
+
+        /*  0x01    0x02    0x03  *
+         *   1       2       3    *
+         *                        *
+         *  0x04    0x05    0x06  *
+         *   4       5       6    *
+         *                        *
+         *  0x07    0x08    0x09  *
+         *   7       8       9    *
+         *                        */
+        [ 0x01 ] = KEY_KP1,
+        [ 0x02 ] = KEY_KP2,
+        [ 0x03 ] = KEY_KP3,
+        [ 0x04 ] = KEY_KP4,
+        [ 0x05 ] = KEY_KP5,
+        [ 0x06 ] = KEY_KP6,
+        [ 0x07 ] = KEY_KP7,
+        [ 0x08 ] = KEY_KP8,
+        [ 0x09 ] = KEY_KP9,
+
+        /*  0x0a    0x00    0x17  *
+         * RECALL    0      +100  *
+         *                  PLUS  *
+         *                        */
+        [ 0x0a ] = KEY_AGAIN,   /*XXX KEY_REWIND? */
+        [ 0x00 ] = KEY_KP0,
+        [ 0x17 ] = KEY_DIGITS,  /*XXX*/
+
+        /*  0x14            0x10  *
+         *  MENU            INFO  *
+         *  OSD                   */
+        [ 0x14 ] = KEY_MENU,
+        [ 0x10 ] = KEY_INFO,
+
+        /*          0x0b          *
+         *           Up           *
+         *                        *
+         *  0x18    0x16    0x0c  *
+         *  Left     Ok     Right *
+         *                        *
+         *         0x015          *
+         *         Down           *
+         *                        */
+        [ 0x0b ] = KEY_UP,      /*XXX KEY_SCROLLUP? */
+        [ 0x18 ] = KEY_LEFT,    /*XXX KEY_BACK? */
+        [ 0x16 ] = KEY_OK,      /*XXX KEY_SELECT? KEY_ENTER? */
+        [ 0x0c ] = KEY_RIGHT,   /*XXX KEY_FORWARD? */
+        [ 0x15 ] = KEY_DOWN,    /*XXX KEY_SCROLLDOWN? */
+
+        /*  0x11            0x0d  *
+         *  TV/AV           MODE  *
+         *  SOURCE         STEREO *
+         *                        */
+        [ 0x11 ] = KEY_TV,      /*XXX*/
+        [ 0x0d ] = KEY_MODE,    /*XXX there's no KEY_STEREO */
+
+        /*  0x0f    0x1b    0x1a  *
+         *  AUDIO   Vol+    Chan+ *
+         *        TIMESHIFT???    *
+         *                        *
+         *  0x0e    0x1f    0x1e  *
+         *  SLEEP   Vol-    Chan- *
+         *                        */
+        [ 0x0f ] = KEY_AUDIO,
+        [ 0x1b ] = KEY_VOLUMEUP,
+        [ 0x1a ] = KEY_CHANNELUP,
+        [ 0x0e ] = KEY_SLEEP,   /*XXX maybe KEY_PAUSE */
+        [ 0x1f ] = KEY_VOLUMEDOWN,
+        [ 0x1e ] = KEY_CHANNELDOWN,
+
+        /*         0x13     0x19  *
+         *         MUTE   SNAPSHOT*
+         *                        */
+        [ 0x13 ] = KEY_MUTE,
+        [ 0x19 ] = KEY_RECORD,  /*XXX*/
+
+        // 0x1d unused ?
+};
 /* ---------------------------------------------------------------------- */
 
 static int build_key(struct saa7134_dev *dev)
@@ -379,7 +475,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         switch (dev->board) {
         case SAA7134_BOARD_FLYVIDEO2000:
         case SAA7134_BOARD_FLYVIDEO3000:
-        case SAA7134_BOARD_FLYTVPLATINUM_FM:
+        case SAA7134_BOARD_FLYTVPLATINUM_FM:
                 ir_codes     = flyvideo_codes;
                 mask_keycode = 0xEC00000;
                 mask_keydown = 0x0040000;
@@ -405,8 +501,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 polling      = 50; // ms
                 break;
         case SAA7134_BOARD_MD2819:
+        case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:
         case SAA7134_BOARD_AVERMEDIA_305:
         case SAA7134_BOARD_AVERMEDIA_307:
+        case SAA7134_BOARD_AVERMEDIA_STUDIO_305:
+        case SAA7134_BOARD_AVERMEDIA_STUDIO_307:
+        case SAA7134_BOARD_AVERMEDIA_GO_007_FM:
                 ir_codes     = md2819_codes;
                 mask_keycode = 0x0007C8;
                 mask_keydown = 0x000010;
@@ -415,6 +515,14 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 saa_setb(SAA7134_GPIO_GPMODE0, 0x4);
                 saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
                 break;
+        case SAA7134_BOARD_MANLI_MTV001:
+        case SAA7134_BOARD_MANLI_MTV002:
+                ir_codes     = manli_codes;
+                mask_keycode = 0x001f00;
+                mask_keyup   = 0x004000;
+                mask_keydown = 0x002000;
+                polling      = 50; // ms
+                break;
         case SAA7134_BOARD_VIDEOMATE_TV_PVR:
                 ir_codes     = videomate_tv_pvr_codes;
                 mask_keycode = 0x00003F;
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 6b6a643bf1cd..81732904623f 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-oss.c,v 1.13 2004/12/10 12:33:39 kraxel Exp $
+ * $Id: saa7134-oss.c,v 1.14 2005/05/18 22:45:16 hhackmann Exp $
  *
  * device driver for philips saa7134 based TV cards
  * oss dsp interface
@@ -49,7 +49,6 @@ MODULE_PARM_DESC(oss_rate,"sample rate (valid are: 32000,48000)");
 
 static int dsp_buffer_conf(struct saa7134_dev *dev, int blksize, int blocks)
 {
-        blksize &= ~0xff;
         if (blksize < 0x100)
                 blksize = 0x100;
         if (blksize > 0x10000)
@@ -57,8 +56,6 @@ static int dsp_buffer_conf(struct saa7134_dev *dev, int blksize, int blocks)
 
         if (blocks < 2)
                 blocks = 2;
-        while ((blksize * blocks) & ~PAGE_MASK)
-                blocks++;
         if ((blksize * blocks) > 1024*1024)
                 blocks = 1024*1024 / blksize;
 
@@ -79,7 +76,7 @@ static int dsp_buffer_init(struct saa7134_dev *dev)
                 BUG();
         videobuf_dma_init(&dev->oss.dma);
         err = videobuf_dma_init_kernel(&dev->oss.dma, PCI_DMA_FROMDEVICE,
-                                       dev->oss.bufsize >> PAGE_SHIFT);
+                                       (dev->oss.bufsize + PAGE_SIZE) >> PAGE_SHIFT);
         if (0 != err)
                 return err;
         return 0;
@@ -163,10 +160,11 @@ static int dsp_rec_start(struct saa7134_dev *dev)
                         fmt |= 0x04;
                 fmt |= (TV == dev->oss.input) ? 0xc0 : 0x80;
 
-                saa_writeb(SAA7134_NUM_SAMPLES0, (dev->oss.blksize & 0x0000ff));
-                saa_writeb(SAA7134_NUM_SAMPLES1, (dev->oss.blksize & 0x00ff00) >>  8);
-                saa_writeb(SAA7134_NUM_SAMPLES2, (dev->oss.blksize & 0xff0000) >> 16);
+                saa_writeb(SAA7134_NUM_SAMPLES0, ((dev->oss.blksize - 1) & 0x0000ff));
+                saa_writeb(SAA7134_NUM_SAMPLES1, ((dev->oss.blksize - 1) & 0x00ff00) >>  8);
+                saa_writeb(SAA7134_NUM_SAMPLES2, ((dev->oss.blksize - 1) & 0xff0000) >> 16);
                 saa_writeb(SAA7134_AUDIO_FORMAT_CTRL, fmt);
+
                 break;
         case PCI_DEVICE_ID_PHILIPS_SAA7133:
         case PCI_DEVICE_ID_PHILIPS_SAA7135:
@@ -817,7 +815,7 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status)
                         reg = SAA7134_RS_BA1(6);
         } else {
                 /* even */
-                if (0 == (dev->oss.dma_blk & 0x00))
+                if (1 == (dev->oss.dma_blk & 0x01))
                         reg = SAA7134_RS_BA2(6);
         }
         if (0 == reg) {
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index ecac13c006d5..3617e7f7a410 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-tvaudio.c,v 1.22 2005/01/07 13:11:19 kraxel Exp $
+ * $Id: saa7134-tvaudio.c,v 1.25 2005/06/07 19:00:38 nsh Exp $
  *
  * device driver for philips saa7134 based TV cards
  * tv audio decoder (fm stereo, nicam, ...)
@@ -181,7 +181,8 @@ static void tvaudio_init(struct saa7134_dev *dev)
         saa_writeb(SAA7134_AUDIO_CLOCK0,      clock        & 0xff);
         saa_writeb(SAA7134_AUDIO_CLOCK1,     (clock >>  8) & 0xff);
         saa_writeb(SAA7134_AUDIO_CLOCK2,     (clock >> 16) & 0xff);
-        saa_writeb(SAA7134_AUDIO_PLL_CTRL,   0x01);
+        // frame locked audio was reported not to be reliable
+        saa_writeb(SAA7134_AUDIO_PLL_CTRL,   0x02);
 
         saa_writeb(SAA7134_NICAM_ERROR_LOW,  0x14);
         saa_writeb(SAA7134_NICAM_ERROR_HIGH, 0x50);
@@ -250,6 +251,11 @@ static void mute_input_7134(struct saa7134_dev *dev)
         saa_andorb(SAA7134_AUDIO_FORMAT_CTRL, 0xc0, ausel);
         saa_andorb(SAA7134_ANALOG_IO_SELECT, 0x08, ics);
         saa_andorb(SAA7134_ANALOG_IO_SELECT, 0x07, ocs);
+        // for oss, we need to change the clock configuration
+        if (in->amux == TV)
+                saa_andorb(SAA7134_SIF_SAMPLE_FREQ,   0x03, 0x00);
+        else
+                saa_andorb(SAA7134_SIF_SAMPLE_FREQ,   0x03, 0x01);
 
         /* switch gpio-connected external audio mux */
         if (0 == card(dev).gpiomask)
@@ -439,16 +445,15 @@ static int tvaudio_getstereo(struct saa7134_dev *dev, struct saa7134_tvaudio *au
                 nicam = saa_readb(SAA7134_NICAM_STATUS);
                 dprintk("getstereo: nicam=0x%x\n",nicam);
                 switch (nicam & 0x0b) {
+                case 0x08:
+                        retval = V4L2_TUNER_SUB_MONO;
+                        break;
                 case 0x09:
                         retval = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
                         break;
                 case 0x0a:
                         retval = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
                         break;
-                case 0x08:
-                default:
-                        retval = V4L2_TUNER_SUB_MONO;
-                        break;
                 }
                 break;
         }
@@ -572,14 +577,14 @@ static int tvaudio_thread(void *data)
                 } else if (0 != dev->last_carrier) {
                         /* no carrier -- try last detected one as fallback */
                         carrier = dev->last_carrier;
-                        printk(KERN_WARNING "%s/audio: audio carrier scan failed, "
+                        dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, "
                                "using %d.%03d MHz [last detected]\n",
                                dev->name, carrier/1000, carrier%1000);
 
                 } else {
                         /* no carrier + no fallback -- use default */
                         carrier = default_carrier;
-                        printk(KERN_WARNING "%s/audio: audio carrier scan failed, "
+                        dprintk(KERN_WARNING "%s/audio: audio carrier scan failed, "
                                "using %d.%03d MHz [default]\n",
                                dev->name, carrier/1000, carrier%1000);
                 }
diff --git a/drivers/media/video/saa7134/saa7134-vbi.c b/drivers/media/video/saa7134/saa7134-vbi.c
index 86954cc7c377..3c33c591cc85 100644
--- a/drivers/media/video/saa7134/saa7134-vbi.c
+++ b/drivers/media/video/saa7134/saa7134-vbi.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-vbi.c,v 1.6 2004/12/10 12:33:39 kraxel Exp $
+ * $Id: saa7134-vbi.c,v 1.7 2005/05/24 23:13:06 nsh Exp $
  *
  * device driver for philips saa7134 based TV cards
  * video4linux video interface
@@ -60,10 +60,10 @@ static void task_init(struct saa7134_dev *dev, struct saa7134_buf *buf,
         saa_writeb(SAA7134_VBI_H_START2(task), norm->h_start     >> 8);
         saa_writeb(SAA7134_VBI_H_STOP1(task),  norm->h_stop      &  0xff);
         saa_writeb(SAA7134_VBI_H_STOP2(task),  norm->h_stop      >> 8);
-        saa_writeb(SAA7134_VBI_V_START1(task), norm->vbi_v_start &  0xff);
-        saa_writeb(SAA7134_VBI_V_START2(task), norm->vbi_v_start >> 8);
-        saa_writeb(SAA7134_VBI_V_STOP1(task),  norm->vbi_v_stop  &  0xff);
-        saa_writeb(SAA7134_VBI_V_STOP2(task),  norm->vbi_v_stop  >> 8);
+        saa_writeb(SAA7134_VBI_V_START1(task), norm->vbi_v_start_0 &  0xff);
+        saa_writeb(SAA7134_VBI_V_START2(task), norm->vbi_v_start_0 >> 8);
+        saa_writeb(SAA7134_VBI_V_STOP1(task),  norm->vbi_v_stop_0  &  0xff);
+        saa_writeb(SAA7134_VBI_V_STOP2(task),  norm->vbi_v_stop_0  >> 8);
 
         saa_writeb(SAA7134_VBI_H_SCALE_INC1(task),        VBI_SCALE & 0xff);
         saa_writeb(SAA7134_VBI_H_SCALE_INC2(task),        VBI_SCALE >> 8);
@@ -127,7 +127,7 @@ static int buffer_prepare(struct videobuf_queue *q,
         unsigned int lines, llength, size;
         int err;
 
-        lines   = norm->vbi_v_stop - norm->vbi_v_start +1;
+        lines   = norm->vbi_v_stop_0 - norm->vbi_v_start_0 +1;
         if (lines > VBI_LINE_COUNT)
                 lines = VBI_LINE_COUNT;
 #if 1
@@ -177,7 +177,7 @@ buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
         struct saa7134_dev *dev = fh->dev;
         int llength,lines;
 
-        lines   = dev->tvnorm->vbi_v_stop - dev->tvnorm->vbi_v_start +1;
+        lines   = dev->tvnorm->vbi_v_stop_0 - dev->tvnorm->vbi_v_start_0 +1;
 #if 1
         llength = VBI_LINE_LENGTH;
 #else
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 5d66060026ff..c0a2ee520531 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-video.c,v 1.28 2005/02/15 15:59:35 kraxel Exp $
+ * $Id: saa7134-video.c,v 1.30 2005/06/07 19:00:38 nsh Exp $
  *
  * device driver for philips saa7134 based TV cards
  * video4linux video interface
@@ -31,8 +31,6 @@
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
-#define V4L2_I2C_CLIENTS 1
-
 /* ------------------------------------------------------------------ */
 
 static unsigned int video_debug   = 0;
@@ -158,18 +156,20 @@ static struct saa7134_format formats[] = {
                 .h_stop        = 719,   \
                 .video_v_start = 24,    \
                 .video_v_stop  = 311,   \
-                .vbi_v_start   = 7,     \
-                .vbi_v_stop    = 22,    \
+                .vbi_v_start_0 = 7,     \
+                .vbi_v_stop_0  = 22,    \
+                .vbi_v_start_1 = 319,   \
                 .src_timing    = 4
 
 #define NORM_525_60                     \
                 .h_start       = 0,     \
                 .h_stop        = 703,   \
-                .video_v_start = 22,    \
-                .video_v_stop  = 22+239, \
-                .vbi_v_start   = 10, /* FIXME */ \
-                .vbi_v_stop    = 21, /* FIXME */ \
-                .src_timing    = 1
+                .video_v_start = 23,    \
+                .video_v_stop  = 262,   \
+                .vbi_v_start_0 = 10,    \
+                .vbi_v_stop_0  = 21,    \
+                .vbi_v_start_1 = 273,   \
+                .src_timing    = 7
 
 static struct saa7134_tvnorm tvnorms[] = {
         {
@@ -274,11 +274,12 @@ static struct saa7134_tvnorm tvnorms[] = {
 
                 .h_start       = 0,
                 .h_stop        = 719,
-                .video_v_start = 22,
-                .video_v_stop  = 22+239,
-                .vbi_v_start   = 10, /* FIXME */
-                .vbi_v_stop    = 21, /* FIXME */
-                .src_timing    = 1,
+                .video_v_start = 23,
+                .video_v_stop  = 262,
+                .vbi_v_start_0 = 10,
+                .vbi_v_stop_0  = 21,
+                .vbi_v_start_1 = 273,
+                .src_timing    = 7,
 
                 .sync_control  = 0x18,
                 .luma_control  = 0x40,
@@ -335,8 +336,8 @@ static const struct v4l2_queryctrl video_ctrls[] = {
                 .default_value = 0,
                 .type          = V4L2_CTRL_TYPE_INTEGER,
         },{
-                .id            = V4L2_CID_VFLIP,
-                .name          = "vertical flip",
+                .id            = V4L2_CID_HFLIP,
+                .name          = "Mirror",
                 .minimum       = 0,
                 .maximum       = 1,
                 .type          = V4L2_CTRL_TYPE_BOOLEAN,
@@ -482,7 +483,7 @@ static void set_tvnorm(struct saa7134_dev *dev, struct saa7134_tvnorm *norm)
         dev->crop_bounds.width   = norm->h_stop - norm->h_start +1;
         dev->crop_defrect.width  = norm->h_stop - norm->h_start +1;
 
-        dev->crop_bounds.top     = (norm->vbi_v_stop+1)*2;
+        dev->crop_bounds.top     = (norm->vbi_v_stop_0+1)*2;
         dev->crop_defrect.top    = norm->video_v_start*2;
         dev->crop_bounds.height  = ((norm->id & V4L2_STD_525_60) ? 524 : 624)
                 - dev->crop_bounds.top;
@@ -521,22 +522,7 @@ static void set_tvnorm(struct saa7134_dev *dev, struct saa7134_tvnorm *norm)
         saa_writeb(SAA7134_RAW_DATA_GAIN,         0x40);
         saa_writeb(SAA7134_RAW_DATA_OFFSET,       0x80);
 
-#ifdef V4L2_I2C_CLIENTS
         saa7134_i2c_call_clients(dev,VIDIOC_S_STD,&norm->id);
-#else
-        {
-                /* pass down info to the i2c chips (v4l1) */
-                struct video_channel c;
-                memset(&c,0,sizeof(c));
-                c.channel = dev->ctl_input;
-                c.norm = VIDEO_MODE_PAL;
-                if (norm->id & V4L2_STD_NTSC)
-                        c.norm = VIDEO_MODE_NTSC;
-                if (norm->id & V4L2_STD_SECAM)
-                        c.norm = VIDEO_MODE_SECAM;
-                saa7134_i2c_call_clients(dev,VIDIOCSCHAN,&c);
-        }
-#endif
 }
 
 static void video_mux(struct saa7134_dev *dev, int input)
@@ -1064,7 +1050,7 @@ static int get_control(struct saa7134_dev *dev, struct v4l2_control *c)
         case V4L2_CID_PRIVATE_INVERT:
                 c->value = dev->ctl_invert;
                 break;
-        case V4L2_CID_VFLIP:
+        case V4L2_CID_HFLIP:
                 c->value = dev->ctl_mirror;
                 break;
         case V4L2_CID_PRIVATE_Y_EVEN:
@@ -1139,7 +1125,7 @@ static int set_control(struct saa7134_dev *dev, struct saa7134_fh *fh,
                 saa_writeb(SAA7134_DEC_CHROMA_SATURATION,
                            dev->ctl_invert ? -dev->ctl_saturation : dev->ctl_saturation);
                 break;
-        case V4L2_CID_VFLIP:
+        case V4L2_CID_HFLIP:
                 dev->ctl_mirror = c->value;
                 restart_overlay = 1;
                 break;
@@ -1407,9 +1393,9 @@ static void saa7134_vbi_fmt(struct saa7134_dev *dev, struct v4l2_format *f)
         f->fmt.vbi.samples_per_line = 2048 /* VBI_LINE_LENGTH */;
         f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
         f->fmt.vbi.offset = 64 * 4;
-        f->fmt.vbi.start[0] = norm->vbi_v_start;
-        f->fmt.vbi.count[0] = norm->vbi_v_stop - norm->vbi_v_start +1;
-        f->fmt.vbi.start[1] = norm->video_v_stop + norm->vbi_v_start +1;
+        f->fmt.vbi.start[0] = norm->vbi_v_start_0;
+        f->fmt.vbi.count[0] = norm->vbi_v_stop_0 - norm->vbi_v_start_0 +1;
+        f->fmt.vbi.start[1] = norm->vbi_v_start_1;
         f->fmt.vbi.count[1] = f->fmt.vbi.count[0];
         f->fmt.vbi.flags = 0; /* VBI_UNSYNC VBI_INTERLACED */
 
@@ -1880,11 +1866,9 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                         return -EINVAL;
                 down(&dev->lock);
                 dev->ctl_freq = f->frequency;
-#ifdef V4L2_I2C_CLIENTS
+
                 saa7134_i2c_call_clients(dev,VIDIOC_S_FREQUENCY,f);
-#else
-                saa7134_i2c_call_clients(dev,VIDIOCSFREQ,&dev->ctl_freq);
-#endif
+
                 saa7134_tvaudio_do_scan(dev);
                 up(&dev->lock);
                 return 0;
@@ -2139,16 +2123,19 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
                 t->rangelow  = (int)(65*16);
                 t->rangehigh = (int)(108*16);
 
-#ifdef V4L2_I2C_CLIENTS
-                saa7134_i2c_call_clients(dev,VIDIOC_G_TUNER,t);
-#else
-                {
-                        struct video_tuner vt;
-                        memset(&vt,0,sizeof(vt));
-                        saa7134_i2c_call_clients(dev,VIDIOCGTUNER,&vt);
-                        t->signal = vt.signal;
-                }
-#endif
+                saa7134_i2c_call_clients(dev, VIDIOC_G_TUNER, t);
+
+                return 0;
+        }
+        case VIDIOC_S_TUNER:
+        {
+                struct v4l2_tuner *t = arg;
+
+                if (0 != t->index)
+                        return -EINVAL;
+
+                saa7134_i2c_call_clients(dev,VIDIOC_S_TUNER,t);
+
                 return 0;
         }
         case VIDIOC_ENUMINPUT:
@@ -2182,7 +2169,6 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
                 return 0;
         }
         case VIDIOC_S_AUDIO:
-        case VIDIOC_S_TUNER:
         case VIDIOC_S_INPUT:
         case VIDIOC_S_STD:
                 return 0;
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index ac90a9853236..d6b1c0d4d0f9 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134.h,v 1.38 2005/03/07 12:01:51 kraxel Exp $
+ * $Id: saa7134.h,v 1.41 2005/06/07 18:02:26 nsh Exp $
  *
  * v4l2 device driver for philips saa7134 based TV cards
  *
@@ -21,7 +21,7 @@
  */
 
 #include <linux/version.h>
-#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,12)
+#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,13)
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
@@ -91,9 +91,10 @@ struct saa7134_tvnorm {
         unsigned int  h_stop;
         unsigned int  video_v_start;
         unsigned int  video_v_stop;
-        unsigned int  vbi_v_start;
-        unsigned int  vbi_v_stop;
+        unsigned int  vbi_v_start_0;
+        unsigned int  vbi_v_stop_0;
         unsigned int  src_timing;
+        unsigned int  vbi_v_start_1;
 };
 
 struct saa7134_tvaudio {
@@ -167,7 +168,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_SABRENT_SBTTVFM  42
 #define SAA7134_BOARD_ZOLID_XPERT_TV7134 43
 #define SAA7134_BOARD_EMPIRE_PCI_TV_RADIO_LE 44
-#define SAA7134_BOARD_AVERMEDIA_307    45
+#define SAA7134_BOARD_AVERMEDIA_STUDIO_307    45
 #define SAA7134_BOARD_AVERMEDIA_CARDBUS 46
 #define SAA7134_BOARD_CINERGY400_CARDBUS 47
 #define SAA7134_BOARD_CINERGY600_MK3   48
@@ -178,6 +179,10 @@ struct saa7134_format {
 #define SAA7135_BOARD_ASUSTeK_TVFM7135 53
 #define SAA7134_BOARD_FLYTVPLATINUM_FM 54
 #define SAA7134_BOARD_FLYDVBTDUO 55
+#define SAA7134_BOARD_AVERMEDIA_307    56
+#define SAA7134_BOARD_AVERMEDIA_GO_007_FM 57
+#define SAA7134_BOARD_ADS_INSTANT_TV 58
+#define SAA7134_BOARD_KWORLD_VSTREAM_XPERT 59
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
@@ -241,7 +246,7 @@ struct saa7134_dma;
 /* saa7134 page table */
 struct saa7134_pgtable {
         unsigned int               size;
-        u32                        *cpu;
+        __le32                     *cpu;
         dma_addr_t                 dma;
 };
 
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 5f0b224c3cb6..108e7a4a0273 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -380,22 +380,14 @@ saa7185_command (struct i2c_client *client,
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 static unsigned short normal_i2c[] = { I2C_SAA7185 >> 1, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7185;
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 376a4a439e9b..07ba6d3ed08c 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -74,7 +74,6 @@ static unsigned short normal_i2c[] = {
         I2C_TDA7432 >> 1,
         I2C_CLIENT_END,
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END, I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 /* Structure of address and subaddresses for the tda7432 */
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index b5177c6f54f6..c29bdfc3244e 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -43,7 +43,6 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 
 /* addresses to scan, found only at 0x42 (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_TDA9840, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 4f1114c033a1..97b113e070f3 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -44,7 +44,6 @@ static unsigned short normal_i2c[] =  {
     I2C_TDA9875 >> 1,
     I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
 I2C_CLIENT_INSMOD;
 
 /* This is a superset of the TDA9875 */
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index debef1910c37..39773633cc3c 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -33,7 +33,6 @@ static unsigned short normal_i2c[] = {
         0x96 >>1,
         I2C_CLIENT_END,
 };
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};
 I2C_CLIENT_INSMOD;
 
 /* insmod options */
@@ -54,6 +53,7 @@ struct tda9887 {
         unsigned int       config;
         unsigned int       pinnacle_id;
         unsigned int       using_v4l2;
+        unsigned int       radio_mode;
 };
 
 struct tvnorm {
@@ -213,12 +213,22 @@ static struct tvnorm tvnorms[] = {
         }
 };
 
-static struct tvnorm radio = {
-        .name = "radio",
+static struct tvnorm radio_stereo = {
+        .name = "Radio Stereo",
+        .b    = ( cFmRadio       |
+                  cQSS           ),
+        .c    = ( cDeemphasisOFF |
+                  cAudioGain6 ),
+        .e    = ( cAudioIF_5_5   |
+                  cRadioIF_38_90 ),
+};
+
+static struct tvnorm radio_mono = {
+        .name = "Radio Mono",
         .b    = ( cFmRadio       |
                   cQSS           ),
         .c    = ( cDeemphasisON  |
-                  cDeemphasis50  ),
+                  cDeemphasis50),
         .e    = ( cAudioIF_5_5   |
                   cRadioIF_38_90 ),
 };
@@ -355,7 +365,10 @@ static int tda9887_set_tvnorm(struct tda9887 *t, char *buf)
         int i;
 
         if (t->radio) {
-                norm = &radio;
+                if (t->radio_mode == V4L2_TUNER_MODE_MONO)
+                        norm = &radio_mono;
+                else
+                        norm = &radio_stereo;
         } else {
                 for (i = 0; i < ARRAY_SIZE(tvnorms); i++) {
                         if (tvnorms[i].std & t->std) {
@@ -546,11 +559,14 @@ static int tda9887_configure(struct tda9887 *t)
 
         memset(buf,0,sizeof(buf));
         tda9887_set_tvnorm(t,buf);
+
         buf[1] |= cOutputPort1Inactive;
         buf[1] |= cOutputPort2Inactive;
+
         if (UNSET != t->pinnacle_id) {
                 tda9887_set_pinnacle(t,buf);
         }
+
         tda9887_set_config(t,buf);
         tda9887_set_insmod(t,buf);
 
@@ -593,9 +609,12 @@ static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)
         if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
                 return -ENOMEM;
         memset(t,0,sizeof(*t));
+
         t->client      = client_template;
         t->std         = 0;
         t->pinnacle_id = UNSET;
+        t->radio_mode = V4L2_TUNER_MODE_STEREO;
+
         i2c_set_clientdata(&t->client, t);
         i2c_attach_client(&t->client);
 
@@ -734,6 +753,16 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 }
                 break;
         }
+        case VIDIOC_S_TUNER:
+        {
+                struct v4l2_tuner* tuner = arg;
+
+                if (t->radio) {
+                        t->radio_mode = tuner->audmode;
+                        tda9887_configure (t);
+                }
+                break;
+        }
         default:
                 /* nothing */
                 break;
@@ -741,7 +770,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return 0;
 }
 
-static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level)
+static int tda9887_suspend(struct device * dev, u32 state, u32 level)
 {
         dprintk("tda9887: suspend\n");
         return 0;
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 3ec39550bf46..b44db8a7b94d 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -43,7 +43,6 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 
 /* addresses to scan, found only at 0x03 and/or 0x43 (7-bit) */
 static unsigned short normal_i2c[] = { I2C_TEA6415C_1, I2C_TEA6415C_2, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index bd10710fd909..48d4db7d507b 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -40,7 +40,6 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 
 /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_TEA6420_1, I2C_TEA6420_2, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 6b20aa902a8f..51748c6578d1 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -34,19 +34,14 @@ static int this_adap;
 static struct i2c_client client_template;
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = {I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {0x60, 0x61, I2C_CLIENT_END};
-static unsigned short probe[2]        = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2]  = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2]       = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2]        = { I2C_CLIENT_END, I2C_CLIENT_END };
+static unsigned short normal_i2c[] = { 0x60, 0x61, I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
 
 static struct i2c_client_address_data addr_data = {
-        normal_i2c, normal_i2c_range, 
-        probe, probe_range, 
-        ignore, ignore_range, 
-        force
+        .normal_i2c     = normal_i2c,
+        .probe          = &ignore,
+        .ignore         = &ignore,
+        .force          = &ignore,
 };
 
 /* ---------------------------------------------------------------------- */
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 6212388edb75..eaabfc858703 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tuner-core.c,v 1.5 2005/02/15 15:59:35 kraxel Exp $
+ * $Id: tuner-core.c,v 1.15 2005/06/12 01:36:14 mchehab Exp $
  *
  * i2c tv tuner chip device driver
  * core core, i.e. kernel interfaces, registering and so on
@@ -23,15 +23,18 @@
 #include <media/tuner.h>
 #include <media/audiochip.h>
 
+/*
+ * comment line bellow to return to old behavor, where only one I2C device is supported
+ */
+#define CONFIG_TUNER_MULTI_I2C /**/
+
 #define UNSET (-1U)
 
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
         0x4b, /* tda8290 */
-        I2C_CLIENT_END
-};
-static unsigned short normal_i2c_range[] = {
-        0x60, 0x6f,
+        0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+        0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
         I2C_CLIENT_END
 };
 I2C_CLIENT_INSMOD;
@@ -55,13 +58,16 @@ MODULE_AUTHOR("Ralph Metzler, Gerd Knorr, Gunther Mayer");
 MODULE_LICENSE("GPL");
 
 static int this_adap;
+#ifdef CONFIG_TUNER_MULTI_I2C
+static unsigned short first_tuner, tv_tuner, radio_tuner;
+#endif
 
 static struct i2c_driver driver;
 static struct i2c_client client_template;
 
 /* ---------------------------------------------------------------------- */
 
-// Set tuner frequency,  freq in Units of 62.5kHz = 1/16MHz
+/* Set tuner frequency,  freq in Units of 62.5kHz = 1/16MHz */
 static void set_tv_freq(struct i2c_client *c, unsigned int freq)
 {
         struct tuner *t = i2c_get_clientdata(c);
@@ -75,14 +81,26 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
                 return;
         }
         if (freq < tv_range[0]*16 || freq > tv_range[1]*16) {
-                /* FIXME: better do that chip-specific, but
-                   right now we don't have that in the config
-                   struct and this way is still better than no
-                   check at all */
-                tuner_info("TV freq (%d.%02d) out of range (%d-%d)\n",
-                           freq/16,freq%16*100/16,tv_range[0],tv_range[1]);
-                return;
+
+                if (freq >= tv_range[0]*16364 && freq <= tv_range[1]*16384) {
+                        /* V4L2_TUNER_CAP_LOW frequency */
+
+                        tuner_dbg("V4L2_TUNER_CAP_LOW freq selected for TV. Tuners yet doesn't support converting it to valid freq.\n");
+
+                        t->tv_freq(c,freq>>10);
+
+                        return;
+                } else {
+                        /* FIXME: better do that chip-specific, but
+                           right now we don't have that in the config
+                           struct and this way is still better than no
+                           check at all */
+                        tuner_info("TV freq (%d.%02d) out of range (%d-%d)\n",
+                                   freq/16,freq%16*100/16,tv_range[0],tv_range[1]);
+                        return;
+                }
         }
+        tuner_dbg("62.5 Khz freq step selected for TV.\n");
         t->tv_freq(c,freq);
 }
 
@@ -99,11 +117,29 @@ static void set_radio_freq(struct i2c_client *c, unsigned int freq)
                 return;
         }
         if (freq < radio_range[0]*16 || freq > radio_range[1]*16) {
-                tuner_info("radio freq (%d.%02d) out of range (%d-%d)\n",
+                if (freq >= tv_range[0]*16364 && freq <= tv_range[1]*16384) {
+                        /* V4L2_TUNER_CAP_LOW frequency */
+                        if (t->type == TUNER_TEA5767) {
+                                tuner_info("radio freq step 62.5Hz (%d.%06d)\n",(freq>>14),freq%(1<<14)*10000);
+                                t->radio_freq(c,freq>>10);
+                                return;
+                        }
+
+                        tuner_dbg("V4L2_TUNER_CAP_LOW freq selected for Radio. Tuners yet doesn't support converting it to valid freq.\n");
+
+                        tuner_info("radio freq (%d.%06d)\n",(freq>>14),freq%(1<<14)*10000);
+
+                        t->radio_freq(c,freq>>10);
+                        return;
+
+                } else {
+                        tuner_info("radio freq (%d.%02d) out of range (%d-%d)\n",
                            freq/16,freq%16*100/16,
-                           radio_range[0],radio_range[1]);
-                return;
+                                   radio_range[0],radio_range[1]);
+                        return;
+                }
         }
+        tuner_dbg("62.5 Khz freq step selected for Radio.\n");
         t->radio_freq(c,freq);
 }
 
@@ -131,8 +167,9 @@ static void set_type(struct i2c_client *c, unsigned int type)
 {
         struct tuner *t = i2c_get_clientdata(c);
 
+        tuner_dbg ("I2C addr 0x%02x with type %d\n",c->addr<<1,type);
         /* sanity check */
-        if (type == UNSET  ||  type == TUNER_ABSENT)
+        if (type == UNSET || type == TUNER_ABSENT)
                 return;
         if (type >= tuner_count)
                 return;
@@ -147,6 +184,7 @@ static void set_type(struct i2c_client *c, unsigned int type)
                 return;
 
         t->initialized = 1;
+
         t->type = type;
         switch (t->type) {
         case TUNER_MT2032:
@@ -161,6 +199,53 @@ static void set_type(struct i2c_client *c, unsigned int type)
         }
 }
 
+#ifdef CONFIG_TUNER_MULTI_I2C
+#define CHECK_ADDR(tp,cmd,tun)  if (client->addr!=tp) { \
+                          return 0; } else \
+                          tuner_info ("Cmd %s accepted to "tun"\n",cmd);
+#define CHECK_MODE(cmd) if (t->mode == V4L2_TUNER_RADIO) { \
+                        CHECK_ADDR(radio_tuner,cmd,"radio") } else \
+                        { CHECK_ADDR(tv_tuner,cmd,"TV"); }
+#else
+#define CHECK_ADDR(tp,cmd,tun) tuner_info ("Cmd %s accepted to "tun"\n",cmd);
+#define CHECK_MODE(cmd) tuner_info ("Cmd %s accepted\n",cmd);
+#endif
+
+#ifdef CONFIG_TUNER_MULTI_I2C
+
+static void set_addr(struct i2c_client *c, struct tuner_addr *tun_addr)
+{
+        /* ADDR_UNSET defaults to first available tuner */
+        if ( tun_addr->addr == ADDR_UNSET ) {
+                if (first_tuner != c->addr)
+                        return;
+                switch (tun_addr->v4l2_tuner) {
+                case V4L2_TUNER_RADIO:
+                        radio_tuner=c->addr;
+                        break;
+                default:
+                        tv_tuner=c->addr;
+                        break;
+                }
+        } else {
+                /* Sets tuner to its configured value */
+                switch (tun_addr->v4l2_tuner) {
+                case V4L2_TUNER_RADIO:
+                        radio_tuner=tun_addr->addr;
+                        if ( tun_addr->addr == c->addr ) set_type(c,tun_addr->type);
+                        return;
+                default:
+                        tv_tuner=tun_addr->addr;
+                        if ( tun_addr->addr == c->addr ) set_type(c,tun_addr->type);
+                        return;
+                }
+        }
+        set_type(c,tun_addr->type);
+}
+#else
+#define set_addr(c,tun_addr) set_type(c,(tun_addr)->type)
+#endif
+
 static char pal[] = "-";
 module_param_string(pal, pal, sizeof(pal), 0644);
 
@@ -199,8 +284,17 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 {
         struct tuner *t;
 
+#ifndef CONFIG_TUNER_MULTI_I2C
         if (this_adap > 0)
                 return -1;
+#else
+        /* by default, first I2C card is both tv and radio tuner */
+        if (this_adap == 0) {
+                first_tuner = addr;
+                tv_tuner = addr;
+                radio_tuner = addr;
+        }
+#endif
         this_adap++;
 
         client_template.adapter = adap;
@@ -213,11 +307,12 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
         memcpy(&t->i2c,&client_template,sizeof(struct i2c_client));
         i2c_set_clientdata(&t->i2c, t);
         t->type       = UNSET;
-        t->radio_if2  = 10700*1000; // 10.7MHz - FM radio
+        t->radio_if2  = 10700*1000; /* 10.7MHz - FM radio */
 
         i2c_attach_client(&t->i2c);
         tuner_info("chip found @ 0x%x (%s)\n",
                    addr << 1, adap->name);
+
         set_type(&t->i2c, t->type);
         return 0;
 }
@@ -225,12 +320,17 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 static int tuner_probe(struct i2c_adapter *adap)
 {
         if (0 != addr) {
-                normal_i2c[0]       = addr;
-                normal_i2c_range[0] = addr;
-                normal_i2c_range[1] = addr;
+                normal_i2c[0] = addr;
+                normal_i2c[1] = I2C_CLIENT_END;
         }
         this_adap = 0;
 
+#ifdef CONFIG_TUNER_MULTI_I2C
+        first_tuner = 0;
+        tv_tuner = 0;
+        radio_tuner = 0;
+#endif
+
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, tuner_attach);
         return 0;
@@ -239,8 +339,14 @@ static int tuner_probe(struct i2c_adapter *adap)
 static int tuner_detach(struct i2c_client *client)
 {
         struct tuner *t = i2c_get_clientdata(client);
+        int err;
+
+        err=i2c_detach_client(&t->i2c);
+        if (err) {
+                tuner_warn ("Client deregistration failed, client not detached.\n");
+                return err;
+        }
 
-        i2c_detach_client(&t->i2c);
         kfree(t);
         return 0;
 }
@@ -259,18 +365,23 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
         unsigned int *iarg = (int*)arg;
 
         switch (cmd) {
-
         /* --- configuration --- */
         case TUNER_SET_TYPE:
                 set_type(client,*iarg);
                 break;
+        case TUNER_SET_TYPE_ADDR:
+                set_addr(client,(struct tuner_addr *)arg);
+                break;
         case AUDC_SET_RADIO:
+                t->mode = V4L2_TUNER_RADIO;
+                CHECK_ADDR(tv_tuner,"AUDC_SET_RADIO","TV");
+
                 if (V4L2_TUNER_RADIO != t->mode) {
                         set_tv_freq(client,400 * 16);
-                        t->mode = V4L2_TUNER_RADIO;
                 }
                 break;
         case AUDC_CONFIG_PINNACLE:
+                CHECK_ADDR(tv_tuner,"AUDC_CONFIG_PINNACLE","TV");
                 switch (*iarg) {
                 case 2:
                         tuner_dbg("pinnacle pal\n");
@@ -300,6 +411,8 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
                 CHECK_V4L2;
                 t->mode = V4L2_TUNER_ANALOG_TV;
+                CHECK_ADDR(tv_tuner,"VIDIOCSCHAN","TV");
+
                 if (vc->norm < ARRAY_SIZE(map))
                         t->std = map[vc->norm];
                 tuner_fixup_std(t);
@@ -311,6 +424,7 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
         {
                 unsigned long *v = arg;
 
+                CHECK_MODE("VIDIOCSFREQ");
                 CHECK_V4L2;
                 set_freq(client,*v);
                 return 0;
@@ -319,15 +433,27 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
         {
                 struct video_tuner *vt = arg;
 
+                CHECK_ADDR(radio_tuner,"VIDIOCGTUNER","radio");
                 CHECK_V4L2;
-                if (V4L2_TUNER_RADIO == t->mode  &&  t->has_signal)
-                        vt->signal = t->has_signal(client);
+                if (V4L2_TUNER_RADIO == t->mode) {
+                        if (t->has_signal)
+                                vt->signal = t->has_signal(client);
+                        if (t->is_stereo) {
+                                if (t->is_stereo(client))
+                                        vt-> flags |= VIDEO_TUNER_STEREO_ON;
+                                else
+                                        vt-> flags &= 0xffff ^ VIDEO_TUNER_STEREO_ON;
+                        }
+                        vt->flags |= V4L2_TUNER_CAP_LOW; /* Allow freqs at 62.5 Hz */
+                }
+
                 return 0;
         }
         case VIDIOCGAUDIO:
         {
                 struct video_audio *va = arg;
 
+                CHECK_ADDR(radio_tuner,"VIDIOCGAUDIO","radio");
                 CHECK_V4L2;
                 if (V4L2_TUNER_RADIO == t->mode  &&  t->is_stereo)
                         va->mode = t->is_stereo(client)
@@ -342,6 +468,8 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
                 SWITCH_V4L2;
                 t->mode = V4L2_TUNER_ANALOG_TV;
+                CHECK_ADDR(tv_tuner,"VIDIOC_S_STD","TV");
+
                 t->std = *id;
                 tuner_fixup_std(t);
                 if (t->freq)
@@ -352,6 +480,7 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
         {
                 struct v4l2_frequency *f = arg;
 
+                CHECK_MODE("VIDIOC_S_FREQUENCY");
                 SWITCH_V4L2;
                 if (V4L2_TUNER_RADIO == f->type &&
                     V4L2_TUNER_RADIO != t->mode)
@@ -364,6 +493,7 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
         {
                 struct v4l2_frequency *f = arg;
 
+                CHECK_MODE("VIDIOC_G_FREQUENCY");
                 SWITCH_V4L2;
                 f->type = t->mode;
                 f->frequency = t->freq;
@@ -373,14 +503,29 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
         {
                 struct v4l2_tuner *tuner = arg;
 
+                CHECK_MODE("VIDIOC_G_TUNER");
                 SWITCH_V4L2;
-                if (V4L2_TUNER_RADIO == t->mode  &&  t->has_signal)
-                        tuner->signal = t->has_signal(client);
+                if (V4L2_TUNER_RADIO == t->mode) {
+                        if (t->has_signal)
+                                tuner -> signal = t->has_signal(client);
+                        if (t->is_stereo) {
+                                if (t->is_stereo(client)) {
+                                        tuner -> capability |= V4L2_TUNER_CAP_STEREO;
+                                        tuner -> rxsubchans |= V4L2_TUNER_SUB_STEREO;
+                                } else {
+                                        tuner -> rxsubchans &= 0xffff ^ V4L2_TUNER_SUB_STEREO;
+                                }
+                        }
+                }
+                /* Wow to deal with V4L2_TUNER_CAP_LOW ? For now, it accepts from low at 62.5KHz step  to high at 62.5 Hz */
                 tuner->rangelow = tv_range[0] * 16;
-                tuner->rangehigh = tv_range[1] * 16;
+//              tuner->rangehigh = tv_range[1] * 16;
+//              tuner->rangelow = tv_range[0] * 16384;
+                tuner->rangehigh = tv_range[1] * 16384;
                 break;
         }
         default:
+                tuner_dbg ("Unimplemented IOCTL 0x%08x called to tuner.\n", cmd);
                 /* nothing */
                 break;
         }
@@ -388,7 +533,7 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return 0;
 }
 
-static int tuner_suspend(struct device * dev, pm_message_t state, u32 level)
+static int tuner_suspend(struct device * dev, u32 state, u32 level)
 {
         struct i2c_client *c = container_of(dev, struct i2c_client, dev);
         struct tuner *t = i2c_get_clientdata(c);
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 48c6ceff1dc2..539f30557317 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tuner-simple.c,v 1.10 2005/03/08 08:38:00 kraxel Exp $
+ * $Id: tuner-simple.c,v 1.21 2005/06/10 19:53:26 nsh Exp $
  *
  * i2c tv tuner chip device driver
  * controls all those simple 4-control-bytes style tuners.
@@ -212,7 +212,25 @@ static struct tunertype tuners[] = {
         { "Philips FQ1236A MK4", Philips, NTSC,
           16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
 
+        /* Should work for TVF8531MF, TVF8831MF, TVF8731MF */
+        { "Ymec TVision TVF-8531MF", Philips, NTSC,
+          16*160.00,16*454.00,0xa0,0x90,0x30,0x8e,732},
+        { "Ymec TVision TVF-5533MF", Philips, NTSC,
+          16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732},
+
+        { "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC,
+          16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732},
+        { "Tena TNF9533-D/IF", LGINNOTEK, PAL,
+          16*160.25, 16*464.25, 0x01,0x02,0x08,0x8e,623},
+
+        /*
+         * This entry is for TEA5767 FM radio only chip used on several boards
+         * w/TV tuner
+         */
+        { TEA5767_TUNER_NAME, Philips, RADIO,
+          -1, -1, 0, 0, 0, TEA5767_LOW_LO_32768,0},
 };
+
 unsigned const int tuner_count = ARRAY_SIZE(tuners);
 
 /* ---------------------------------------------------------------------- */
@@ -223,6 +241,7 @@ static int tuner_getstatus(struct i2c_client *c)
 
         if (1 != i2c_master_recv(c,&byte,1))
                 return 0;
+
         return byte;
 }
 
@@ -231,17 +250,33 @@ static int tuner_getstatus(struct i2c_client *c)
 #define TUNER_MODE      0x38
 #define TUNER_AFC       0x07
 
-#define TUNER_STEREO    0x10 /* radio mode */
-#define TUNER_SIGNAL    0x07 /* radio mode */
+#define TUNER_STEREO       0x10 /* radio mode */
+#define TUNER_STEREO_MK3   0x04 /* radio mode */
+#define TUNER_SIGNAL       0x07 /* radio mode */
 
 static int tuner_signal(struct i2c_client *c)
 {
-        return (tuner_getstatus(c) & TUNER_SIGNAL)<<13;
+        return (tuner_getstatus(c) & TUNER_SIGNAL) << 13;
 }
 
 static int tuner_stereo(struct i2c_client *c)
 {
-        return (tuner_getstatus (c) & TUNER_STEREO);
+        int stereo, status;
+        struct tuner *t = i2c_get_clientdata(c);
+
+        status = tuner_getstatus (c);
+
+        switch (t->type) {
+                case TUNER_PHILIPS_FM1216ME_MK3:
+                case TUNER_PHILIPS_FM1236_MK3:
+                case TUNER_PHILIPS_FM1256_IH3:
+                        stereo = ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
+                        break;
+                default:
+                        stereo = status & TUNER_STEREO;
+        }
+
+        return stereo;
 }
 
 #if 0 /* unused */
@@ -424,6 +459,14 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
         buffer[2] = tun->config;
 
         switch (t->type) {
+        case TUNER_TENA_9533_DI:
+        case TUNER_YMEC_TVF_5533MF:
+
+                /*These values are empirically determinated */
+                div = (freq*122)/16 - 20;
+                buffer[2] = 0x88; /* could be also 0x80 */
+                buffer[3] = 0x19; /* could be also 0x10, 0x18, 0x99 */
+                break;
         case TUNER_PHILIPS_FM1216ME_MK3:
         case TUNER_PHILIPS_FM1236_MK3:
                 buffer[3] = 0x19;
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 80dc34f18c2c..9a493bea76d8 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -148,7 +148,6 @@ static unsigned short normal_i2c[] = {
         I2C_TDA9874   >> 1,
         I2C_PIC16C54  >> 1,
         I2C_CLIENT_END };
-static unsigned short normal_i2c_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 static struct i2c_driver driver;
@@ -286,7 +285,6 @@ static int chip_thread(void *data)
                         schedule();
                 }
                 remove_wait_queue(&chip->wq, &wait);
-                try_to_freeze(PF_FREEZE);
                 if (chip->done || signal_pending(current))
                         break;
                 dprintk("%s: thread wakeup\n", i2c_clientname(&chip->c));
@@ -1238,17 +1236,17 @@ static int ta8874z_checkit(struct CHIPSTATE *chip)
 /* audio chip descriptions - struct CHIPDESC                              */
 
 /* insmod options to enable/disable individual audio chips */
-int tda8425  = 1;
-int tda9840  = 1;
-int tda9850  = 1;
-int tda9855  = 1;
-int tda9873  = 1;
-int tda9874a = 1;
-int tea6300  = 0;  // address clash with msp34xx
-int tea6320  = 0;  // address clash with msp34xx
-int tea6420  = 1;
-int pic16c54 = 1;
-int ta8874z  = 0;  // address clash with tda9840
+static int tda8425  = 1;
+static int tda9840  = 1;
+static int tda9850  = 1;
+static int tda9855  = 1;
+static int tda9873  = 1;
+static int tda9874a = 1;
+static int tea6300  = 0;  // address clash with msp34xx
+static int tea6320  = 0;  // address clash with msp34xx
+static int tea6420  = 1;
+static int pic16c54 = 1;
+static int ta8874z  = 0;  // address clash with tda9840
 
 module_param(tda8425, int, 0444);
 module_param(tda9840, int, 0444);
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index e1443a0937e3..0f03c25489f1 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -75,7 +75,7 @@ hauppauge_tuner_fmt[] =
         { 0x00000007, "PAL(B/G)" },
         { 0x00001000, "NTSC(M)" },
         { 0x00000010, "PAL(I)" },
-        { 0x00400000, "SECAM(L/L�)" },
+        { 0x00400000, "SECAM(L/L´)" },
         { 0x00000e00, "PAL(D/K)" },
         { 0x03000000, "ATSC Digital" },
 };
@@ -482,7 +482,6 @@ static unsigned short normal_i2c[] = {
         0xa0 >> 1,
         I2C_CLIENT_END,
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 struct i2c_driver i2c_driver_tveeprom;
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index eafd7061b310..51b99cdbf29e 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -1,3 +1,7 @@
+/*
+ * $Id: tvmixer.c,v 1.8 2005/06/12 04:19:19 mchehab Exp $
+ */
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index b0d4bcb027d0..70ecbdb80277 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -1,4 +1,6 @@
 /*
+ * $Id: v4l1-compat.c,v 1.9 2005/06/12 04:19:19 mchehab Exp $
+ *
  *      Video for Linux Two
  *      Backward Compatibility Layer
  *
@@ -15,14 +17,11 @@
  *
  */
 
-#ifndef __KERNEL__
-#define __KERNEL__
-#endif
-
 #include <linux/config.h>
 
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -787,12 +786,15 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                     !(qctrl2.flags & V4L2_CTRL_FLAG_DISABLED))
                         aud->step = qctrl2.step;
                 aud->mode = 0;
+
+                memset(&tun2,0,sizeof(tun2));
                 err = drv(inode, file, VIDIOC_G_TUNER, &tun2);
                 if (err < 0) {
                         dprintk("VIDIOCGAUDIO / VIDIOC_G_TUNER: %d\n",err);
                         err = 0;
                         break;
                 }
+
                 if (tun2.rxsubchans & V4L2_TUNER_SUB_LANG2)
                         aud->mode = VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
                 else if (tun2.rxsubchans & V4L2_TUNER_SUB_STEREO)
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c
index 31cc4ed9b747..15f5bb486963 100644
--- a/drivers/media/video/video-buf-dvb.c
+++ b/drivers/media/video/video-buf-dvb.c
@@ -62,8 +62,7 @@ static int videobuf_dvb_thread(void *data)
                         break;
                 if (kthread_should_stop())
                         break;
-                if (current->flags & PF_FREEZE)
-                        refrigerator(PF_FREEZE);
+                try_to_freeze();
 
                 /* feed buffer data to demux */
                 if (buf->state == STATE_DONE)
@@ -149,10 +148,10 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,
                        dvb->name, result);
                 goto fail_adapter;
         }
-        dvb->adapter->priv = adapter_priv;
+        dvb->adapter.priv = adapter_priv;
 
         /* register frontend */
-        result = dvb_register_frontend(dvb->adapter, dvb->frontend);
+        result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
         if (result < 0) {
                 printk(KERN_WARNING "%s: dvb_register_frontend failed (errno = %d)\n",
                        dvb->name, result);
@@ -178,7 +177,7 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,
         dvb->dmxdev.filternum    = 256;
         dvb->dmxdev.demux        = &dvb->demux.dmx;
         dvb->dmxdev.capabilities = 0;
-        result = dvb_dmxdev_init(&dvb->dmxdev, dvb->adapter);
+        result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter);
         if (result < 0) {
                 printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n",
                        dvb->name, result);
@@ -209,7 +208,7 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,
         }
 
         /* register network adapter */
-        dvb_net_init(dvb->adapter, &dvb->net, &dvb->demux.dmx);
+        dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
         return 0;
 
 fail_fe_conn:
@@ -223,7 +222,7 @@ fail_dmxdev:
 fail_dmx:
         dvb_unregister_frontend(dvb->frontend);
 fail_frontend:
-        dvb_unregister_adapter(dvb->adapter);
+        dvb_unregister_adapter(&dvb->adapter);
 fail_adapter:
         return result;
 }
@@ -236,7 +235,7 @@ void videobuf_dvb_unregister(struct videobuf_dvb *dvb)
         dvb_dmxdev_release(&dvb->dmxdev);
         dvb_dmx_release(&dvb->demux);
         dvb_unregister_frontend(dvb->frontend);
-        dvb_unregister_adapter(dvb->adapter);
+        dvb_unregister_adapter(&dvb->adapter);
 }
 
 EXPORT_SYMBOL(videobuf_dvb_register);
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 0fd6c9a70917..5dbd9f6bf353 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -569,22 +569,14 @@ static unsigned short normal_i2c[] =
     { I2C_VPX3220 >> 1, (I2C_VPX3220 >> 1) + 4,
         I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver vpx3220_i2c_driver;