diff options
-rw-r--r-- | drivers/media/dvb/mantis/mantis_dma.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/mantis/mantis_hif.c | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/dvb/mantis/mantis_dma.c index 250f49a913a..d15a1eb980c 100644 --- a/drivers/media/dvb/mantis/mantis_dma.c +++ b/drivers/media/dvb/mantis/mantis_dma.c | |||
@@ -190,7 +190,7 @@ void mantis_dma_start(struct mantis_pci *mantis) | |||
190 | 190 | ||
191 | mantis_risc_program(mantis); | 191 | mantis_risc_program(mantis); |
192 | mmwrite(mantis->risc_dma, MANTIS_RISC_START); | 192 | mmwrite(mantis->risc_dma, MANTIS_RISC_START); |
193 | mmwrite(mmread(MANTIS_GPIF_HIFADDR) | MANTIS_GPIF_HIFRDWRN, MANTIS_GPIF_HIFADDR); | 193 | mmwrite(mmread(MANTIS_GPIF_ADDR) | MANTIS_GPIF_HIFRDWRN, MANTIS_GPIF_ADDR); |
194 | 194 | ||
195 | mmwrite(0, MANTIS_DMA_CTL); | 195 | mmwrite(0, MANTIS_DMA_CTL); |
196 | mantis->last_block = mantis->finished_block = 0; | 196 | mantis->last_block = mantis->finished_block = 0; |
@@ -210,7 +210,7 @@ void mantis_dma_stop(struct mantis_pci *mantis) | |||
210 | mask = mmread(MANTIS_INT_MASK); | 210 | mask = mmread(MANTIS_INT_MASK); |
211 | dprintk(verbose, MANTIS_DEBUG, 1, "Mantis Stop DMA engine"); | 211 | dprintk(verbose, MANTIS_DEBUG, 1, "Mantis Stop DMA engine"); |
212 | 212 | ||
213 | mmwrite((mmread(MANTIS_GPIF_HIFADDR) & (~(MANTIS_GPIF_HIFRDWRN))), MANTIS_GPIF_HIFADDR); | 213 | mmwrite((mmread(MANTIS_GPIF_ADDR) & (~(MANTIS_GPIF_HIFRDWRN))), MANTIS_GPIF_ADDR); |
214 | 214 | ||
215 | mmwrite((mmread(MANTIS_DMA_CTL) & ~(MANTIS_FIFO_EN | | 215 | mmwrite((mmread(MANTIS_DMA_CTL) & ~(MANTIS_FIFO_EN | |
216 | MANTIS_DCAP_EN | | 216 | MANTIS_DCAP_EN | |
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c index 42e0360e96d..9e058be8726 100644 --- a/drivers/media/dvb/mantis/mantis_hif.c +++ b/drivers/media/dvb/mantis/mantis_hif.c | |||
@@ -72,7 +72,7 @@ int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr) | |||
72 | 72 | ||
73 | udelay(20); | 73 | udelay(20); |
74 | 74 | ||
75 | mmwrite(hif_addr, MANTIS_GPIF_HIFADDR); | 75 | mmwrite(hif_addr, MANTIS_GPIF_ADDR); |
76 | if (mantis_hif_data_available(ca) != 0) { | 76 | if (mantis_hif_data_available(ca) != 0) { |
77 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer burst read failed", mantis->num); | 77 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer burst read failed", mantis->num); |
78 | return -EREMOTEIO; | 78 | return -EREMOTEIO; |
@@ -81,7 +81,7 @@ int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr) | |||
81 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer operation failed", mantis->num); | 81 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer operation failed", mantis->num); |
82 | return -EREMOTEIO; | 82 | return -EREMOTEIO; |
83 | } | 83 | } |
84 | data = mmread(MANTIS_GPIF_HIFDIN); | 84 | data = mmread(MANTIS_GPIF_DIN); |
85 | 85 | ||
86 | return (data >> 24) & 0xff; | 86 | return (data >> 24) & 0xff; |
87 | } | 87 | } |
@@ -100,8 +100,8 @@ int mantis_hif_write_mem(struct mantis_ca *ca, u32 addr, u8 data) | |||
100 | 100 | ||
101 | mmwrite(slot->slave_cfg, MANTIS_GPIF_CFGSLA); /* Slot0 alone for now */ | 101 | mmwrite(slot->slave_cfg, MANTIS_GPIF_CFGSLA); /* Slot0 alone for now */ |
102 | 102 | ||
103 | mmwrite(hif_addr, MANTIS_GPIF_HIFADDR); | 103 | mmwrite(hif_addr, MANTIS_GPIF_ADDR); |
104 | mmwrite(data, MANTIS_GPIF_HIFDOUT); | 104 | mmwrite(data, MANTIS_GPIF_DOUT); |
105 | ca->hif_job_queue = MANTIS_HIF_MEMWR; | 105 | ca->hif_job_queue = MANTIS_HIF_MEMWR; |
106 | 106 | ||
107 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { | 107 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { |
@@ -124,7 +124,7 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr) | |||
124 | hif_addr |= MANTIS_GPIF_PCMCIAIOM; | 124 | hif_addr |= MANTIS_GPIF_PCMCIAIOM; |
125 | hif_addr |= addr; | 125 | hif_addr |= addr; |
126 | 126 | ||
127 | mmwrite(hif_addr, MANTIS_GPIF_HIFADDR); | 127 | mmwrite(hif_addr, MANTIS_GPIF_ADDR); |
128 | ca->hif_job_queue = MANTIS_HIF_IOMRD; | 128 | ca->hif_job_queue = MANTIS_HIF_IOMRD; |
129 | 129 | ||
130 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { | 130 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { |
@@ -134,9 +134,9 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr) | |||
134 | } | 134 | } |
135 | udelay(50); | 135 | udelay(50); |
136 | ca->hif_job_queue &= ~MANTIS_HIF_IOMRD; | 136 | ca->hif_job_queue &= ~MANTIS_HIF_IOMRD; |
137 | data = mmread(MANTIS_GPIF_HIFDIN); | 137 | data = mmread(MANTIS_GPIF_DIN); |
138 | hif_addr |= MANTIS_GPIF_PCMCIAREG; | 138 | hif_addr |= MANTIS_GPIF_PCMCIAREG; |
139 | mmwrite(hif_addr, MANTIS_GPIF_HIFADDR); | 139 | mmwrite(hif_addr, MANTIS_GPIF_ADDR); |
140 | 140 | ||
141 | return data; | 141 | return data; |
142 | } | 142 | } |
@@ -152,8 +152,8 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data) | |||
152 | hif_addr |= MANTIS_GPIF_PCMCIAIOM; | 152 | hif_addr |= MANTIS_GPIF_PCMCIAIOM; |
153 | hif_addr |= addr; | 153 | hif_addr |= addr; |
154 | 154 | ||
155 | mmwrite(hif_addr, MANTIS_GPIF_HIFADDR); | 155 | mmwrite(hif_addr, MANTIS_GPIF_ADDR); |
156 | mmwrite(data, MANTIS_GPIF_HIFDOUT); | 156 | mmwrite(data, MANTIS_GPIF_DOUT); |
157 | 157 | ||
158 | ca->hif_job_queue = MANTIS_HIF_IOMWR; | 158 | ca->hif_job_queue = MANTIS_HIF_IOMWR; |
159 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { | 159 | if (mantis_hif_sbuf_opdone_wait(ca) != 0) { |
@@ -164,7 +164,7 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data) | |||
164 | udelay(50); | 164 | udelay(50); |
165 | ca->hif_job_queue &= ~MANTIS_HIF_IOMWR; | 165 | ca->hif_job_queue &= ~MANTIS_HIF_IOMWR; |
166 | hif_addr |= MANTIS_GPIF_PCMCIAREG; | 166 | hif_addr |= MANTIS_GPIF_PCMCIAREG; |
167 | mmwrite(hif_addr, MANTIS_GPIF_HIFADDR); | 167 | mmwrite(hif_addr, MANTIS_GPIF_ADDR); |
168 | 168 | ||
169 | return 0; | 169 | return 0; |
170 | } | 170 | } |