patch-2.1.124 linux/drivers/video/fbcon-cfb8.c

• Lines: 288
• Date: Tue Sep 29 21:01:45 1998
• Orig file: v2.1.123/linux/drivers/video/fbcon-cfb8.c
• Orig date: Mon Aug 3 12:45:46 1998

diff -u --recursive --new-file v2.1.123/linux/drivers/video/fbcon-cfb8.c linux/drivers/video/fbcon-cfb8.c
@@ -9,15 +9,14 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/fb.h>
 
-#include "fbcon.h"
-#include "fbcon-cfb8.h"
+#include <video/fbcon.h>
+#include <video/fbcon-cfb8.h>
 
 
     /*
@@ -49,24 +48,24 @@
 void fbcon_cfb8_bmove(struct display *p, int sy, int sx, int dy, int dx,
 		      int height, int width)
 {
-    int bytes = p->next_line, linesize = bytes * p->fontheight, rows;
+    int bytes = p->next_line, linesize = bytes * fontheight(p), rows;
     u8 *src,*dst;
 
-    if (sx == 0 && dx == 0 && width * p->fontwidth == bytes) {
+    if (sx == 0 && dx == 0 && width * fontwidth(p) == bytes) {
 	mymemmove(p->screen_base + dy * linesize,
 		  p->screen_base + sy * linesize,
 		  height * linesize);
 	return;
     }
-    if (p->fontwidthlog) {
-    	sx <<= p->fontwidthlog; dx <<= p->fontwidthlog; width <<= p->fontwidthlog;
+    if (fontwidthlog(p)) {
+    	sx <<= fontwidthlog(p); dx <<= fontwidthlog(p); width <<= fontwidthlog(p);
     } else {
-    	sx *= p->fontwidth; dx *= p->fontwidth; width *= p->fontwidth;
+    	sx *= fontwidth(p); dx *= fontwidth(p); width *= fontwidth(p);
     }
     if (dy < sy || (dy == sy && dx < sx)) {
 	src = p->screen_base + sy * linesize + sx;
 	dst = p->screen_base + dy * linesize + dx;
-	for (rows = height * p->fontheight ; rows-- ;) {
+	for (rows = height * fontheight(p) ; rows-- ;) {
 	    mymemmove(dst, src, width);
 	    src += bytes;
 	    dst += bytes;
@@ -74,7 +73,7 @@
     } else {
 	src = p->screen_base + (sy+height) * linesize + sx - bytes;
 	dst = p->screen_base + (dy+height) * linesize + dx - bytes;
-	for (rows = height * p->fontheight ; rows-- ;) {
+	for (rows = height * fontheight(p) ; rows-- ;) {
 	    mymemmove(dst, src, width);
 	    src -= bytes;
 	    dst -= bytes;
@@ -82,24 +81,31 @@
     }
 }
 
+static inline void rectfill(u8 *dest, int width, int height, u8 data,
+			    int linesize)
+{
+    while (height-- > 0) {
+	memset(dest, data, width);
+	dest += linesize;
+    }
+}
+
 void fbcon_cfb8_clear(struct vc_data *conp, struct display *p, int sy, int sx,
 		      int height, int width)
 {
     u8 *dest;
-    int bytes=p->next_line,lines=height * p->fontheight, rows;
+    int bytes=p->next_line,lines=height * fontheight(p);
     u8 bgx;
 
-    dest = p->screen_base + sy * p->fontheight * bytes + sx * p->fontwidth;
+    dest = p->screen_base + sy * fontheight(p) * bytes + sx * fontwidth(p);
 
     bgx=attr_bgcol_ec(p,conp);
 
-    if (sx == 0 && p->fontwidth == 8 && width * 8 == bytes)
-        memset(dest, bgx, lines * width * p->fontwidth);
-    else {
-    	width *= p->fontwidth;
-	for (rows = lines; rows-- ; dest += bytes)
-	    memset(dest, bgx, width);
-    }
+    width *= fontwidth(p);
+    if (width == bytes)
+	rectfill(dest, lines * width, 1, bgx, bytes);
+    else
+	rectfill(dest, width, lines, bgx, bytes);
 }
 
 void fbcon_cfb8_putc(struct vc_data *conp, struct display *p, int c, int yy,
@@ -109,11 +115,11 @@
     int bytes=p->next_line,rows;
     u32 eorx,fgx,bgx;
 
-    dest = p->screen_base + yy * p->fontheight * bytes + xx * p->fontwidth;
-    if (p->fontwidth <= 8)
-	cdat = p->fontdata + (c & p->charmask) * p->fontheight;
+    dest = p->screen_base + yy * fontheight(p) * bytes + xx * fontwidth(p);
+    if (fontwidth(p) <= 8)
+	cdat = p->fontdata + (c & p->charmask) * fontheight(p);
     else
-	cdat = p->fontdata + ((c & p->charmask) * p->fontheight << 1);
+	cdat = p->fontdata + ((c & p->charmask) * fontheight(p) << 1);
 
     fgx=attr_fgcol(p,c);
     bgx=attr_bgcol(p,c);
@@ -123,33 +129,29 @@
     bgx |= (bgx << 16);
     eorx = fgx ^ bgx;
 
-#ifndef CONFIG_FBCON_FONTWIDTH8_ONLY
-    switch (p->fontwidth) {
+    switch (fontwidth(p)) {
     case 4:
-	for (rows = p->fontheight ; rows-- ; dest += bytes)
+	for (rows = fontheight(p) ; rows-- ; dest += bytes)
 	    ((u32 *)dest)[0]= (nibbletab_cfb8[*cdat++ >> 4] & eorx) ^ bgx;
         break;
     case 8:
-#endif
-	for (rows = p->fontheight ; rows-- ; dest += bytes) {
+	for (rows = fontheight(p) ; rows-- ; dest += bytes) {
 	    ((u32 *)dest)[0]= (nibbletab_cfb8[*cdat >> 4] & eorx) ^ bgx;
 	    ((u32 *)dest)[1]= (nibbletab_cfb8[*cdat++ & 0xf] & eorx) ^ bgx;
         }
-#ifndef CONFIG_FBCON_FONTWIDTH8_ONLY
         break;
     case 12:
     case 16:
-	for (rows = p->fontheight ; rows-- ; dest += bytes) {
+	for (rows = fontheight(p) ; rows-- ; dest += bytes) {
 	    ((u32 *)dest)[0]= (nibbletab_cfb8[*(u16 *)cdat >> 12] & eorx) ^ bgx;
 	    ((u32 *)dest)[1]= (nibbletab_cfb8[(*(u16 *)cdat >> 8) & 0xf] & eorx) ^ bgx;
 	    ((u32 *)dest)[2]= (nibbletab_cfb8[(*(u16 *)cdat >> 4) & 0xf] & eorx) ^ bgx;
-	    if (p->fontwidth == 16)
+	    if (fontwidth(p) == 16)
 	        ((u32 *)dest)[3]= (nibbletab_cfb8[*cdat & 0xf] & eorx) ^ bgx;
 	    cdat += 2;
         }
         break;
     }
-#endif
 }
 
 void fbcon_cfb8_putcs(struct vc_data *conp, struct display *p, 
@@ -160,7 +162,7 @@
     int rows,bytes=p->next_line;
     u32 eorx, fgx, bgx;
 
-    dest0 = p->screen_base + yy * p->fontheight * bytes + xx * p->fontwidth;
+    dest0 = p->screen_base + yy * fontheight(p) * bytes + xx * fontwidth(p);
     fgx=attr_fgcol(p,*s);
     bgx=attr_bgcol(p,*s);
     fgx |= (fgx << 8);
@@ -168,51 +170,47 @@
     bgx |= (bgx << 8);
     bgx |= (bgx << 16);
     eorx = fgx ^ bgx;
-#ifndef CONFIG_FBCON_FONTWIDTH8_ONLY
-    switch (p->fontwidth) {
+    switch (fontwidth(p)) {
     case 4:
 	while (count--) {
 	    c = *s++ & p->charmask;
-	    cdat = p->fontdata + c * p->fontheight;
+	    cdat = p->fontdata + c * fontheight(p);
 
-	    for (rows = p->fontheight, dest = dest0; rows-- ; dest += bytes)
+	    for (rows = fontheight(p), dest = dest0; rows-- ; dest += bytes)
 		((u32 *)dest)[0]= (nibbletab_cfb8[*cdat++ >> 4] & eorx) ^ bgx;
 	    dest0+=4;
         }
         break;
     case 8:
-#endif
 	while (count--) {
 	    c = *s++ & p->charmask;
-	    cdat = p->fontdata + c * p->fontheight;
+	    cdat = p->fontdata + c * fontheight(p);
 
-	    for (rows = p->fontheight, dest = dest0; rows-- ; dest += bytes) {
+	    for (rows = fontheight(p), dest = dest0; rows-- ; dest += bytes) {
 		((u32 *)dest)[0]= (nibbletab_cfb8[*cdat >> 4] & eorx) ^ bgx;
 		((u32 *)dest)[1]= (nibbletab_cfb8[*cdat++ & 0xf] & eorx) ^ bgx;
 	    }
 	    dest0+=8;
         }
-#ifndef CONFIG_FBCON_FONTWIDTH8_ONLY
         break;
     case 12:
     case 16:
 	while (count--) {
 	    c = *s++ & p->charmask;
-	    cdat = p->fontdata + (c * p->fontheight << 1);
+	    cdat = p->fontdata + (c * fontheight(p) << 1);
 
-	    for (rows = p->fontheight, dest = dest0; rows-- ; dest += bytes) {
+	    for (rows = fontheight(p), dest = dest0; rows-- ; dest += bytes) {
 		((u32 *)dest)[0]= (nibbletab_cfb8[*(u16 *)cdat >> 12] & eorx) ^ bgx;
 		((u32 *)dest)[1]= (nibbletab_cfb8[(*(u16 *)cdat >> 8) & 0xf] & eorx) ^ bgx;
 		((u32 *)dest)[2]= (nibbletab_cfb8[(*(u16 *)cdat >> 4) & 0xf] & eorx) ^ bgx;
-		if (p->fontwidth == 16)
+		if (fontwidth(p) == 16)
 		    ((u32 *)dest)[3]= (nibbletab_cfb8[*cdat & 0xf] & eorx) ^ bgx;
 		cdat += 2;
 	    }
-	    dest0+=p->fontwidth;
+	    dest0+=fontwidth(p);
         }
         break;
     }
-#endif
 }
 
 void fbcon_cfb8_revc(struct display *p, int xx, int yy)
@@ -220,44 +218,36 @@
     u8 *dest;
     int bytes=p->next_line, rows;
 
-    dest = p->screen_base + yy * p->fontheight * bytes + xx * p->fontwidth;
-    for (rows = p->fontheight ; rows-- ; dest += bytes) {
-#ifdef CONFIG_FBCON_FONTWIDTH8_ONLY
-    	((u32 *)dest)[1] ^= 0x0f0f0f0f;
-    	((u32 *)dest)[0] ^= 0x0f0f0f0f;
-#else
-    	switch (p->fontwidth) {
+    dest = p->screen_base + yy * fontheight(p) * bytes + xx * fontwidth(p);
+    for (rows = fontheight(p) ; rows-- ; dest += bytes) {
+    	switch (fontwidth(p)) {
     	case 16: ((u32 *)dest)[3] ^= 0x0f0f0f0f; /* FALL THROUGH */
     	case 12: ((u32 *)dest)[2] ^= 0x0f0f0f0f; /* FALL THROUGH */
     	case 8: ((u32 *)dest)[1] ^= 0x0f0f0f0f;  /* FALL THROUGH */
     	case 4: ((u32 *)dest)[0] ^= 0x0f0f0f0f;  /* FALL THROUGH */
     	default: break;
     	}
