patch-2.2.0-pre9 linux/drivers/char/console.c

• Lines: 18
• Date: Tue Jan 19 10:10:23 1999
• Orig file: v2.2.0-pre8/linux/drivers/char/console.c
• Orig date: Fri Jan 8 22:36:05 1999

diff -u --recursive --new-file v2.2.0-pre8/linux/drivers/char/console.c linux/drivers/char/console.c
@@ -1221,6 +1221,8 @@
 			break;
 		case 8:	/* store colors as defaults */
 			def_color = attr;
+			if (hi_font_mask == 0x100)
+				def_color >>= 1;
 			default_attr(currcons);
 			update_attr(currcons);
 			break;
@@ -1894,7 +1896,7 @@
 			if (decim)
 				insert_char(currcons, 1);
 			scr_writew(himask ?
-				     ((attr & ~himask) << 8) + ((tc & 0x100) ? himask : 0) + (tc & 0xff) :
+				     ((attr << 8) & ~himask) + ((tc & 0x100) ? himask : 0) + (tc & 0xff) :
 				     (attr << 8) + tc,
 				   (u16 *) pos);
 			if (DO_UPDATE && draw_x < 0) {