diff options
author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-01-09 05:55:46 +0000 |
---|---|---|
committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-01-09 05:55:46 +0000 |
commit | aec072adb2af2bd1cc0677a25d4a099c8779c10d (patch) | |
tree | 10cbf2e652d48319825c3b0b029eb4c86fcdb37b /MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h | |
parent | ff44fe7118b1987e3e682d3293a508802a6cf1f8 (diff) | |
download | edk2-aec072adb2af2bd1cc0677a25d4a099c8779c10d.zip edk2-aec072adb2af2bd1cc0677a25d4a099c8779c10d.tar.gz edk2-aec072adb2af2bd1cc0677a25d4a099c8779c10d.tar.bz2 |
sync tracker to remove duplicate display mode in ConOut virtual handle GOP instance.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4533 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h')
-rw-r--r-- | MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h | 68 |
1 files changed, 32 insertions, 36 deletions
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h index 74d7b7d..587c6c1 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h @@ -106,7 +106,7 @@ typedef struct { UINTN CurrentNumberOfExConsoles;
EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL **TextInExList;
UINTN TextInExListCount;
- LIST_ENTRY NotifyList;
+ LIST_ENTRY NotifyList;
EFI_SIMPLE_POINTER_PROTOCOL SimplePointer;
@@ -120,7 +120,7 @@ typedef struct { UINTN CurrentNumberOfAbsolutePointers;
EFI_ABSOLUTE_POINTER_PROTOCOL **AbsolutePointerList;
UINTN AbsolutePointerListCount;
- BOOLEAN AbsoluteInputEventSignalState;
+ BOOLEAN AbsoluteInputEventSignalState;
BOOLEAN PasswordEnabled;
CHAR16 Password[MAX_STD_IN_PASSWORD];
@@ -172,11 +172,6 @@ typedef struct { } TEXT_OUT_AND_GOP_DATA;
typedef struct {
- UINT32 HorizontalResolution;
- UINT32 VerticalResolution;
-} TEXT_OUT_GOP_MODE;
-
-typedef struct {
UINT64 Signature;
EFI_HANDLE VirtualHandle;
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL TextOut;
@@ -191,8 +186,9 @@ typedef struct { EFI_GRAPHICS_OUTPUT_PROTOCOL GraphicsOutput;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL *GraphicsOutputBlt;
- TEXT_OUT_GOP_MODE *GraphicsOutputModeBuffer;
+ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *GraphicsOutputModeBuffer;
UINTN CurrentNumberOfGraphicsOutput;
+ UINTN CurrentNumberOfUgaDraw;
BOOLEAN HardwareNeedsStarting;
EFI_CONSOLE_CONTROL_PROTOCOL ConsoleControl;
@@ -446,14 +442,14 @@ ConSplitterAbsolutePointerReset ( Returns:
EFI_SUCCESS - The device was reset.
- EFI_DEVICE_ERROR - The device is not functioning correctly and could
+ EFI_DEVICE_ERROR - The device is not functioning correctly and could
not be reset.
-
+
--*/
;
EFI_STATUS
-EFIAPI
+EFIAPI
ConSplitterAbsolutePointerGetState (
IN EFI_ABSOLUTE_POINTER_PROTOCOL *This,
IN OUT EFI_ABSOLUTE_POINTER_STATE *State
@@ -470,9 +466,9 @@ ConSplitterAbsolutePointerGetState ( Returns:
EFI_SUCCESS - The state of the pointer device was returned in State..
EFI_NOT_READY - The state of the pointer device has not changed since the last call to
- GetState().
+ GetState().
EFI_DEVICE_ERROR - A device error occurred while attempting to retrieve the pointer
- device's current state.
+ device's current state.
--*/
;
@@ -964,7 +960,7 @@ ConSplitterTextInResetEx ( Returns:
EFI_SUCCESS - The device was reset.
- EFI_DEVICE_ERROR - The device is not functioning properly and could
+ EFI_DEVICE_ERROR - The device is not functioning properly and could
not be reset.
--*/
@@ -979,20 +975,20 @@ ConSplitterTextInReadKeyStrokeEx ( /*++
Routine Description:
- Reads the next keystroke from the input device. The WaitForKey Event can
+ Reads the next keystroke from the input device. The WaitForKey Event can
be used to test for existance of a keystroke via WaitForEvent () call.
Arguments:
This - Protocol instance pointer.
- KeyData - A pointer to a buffer that is filled in with the keystroke
+ KeyData - A pointer to a buffer that is filled in with the keystroke
state data for the key that was pressed.
Returns:
EFI_SUCCESS - The keystroke information was returned.
EFI_NOT_READY - There was no keystroke data availiable.
- EFI_DEVICE_ERROR - The keystroke information was not returned due to
+ EFI_DEVICE_ERROR - The keystroke information was not returned due to
hardware errors.
- EFI_INVALID_PARAMETER - KeyData is NULL.
+ EFI_INVALID_PARAMETER - KeyData is NULL.
--*/
;
@@ -1010,17 +1006,17 @@ ConSplitterTextInSetState ( Arguments:
This - Protocol instance pointer.
- KeyToggleState - A pointer to the EFI_KEY_TOGGLE_STATE to set the
+ KeyToggleState - A pointer to the EFI_KEY_TOGGLE_STATE to set the
state for the input device.
-
- Returns:
+
+ Returns:
EFI_SUCCESS - The device state was set successfully.
- EFI_DEVICE_ERROR - The device is not functioning correctly and could
+ EFI_DEVICE_ERROR - The device is not functioning correctly and could
not have the setting adjusted.
EFI_UNSUPPORTED - The device does not have the ability to set its state.
- EFI_INVALID_PARAMETER - KeyToggleState is NULL.
+ EFI_INVALID_PARAMETER - KeyToggleState is NULL.
---*/
+--*/
;
EFI_STATUS
@@ -1038,18 +1034,18 @@ ConSplitterTextInRegisterKeyNotify ( Arguments:
This - Protocol instance pointer.
- KeyData - A pointer to a buffer that is filled in with the keystroke
+ KeyData - A pointer to a buffer that is filled in with the keystroke
information data for the key that was pressed.
- KeyNotificationFunction - Points to the function to be called when the key
- sequence is typed specified by KeyData.
- NotifyHandle - Points to the unique handle assigned to the registered notification.
+ KeyNotificationFunction - Points to the function to be called when the key
+ sequence is typed specified by KeyData.
+ NotifyHandle - Points to the unique handle assigned to the registered notification.
Returns:
EFI_SUCCESS - The notification function was registered successfully.
EFI_OUT_OF_RESOURCES - Unable to allocate resources for necesssary data structures.
- EFI_INVALID_PARAMETER - KeyData or NotifyHandle is NULL.
-
---*/
+ EFI_INVALID_PARAMETER - KeyData or NotifyHandle is NULL.
+
+--*/
;
EFI_STATUS
@@ -1064,15 +1060,15 @@ ConSplitterTextInUnregisterKeyNotify ( Remove a registered notification function from a particular keystroke.
Arguments:
- This - Protocol instance pointer.
+ This - Protocol instance pointer.
NotificationHandle - The handle of the notification function being unregistered.
Returns:
EFI_SUCCESS - The notification function was unregistered successfully.
EFI_INVALID_PARAMETER - The NotificationHandle is invalid.
- EFI_NOT_FOUND - Can not find the matching entry in database.
-
---*/
+ EFI_NOT_FOUND - Can not find the matching entry in database.
+
+--*/
;
VOID
EFIAPI
@@ -1369,7 +1365,7 @@ DevNullTextOutEnableCursor ( ;
EFI_STATUS
-DevNullSyncGopStdOut (
+DevNullSyncStdOut (
IN TEXT_OUT_SPLITTER_PRIVATE_DATA *Private
)
;
|