1
From 8e9b8bbb3f9bd6573fc55306be2b87a369342ed1 Mon Sep 17 00:00:00 2001
2
From: Sigmund Augdal <sigmund@snap.tv>
3
Date: Fri, 4 Dec 2009 05:13:21 -0300
4
Subject: [PATCH 049/120] V4L/DVB (13747): [Mantis] Bug Fix!: Use Register Address rather than register field
6
Content-Type: text/plain; charset=UTF-8
7
Content-Transfer-Encoding: 8bit
9
Signed-off-by: Sigmund Augdal <sigmund@snap.tv>
10
Signed-off-by: Manu Abraham <manu@linuxtv.org>
11
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
12
(cherry picked from commit a0c59063a7fe92524ab8fa6e31997b177a8f3029)
14
Signed-off-by: Bjørn Mork <bjorn@mork.no>
16
drivers/media/dvb/mantis/mantis_dma.c | 4 ++--
17
drivers/media/dvb/mantis/mantis_hif.c | 20 ++++++++++----------
18
2 files changed, 12 insertions(+), 12 deletions(-)
20
diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/dvb/mantis/mantis_dma.c
21
index 250f49a..d15a1eb 100644
22
--- a/drivers/media/dvb/mantis/mantis_dma.c
23
+++ b/drivers/media/dvb/mantis/mantis_dma.c
24
@@ -190,7 +190,7 @@ void mantis_dma_start(struct mantis_pci *mantis)
26
mantis_risc_program(mantis);
27
mmwrite(mantis->risc_dma, MANTIS_RISC_START);
28
- mmwrite(mmread(MANTIS_GPIF_HIFADDR) | MANTIS_GPIF_HIFRDWRN, MANTIS_GPIF_HIFADDR);
29
+ mmwrite(mmread(MANTIS_GPIF_ADDR) | MANTIS_GPIF_HIFRDWRN, MANTIS_GPIF_ADDR);
31
mmwrite(0, MANTIS_DMA_CTL);
32
mantis->last_block = mantis->finished_block = 0;
33
@@ -210,7 +210,7 @@ void mantis_dma_stop(struct mantis_pci *mantis)
34
mask = mmread(MANTIS_INT_MASK);
35
dprintk(verbose, MANTIS_DEBUG, 1, "Mantis Stop DMA engine");
37
- mmwrite((mmread(MANTIS_GPIF_HIFADDR) & (~(MANTIS_GPIF_HIFRDWRN))), MANTIS_GPIF_HIFADDR);
38
+ mmwrite((mmread(MANTIS_GPIF_ADDR) & (~(MANTIS_GPIF_HIFRDWRN))), MANTIS_GPIF_ADDR);
40
mmwrite((mmread(MANTIS_DMA_CTL) & ~(MANTIS_FIFO_EN |
42
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
43
index 42e0360..9e058be 100644
44
--- a/drivers/media/dvb/mantis/mantis_hif.c
45
+++ b/drivers/media/dvb/mantis/mantis_hif.c
46
@@ -72,7 +72,7 @@ int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr)
50
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
51
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);
52
if (mantis_hif_data_available(ca) != 0) {
53
dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer burst read failed", mantis->num);
55
@@ -81,7 +81,7 @@ int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr)
56
dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer operation failed", mantis->num);
59
- data = mmread(MANTIS_GPIF_HIFDIN);
60
+ data = mmread(MANTIS_GPIF_DIN);
62
return (data >> 24) & 0xff;
64
@@ -100,8 +100,8 @@ int mantis_hif_write_mem(struct mantis_ca *ca, u32 addr, u8 data)
66
mmwrite(slot->slave_cfg, MANTIS_GPIF_CFGSLA); /* Slot0 alone for now */
68
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
69
- mmwrite(data, MANTIS_GPIF_HIFDOUT);
70
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);
71
+ mmwrite(data, MANTIS_GPIF_DOUT);
72
ca->hif_job_queue = MANTIS_HIF_MEMWR;
74
if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
75
@@ -124,7 +124,7 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr)
76
hif_addr |= MANTIS_GPIF_PCMCIAIOM;
79
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
80
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);
81
ca->hif_job_queue = MANTIS_HIF_IOMRD;
83
if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
84
@@ -134,9 +134,9 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr)
87
ca->hif_job_queue &= ~MANTIS_HIF_IOMRD;
88
- data = mmread(MANTIS_GPIF_HIFDIN);
89
+ data = mmread(MANTIS_GPIF_DIN);
90
hif_addr |= MANTIS_GPIF_PCMCIAREG;
91
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
92
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);
96
@@ -152,8 +152,8 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
97
hif_addr |= MANTIS_GPIF_PCMCIAIOM;
100
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
101
- mmwrite(data, MANTIS_GPIF_HIFDOUT);
102
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);
103
+ mmwrite(data, MANTIS_GPIF_DOUT);
105
ca->hif_job_queue = MANTIS_HIF_IOMWR;
106
if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
107
@@ -164,7 +164,7 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
109
ca->hif_job_queue &= ~MANTIS_HIF_IOMWR;
110
hif_addr |= MANTIS_GPIF_PCMCIAREG;
111
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
112
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);