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

• Lines: 75
• Date: Fri Jul 10 15:18:31 1998
• Orig file: v2.1.108/linux/drivers/video/fbcon-mfb.c
• Orig date: Wed Jun 24 22:54:07 1998

diff -u --recursive --new-file v2.1.108/linux/drivers/video/fbcon-mfb.c linux/drivers/video/fbcon-mfb.c
@@ -70,13 +70,13 @@
     dest = p->screen_base+sy*p->fontheight*p->next_line+sx;
 
     if (sx == 0 && width == p->next_line) {
-	if (attr_reverse(p,conp))
+	if (attr_reverse(p,conp->vc_attr))
 	    mymemset(dest, height*p->fontheight*width);
 	else
 	    mymemclear(dest, height*p->fontheight*width);
     } else
 	for (rows = height*p->fontheight; rows--; dest += p->next_line)
-	    if (attr_reverse(p,conp))
+	    if (attr_reverse(p,conp->vc_attr))
 		mymemset(dest, width);
 	    else
 		mymemclear_small(dest, width);
@@ -89,13 +89,11 @@
     u_int rows, bold, revs, underl;
     u8 d;
 
-    c &= 0xff;
-
     dest = p->screen_base+yy*p->fontheight*p->next_line+xx;
-    cdat = p->fontdata+c*p->fontheight;
-    bold = attr_bold(p,conp);
-    revs = attr_reverse(p,conp);
-    underl = attr_underline(p,conp);
+    cdat = p->fontdata+(c&0xff)*p->fontheight;
+    bold = attr_bold(p,c);
+    revs = attr_reverse(p,c);
+    underl = attr_underline(p,c);
 
     for (rows = p->fontheight; rows--; dest += p->next_line) {
 	d = *cdat++;
@@ -109,17 +107,17 @@
     }
 }
 
-void fbcon_mfb_putcs(struct vc_data *conp, struct display *p, const char *s,
-		     int count, int yy, int xx)
+void fbcon_mfb_putcs(struct vc_data *conp, struct display *p, 
+		     const unsigned short *s, int count, int yy, int xx)
 {
     u8 *dest, *dest0, *cdat;
     u_int rows, bold, revs, underl;
     u8 c, d;
 
     dest0 = p->screen_base+yy*p->fontheight*p->next_line+xx;
-    bold = attr_bold(p,conp);
-    revs = attr_reverse(p,conp);
-    underl = attr_underline(p,conp);
+    bold = attr_bold(p,*s);
+    revs = attr_reverse(p,*s);
+    underl = attr_underline(p,*s);
 
     while (count--) {
 	c = *s++;
@@ -157,6 +155,17 @@
     fbcon_mfb_setup, fbcon_mfb_bmove, fbcon_mfb_clear, fbcon_mfb_putc,
     fbcon_mfb_putcs, fbcon_mfb_revc, NULL
 };
+
+
+#ifdef MODULE
+int init_module(void)
+{
+    return 0;
+}
+
+void cleanup_module(void)
+{}
+#endif /* MODULE */
 
 
     /*