X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FHiiDatabaseDxe%2FHiiDatabaseEntry.c;h=ae75f8ccbf92dc6248b9190060845b03d73ae7a2;hb=328ce03e55c2d802e1c83739d51c54bbcc92d87b;hp=4bba8af1b182a9a50a9eed58b2440f65b8985015;hpb=813acf3a9a99e97ab200c7e222ee96810a9aa3fd;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
index 4bba8af1b1..ae75f8ccbf 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
@@ -1,7 +1,9 @@
 /** @file
+This file contains the entry code to the HII database, which is defined by
+UEFI 2.1 specification.
 
-Copyright (c) 2007 - 2008, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
@@ -9,18 +11,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-
-    HiiDatabaseEntry.c
-
-Abstract:
-
-    This file contains the entry code to the HII database, which is defined by
-    UEFI 2.1 specification.
-
-Revision History
-
-
 **/
 
 
@@ -30,9 +20,8 @@ Revision History
 // Global variables
 //
 EFI_EVENT gHiiKeyboardLayoutChanged;
-STATIC EFI_GUID gHiiSetKbdLayoutEventGuid = EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID;
 
-STATIC HII_DATABASE_PRIVATE_DATA mPrivate = {
+HII_DATABASE_PRIVATE_DATA mPrivate = {
   HII_DATABASE_PRIVATE_DATA_SIGNATURE,
   {
     (LIST_ENTRY *) NULL,
@@ -48,15 +37,13 @@ STATIC HII_DATABASE_PRIVATE_DATA mPrivate = {
     HiiGetGlyph,
     HiiGetFontInfo
   },
-#ifndef DISABLE_UNUSED_HII_PROTOCOLS
   {
-    HiiNewImage,
-    HiiGetImage,
-    HiiSetImage,
-    HiiDrawImage,
-    HiiDrawImageId
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL
   },
-#endif
   {
     HiiNewString,
     HiiGetString,
@@ -104,7 +91,24 @@ STATIC HII_DATABASE_PRIVATE_DATA mPrivate = {
   NULL
 };
 
-STATIC
+GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_HII_IMAGE_PROTOCOL mImageProtocol = {
+  HiiNewImage,
+  HiiGetImage,
+  HiiSetImage,
+  HiiDrawImage,
+  HiiDrawImageId
+};
+
+/**
+  The default event handler for gHiiKeyboardLayoutChanged
+  event group.
+
+  This is internal function.
+
+  @param Event           The event that triggered this notification function.
+  @param Context         Pointer to the notification functions context.
+
+**/
 VOID
 EFIAPI
 KeyboardLayoutChangeNullEvent (
@@ -115,54 +119,41 @@ KeyboardLayoutChangeNullEvent (
   return;
 }
 
+/**
+  Initialize HII Database.
+
+
+  @param ImageHandle     The image handle.
+  @param SystemTable     The system table.
+
+  @retval EFI_SUCCESS    The Hii database is setup correctly.
+  @return Other value if failed to create the default event for
+          gHiiKeyboardLayoutChanged. Check gBS->CreateEventEx for
+          details. Or failed to insatll the protocols.
+          Check gBS->InstallMultipleProtocolInterfaces for details.
+
+**/
 EFI_STATUS
 EFIAPI
 InitializeHiiDatabase (
   IN EFI_HANDLE           ImageHandle,
   IN EFI_SYSTEM_TABLE     *SystemTable
   )
-/*++
-
-Routine Description:
-  Initialize HII Database
-
-Arguments:
-  (Standard EFI Image entry - EFI_IMAGE_ENTRY_POINT)
-
-Returns:
-  EFI_SUCCESS -
-  other       -
-
---*/
 {
   EFI_STATUS                             Status;
   EFI_HANDLE                             Handle;
-  EFI_HANDLE                             *HandleBuffer;
-  UINTN                                  HandleCount;
 
   //
   // There will be only one HII Database in the system
   // If there is another out there, someone is trying to install us
   // again.  Fail that scenario.
   //
-  Status = gBS->LocateHandleBuffer (
-                  ByProtocol,
-                  &gEfiHiiDatabaseProtocolGuid,
-                  NULL,
-                  &HandleCount,
-                  &HandleBuffer
-                  );
-
-  //
-  // If there was no error, assume there is an installation and fail to load
-  //
-  if (!EFI_ERROR (Status)) {
-    if (HandleBuffer != NULL) {
-      gBS->FreePool (HandleBuffer);
-    }
-    return EFI_DEVICE_ERROR;
-  }
-
+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiDatabaseProtocolGuid);
+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiFontProtocolGuid);
+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiImageProtocolGuid);
+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiStringProtocolGuid);
+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiConfigRoutingProtocolGuid);
+  
   InitializeListHead (&mPrivate.DatabaseList);
   InitializeListHead (&mPrivate.DatabaseNotifyList);
   InitializeListHead (&mPrivate.HiiHandleList);
@@ -172,11 +163,11 @@ Returns:
   // Create a event with EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID group type.
   //
   Status = gBS->CreateEventEx (
-                  EFI_EVENT_NOTIFY_SIGNAL,
+                  EVT_NOTIFY_SIGNAL,
                   TPL_NOTIFY,
                   KeyboardLayoutChangeNullEvent,
                   NULL,
-                  &gHiiSetKbdLayoutEventGuid,
+                  &gEfiHiiKeyBoardLayoutGuid,
                   &gHiiKeyboardLayoutChanged
                   );
   if (EFI_ERROR (Status)) {
@@ -184,21 +175,35 @@ Returns:
   }
 
   Handle = NULL;
-  return gBS->InstallMultipleProtocolInterfaces (
-                &Handle,
-                &gEfiHiiFontProtocolGuid,
-                &mPrivate.HiiFont,
-#ifndef DISABLE_UNUSED_HII_PROTOCOLS
-                &gEfiHiiImageProtocolGuid,
-                &mPrivate.HiiImage,
-#endif
-                &gEfiHiiStringProtocolGuid,
-                &mPrivate.HiiString,
-                &gEfiHiiDatabaseProtocolGuid,
-                &mPrivate.HiiDatabase,
-                &gEfiHiiConfigRoutingProtocolGuid,
-                &mPrivate.ConfigRouting,
-                NULL
-                );
+  Status = gBS->InstallMultipleProtocolInterfaces (
+                  &Handle,
+                  &gEfiHiiFontProtocolGuid,
+                  &mPrivate.HiiFont,
+                  &gEfiHiiStringProtocolGuid,
+                  &mPrivate.HiiString,
+                  &gEfiHiiDatabaseProtocolGuid,
+                  &mPrivate.HiiDatabase,
+                  &gEfiHiiConfigRoutingProtocolGuid,
+                  &mPrivate.ConfigRouting,
+                  NULL
+                  );
+
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  if (FeaturePcdGet (PcdSupportHiiImageProtocol)) {
+    CopyMem (&mPrivate.HiiImage, &mImageProtocol, sizeof (mImageProtocol));
+
+    Status = gBS->InstallMultipleProtocolInterfaces (
+                    &Handle,
+                    &gEfiHiiImageProtocolGuid,
+                    &mPrivate.HiiImage,
+                    NULL
+                    );
+
+  }
+
+  return Status;
 }