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

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

diff -u --recursive --new-file v2.1.123/linux/drivers/video/fbcon-cfb32.c linux/drivers/video/fbcon-cfb32.c
@@ -9,23 +9,20 @@
  *  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-cfb32.h"
+#include <video/fbcon.h>
+#include <video/fbcon-cfb32.h>
 
 
     /*
      *  32 bpp packed pixels
      */
 
-u32 fbcon_cfb32_cmap[16];
-
 void fbcon_cfb32_setup(struct display *p)
 {
     p->next_line = p->line_length ? p->line_length : p->var.xres_virtual<<2;
@@ -35,28 +32,28 @@
 void fbcon_cfb32_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 * 4 == bytes) {
+    if (sx == 0 && dx == 0 && width * fontwidth(p) * 4 == bytes) {
 	mymemmove(p->screen_base + dy * linesize,
 		  p->screen_base + sy * linesize,
 		  height * linesize);
 	return;
     }
-    if (p->fontwidthlog) {
-	sx <<= p->fontwidthlog+2;
-	dx <<= p->fontwidthlog+2;
-	width <<= p->fontwidthlog+2;
+    if (fontwidthlog(p)) {
+	sx <<= fontwidthlog(p)+2;
+	dx <<= fontwidthlog(p)+2;
+	width <<= fontwidthlog(p)+2;
     } else {
-	sx *= p->fontwidth*4;
-	dx *= p->fontwidth*4;
-	width *= p->fontwidth*4;
+	sx *= fontwidth(p)*4;
+	dx *= fontwidth(p)*4;
+	width *= fontwidth(p)*4;
     }
     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;
@@ -64,7 +61,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;
@@ -72,39 +69,45 @@
     }
 }
 
