patch-2.1.112 linux/drivers/video/fbcon-mfb.c

• Lines: 28
• Date: Sun Jul 26 14:40:19 1998
• Orig file: v2.1.111/linux/drivers/video/fbcon-mfb.c
• Orig date: Sun Jul 26 11:57:17 1998

diff -u --recursive --new-file v2.1.111/linux/drivers/video/fbcon-mfb.c linux/drivers/video/fbcon-mfb.c
@@ -90,7 +90,7 @@
     u8 d;
 
     dest = p->screen_base+yy*p->fontheight*p->next_line+xx;
-    cdat = p->fontdata+(c&0xff)*p->fontheight;
+    cdat = p->fontdata+(c&p->charmask)*p->fontheight;
     bold = attr_bold(p,c);
     revs = attr_reverse(p,c);
     underl = attr_underline(p,c);
@@ -112,7 +112,8 @@
 {
     u8 *dest, *dest0, *cdat;
     u_int rows, bold, revs, underl;
-    u8 c, d;
+    u8 d;
+    u16 c;
 
     dest0 = p->screen_base+yy*p->fontheight*p->next_line+xx;
     bold = attr_bold(p,*s);
@@ -120,7 +121,7 @@
     underl = attr_underline(p,*s);
 
     while (count--) {
-	c = *s++;
+	c = *s++ & p->charmask;
 	dest = dest0++;
 	cdat = p->fontdata+c*p->fontheight;
 	for (rows = p->fontheight; rows--; dest += p->next_line) {