V4L/DVB (13710): [Mantis] FIX: Use swfilter (188/204) accordingly

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
index d39cbe0..197393e 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_common.h
+++ b/drivers/media/dvb/mantis/mantis_common.h
@@ -64,13 +64,15 @@
 #define mmor(dat, addr)                mmwrite((dat) | mmread(addr), addr)
 #define mmaor(dat, addr)       mmwrite((dat) | ((mask) & mmread(addr)), addr)
 
+#define MANTIS_TS_188          0
+#define MANTIS_TS_204          1
 
 struct mantis_hwconfig {
        char                    *model_name;
        char                    *dev_type;
+       u32                     ts_size;
 };
 
-
 struct mantis_pci {
        /*      PCI stuff               */
        u16                     vendor_id;

diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/dvb/mantis/mantis_dma.c
index 9e3aa5e..b8fd1c7 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_dma.c
+++ b/drivers/media/dvb/mantis/mantis_dma.c
@@ -154,8 +154,6 @@ err:
        return err;
 }
 
-
-
 static inline void mantis_risc_program(struct mantis_pci *mantis)
 {
        u32 buf_pos = 0;

diff --git a/drivers/media/dvb/mantis/mantis_vp1033.c b/drivers/media/dvb/mantis/mantis_vp1033.c
index 07fcc45..daf02c1 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_vp1033.c
+++ b/drivers/media/dvb/mantis/mantis_vp1033.c
@@ -87,6 +87,7 @@ struct stv0299_config lgtdqcs001f_config = {
 struct mantis_hwconfig vp1033_mantis_config = {
        .model_name             = MANTIS_MODEL_NAME,
        .dev_type               = MANTIS_DEV_TYPE,
+       .ts_size                = MANTIS_TS_204,
 };
 
 int lgtdqcs001f_tuner_set(struct dvb_frontend *fe,

diff --git a/drivers/media/dvb/mantis/mantis_vp1034.c b/drivers/media/dvb/mantis/mantis_vp1034.c
index f6766d0..a2fe9d4 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_vp1034.c
+++ b/drivers/media/dvb/mantis/mantis_vp1034.c
@@ -32,6 +32,7 @@ struct mb86a16_config vp1034_config = {
 struct mantis_hwconfig vp1034_mantis_config = {
        .model_name     = MANTIS_MODEL_NAME,
        .dev_type       = MANTIS_DEV_TYPE,
+       .ts_size        = MANTIS_TS_204,
 };
 
 int vp1034_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)

diff --git a/drivers/media/dvb/mantis/mantis_vp2033.c b/drivers/media/dvb/mantis/mantis_vp2033.c
index 853b558..15772fe 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_vp2033.c
+++ b/drivers/media/dvb/mantis/mantis_vp2033.c
@@ -27,6 +27,7 @@
 struct mantis_hwconfig vp2033_mantis_config = {
        .model_name     = MANTIS_MODEL_NAME,
        .dev_type       = MANTIS_DEV_TYPE,
+       .ts_size        = MANTIS_TS_188,
 };
 
 struct cu1216_config philips_cu1216_config = {

diff --git a/drivers/media/dvb/mantis/mantis_vp3030.c b/drivers/media/dvb/mantis/mantis_vp3030.c
index 8043e5d..cab092c 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_vp3030.c
+++ b/drivers/media/dvb/mantis/mantis_vp3030.c
@@ -31,6 +31,7 @@ struct zl10353_config mantis_vp3030_config = {
 struct mantis_hwconfig vp3030_mantis_config = {
        .model_name     = MANTIS_MODEL_NAME,
        .dev_type       = MANTIS_DEV_TYPE,
+       .ts_size        = MANTIS_TS_188,
 };
 
 int panasonic_en57h12d5_set_params(struct dvb_frontend *fe,