diff options
| author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-04-07 08:42:15 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-04-07 08:42:15 +0000 |
| commit | 406ddad31b58d7a47927c3fa132657705816b65f (patch) | |
| tree | 3244ae7262fc859bba9473b177346dc6d524eca1 /MdeModulePkg/Universal | |
| parent | 7ef76906acc51310890dd677201d9807a7fec63d (diff) | |
| download | edk2-406ddad31b58d7a47927c3fa132657705816b65f.zip edk2-406ddad31b58d7a47927c3fa132657705816b65f.tar.gz edk2-406ddad31b58d7a47927c3fa132657705816b65f.tar.bz2 | |
1. Update the CRC32 in the EFI System Table header in BdsConsole.c
2. Removed duplicated installation for Simple Text Output protocol on ErrHandle.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8031 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal')
| -rw-r--r-- | MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c | 32 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h | 4 |
2 files changed, 14 insertions, 22 deletions
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c index 3389f62..109caf7 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c @@ -1317,18 +1317,9 @@ ConSplitterStdErrDriverBindingStart ( if (mStdErr.CurrentNumberOfConsoles == 0) {
//
- // Create virtual device handle for StdErr Splitter
+ // Construct console output devices' private data
//
Status = ConSplitterTextOutConstructor (&mStdErr);
- if (!EFI_ERROR (Status)) {
- Status = gBS->InstallMultipleProtocolInterfaces (
- &mStdErr.VirtualHandle,
- &gEfiSimpleTextOutProtocolGuid,
- &mStdErr.TextOut,
- NULL
- );
- }
-
if (EFI_ERROR (Status)) {
return Status;
}
@@ -1370,14 +1361,14 @@ ConSplitterStdErrDriverBindingStart ( //
// Create virtual device handle for StdErr Splitter
//
- Status = ConSplitterTextOutConstructor (&mStdErr);
- if (!EFI_ERROR (Status)) {
- Status = gBS->InstallMultipleProtocolInterfaces (
- &mStdErr.VirtualHandle,
- &gEfiSimpleTextOutProtocolGuid,
- &mStdErr.TextOut,
- NULL
- );
+ Status = gBS->InstallMultipleProtocolInterfaces (
+ &mStdErr.VirtualHandle,
+ &gEfiSimpleTextOutProtocolGuid,
+ &mStdErr.TextOut,
+ NULL
+ );
+ if (EFI_ERROR (Status)) {
+ return Status;
}
gST->StandardErrorHandle = mStdErr.VirtualHandle;
@@ -1779,8 +1770,8 @@ ConSplitterStdErrDriverBindingStop ( **/
EFI_STATUS
ConSplitterGrowBuffer (
- IN UINTN SizeOfCount,
- IN UINTN *Count,
+ IN UINTN SizeOfCount,
+ IN OUT UINTN *Count,
IN OUT VOID **Buffer
)
{
@@ -2968,6 +2959,7 @@ ConSplitterTextOutAddDevice ( // If the Text Out List is full, enlarge it by calling ConSplitterGrowBuffer().
//
while (CurrentNumOfConsoles >= Private->TextOutListCount) {
+ CpuBreakpoint ();
Status = ConSplitterGrowBuffer (
sizeof (TEXT_OUT_AND_GOP_DATA),
&Private->TextOutListCount,
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h index 3bfa245..a3904f4 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h @@ -1749,8 +1749,8 @@ ConSplitterTextOutEnableCursor ( **/
EFI_STATUS
ConSplitterGrowBuffer (
- IN UINTN SizeOfCount,
- IN UINTN *Count,
+ IN UINTN SizeOfCount,
+ IN OUT UINTN *Count,
IN OUT VOID **Buffer
);
|