#define _TERMINAL_H_\r
\r
\r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
#include <Protocol/SimpleTextOut.h>\r
#include <Protocol/SerialIo.h>\r
#include <Guid/GlobalVariable.h>\r
EFI_INPUT_KEY Data[FIFO_MAX_NUMBER + 1];\r
} EFI_KEY_FIFO;\r
\r
-#define TERMINAL_DEV_SIGNATURE EFI_SIGNATURE_32 ('t', 'm', 'n', 'l')\r
+#define TERMINAL_DEV_SIGNATURE SIGNATURE_32 ('t', 'm', 'n', 'l')\r
\r
-#define TERMINAL_CONSOLE_IN_EX_NOTIFY_SIGNATURE EFI_SIGNATURE_32 ('t', 'm', 'e', 'n')\r
+#define TERMINAL_CONSOLE_IN_EX_NOTIFY_SIGNATURE SIGNATURE_32 ('t', 'm', 'e', 'n')\r
\r
typedef struct _TERMINAL_CONSOLE_IN_EX_NOTIFY {\r
UINTN Signature;\r
InitializeTerminal (\r
IN EFI_HANDLE ImageHandle,\r
IN EFI_SYSTEM_TABLE *SystemTable\r
- )\r
-;\r
+ );\r
\r
/**\r
Implements EFI_SIMPLE_TEXT_INPUT_PROTOCOL.Reset().\r
TerminalConInReset (\r
IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,\r
IN BOOLEAN ExtendedVerification\r
- )\r
-;\r
+ );\r
\r
\r
/**\r
TerminalConInReadKeyStroke (\r
IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,\r
OUT EFI_INPUT_KEY *Key\r
- )\r
-;\r
+ );\r
\r
/**\r
Check if the key already has been registered.\r
IsKeyRegistered (\r
IN EFI_KEY_DATA *RegsiteredData,\r
IN EFI_KEY_DATA *InputData\r
- )\r
-;\r
+ );\r
\r
/**\r
Event notification function for EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL.WaitForKeyEx event\r
TerminalConInWaitForKeyEx (\r
IN EFI_EVENT Event,\r
IN VOID *Context\r
- )\r
-;\r
+ );\r
\r
//\r
// Simple Text Input Ex protocol prototypes\r
TerminalConInResetEx (\r
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
IN BOOLEAN ExtendedVerification\r
- )\r
-;\r
+ );\r
\r
/**\r
Reads the next keystroke from the input device. The WaitForKey Event can\r
TerminalConInReadKeyStrokeEx (\r
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
OUT EFI_KEY_DATA *KeyData\r
- )\r
-;\r
+ );\r
\r
/**\r
Set certain state for the input device.\r
TerminalConInSetState (\r
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
IN EFI_KEY_TOGGLE_STATE *KeyToggleState\r
- )\r
-;\r
+ );\r
\r
/**\r
Register a notification function for a particular keystroke for the input device.\r
IN EFI_KEY_DATA *KeyData,\r
IN EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction,\r
OUT EFI_HANDLE *NotifyHandle\r
- )\r
-;\r
+ );\r
\r
/**\r
Remove a registered notification function from a particular keystroke.\r
TerminalConInUnregisterKeyNotify (\r
IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
IN EFI_HANDLE NotificationHandle\r
- )\r
-;\r
+ );\r
\r
/**\r
Event notification function for EFI_SIMPLE_TEXT_INPUT_PROTOCOL.WaitForKey event\r
TerminalConInWaitForKey (\r
IN EFI_EVENT Event,\r
IN VOID *Context\r
- )\r
-;\r
+ );\r
\r
/**\r
Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.Reset().\r
TerminalConOutReset (\r
IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN BOOLEAN ExtendedVerification\r
- )\r
-;\r
+ );\r
\r
/**\r
Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString().\r
TerminalConOutOutputString (\r
IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN CHAR16 *WString\r
- )\r
-;\r
+ );\r
\r
/**\r
Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.TestString().\r
TerminalConOutTestString (\r
IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN CHAR16 *WString\r
- )\r
-;\r
+ );\r
\r
/**\r
Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.QueryMode().\r
IN UINTN ModeNumber,\r
OUT UINTN *Columns,\r
OUT UINTN *Rows\r
- )\r
-;\r
+ );\r
\r
/**\r
Implements EFI_SIMPLE_TEXT_OUT.SetMode().\r
TerminalConOutSetMode (\r
IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN UINTN ModeNumber\r
- )\r
-;\r
+ );\r
\r
/**\r
Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetAttribute().\r
TerminalConOutSetAttribute (\r
IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN UINTN Attribute\r
- )\r
-;\r
+ );\r
\r
/**\r
Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.ClearScreen().\r
EFIAPI\r
TerminalConOutClearScreen (\r
IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This\r
- )\r
-;\r
+ );\r
\r
/**\r
Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetCursorPosition().\r
IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN UINTN Column,\r
IN UINTN Row\r
- )\r
-;\r
+ );\r
\r
/**\r
Implements SIMPLE_TEXT_OUTPUT.EnableCursor().\r
TerminalConOutEnableCursor (\r
IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,\r
IN BOOLEAN Visible\r
- )\r
-;\r
+ );\r
\r
/**\r
- Test to see if this driver supports ControllerHandle. \r
+ Test to see if this driver supports Controller. \r
\r
@param This Protocol instance pointer.\r
@param ControllerHandle Handle of device to test\r
@param RemainingDevicePath Optional parameter use to pick a specific child\r
device to start.\r
\r
- @retval EFI_SUCCESS This driver supports this device\r
- @retval EFI_ALREADY_STARTED This driver is already running on this device\r
- @retval other This driver does not support this device\r
+ @retval EFI_SUCCESS This driver supports this device.\r
+ @retval EFI_ALREADY_STARTED This driver is already running on this device.\r
+ @retval other This driver does not support this device.\r
\r
**/\r
EFI_STATUS\r
EFIAPI\r
TerminalDriverBindingSupported (\r
IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
- IN EFI_HANDLE Controller,\r
+ IN EFI_HANDLE ControllerHandle,\r
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
);\r
\r
/**\r
- Start this driver on ControllerHandle by opening a Serial IO protocol,\r
+ Start this driver on Controller by opening a Serial IO protocol,\r
reading Device Path, and creating a child handle with a Simple Text In,\r
Simple Text In Ex and Simple Text Out protocol, and device path protocol.\r
And store Console Device Environment Variables.\r
\r
@param This Protocol instance pointer.\r
- @param ControllerHandle Handle of device to bind driver to\r
+ @param Controller Handle of device to bind driver to\r
@param RemainingDevicePath Optional parameter use to pick a specific child\r
device to start.\r
\r
- @retval EFI_SUCCESS This driver is added to ControllerHandle\r
- @retval EFI_ALREADY_STARTED This driver is already running on ControllerHandle\r
- @retval other This driver does not support this device\r
+ @retval EFI_SUCCESS This driver is added to Controller.\r
+ @retval EFI_ALREADY_STARTED This driver is already running on Controller.\r
+ @retval other This driver does not support this device.\r
\r
**/\r
EFI_STATUS\r
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
);\r
\r
+\r
/**\r
- Stop this driver on ControllerHandle by closing Simple Text In, Simple Text\r
+ Stop this driver on Controller by closing Simple Text In, Simple Text\r
In Ex, Simple Text Out protocol, and removing parent device path from\r
Console Device Environment Variables. \r
\r
@param This Protocol instance pointer.\r
- @param ControllerHandle Handle of device to stop driver on\r
+ @param Controller Handle of device to stop driver on\r
@param NumberOfChildren Number of Handles in ChildHandleBuffer. If number of\r
children is zero stop the entire bus driver.\r
@param ChildHandleBuffer List of Child Handles to Stop.\r
\r
- @retval EFI_SUCCESS This driver is removed ControllerHandle.\r
+ @retval EFI_SUCCESS This driver is removed Controller.\r
@retval other This driver could not be removed from this device.\r
\r
**/\r
EFI_STATUS\r
TerminalConInCheckForKey (\r
IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This\r
- )\r
-;\r
+ );\r
\r
/**\r
Update terminal device path in Console Device Environment Variables.\r
TerminalUpdateConsoleDevVariable (\r
IN CHAR16 *VariableName,\r
IN EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath\r
- )\r
-;\r
+ );\r
\r
/**\r
Remove console device variable.\r
TerminalRemoveConsoleDevVariable (\r
IN CHAR16 *VariableName,\r
IN EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath\r
- )\r
-;\r
+ );\r
\r
/**\r
Read the EFI variable (VendorGuid/Name) and return a dynamically allocated\r
@param VariableSize Returns the size of the EFI variable that was read\r
\r
@return Dynamically allocated memory that contains a copy of the EFI variable.\r
- @return Caller is repsoncible freeing the buffer.\r
- @retval NULL Variable was not read\r
+ Caller is repsoncible freeing the buffer. If variable was not read, \r
+ NULL regturned.\r
\r
**/\r
VOID *\r
IN CHAR16 *Name,\r
IN EFI_GUID *VendorGuid,\r
OUT UINTN *VariableSize\r
- )\r
-;\r
+ );\r
\r
/**\r
Build termial device path according to terminal type.\r
IN UINT8 TerminalType,\r
IN EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath,\r
OUT EFI_DEVICE_PATH_PROTOCOL **TerminalDevicePath\r
- )\r
-;\r
+ );\r
\r
/**\r
Initialize the Raw Data FIFO.\r
VOID\r
InitializeRawFiFo (\r
IN TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
/**\r
Initialize the Unicode FIFO.\r
VOID\r
InitializeUnicodeFiFo (\r
IN TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
/**\r
Initialize the EFI Key FIFO.\r
VOID\r
InitializeEfiKeyFiFo (\r
IN TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
/**\r
Get one key out of serial buffer.\r
GetOneKeyFromSerial (\r
EFI_SERIAL_IO_PROTOCOL *SerialIo,\r
UINT8 *Input\r
- )\r
-;\r
+ );\r
\r
/**\r
Insert one byte raw data into the Raw Data FIFO.\r
RawFiFoInsertOneKey (\r
TERMINAL_DEV *TerminalDevice,\r
UINT8 Input\r
- )\r
-;\r
+ );\r
\r
/**\r
Remove one pre-fetched key out of the Raw Data FIFO.\r
RawFiFoRemoveOneKey (\r
TERMINAL_DEV *TerminalDevice,\r
UINT8 *Output\r
- )\r
-;\r
+ );\r
\r
/**\r
Clarify whether Raw Data FIFO buffer is empty.\r
BOOLEAN\r
IsRawFiFoEmpty (\r
TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
/**\r
Clarify whether Raw Data FIFO buffer is full.\r
BOOLEAN\r
IsRawFiFoFull (\r
TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
/**\r
Insert one pre-fetched key into the FIFO buffer.\r
EfiKeyFiFoInsertOneKey (\r
TERMINAL_DEV *TerminalDevice,\r
EFI_INPUT_KEY Key\r
- )\r
-;\r
+ );\r
\r
/**\r
Remove one pre-fetched key out of the FIFO buffer.\r
EfiKeyFiFoRemoveOneKey (\r
TERMINAL_DEV *TerminalDevice,\r
EFI_INPUT_KEY *Output\r
- )\r
-;\r
+ );\r
\r
/**\r
Clarify whether FIFO buffer is empty.\r
BOOLEAN\r
IsEfiKeyFiFoEmpty (\r
TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
/**\r
Clarify whether FIFO buffer is full.\r
BOOLEAN\r
IsEfiKeyFiFoFull (\r
TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
/**\r
Insert one pre-fetched key into the Unicode FIFO buffer.\r
UnicodeFiFoInsertOneKey (\r
TERMINAL_DEV *TerminalDevice,\r
UINT16 Input\r
- )\r
-;\r
+ );\r
\r
/**\r
Remove one pre-fetched key out of the Unicode FIFO buffer.\r
UnicodeFiFoRemoveOneKey (\r
TERMINAL_DEV *TerminalDevice,\r
UINT16 *Output\r
- )\r
-;\r
+ );\r
\r
/**\r
Clarify whether Unicode FIFO buffer is empty.\r
BOOLEAN\r
IsUnicodeFiFoEmpty (\r
TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
/**\r
Clarify whether Unicode FIFO buffer is full.\r
BOOLEAN\r
IsUnicodeFiFoFull (\r
TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
/**\r
Count Unicode FIFO buffer.\r
UINT8\r
UnicodeFiFoGetKeyCount (\r
TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
/**\r
Translate raw data into Unicode (according to different encode), and \r
VOID\r
TranslateRawDataToEfiKey (\r
IN TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
//\r
// internal functions for PC ANSI\r
VOID\r
AnsiRawDataToUnicode (\r
IN TERMINAL_DEV *TerminalDevice\r
- )\r
-;\r
+ );\r
\r
/**\r
Converts a stream of Unicode characters from a terminal input device into EFI Keys that\r
**/\r
VOID\r
UnicodeToEfiKey (\r
- IN TERMINAL_DEV *PcAnsiDevice\r
- )\r
-;\r
+ IN TERMINAL_DEV *TerminalDevice\r
+ );\r
\r
/**\r
Check if input string is valid Ascii string, valid EFI control characters\r
AnsiTestString (\r
IN TERMINAL_DEV *TerminalDevice,\r
IN CHAR16 *WString\r
- )\r
-;\r
+ );\r
\r
//\r
// internal functions for VTUTF8\r
VOID\r
VTUTF8RawDataToUnicode (\r
IN TERMINAL_DEV *VtUtf8Device\r
- )\r
-;\r
+ );\r
\r
/**\r
Check if input string is valid VT-UTF8 string.\r
VTUTF8TestString (\r
IN TERMINAL_DEV *TerminalDevice,\r
IN CHAR16 *WString\r
- )\r
-;\r
+ );\r
\r
/** \r
Translate one Unicode character into VT-UTF8 characters.\r
IN CHAR16 Unicode,\r
OUT UTF8_CHAR *Utf8Char,\r
OUT UINT8 *ValidBytes\r
- )\r
-;\r
+ );\r
\r
/**\r
Get one valid VT-UTF8 characters set from Raw Data FIFO.\r
@param ValidBytes The count of returned VT-VTF8 characters. \r
If ValidBytes is zero, no valid VT-UTF8 returned.\r
\r
- @retval None.\r
-\r
**/\r
VOID\r
GetOneValidUtf8Char (\r
IN TERMINAL_DEV *Utf8Device,\r
OUT UTF8_CHAR *Utf8Char,\r
OUT UINT8 *ValidBytes\r
- )\r
-;\r
+ );\r
\r
/** \r
Translate VT-UTF8 characters into one Unicode character.\r
IN UTF8_CHAR Utf8Char,\r
IN UINT8 ValidBytes,\r
OUT CHAR16 *UnicodeChar\r
- )\r
-;\r
+ );\r
\r
//\r
// functions for boxdraw unicode\r
IN CHAR16 Graphic,\r
OUT CHAR8 *PcAnsi, OPTIONAL\r
OUT CHAR8 *Ascii OPTIONAL\r
- )\r
-;\r
+ );\r
\r
/**\r
Detects if a valid ASCII char.\r
BOOLEAN\r
TerminalIsValidAscii (\r
IN CHAR16 Ascii\r
- )\r
-;\r
+ );\r
\r
/**\r
Detects if a valid EFI control character.\r
BOOLEAN\r
TerminalIsValidEfiCntlChar (\r
IN CHAR16 CharC\r
- )\r
-;\r
+ );\r
\r
#endif\r