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

• Lines: 91
• Date: Mon Oct 11 10:26:52 1999
• Orig file: v2.3.20/linux/drivers/video/fbcon-mfb.c
• Orig date: Thu Feb 25 10:02:12 1999

diff -u --recursive --new-file v2.3.20/linux/drivers/video/fbcon-mfb.c linux/drivers/video/fbcon-mfb.c
@@ -41,12 +41,12 @@
     if (sx == 0 && dx == 0 && width == p->next_line) {
 	src = p->screen_base+sy*fontheight(p)*width;
 	dest = p->screen_base+dy*fontheight(p)*width;
-	mymemmove(dest, src, height*fontheight(p)*width);
+	fb_memmove(dest, src, height*fontheight(p)*width);
     } else if (dy <= sy) {
 	src = p->screen_base+sy*fontheight(p)*p->next_line+sx;
 	dest = p->screen_base+dy*fontheight(p)*p->next_line+dx;
 	for (rows = height*fontheight(p); rows--;) {
-	    mymemmove(dest, src, width);
+	    fb_memmove(dest, src, width);
 	    src += p->next_line;
 	    dest += p->next_line;
 	}
@@ -54,7 +54,7 @@
 	src = p->screen_base+((sy+height)*fontheight(p)-1)*p->next_line+sx;
 	dest = p->screen_base+((dy+height)*fontheight(p)-1)*p->next_line+dx;
 	for (rows = height*fontheight(p); rows--;) {
-	    mymemmove(dest, src, width);
+	    fb_memmove(dest, src, width);
 	    src -= p->next_line;
 	    dest -= p->next_line;
 	}
@@ -72,15 +72,15 @@
 
     if (sx == 0 && width == p->next_line) {
 	if (inverse)
-	    mymemset(dest, height*fontheight(p)*width);
+	    fb_memset255(dest, height*fontheight(p)*width);
 	else
-	    mymemclear(dest, height*fontheight(p)*width);
+	    fb_memclear(dest, height*fontheight(p)*width);
     } else
 	for (rows = height*fontheight(p); rows--; dest += p->next_line)
 	    if (inverse)
-		mymemset(dest, width);
+		fb_memset255(dest, width);
 	    else
-		mymemclear_small(dest, width);
+		fb_memclear_small(dest, width);
 }
 
 void fbcon_mfb_putc(struct vc_data *conp, struct display *p, int c, int yy,
@@ -104,7 +104,7 @@
 	    d |= d>>1;
 	if (revs)
 	    d = ~d;
-	*dest = d;
+    	fb_writeb (d, dest);
     }
 }
 
@@ -133,19 +133,21 @@
 		d |= d>>1;
 	    if (revs)
 		d = ~d;
-	    *dest = d;
+    	    fb_writeb (d, dest);
 	}
     }
 }
 
 void fbcon_mfb_revc(struct display *p, int xx, int yy)
 {
-    u8 *dest;
+    u8 *dest, d;
     u_int rows;
 
     dest = p->screen_base+yy*fontheight(p)*p->next_line+xx;
-    for (rows = fontheight(p); rows--; dest += p->next_line)
-	*dest = ~*dest;
+    for (rows = fontheight(p); rows--; dest += p->next_line) {
+    	d = fb_readb(dest);
+	fb_writeb (~d, dest);
+    }
 }
 
 void fbcon_mfb_clear_margins(struct vc_data *conp, struct display *p,
@@ -165,9 +167,9 @@
 	bottom -= p->vrows;
     dest = p->screen_base + bottom * fontheight(p) * p->next_line;
     if (inverse)
-	mymemset(dest, height * p->next_line);
+	fb_memset255(dest, height * p->next_line);
     else
-	mymemclear(dest, height * p->next_line);
+	fb_memclear(dest, height * p->next_line);
 }