| /shark/trunk/drivers/fb/vgastate.c |
|---|
| 367,7 → 367,10 |
| if (saved == NULL) |
| return 1; |
| memset (saved, 0, sizeof(struct regstate)); |
| (struct regstate *) state->vidstate = saved; |
| // changed for gcc4 compatibility |
| //(struct regstate *) state->vidstate = saved; |
| state->vidstate = (struct regstate *) (saved); |
| if (state->flags & VGA_SAVE_CMAP) { |
| saved->vga_cmap = vmalloc(768); |
| /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; |
| } |
| /shark/trunk/drivers/fb/radeonfb.c |
|---|
| 1599,7 → 1599,9 |
| if (CRTC_CRT_ON & tmp) |
| value |= 0x02; |
| (__u32*)arg = value; |
| // changed for gcc4 compatibility |
| //(__u32*)arg = value; |
| arg = (__u32*)(value); |
| return 0; |
| default: |
| return -EINVAL; |
| /shark/trunk/drivers/fb/matrox/matroxfb_base.h |
|---|
| 421,7 → 421,8 |
| } output; |
| }; |
| extern struct display fb_display[]; |
| // removed for gcc4 compatibility (btw, never used within this driver) |
| //extern struct display fb_display[]; |
| struct matrox_switch; |
| struct matroxfb_driver; |
| /shark/trunk/drivers/fb/cfbimgblt.c |
|---|
| 140,8 → 140,10 |
| if (pitch_index) { |
| dst2 += p->fix.line_length; |
| dst1 = (char *) dst2; |
| (unsigned long) dst1 &= ~(sizeof(u32) - 1); |
| // changed for gcc4 compatibility |
| dst1 = (unsigned long)(dst1) & ~(sizeof(u32) - 1); |
| start_index += pitch_index; |
| start_index &= 32 - 1; |
| } |
| 206,8 → 208,10 |
| if (pitch_index) { |
| dst2 += pitch; |
| dst1 = (char *) dst2; |
| (unsigned long) dst1 &= ~(sizeof(u32) - 1); |
| // changed for gcc4 compatibility |
| dst1 = (unsigned long)(dst1) & ~(sizeof(u32) - 1); |
| start_index += pitch_index; |
| start_index &= 32 - 1; |
| } |