18 files changed, 4797 insertions, 0 deletions

diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
new file mode 100644
index 00000000000..9e578140074
--- /dev/null
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -0,0 +1,45 @@
+config DVB_B2C2_FLEXCOP
+        tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
+        depends on DVB_CORE && I2C
+        select DVB_PLL if !DVB_FE_CUSTOMISE
+        select DVB_STV0299 if !DVB_FE_CUSTOMISE
+        select DVB_MT352 if !DVB_FE_CUSTOMISE
+        select DVB_MT312 if !DVB_FE_CUSTOMISE
+        select DVB_NXT200X if !DVB_FE_CUSTOMISE
+        select DVB_STV0297 if !DVB_FE_CUSTOMISE
+        select DVB_BCM3510 if !DVB_FE_CUSTOMISE
+        select DVB_LGDT330X if !DVB_FE_CUSTOMISE
+        select DVB_S5H1420 if !DVB_FE_CUSTOMISE
+        select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
+        select DVB_ISL6421 if !DVB_FE_CUSTOMISE
+        select DVB_CX24123 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
+        select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE
+        help
+          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_FLEXCOP_PCI
+        tristate "Technisat/B2C2 Air/Sky/Cable2PC PCI"
+        depends on DVB_B2C2_FLEXCOP && PCI && I2C
+        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 && I2C
+        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.
diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/dvb/b2c2/Makefile
new file mode 100644
index 00000000000..b97cf7208a1
--- /dev/null
+++ b/drivers/media/dvb/b2c2/Makefile
@@ -0,0 +1,16 @@
+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
+obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
+
+ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),)
+b2c2-flexcop-objs += flexcop-dma.o
+endif
+
+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
+
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+EXTRA_CFLAGS += -Idrivers/media/common/tuners/
diff --git a/drivers/media/dvb/b2c2/flexcop-common.h b/drivers/media/dvb/b2c2/flexcop-common.h
new file mode 100644
index 00000000000..437912e4982
--- /dev/null
+++ b/drivers/media/dvb/b2c2/flexcop-common.h
@@ -0,0 +1,185 @@
+/*
+ * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
+ * flexcop-common.h - common header file for device-specific source files
+ * see flexcop.c for copyright information
+ */
+#ifndef __FLEXCOP_COMMON_H__
+#define __FLEXCOP_COMMON_H__
+
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/mutex.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 */
+};
+
+struct flexcop_i2c_adapter {
+        struct flexcop_device *fc;
+        struct i2c_adapter i2c_adap;
+
+        u8 no_base_addr;
+        flexcop_i2c_port_t port;
+};
+
+/* 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 flexcop_i2c_adapter fc_i2c_adap[3];
+        struct mutex i2c_mutex;
+        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_i2c_adapter *,
+                flexcop_access_op_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);
+void flexcop_reset_block_300(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);