diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2012-01-01 10:33:51 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2012-01-01 10:33:51 -0500 |
| commit | ae6eb8f5d3c076e54709f87da8a0ba1985596cb1 (patch) | |
| tree | 41889ca152166985f32c6d25fee1ee8b4a5cb574 /vgasrc/vgafb.c | |
| parent | 161d201affa5dd23a39a0de9a0743b857448c4b6 (diff) | |
| download | seabios-hppa-ae6eb8f5d3c076e54709f87da8a0ba1985596cb1.zip seabios-hppa-ae6eb8f5d3c076e54709f87da8a0ba1985596cb1.tar.gz seabios-hppa-ae6eb8f5d3c076e54709f87da8a0ba1985596cb1.tar.bz2 | |
vgabios: Framebuffer fixes for CGA and planar graphics modes.
Fix missing divide by 2 in CGA mode scroll. Consistently use
cheight/2 for all uses.
Planar graphics character write has a read to video memory with a side
effect - mark that as volatile so the compiler doesn't optimize it
away.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'vgasrc/vgafb.c')
| -rw-r--r-- | vgasrc/vgafb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vgasrc/vgafb.c b/vgasrc/vgafb.c index 38ed070..e2110cc 100644 --- a/vgasrc/vgafb.c +++ b/vgasrc/vgafb.c @@ -72,7 +72,7 @@ static void scroll_cga(struct vgamode_s *vmode_g, int nblines, int attr , struct cursorpos ul, struct cursorpos lr) { - u8 cheight = GET_GLOBAL(vmode_g->cheight); + u8 cheight = GET_GLOBAL(vmode_g->cheight) / 2; u8 bpp = GET_GLOBAL(vmode_g->pixbits); int stride = GET_BDA(video_cols) * bpp; void *src_far, *dest_far; @@ -90,16 +90,16 @@ scroll_cga(struct vgamode_s *vmode_g, int nblines, int attr int rows = lr.y - ul.y + 1; if (nblines < rows) { memcpy_stride(SEG_CTEXT, dest_far + 0x2000, src_far + 0x2000, cols - , stride, (rows - nblines) * cheight / 2); + , stride, (rows - nblines) * cheight); dest_far = memcpy_stride(SEG_CTEXT, dest_far, src_far, cols - , stride, (rows - nblines) * cheight / 2); + , stride, (rows - nblines) * cheight); } if (attr < 0) attr = 0; memset_stride(SEG_CTEXT, dest_far + 0x2000, attr, cols - , stride, nblines * cheight / 2); + , stride, nblines * cheight); memset_stride(SEG_CTEXT, dest_far, attr, cols - , stride, nblines * cheight / 2); + , stride, nblines * cheight); } static void @@ -198,7 +198,7 @@ write_gfx_char_pl4(struct vgamode_s *vmode_g for (j = 0; j < 8; j++) { u8 mask = 0x80 >> j; stdvga_grdc_write(0x08, mask); - GET_FARVAR(SEG_GRAPH, *dest_far); + GET_FARVAR(SEG_GRAPH, *(volatile u8*)dest_far); if (GET_GLOBAL(fdata_g[src + i]) & mask) SET_FARVAR(SEG_GRAPH, *dest_far, ca.attr & 0x0f); else @@ -392,7 +392,7 @@ vgafb_write_pixel(u8 color, u16 x, u16 y) mask = 0x80 >> (x & 0x07); stdvga_grdc_write(0x08, mask); stdvga_grdc_write(0x05, 0x02); - data = GET_FARVAR(SEG_GRAPH, *addr_far); + GET_FARVAR(SEG_GRAPH, *(volatile u8*)addr_far); if (color & 0x80) stdvga_grdc_write(0x03, 0x18); SET_FARVAR(SEG_GRAPH, *addr_far, color); |