diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /drivers/video/fbcon-cfb2.c | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'drivers/video/fbcon-cfb2.c')
| -rw-r--r-- | drivers/video/fbcon-cfb2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/fbcon-cfb2.c b/drivers/video/fbcon-cfb2.c index e25fadaae..5b339a4fa 100644 --- a/drivers/video/fbcon-cfb2.c +++ b/drivers/video/fbcon-cfb2.c @@ -50,7 +50,7 @@ static u_char nibbletab_cfb2[]={ void fbcon_cfb2_setup(struct display *p) { - p->next_line = p->var.xres_virtual>>2; + p->next_line = p->line_length ? p->line_length : p->var.xres_virtual>>2; p->next_plane = 0; } @@ -156,15 +156,15 @@ void fbcon_cfb2_putcs(struct vc_data *conp, struct display *p, const unsigned sh u32 eorx, fgx, bgx; dest0 = p->screen_base + yy * fontheight(p) * bytes + xx * 2; - fgx=3/*attr_fgcol(p,*s)*/; - bgx=attr_bgcol(p,*s); + fgx=3/*attr_fgcol(p,scr_readw(s))*/; + bgx=attr_bgcol(p,scr_readw(s)); fgx |= (fgx << 2); fgx |= (fgx << 4); bgx |= (bgx << 2); bgx |= (bgx << 4); eorx = fgx ^ bgx; while (count--) { - c = *s++ & p->charmask; + c = scr_readw(s++) & p->charmask; cdat = p->fontdata + c * fontheight(p); for (rows = fontheight(p), dest = dest0; rows-- ; dest += bytes) { |