patch-2.2.3 linux/drivers/video/fbcon-afb.c

• Lines: 31
• Date: Thu Feb 25 10:02:12 1999
• Orig file: v2.2.2/linux/drivers/video/fbcon-afb.c
• Orig date: Mon Oct 5 13:13:41 1998

diff -u --recursive --new-file v2.2.2/linux/drivers/video/fbcon-afb.c linux/drivers/video/fbcon-afb.c
@@ -290,12 +290,12 @@
     int fg0, bg0, fg, bg;
 
     dest0 = p->screen_base+yy*fontheight(p)*p->next_line+xx;
-    fg0 = attr_fgcol(p,*s);
-    bg0 = attr_bgcol(p,*s);
+    fg0 = attr_fgcol(p, scr_readw(s));
+    bg0 = attr_bgcol(p, scr_readw(s));
 
     while (count--)
 	if (xx&3 || count < 3) {	/* Slow version */
-	    c1 = *s++ & p->charmask;
+	    c1 = scr_readw(s++) & p->charmask;
 	    dest1 = dest0++;
 	    xx++;
 
@@ -322,10 +322,10 @@
 		dest1 += p->next_plane;
 	    } while (--i);
 	} else {			/* Fast version */
-	    c1 = s[0] & p->charmask;
-	    c2 = s[1] & p->charmask;
-	    c3 = s[2] & p->charmask;
-	    c4 = s[3] & p->charmask;
+	    c1 = scr_readw(&s[0]) & p->charmask;
+	    c2 = scr_readw(&s[1]) & p->charmask;
+	    c3 = scr_readw(&s[2]) & p->charmask;
+	    c4 = scr_readw(&s[3]) & p->charmask;
 
 	    dest1 = dest0;
 	    cdat10 = p->fontdata+c1*fontheight(p);