Retired gSimpleTextInExNotifyGuid, used local structure address to be notify handle.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7666 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 2 insertions, 32 deletions

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index e189b7d5c9..78d9e9497f 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -3861,6 +3861,7 @@ ConSplitterTextInRegisterKeyNotify (
   }

   NewNotify->Signature         = TEXT_IN_EX_SPLITTER_NOTIFY_SIGNATURE;

   NewNotify->KeyNotificationFn = KeyNotificationFunction;

+  NewNotify->NotifyHandle      = (EFI_HANDLE) NewNotify;

   CopyMem (&NewNotify->KeyData, KeyData, sizeof (KeyData));

 

   //

@@ -3881,17 +3882,6 @@ ConSplitterTextInRegisterKeyNotify (
     }

   }

 

-  //

-  // Use gSimpleTextInExNotifyGuid to get a valid EFI_HANDLE

-  //

-  Status = gBS->InstallMultipleProtocolInterfaces (

-                  &NewNotify->NotifyHandle,

-                  &gSimpleTextInExNotifyGuid,

-                  NULL,

-                  NULL

-                  );

-  ASSERT_EFI_ERROR (Status);

-

   InsertTailList (&mConIn.NotifyList, &NewNotify->NotifyEntry);

 

   *NotifyHandle                = NewNotify->NotifyHandle;

@@ -3931,18 +3921,6 @@ ConSplitterTextInUnregisterKeyNotify (
     return EFI_INVALID_PARAMETER;

   }

 

-  Status = gBS->OpenProtocol (

-                  NotificationHandle,

-                  &gSimpleTextInExNotifyGuid,

-                  NULL,

-                  NULL,

-                  NULL,

-                  EFI_OPEN_PROTOCOL_TEST_PROTOCOL

-                  );

-  if (EFI_ERROR (Status)) {

-    return EFI_INVALID_PARAMETER;

-  }

-

   Private = TEXT_IN_EX_SPLITTER_PRIVATE_DATA_FROM_THIS (This);

 

   //

@@ -3966,13 +3944,7 @@ ConSplitterTextInUnregisterKeyNotify (
         }

       }

       RemoveEntryList (&CurrentNotify->NotifyEntry);

-      Status = gBS->UninstallMultipleProtocolInterfaces (

-                      CurrentNotify->NotifyHandle,

-                      &gSimpleTextInExNotifyGuid,

-                      NULL,

-                      NULL

-                      );

-      ASSERT_EFI_ERROR (Status);

+

       gBS->FreePool (CurrentNotify->NotifyHandleList);

       gBS->FreePool (CurrentNotify);

       return EFI_SUCCESS;

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index b4b8f1d322..8c505740c3 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
@@ -28,7 +28,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/SimpleTextInEx.h>

 #include <Protocol/GraphicsOutput.h>

 #include <Protocol/UgaDraw.h>

-#include <Protocol/SimpleTextInExNotify.h>

 

 #include <Guid/PrimaryStandardErrorDevice.h>

 #include <Guid/PrimaryConsoleOutDevice.h>

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
index f33b26af41..10c464f592 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
@@ -87,7 +87,6 @@
   gEfiSimpleTextOutProtocolGuid                 ## BY_START

   gEfiGraphicsOutputProtocolGuid                ## BY_START

   gEfiUgaDrawProtocolGuid                       ## BY_START

-  gSimpleTextInExNotifyGuid                     ## PRODUCES

 

 

 [FeaturePcd.common]