patch-2.1.29 linux/drivers/sbus/char/leo.c

• Lines: 33
• Date: Wed Mar 5 17:04:32 1997
• Orig file: v2.1.28/linux/drivers/sbus/char/leo.c
• Orig date: Mon Dec 30 02:00:05 1996

diff -u --recursive --new-file v2.1.28/linux/drivers/sbus/char/leo.c linux/drivers/sbus/char/leo.c
@@ -1,4 +1,4 @@
-/* $Id: leo.c,v 1.10 1996/12/23 10:16:09 ecd Exp $
+/* $Id: leo.c,v 1.11 1997/02/02 02:12:44 ecd Exp $
  * leo.c: SUNW,leo 24/8bit frame buffer driver
  *
  * Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
@@ -637,7 +637,7 @@
 	
 static void leo_blitc(unsigned short charattr, int xoff, int yoff)
 {
-	unsigned char attrib = charattr >> 8;
+	unsigned char attrib = CHARATTR_TO_SUNCOLOR(charattr);
 	unsigned char *p = &vga_font[((unsigned char)charattr) << 4];
 	u32 *u = ((u32 *)fbinfo[0].base) + (yoff << 11) + xoff;
 	GX_BLITC_START(attrib, xoff, yoff, 1)
@@ -648,7 +648,7 @@
 
 static void leo_setw(int xoff, int yoff, unsigned short c, int count)
 {
-	unsigned char attrib = c >> 8;
+	unsigned char attrib = CHARATTR_TO_SUNCOLOR(c);
 	unsigned char *p = &vga_font[((unsigned char)c) << 4];
 	register unsigned char *q;
 	u32 *u = ((u32 *)fbinfo[0].base) + (yoff << 11) + xoff;
@@ -664,7 +664,7 @@
 
 static void leo_cpyw(int xoff, int yoff, unsigned short *p, int count)
 {
-	unsigned char attrib = *p >> 8;
+	unsigned char attrib = CHARATTR_TO_SUNCOLOR(*p);
 	register unsigned char *q;
 	u32 *u = ((u32 *)fbinfo[0].base) + (yoff << 11) + xoff;
 	GX_BLITC_START(attrib, xoff, yoff, count)