+static inline void rectfill(u8 *dest, int width, int height, u32 data,
+			    int linesize)
+{
+    int i;
+
+    while (height-- > 0) {
+	u32 *p = (u32 *)dest;
+	for (i = 0; i < width/4; i++) {
+	    *p++ = data;
+	    *p++ = data;
+	    *p++ = data;
+	    *p++ = data;
+	}
+	if (width & 2) {
+	    *p++ = data;
+	    *p++ = data;
+	}
+	if (width & 1)
+	    *p++ = data;
+	dest += linesize;
+    }
+}
+
 void fbcon_cfb32_clear(struct vc_data *conp, struct display *p, int sy, int sx,
 		       int height, int width)
 {
-    u8 *dest0, *dest;
-    int bytes = p->next_line, lines = height * p->fontheight, rows, i;
+    u8 *dest;
+    int bytes = p->next_line, lines = height * fontheight(p);
     u32 bgx;
 
-    dest = p->screen_base + sy * p->fontheight * bytes + sx * p->fontwidth * 4;
+    dest = p->screen_base + sy * fontheight(p) * bytes + sx * fontwidth(p) * 4;
 
-    bgx = fbcon_cfb32_cmap[attr_bgcol_ec(p, conp)];
+    bgx = ((u32 *)p->dispsw_data)[attr_bgcol_ec(p, conp)];
 
-    width *= p->fontwidth/4;
-    if (sx == 0 && width * 16 == bytes)
-	for (i = 0; i < lines * width; i++) {
-	    ((u32 *)dest)[0] = bgx;
-	    ((u32 *)dest)[1] = bgx;
-	    ((u32 *)dest)[2] = bgx;
-	    ((u32 *)dest)[3] = bgx;
-	    dest += 16;
-	}
-    else {
-	dest0 = dest;
-	for (rows = lines; rows--; dest0 += bytes) {
-	    dest = dest0;
-	    for (i = 0; i < width; i++) {
-		((u32 *)dest)[0] = bgx;
-		((u32 *)dest)[1] = bgx;
-		((u32 *)dest)[2] = bgx;
-		((u32 *)dest)[3] = bgx;
-		dest += 16;
-	    }
-	}
-    }
+    width *= fontwidth(p)/4;
+    if (width * 16 == bytes)
+	rectfill(dest, lines * width * 4, 1, bgx, bytes);
+    else
+	rectfill(dest, width * 4, lines, bgx, bytes);
 }
 
 void fbcon_cfb32_putc(struct vc_data *conp, struct display *p, int c, int yy,
@@ -114,48 +117,40 @@
     int bytes = p->next_line, rows;
     u32 eorx, fgx, bgx;
 
-    dest = p->screen_base + yy * p->fontheight * bytes + xx * p->fontwidth * 4;
-#ifdef CONFIG_FBCON_FONTWIDTH8_ONLY
-    cdat = p->fontdata + (c & p->charmask) * p->fontheight;
-#else
-    if (p->fontwidth <= 8)
-	cdat = p->fontdata + (c & p->charmask) * p->fontheight;
+    dest = p->screen_base + yy * fontheight(p) * bytes + xx * fontwidth(p) * 4;
+    if (fontwidth(p) <= 8)
+	cdat = p->fontdata + (c & p->charmask) * fontheight(p);
     else
-	cdat = p->fontdata + ((c & p->charmask) * p->fontheight << 1);
-#endif
-    fgx = fbcon_cfb32_cmap[attr_fgcol(p, c)];
-    bgx = fbcon_cfb32_cmap[attr_bgcol(p, c)];
+	cdat = p->fontdata + ((c & p->charmask) * fontheight(p) << 1);
+    fgx = ((u32 *)p->dispsw_data)[attr_fgcol(p, c)];
+    bgx = ((u32 *)p->dispsw_data)[attr_bgcol(p, c)];
     eorx = fgx ^ bgx;
 
-    for (rows = p->fontheight; rows--; dest += bytes) {
+    for (rows = fontheight(p); rows--; dest += bytes) {
 	bits = *cdat++;
 	((u32 *)dest)[0] = (-(bits >> 7) & eorx) ^ bgx;
 	((u32 *)dest)[1] = (-(bits >> 6 & 1) & eorx) ^ bgx;
 	((u32 *)dest)[2] = (-(bits >> 5 & 1) & eorx) ^ bgx;
 	((u32 *)dest)[3] = (-(bits >> 4 & 1) & eorx) ^ bgx;
-#ifndef CONFIG_FBCON_FONTWIDTH8_ONLY
-	if (p->fontwidth < 8)
+	if (fontwidth(p) < 8)
 	    continue;
-#endif
 	((u32 *)dest)[4] = (-(bits >> 3 & 1) & eorx) ^ bgx;
 	((u32 *)dest)[5] = (-(bits >> 2 & 1) & eorx) ^ bgx;
 	((u32 *)dest)[6] = (-(bits >> 1 & 1) & eorx) ^ bgx;
 	((u32 *)dest)[7] = (-(bits & 1) & eorx) ^ bgx;
-#ifndef CONFIG_FBCON_FONTWIDTH8_ONLY
-	if (p->fontwidth < 12)
+	if (fontwidth(p) < 12)
 	    continue;
 	bits = *cdat++;
 	((u32 *)dest)[8] = (-(bits >> 7) & eorx) ^ bgx;
 	((u32 *)dest)[9] = (-(bits >> 6 & 1) & eorx) ^ bgx;
 	((u32 *)dest)[10] = (-(bits >> 5 & 1) & eorx) ^ bgx;
 	((u32 *)dest)[11] = (-(bits >> 4 & 1) & eorx) ^ bgx;
-	if (p->fontwidth < 16)
+	if (fontwidth(p) < 16)
 	    continue;
 	((u32 *)dest)[12] = (-(bits >> 3 & 1) & eorx) ^ bgx;
 	((u32 *)dest)[13] = (-(bits >> 2 & 1) & eorx) ^ bgx;
 	((u32 *)dest)[14] = (-(bits >> 1 & 1) & eorx) ^ bgx;
 	((u32 *)dest)[15] = (-(bits & 1) & eorx) ^ bgx;
-#endif
     }
 }
 
@@ -167,51 +162,43 @@
     int rows, bytes = p->next_line;
     u32 eorx, fgx, bgx;
 
-    dest0 = p->screen_base + yy * p->fontheight * bytes + xx * p->fontwidth * 4;
-    fgx = fbcon_cfb32_cmap[attr_fgcol(p, *s)];
-    bgx = fbcon_cfb32_cmap[attr_bgcol(p, *s)];
+    dest0 = p->screen_base + yy * fontheight(p) * bytes + xx * fontwidth(p) * 4;
+    fgx = ((u32 *)p->dispsw_data)[attr_fgcol(p, *s)];
+    bgx = ((u32 *)p->dispsw_data)[attr_bgcol(p, *s)];
     eorx = fgx ^ bgx;
     while (count--) {
 	c = *s++ & p->charmask;
-#ifdef CONFIG_FBCON_FONTWIDTH8_ONLY
-	cdat = p->fontdata + c * p->fontheight;
-#else
-	if (p->fontwidth <= 8)
-	    cdat = p->fontdata + c * p->fontheight;
+	if (fontwidth(p) <= 8)
+	    cdat = p->fontdata + c * fontheight(p);
 	else
-	    cdat = p->fontdata + (c * p->fontheight << 1);
-#endif
-	for (rows = p->fontheight, dest = dest0; rows--; dest += bytes) {
+	    cdat = p->fontdata + (c * fontheight(p) << 1);
+	for (rows = fontheight(p), dest = dest0; rows--; dest += bytes) {
 	    bits = *cdat++;
 	    ((u32 *)dest)[0] = (-(bits >> 7) & eorx) ^ bgx;
 	    ((u32 *)dest)[1] = (-(bits >> 6 & 1) & eorx) ^ bgx;
 	    ((u32 *)dest)[2] = (-(bits >> 5 & 1) & eorx) ^ bgx;
 	    ((u32 *)dest)[3] = (-(bits >> 4 & 1) & eorx) ^ bgx;
-#ifndef CONFIG_FBCON_FONTWIDTH8_ONLY
-	    if (p->fontwidth < 8)
+	    if (fontwidth(p) < 8)
 		continue;
-#endif
 	    ((u32 *)dest)[4] = (-(bits >> 3 & 1) & eorx) ^ bgx;
 	    ((u32 *)dest)[5] = (-(bits >> 2 & 1) & eorx) ^ bgx;
 	    ((u32 *)dest)[6] = (-(bits >> 1 & 1) & eorx) ^ bgx;
 	    ((u32 *)dest)[7] = (-(bits & 1) & eorx) ^ bgx;
-#ifndef CONFIG_FBCON_FONTWIDTH8_ONLY
-	    if (p->fontwidth < 12)
+	    if (fontwidth(p) < 12)
 		continue;
 	    bits = *cdat++;
 	    ((u32 *)dest)[8] = (-(bits >> 7) & eorx) ^ bgx;
 	    ((u32 *)dest)[9] = (-(bits >> 6 & 1) & eorx) ^ bgx;
 	    ((u32 *)dest)[10] = (-(bits >> 5 & 1) & eorx) ^ bgx;
 	    ((u32 *)dest)[11] = (-(bits >> 4 & 1) & eorx) ^ bgx;
-	    if (p->fontwidth < 16)
+	    if (fontwidth(p) < 16)
 		continue;
 	    ((u32 *)dest)[12] = (-(bits >> 3 & 1) & eorx) ^ bgx;
 	    ((u32 *)dest)[13] = (-(bits >> 2 & 1) & eorx) ^ bgx;
 	    ((u32 *)dest)[14] = (-(bits >> 1 & 1) & eorx) ^ bgx;
 	    ((u32 *)dest)[15] = (-(bits & 1) & eorx) ^ bgx;
-#endif
 	}
-	dest0 += p->fontwidth*4;
+	dest0 += fontwidth(p)*4;
     }
 }
 
@@ -220,15 +207,9 @@
     u8 *dest;
     int bytes = p->next_line, rows;
 
-    dest = p->screen_base + yy * p->fontheight * bytes + xx * p->fontwidth * 4;
-    for (rows = p->fontheight; rows--; dest += bytes) {
-#ifdef CONFIG_FBCON_FONTWIDTH8_ONLY
-	((u32 *)dest)[4] ^= 0xffffffff; ((u32 *)dest)[5] ^= 0xffffffff;
-	((u32 *)dest)[6] ^= 0xffffffff; ((u32 *)dest)[7] ^= 0xffffffff;
-	((u32 *)dest)[0] ^= 0xffffffff; ((u32 *)dest)[1] ^= 0xffffffff;
-	((u32 *)dest)[2] ^= 0xffffffff; ((u32 *)dest)[3] ^= 0xffffffff;
-#else
-	switch (p->fontwidth) {
+    dest = p->screen_base + yy * fontheight(p) * bytes + xx * fontwidth(p) * 4;
+    for (rows = fontheight(p); rows--; dest += bytes) {
+	switch (fontwidth(p)) {
 	case 16:
 	    ((u32 *)dest)[12] ^= 0xffffffff; ((u32 *)dest)[13] ^= 0xffffffff;
 	    ((u32 *)dest)[14] ^= 0xffffffff; ((u32 *)dest)[15] ^= 0xffffffff;
@@ -246,36 +227,27 @@
 	    ((u32 *)dest)[2] ^= 0xffffffff; ((u32 *)dest)[3] ^= 0xffffffff;
 	    /* FALL THROUGH */
 	}
-#endif
     }
 }
 
-void fbcon_cfb32_clear_margins(struct vc_data *conp, struct display *p)
+void fbcon_cfb32_clear_margins(struct vc_data *conp, struct display *p,
+			       int bottom_only)
 {
-    u8 *dest0;
-    u32 *dest;
     int bytes = p->next_line;
     u32 bgx;
-    int i, j;
 
-    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;
-
-    bgx = fbcon_cfb32_cmap[attr_bgcol_ec(p, conp)];
-
-    if (right_width) {
-	dest0 = p->screen_base+right_start*4;
-	for (i = 0; i < bottom_start; i++, dest0 += bytes)
-	    for (j = 0, dest = (u32 *)dest0; j < right_width; j++)
-		*dest++ = bgx;
-    }
-    if (bottom_width) {
-	dest = (u32 *)(p->screen_base+bottom_start*bytes);
-	for (i = 0; i < bytes*bottom_width/4; i++)
-	    *dest++ = bgx;
-    }
+    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 = ((u32 *)p->dispsw_data)[attr_bgcol_ec(p, conp)];
+
+    if (!bottom_only && (right_width = p->var.xres-right_start))
+	rectfill(p->screen_base+right_start*4, 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);
 }
 
 
@@ -312,4 +284,4 @@
 EXPORT_SYMBOL(fbcon_cfb32_putc);
 EXPORT_SYMBOL(fbcon_cfb32_putcs);
 EXPORT_SYMBOL(fbcon_cfb32_revc);
-EXPORT_SYMBOL(fbcon_cfb32_cmap);
+EXPORT_SYMBOL(fbcon_cfb32_clear_margins);