svn commit: r331539 - in stable/11/stand: efi/libefi i386/libi386

[Kyle Evans]

Author: kevans
Date: Mon Mar 26 00:26:46 2018
New Revision: 331539
URL: https://svnweb.freebsd.org/changeset/base/331539

Log:
  MFC r331416, r331440: Loader consoles: Implement SGR 22, reste intensity
  
  r331416:
  Loader consoles: Implement SGR 22, reset intensity
  
  r331440:
  Match broken style of vidconsole.c
  
  This particular function uses a broken mix of indentation styles. Match it
  for the newly added SGR 22 bits.

Modified:
  stable/11/stand/efi/libefi/efi_console.c
  stable/11/stand/i386/libi386/vidconsole.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/efi/libefi/efi_console.c
==============================================================================
--- stable/11/stand/efi/libefi/efi_console.c	Sun Mar 25 23:23:19 2018	(r331538)
+++ stable/11/stand/efi/libefi/efi_console.c	Mon Mar 26 00:26:46 2018	(r331539)
@@ -383,6 +383,9 @@ efi_term_emu(int c)
 					fg_c = bg_c;
 					bg_c = t;
 					break;
+				case 22:	/* normal intensity */
+					fg_c &= ~0x8;
+					break;
 				case 30: case 31: case 32: case 33:
 				case 34: case 35: case 36: case 37:
 					fg_c = ansi_col[args[i] - 30];

Modified: stable/11/stand/i386/libi386/vidconsole.c
==============================================================================
--- stable/11/stand/i386/libi386/vidconsole.c	Sun Mar 25 23:23:19 2018	(r331538)
+++ stable/11/stand/i386/libi386/vidconsole.c	Mon Mar 26 00:26:46 2018	(r331539)
@@ -449,6 +449,9 @@ vidc_term_emu(int c)
 		    fg_c = bg_c;
 		    bg_c = t;
 		    break;
+		case 22:	/* normal intensity */
+		    fg_c &= ~0x8;
+		    break;
 		case 30: case 31: case 32: case 33:
 		case 34: case 35: case 36: case 37:
 		    fg_c = ansi_col[args[i] - 30];