aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-03 03:38:33 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 08:55:29 -0500
commit01a8c3eebb3c83df337f88332756f16154cecc0f (patch)
tree6125190252fad3edae7b132dec33831df8dbc798
parent715d341c59d2563940ae07b12f949555ccbe3efb (diff)
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>
-rw-r--r--drivers/media/dvb/mantis/mantis_common.h4
-rw-r--r--drivers/media/dvb/mantis/mantis_dma.c2
-rw-r--r--drivers/media/dvb/mantis/mantis_vp1033.c1
-rw-r--r--drivers/media/dvb/mantis/mantis_vp1034.c1
-rw-r--r--drivers/media/dvb/mantis/mantis_vp2033.c1
-rw-r--r--drivers/media/dvb/mantis/mantis_vp3030.c1
6 files changed, 7 insertions, 3 deletions
diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
index d39cbe0f2414..197393e700f7 100644
--- a/drivers/media/dvb/mantis/mantis_common.h
+++ b/drivers/media/dvb/mantis/mantis_common.h
@@ -64,13 +64,15 @@
64#define mmor(dat, addr) mmwrite((dat) | mmread(addr), addr) 64#define mmor(dat, addr) mmwrite((dat) | mmread(addr), addr)
65#define mmaor(dat, addr) mmwrite((dat) | ((mask) & mmread(addr)), addr) 65#define mmaor(dat, addr) mmwrite((dat) | ((mask) & mmread(addr)), addr)
66 66
67#define MANTIS_TS_188 0
68#define MANTIS_TS_204 1
67 69
68struct mantis_hwconfig { 70struct mantis_hwconfig {
69 char *model_name; 71 char *model_name;
70 char *dev_type; 72 char *dev_type;
73 u32 ts_size;
71}; 74};
72 75
73
74struct mantis_pci { 76struct mantis_pci {
75 /* PCI stuff */ 77 /* PCI stuff */
76 u16 vendor_id; 78 u16 vendor_id;
diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/dvb/mantis/mantis_dma.c
index 9e3aa5ec1645..b8fd1c7cd294 100644
--- a/drivers/media/dvb/mantis/mantis_dma.c
+++ b/drivers/media/dvb/mantis/mantis_dma.c
@@ -154,8 +154,6 @@ err:
154 return err; 154 return err;
155} 155}
156 156
157
158
159static inline void mantis_risc_program(struct mantis_pci *mantis) 157static inline void mantis_risc_program(struct mantis_pci *mantis)
160{ 158{
161 u32 buf_pos = 0; 159 u32 buf_pos = 0;
diff --git a/drivers/media/dvb/mantis/mantis_vp1033.c b/drivers/media/dvb/mantis/mantis_vp1033.c
index 07fcc45b7f67..daf02c12d299 100644
--- 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 = {
87struct mantis_hwconfig vp1033_mantis_config = { 87struct mantis_hwconfig vp1033_mantis_config = {
88 .model_name = MANTIS_MODEL_NAME, 88 .model_name = MANTIS_MODEL_NAME,
89 .dev_type = MANTIS_DEV_TYPE, 89 .dev_type = MANTIS_DEV_TYPE,
90 .ts_size = MANTIS_TS_204,
90}; 91};
91 92
92int lgtdqcs001f_tuner_set(struct dvb_frontend *fe, 93int 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 f6766d0793d7..a2fe9d42d1e5 100644
--- 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 = {
32struct mantis_hwconfig vp1034_mantis_config = { 32struct mantis_hwconfig vp1034_mantis_config = {
33 .model_name = MANTIS_MODEL_NAME, 33 .model_name = MANTIS_MODEL_NAME,
34 .dev_type = MANTIS_DEV_TYPE, 34 .dev_type = MANTIS_DEV_TYPE,
35 .ts_size = MANTIS_TS_204,
35}; 36};
36 37
37int vp1034_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) 38int 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 853b558b928e..15772fe58280 100644
--- a/drivers/media/dvb/mantis/mantis_vp2033.c
+++ b/drivers/media/dvb/mantis/mantis_vp2033.c
@@ -27,6 +27,7 @@
27struct mantis_hwconfig vp2033_mantis_config = { 27struct mantis_hwconfig vp2033_mantis_config = {
28 .model_name = MANTIS_MODEL_NAME, 28 .model_name = MANTIS_MODEL_NAME,
29 .dev_type = MANTIS_DEV_TYPE, 29 .dev_type = MANTIS_DEV_TYPE,
30 .ts_size = MANTIS_TS_188,
30}; 31};
31 32
32struct cu1216_config philips_cu1216_config = { 33struct cu1216_config philips_cu1216_config = {
diff --git a/drivers/media/dvb/mantis/mantis_vp3030.c b/drivers/media/dvb/mantis/mantis_vp3030.c
index 8043e5d9218d..cab092ce2306 100644
--- 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 = {
31struct mantis_hwconfig vp3030_mantis_config = { 31struct mantis_hwconfig vp3030_mantis_config = {
32 .model_name = MANTIS_MODEL_NAME, 32 .model_name = MANTIS_MODEL_NAME,
33 .dev_type = MANTIS_DEV_TYPE, 33 .dev_type = MANTIS_DEV_TYPE,
34 .ts_size = MANTIS_TS_188,
34}; 35};
35 36
36int panasonic_en57h12d5_set_params(struct dvb_frontend *fe, 37int panasonic_en57h12d5_set_params(struct dvb_frontend *fe,