tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update ConPlatform to ensure console dev variable is correct. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7796 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
xli24 2009-03-04 05:48:09 +00:00
parent 0dc9978436
commit ca6b86efed
1 changed files with 94 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
View File

@ -226,6 +226,7 @@ ConPlatformTextInDriverBindingStart (
EFI_STATUS Status;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
EFI_SIMPLE_TEXT_INPUT_PROTOCOL *TextIn;
BOOLEAN IsInConInVariable;
//
// Get the Device Path Protocol so the environment variables can be updated
@ -255,6 +256,19 @@ ConPlatformTextInDriverBindingStart (
if (EFI_ERROR (Status)) {
return Status;
}
//
// Check if the device path is in ConIn Variable
//
IsInConInVariable = FALSE;
Status = ConPlatformUpdateDeviceVariable (
L"ConIn",
DevicePath,
CHECK
);
if (!EFI_ERROR (Status)) {
IsInConInVariable = TRUE;
}
//
// Check the device path, if it is a hot plug device,
// do not put the device path into ConInDev, and install
@ -268,6 +282,16 @@ ConPlatformTextInDriverBindingStart (
NULL,
NULL
);
//
// Append the device path to ConInDev only if it is in ConIn variable.
//
if (IsInConInVariable) {
ConPlatformUpdateDeviceVariable (
L"ConInDev",
DevicePath,
APPEND
);
}
} else {
//
// If it is not a hot-plug device, append the device path to the
@ -283,13 +307,7 @@ ConPlatformTextInDriverBindingStart (
// If the device path is an instance in the ConIn environment variable,
// then install EfiConsoleInDeviceGuid onto ControllerHandle
//
Status = ConPlatformUpdateDeviceVariable (
L"ConIn",
DevicePath,
CHECK
);
if (!EFI_ERROR (Status)) {
if (IsInConInVariable) {
gBS->InstallMultipleProtocolInterfaces (
&ControllerHandle,
&gEfiConsoleInDeviceGuid,
@ -341,6 +359,8 @@ ConPlatformTextOutDriverBindingStart (
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *TextOut;
BOOLEAN NeedClose;
BOOLEAN IsInConOutVariable;
BOOLEAN IsInErrOutVariable;
NeedClose = TRUE;
@ -372,6 +392,29 @@ ConPlatformTextOutDriverBindingStart (
if (EFI_ERROR (Status)) {
return Status;
}
//
// Check if the device path is in ConOut & ErrOut Variable
//
IsInConOutVariable = FALSE;
Status = ConPlatformUpdateDeviceVariable (
L"ConOut",
DevicePath,
CHECK
);
if (!EFI_ERROR (Status)) {
IsInConOutVariable = TRUE;
}
IsInErrOutVariable = FALSE;
Status = ConPlatformUpdateDeviceVariable (
L"ErrOut",
DevicePath,
CHECK
);
if (!EFI_ERROR (Status)) {
IsInErrOutVariable = TRUE;
}
//
// Check the device path, if it is a hot plug device,
// do not put the device path into ConOutDev and ErrOutDev,
@ -385,6 +428,26 @@ ConPlatformTextOutDriverBindingStart (
NULL,
NULL
);
//
// Append the device path to ConOutDev only if it is in ConOut variable.
//
if (IsInConOutVariable) {
ConPlatformUpdateDeviceVariable (
L"ConOutDev",
DevicePath,
APPEND
);
}
//
// Append the device path to ErrOutDev only if it is in ErrOut variable.
//
if (IsInErrOutVariable) {
ConPlatformUpdateDeviceVariable (
L"ErrOutDev",
DevicePath,
APPEND
);
}
} else {
//
// If it is not a hot-plug device, first append the device path to the
@ -408,13 +471,7 @@ ConPlatformTextOutDriverBindingStart (
// If the device path is an instance in the ConOut environment variable,
// then install EfiConsoleOutDeviceGuid onto ControllerHandle
//
Status = ConPlatformUpdateDeviceVariable (
L"ConOut",
DevicePath,
CHECK
);
if (!EFI_ERROR (Status)) {
if (IsInConOutVariable) {
NeedClose = FALSE;
Status = gBS->InstallMultipleProtocolInterfaces (
&ControllerHandle,
@ -427,12 +484,7 @@ ConPlatformTextOutDriverBindingStart (
// If the device path is an instance in the ErrOut environment variable,
// then install EfiStandardErrorDeviceGuid onto ControllerHandle
//
Status = ConPlatformUpdateDeviceVariable (
L"ErrOut",
DevicePath,
CHECK
);
if (!EFI_ERROR (Status)) {
if (IsInErrOutVariable) {
NeedClose = FALSE;
gBS->InstallMultipleProtocolInterfaces (
&ControllerHandle,
@ -497,18 +549,13 @@ ConPlatformTextInDriverBindingStop (
//
if (!EFI_ERROR (Status)) {
//
// If it is not a hot-plug device, first delete it from the ConInDev variable.
// Remove DevicePath from ConInDev if exists.
//
if (!IsHotPlugDevice (DevicePath)) {
//
// Remove DevicePath from ConInDev
//
ConPlatformUpdateDeviceVariable (
L"ConInDev",
DevicePath,
DELETE
);
}
ConPlatformUpdateDeviceVariable (
L"ConInDev",
DevicePath,
DELETE
);
}
//
@ -524,11 +571,11 @@ ConPlatformTextInDriverBindingStop (
// Close the Simple Text Input Protocol
//
gBS->CloseProtocol (
ControllerHandle,
&gEfiSimpleTextInProtocolGuid,
This->DriverBindingHandle,
ControllerHandle
);
ControllerHandle,
&gEfiSimpleTextInProtocolGuid,
This->DriverBindingHandle,
ControllerHandle
);
return EFI_SUCCESS;
}
@ -573,23 +620,18 @@ ConPlatformTextOutDriverBindingStop (
);
if (!EFI_ERROR (Status)) {
//
// If it is not a hot-plug device, first delete it from the ConOutDev and ErrOutDev variable.
// Remove DevicePath from ConOutDev and ErrOutDev if exists.
//
if (!IsHotPlugDevice (DevicePath)) {
//
// Remove DevicePath from ConOutDev, and ErrOutDev
//
ConPlatformUpdateDeviceVariable (
L"ConOutDev",
DevicePath,
DELETE
);
ConPlatformUpdateDeviceVariable (
L"ErrOutDev",
DevicePath,
DELETE
);
}
ConPlatformUpdateDeviceVariable (
L"ConOutDev",
DevicePath,
DELETE
);
ConPlatformUpdateDeviceVariable (
L"ErrOutDev",
DevicePath,
DELETE
);
}
//