-#endif
     }
 }
 
-void fbcon_cfb8_clear_margins(struct vc_data *conp, struct display *p)
+void fbcon_cfb8_clear_margins(struct vc_data *conp, struct display *p,
+			      int bottom_only)
 {
-    u8 *dest;
     int bytes=p->next_line;
     u8 bgx;
-    int i;
 
-    unsigned int right_start = conp->vc_cols*p->fontwidth;
-    unsigned int right_width = p->var.xres_virtual-right_start;
-    unsigned int bottom_start = conp->vc_rows*p->fontheight;
-    unsigned int bottom_width = p->var.yres_virtual-bottom_start;
+    unsigned int right_start = conp->vc_cols*fontwidth(p);
+    unsigned int bottom_start = conp->vc_rows*fontheight(p);
+    unsigned int right_width, bottom_width;
 
     bgx=attr_bgcol_ec(p,conp);
 
-    if (right_width) {
-	dest = p->screen_base+right_start;
-	for (i = 0; i < bottom_start; i++, dest += bytes)
-	    memset(dest, bgx, right_width);
-    }
-    if (bottom_width)
-	memset(p->screen_base+bottom_start*bytes, bgx, bytes*bottom_width);
+    if (!bottom_only && (right_width = p->var.xres-right_start))
+	rectfill(p->screen_base+right_start, right_width, p->var.yres_virtual,
+		 bgx, bytes);
+    if ((bottom_width = p->var.yres-bottom_start))
+	rectfill(p->screen_base+(p->var.yoffset+bottom_start)*bytes,
+		 right_start, bottom_width, bgx, bytes);
 }
 
 
@@ -294,3 +284,4 @@
 EXPORT_SYMBOL(fbcon_cfb8_putc);
 EXPORT_SYMBOL(fbcon_cfb8_putcs);
 EXPORT_SYMBOL(fbcon_cfb8_revc);
+EXPORT_SYMBOL(fbcon_cfb8_clear_margins);