Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 477 → Rev 1056

/shark/trunk/drivers/fb/riva/fbdev.c
501,8 → 501,15
u32 b, m, tmp;
 
for (i = 0; i < h; i++) {
b = *((u32 *)data)++;
m = *((u32 *)mask)++;
// changed for gcc4 compatibility
//b = *((u32 *)data)++;
b = *((u32 *)data);
data += sizeof(u32);
//m = *((u32 *)mask)++;
m = *((u32 *)mask);
mask += sizeof(u32);
reverse_order(&b);
for (j = 0; j < w/2; j++) {
1443,7 → 1450,12
while (size >= 16) {
RIVA_FIFO_FREE(par->riva, Bitmap, 16);
for (i = 0; i < 16; i++) {
tmp = *((u32 *)cdat)++;
// changed for gcc4 compatibility
//tmp = *((u32 *)cdat)++;
tmp = *((u32 *)(cdat));
tmp += sizeof(u32);
reverse_order(&tmp);
d[i] = tmp;
}
1452,7 → 1464,12
if (size) {
RIVA_FIFO_FREE(par->riva, Bitmap, size);
for (i = 0; i < size; i++) {
tmp = *((u32 *) cdat)++;
// changed for gcc4 compatibility
//tmp = *((u32 *) cdat)++;
tmp = *((u32 *)(cdat));
tmp += sizeof(u32);
reverse_order(&tmp);
d[i] = tmp;
}