aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/mantis/mantis_hif.c
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 03:11:14 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 08:55:34 -0500
commit6053240f5cc914d40ac9c7afe15008bf3e46359c (patch)
tree5a7cdd5b07c43722945f9cb7e57b527eb732169d /drivers/media/dvb/mantis/mantis_hif.c
parentc9a750c909cbde15ecd0f8545f48e051bfee6271 (diff)
V4L/DVB (13743): [Mantis CA] Use DVB_CA Tuple parser
Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/mantis/mantis_hif.c')
-rw-r--r--drivers/media/dvb/mantis/mantis_hif.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index 42aedf7a0147..6a1ea96c16d9 100644
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -111,10 +111,10 @@ int mantis_hif_write_mem(struct mantis_ca *ca, u32 addr, u8 data)
111 return 0; 111 return 0;
112} 112}
113 113
114int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr, u32 count, u32 *data) 114int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr)
115{ 115{
116 struct mantis_pci *mantis = ca->ca_priv; 116 struct mantis_pci *mantis = ca->ca_priv;
117 u32 hif_addr = 0; 117 u32 data, hif_addr = 0;
118 118
119 hif_addr &= ~MANTIS_GPIF_PCMCIAREG; 119 hif_addr &= ~MANTIS_GPIF_PCMCIAREG;
120 hif_addr |= MANTIS_GPIF_HIFRDWRN; 120 hif_addr |= MANTIS_GPIF_HIFRDWRN;
@@ -131,14 +131,14 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr, u32 count, u32 *data)
131 } 131 }
132 udelay(50); 132 udelay(50);
133 ca->hif_job_queue &= ~MANTIS_HIF_IOMRD; 133 ca->hif_job_queue &= ~MANTIS_HIF_IOMRD;
134 *data = mmread(MANTIS_GPIF_HIFDIN); 134 data = mmread(MANTIS_GPIF_HIFDIN);
135 hif_addr |= MANTIS_GPIF_PCMCIAREG; 135 hif_addr |= MANTIS_GPIF_PCMCIAREG;
136 mmwrite(hif_addr, MANTIS_GPIF_HIFADDR); 136 mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
137 137
138 return 0; 138 return data;
139} 139}
140 140
141int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u32 data) 141int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
142{ 142{
143 struct mantis_pci *mantis = ca->ca_priv; 143 struct mantis_pci *mantis = ca->ca_priv;
144 u32 hif_addr = 0; 144 u32 hif_addr = 0;