aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci/av7110_hw.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110_hw.c')
-rw-r--r--drivers/media/dvb/ttpci/av7110_hw.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index 70aee4eb5da4..515e8232e020 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -158,7 +158,7 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)
158 } 158 }
159 dprintk(4, "writing DRAM block %d\n", i); 159 dprintk(4, "writing DRAM block %d\n", i);
160 mwdebi(av7110, DEBISWAB, bootblock, 160 mwdebi(av7110, DEBISWAB, bootblock,
161 ((char*)data) + i * AV7110_BOOT_MAX_SIZE, AV7110_BOOT_MAX_SIZE); 161 ((u8 *)data) + i * AV7110_BOOT_MAX_SIZE, AV7110_BOOT_MAX_SIZE);
162 bootblock ^= 0x1400; 162 bootblock ^= 0x1400;
163 iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4); 163 iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4);
164 iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, AV7110_BOOT_MAX_SIZE, 2); 164 iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, AV7110_BOOT_MAX_SIZE, 2);
@@ -173,10 +173,10 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)
173 } 173 }
174 if (rest > 4) 174 if (rest > 4)
175 mwdebi(av7110, DEBISWAB, bootblock, 175 mwdebi(av7110, DEBISWAB, bootblock,
176 ((char*)data) + i * AV7110_BOOT_MAX_SIZE, rest); 176 ((u8 *)data) + i * AV7110_BOOT_MAX_SIZE, rest);
177 else 177 else
178 mwdebi(av7110, DEBISWAB, bootblock, 178 mwdebi(av7110, DEBISWAB, bootblock,
179 ((char*)data) + i * AV7110_BOOT_MAX_SIZE - 4, rest + 4); 179 ((u8 *)data) + i * AV7110_BOOT_MAX_SIZE - 4, rest + 4);
180 180
181 iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4); 181 iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4);
182 iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, rest, 2); 182 iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, rest, 2);
@@ -751,7 +751,7 @@ static int FlushText(struct av7110 *av7110)
751 return 0; 751 return 0;
752} 752}
753 753
754static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf) 754static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf)
755{ 755{
756 int i, ret; 756 int i, ret;
757 unsigned long start; 757 unsigned long start;