a single hardware device or a virtual device that is an aggregation\r
of multiple physical devices.\r
\r
- Copyright (c) 2006 - 2008, Intel Corporation \r
- All rights reserved. This program and the accompanying materials \r
- are licensed and made available under the terms and conditions of the BSD License \r
- which accompanies this distribution. The full text of the license may be found at \r
- http://opensource.org/licenses/bsd-license.php \r
-\r
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
\r
\r
///\r
/// Protocol GUID defined in EFI1.1.\r
-/// \r
+///\r
#define SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID\r
\r
typedef struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;\r
\r
///\r
/// Backward-compatible with EFI1.1.\r
-/// \r
+///\r
typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL SIMPLE_TEXT_OUTPUT_INTERFACE;\r
\r
//\r
-// Define's for required EFI Unicode Box Draw characters\r
+// Defines for required EFI Unicode Box Draw characters\r
//\r
#define BOXDRAW_HORIZONTAL 0x2500\r
#define BOXDRAW_VERTICAL 0x2502\r
#define EFI_BROWN (EFI_GREEN | EFI_RED)\r
#define EFI_LIGHTGRAY (EFI_BLUE | EFI_GREEN | EFI_RED)\r
#define EFI_BRIGHT 0x08\r
-#define EFI_DARKGRAY (EFI_BRIGHT)\r
+#define EFI_DARKGRAY (EFI_BLACK | EFI_BRIGHT)\r
#define EFI_LIGHTBLUE (EFI_BLUE | EFI_BRIGHT)\r
#define EFI_LIGHTGREEN (EFI_GREEN | EFI_BRIGHT)\r
#define EFI_LIGHTCYAN (EFI_CYAN | EFI_BRIGHT)\r
#define EFI_YELLOW (EFI_BROWN | EFI_BRIGHT)\r
#define EFI_WHITE (EFI_BLUE | EFI_GREEN | EFI_RED | EFI_BRIGHT)\r
\r
-#define EFI_TEXT_ATTR(f, b) ((f) | ((b) << 4))\r
+//\r
+// Macro to accept color values in their raw form to create\r
+// a value that represents both a foreground and background\r
+// color in a single byte.\r
+// For Foreground, and EFI_* value is valid from EFI_BLACK(0x00) to\r
+// EFI_WHITE (0x0F).\r
+// For Background, only EFI_BLACK, EFI_BLUE, EFI_GREEN, EFI_CYAN,\r
+// EFI_RED, EFI_MAGENTA, EFI_BROWN, and EFI_LIGHTGRAY are acceptable\r
+//\r
+// Do not use EFI_BACKGROUND_xxx values with this macro.\r
+//\r
+#define EFI_TEXT_ATTR(Foreground,Background) ((Foreground) | ((Background) << 4))\r
\r
#define EFI_BACKGROUND_BLACK 0x00\r
#define EFI_BACKGROUND_BLUE 0x10\r
\r
//\r
// We currently define attributes from 0 - 7F for color manipulations\r
-// To internally handle the local display characteristics for a particular character, \r
+// To internally handle the local display characteristics for a particular character,\r
// Bit 7 signifies the local glyph representation for a character. If turned on, glyphs will be\r
// pulled from the wide glyph database and will display locally as a wide character (16 X 19 versus 8 X 19)\r
// If bit 7 is off, the narrow glyph database will be used. This does NOT affect information that is sent to\r
#define EFI_WIDE_ATTRIBUTE 0x80\r
\r
/**\r
- Reset the text output device hardware and optionaly run diagnostics\r
+ Reset the text output device hardware and optionally run diagnostics\r
\r
- @param This Protocol instance pointer.\r
- @param ExtendedVerification Driver may perform more exhaustive verfication\r
+ @param This The protocol instance pointer.\r
+ @param ExtendedVerification Driver may perform more exhaustive verification\r
operation of the device during reset.\r
\r
@retval EFI_SUCCESS The text output device was reset.\r
/**\r
Write a string to the output device.\r
\r
- @param This Protocol instance pointer.\r
+ @param This The protocol instance pointer.\r
@param String The NULL-terminated string to be displayed on the output\r
device(s). All output devices must also support the Unicode\r
drawing character codes defined in this file.\r
);\r
\r
/**\r
- Verifies that all characters in a string can be output to the \r
+ Verifies that all characters in a string can be output to the\r
target device.\r
\r
- @param This Protocol instance pointer.\r
+ @param This The protocol instance pointer.\r
@param String The NULL-terminated string to be examined for the output\r
device(s).\r
\r
Returns information for an available text mode that the output device(s)\r
supports.\r
\r
- @param This Protocol instance pointer.\r
+ @param This The protocol instance pointer.\r
@param ModeNumber The mode number to return information on.\r
@param Columns Returns the geometry of the text output device for the\r
requested ModeNumber.\r
@param Rows Returns the geometry of the text output device for the\r
requested ModeNumber.\r
- \r
+\r
@retval EFI_SUCCESS The requested mode information was returned.\r
@retval EFI_DEVICE_ERROR The device had an error and could not complete the request.\r
@retval EFI_UNSUPPORTED The mode number was not valid.\r
/**\r
Sets the output device(s) to a specified mode.\r
\r
- @param This Protocol instance pointer.\r
+ @param This The protocol instance pointer.\r
@param ModeNumber The mode number to set.\r
\r
@retval EFI_SUCCESS The requested text mode was set.\r
Sets the background and foreground colors for the OutputString () and\r
ClearScreen () functions.\r
\r
- @param This Protocol instance pointer.\r
+ @param This The protocol instance pointer.\r
@param Attribute The attribute to set. Bits 0..3 are the foreground color, and\r
bits 4..6 are the background color. All other bits are undefined\r
and must be zero. The valid Attributes are defined in this file.\r
);\r
\r
/**\r
- Clears the output device(s) display to the currently selected background \r
+ Clears the output device(s) display to the currently selected background\r
color.\r
\r
- @param This Protocol instance pointer.\r
- \r
+ @param This The protocol instance pointer.\r
+\r
@retval EFI_SUCCESS The operation completed successfully.\r
@retval EFI_DEVICE_ERROR The device had an error and could not complete the request.\r
@retval EFI_UNSUPPORTED The output device is not in a valid text mode.\r
/**\r
Sets the current coordinates of the cursor position\r
\r
- @param This Protocol instance pointer.\r
+ @param This The protocol instance pointer.\r
@param Column The position to set the cursor to. Must be greater than or\r
equal to zero and less than the number of columns and rows\r
by QueryMode ().\r
/**\r
Makes the cursor visible or invisible\r
\r
- @param This Protocol instance pointer.\r
+ @param This The protocol instance pointer.\r
@param Visible If TRUE, the cursor is set to be visible. If FALSE, the cursor is\r
set to be invisible.\r
\r
///\r
INT32 Mode;\r
///\r
- /// The current character output attribute\r
+ /// The current character output attribute.\r
///\r
INT32 Attribute;\r
///\r
///\r
INT32 CursorRow;\r
///\r
- /// The cursor is currently visbile or not.\r
+ /// The cursor is currently visible or not.\r
///\r
BOOLEAN CursorVisible;\r
} EFI_SIMPLE_TEXT_OUTPUT_MODE;\r
\r
///\r
-/// The SIMPLE_TEXT_OUTPUT protocol is used to control text-based output devices. \r
-/// It is the minimum required protocol for any handle supplied as the ConsoleOut \r
-/// or StandardError device. In addition, the minimum supported text mode of such \r
+/// The SIMPLE_TEXT_OUTPUT protocol is used to control text-based output devices.\r
+/// It is the minimum required protocol for any handle supplied as the ConsoleOut\r
+/// or StandardError device. In addition, the minimum supported text mode of such\r
/// devices is at least 80 x 25 characters.\r
///\r
struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL {\r