tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB (3381): Fix compilation with Alpha

- BOOT_SIZE name is also used at alpha and were breaking
compiling with allyesconfig.
- All BOOT_* renamed to AV7110_BOOT* to fix and keep names
with the same style.
Thanks to Andrew Morton for pointing this.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

authored by Mauro Carvalho Chehab and committed by Mauro Carvalho Chehab fabd2386 1e4baed3

+26 -26
unified split
+20 -20
drivers/media/dvb/ttpci/av7110_hw.c
··· 146 146 { 147 147 int i; 148 148 int blocks, rest; 149 - u32 base, bootblock = BOOT_BLOCK; 149 + u32 base, bootblock = AV7110_BOOT_BLOCK; 150 150 151 151 dprintk(4, "%p\n", av7110); 152 152 153 - blocks = len / BOOT_MAX_SIZE; 154 - rest = len % BOOT_MAX_SIZE; 153 + blocks = len / AV7110_BOOT_MAX_SIZE; 154 + rest = len % AV7110_BOOT_MAX_SIZE; 155 155 base = DRAM_START_CODE; 156 156 157 157 for (i = 0; i < blocks; i++) { 158 - if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) { 158 + if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) { 159 159 printk(KERN_ERR "dvb-ttpci: load_dram(): timeout at block %d\n", i); 160 160 return -ETIMEDOUT; 161 161 } 162 162 dprintk(4, "writing DRAM block %d\n", i); 163 163 mwdebi(av7110, DEBISWAB, bootblock, 164 - ((char*)data) + i * BOOT_MAX_SIZE, BOOT_MAX_SIZE); 164 + ((char*)data) + i * AV7110_BOOT_MAX_SIZE, AV7110_BOOT_MAX_SIZE); 165 165 bootblock ^= 0x1400; 166 - iwdebi(av7110, DEBISWAB, BOOT_BASE, swab32(base), 4); 167 - iwdebi(av7110, DEBINOSWAP, BOOT_SIZE, BOOT_MAX_SIZE, 2); 168 - iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); 169 - base += BOOT_MAX_SIZE; 166 + iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4); 167 + iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, AV7110_BOOT_MAX_SIZE, 2); 168 + iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); 169 + base += AV7110_BOOT_MAX_SIZE; 170 170 } 171 171 172 172 if (rest > 0) { 173 - if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) { 173 + if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) { 174 174 printk(KERN_ERR "dvb-ttpci: load_dram(): timeout at last block\n"); 175 175 return -ETIMEDOUT; 176 176 } 177 177 if (rest > 4) 178 178 mwdebi(av7110, DEBISWAB, bootblock, 179 - ((char*)data) + i * BOOT_MAX_SIZE, rest); 179 + ((char*)data) + i * AV7110_BOOT_MAX_SIZE, rest); 180 180 else 181 181 mwdebi(av7110, DEBISWAB, bootblock, 182 - ((char*)data) + i * BOOT_MAX_SIZE - 4, rest + 4); 182 + ((char*)data) + i * AV7110_BOOT_MAX_SIZE - 4, rest + 4); 183 183 184 - iwdebi(av7110, DEBISWAB, BOOT_BASE, swab32(base), 4); 185 - iwdebi(av7110, DEBINOSWAP, BOOT_SIZE, rest, 2); 186 - iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); 184 + iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4); 185 + iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, rest, 2); 186 + iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); 187 187 } 188 - if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) { 188 + if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) { 189 189 printk(KERN_ERR "dvb-ttpci: load_dram(): timeout after last block\n"); 190 190 return -ETIMEDOUT; 191 191 } 192 - iwdebi(av7110, DEBINOSWAP, BOOT_SIZE, 0, 2); 193 - iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); 194 - if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BOOT_COMPLETE) < 0) { 192 + iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, 0, 2); 193 + iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); 194 + if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_AV7110_BOOT_COMPLETE) < 0) { 195 195 printk(KERN_ERR "dvb-ttpci: load_dram(): final handshake timeout\n"); 196 196 return -ETIMEDOUT; 197 197 } ··· 262 262 //saa7146_setgpio(dev, 3, SAA7146_GPIO_INPUT); 263 263 264 264 mwdebi(av7110, DEBISWAB, DPRAM_BASE, bootcode, sizeof(bootcode)); 265 - iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); 265 + iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); 266 266 267 267 if (saa7146_wait_for_debi_done(av7110->dev, 1)) { 268 268 printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): "
+6 -6
drivers/media/dvb/ttpci/av7110_hw.h
··· 18 18 { 19 19 BOOTSTATE_BUFFER_EMPTY = 0, 20 20 BOOTSTATE_BUFFER_FULL = 1, 21 - BOOTSTATE_BOOT_COMPLETE = 2 21 + BOOTSTATE_AV7110_BOOT_COMPLETE = 2 22 22 }; 23 23 24 24 enum av7110_type_rec_play_format ··· 295 295 #define DPRAM_BASE 0x4000 296 296 297 297 /* boot protocol area */ 298 - #define BOOT_STATE (DPRAM_BASE + 0x3F8) 299 - #define BOOT_SIZE (DPRAM_BASE + 0x3FA) 300 - #define BOOT_BASE (DPRAM_BASE + 0x3FC) 301 - #define BOOT_BLOCK (DPRAM_BASE + 0x400) 302 - #define BOOT_MAX_SIZE 0xc00 298 + #define AV7110_BOOT_STATE (DPRAM_BASE + 0x3F8) 299 + #define AV7110_BOOT_SIZE (DPRAM_BASE + 0x3FA) 300 + #define AV7110_BOOT_BASE (DPRAM_BASE + 0x3FC) 301 + #define AV7110_BOOT_BLOCK (DPRAM_BASE + 0x400) 302 + #define AV7110_BOOT_MAX_SIZE 0xc00 303 303 304 304 /* firmware command protocol area */ 305 305 #define IRQ_STATE (DPRAM_BASE + 0x0F4)