1) Remove the variable initalization in declaration.

[mirror_edk2.git] / MdeModulePkg / Universal / HiiDatabaseDxe / HiiDatabase.h

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index ac88b86d077d68b2b1a14a4a8f13fe466ce7d461..243c5ee9f5c9dc92fccf6e681d6719a8ff8ac132 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __HII_DATABASE_PRIVATE_H__\r
 #define __HII_DATABASE_PRIVATE_H__\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/ConsoleControl.h>\r
 #include <Protocol/DevicePath.h>\r
@@ -38,7 +38,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DevicePathLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/IfrSupportLib.h>\r
-#include <Library/HiiLib.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/PcdLib.h>\r
 \r
 #define HII_DATABASE_NOTIFY_GUID \\r
   { \\r
@@ -241,9 +242,7 @@ typedef struct _HII_DATABASE_PRIVATE_DATA {
   LIST_ENTRY                            DatabaseList;\r
   LIST_ENTRY                            DatabaseNotifyList;\r
   EFI_HII_FONT_PROTOCOL                 HiiFont;\r
-#ifndef _DISABLE_UNUSED_HII_PROTOCOLS_\r
   EFI_HII_IMAGE_PROTOCOL                HiiImage;\r
-#endif\r
   EFI_HII_STRING_PROTOCOL               HiiString;\r
   EFI_HII_DATABASE_PROTOCOL             HiiDatabase;\r
   EFI_HII_CONFIG_ROUTING_PROTOCOL       ConfigRouting;\r
@@ -306,8 +305,7 @@ typedef struct _HII_DATABASE_PRIVATE_DATA {
 BOOLEAN\r
 IsHiiHandleValid (\r
   EFI_HII_HANDLE Handle\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -339,10 +337,33 @@ IsFontInfoExisted (
   IN  EFI_FONT_INFO_MASK        *FontInfoMask,   OPTIONAL\r
   IN  EFI_FONT_HANDLE           FontHandle,      OPTIONAL\r
   OUT HII_GLOBAL_FONT_INFO      **GlobalFontInfo OPTIONAL\r
+  );\r
+\r
+/**\r
+\r
+   This function invokes the matching registered function.\r
+    \r
+   @param  Private           HII Database driver private structure.\r
+   @param  NotifyType        The type of change concerning the database.\r
+   @param  PackageInstance   Points to the package referred to by the notification.\r
+   @param  PackageType       Package type\r
+   @param  Handle            The handle of the package list which contains the specified package.\r
+    \r
+   @retval EFI_SUCCESS            Already checked all registered function and invoked \r
+                                  if matched.\r
+   @retval EFI_INVALID_PARAMETER  Any input parameter is not valid.\r
+     \r
+**/\r
+EFI_STATUS\r
+InvokeRegisteredFunction (\r
+  IN HII_DATABASE_PRIVATE_DATA    *Private, \r
+  IN EFI_HII_DATABASE_NOTIFY_TYPE NotifyType,\r
+  IN VOID                         *PackageInstance,\r
+  IN UINT8                        PackageType,\r
+  IN EFI_HII_HANDLE               Handle\r
   )\r
 ;\r
 \r
-\r
 /**\r
   Retrieve system default font and color.\r
 \r
@@ -363,8 +384,7 @@ GetSystemFont (
   IN  HII_DATABASE_PRIVATE_DATA      *Private,\r
   OUT EFI_FONT_DISPLAY_INFO          **FontInfo,\r
   OUT UINTN                          *FontInfoSize OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -400,8 +420,7 @@ FindStringBlock (
   OUT UINT8                           **StringBlockAddr, OPTIONAL\r
   OUT UINTN                           *StringTextOffset, OPTIONAL\r
   OUT EFI_STRING_ID                   *LastStringId OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -432,8 +451,7 @@ FindGlyphBlock (
   OUT UINT8                          **GlyphBuffer, OPTIONAL\r
   OUT EFI_HII_GLYPH_INFO             *Cell, OPTIONAL\r
   OUT UINTN                          *GlyphBufferLen OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // EFI_HII_FONT_PROTOCOL protocol interfaces\r
@@ -507,8 +525,7 @@ HiiStringToImage (
   OUT EFI_HII_ROW_INFO               **RowInfoArray    OPTIONAL,\r
   OUT UINTN                          *RowInfoArraySize OPTIONAL,\r
   OUT UINTN                          *ColumnInfoArray  OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -587,8 +604,7 @@ HiiStringIdToImage (
   OUT EFI_HII_ROW_INFO               **RowInfoArray    OPTIONAL,\r
   OUT UINTN                          *RowInfoArraySize OPTIONAL,\r
   OUT UINTN                          *ColumnInfoArray  OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -621,8 +637,7 @@ HiiGetGlyph (
   IN  CONST EFI_FONT_DISPLAY_INFO    *StringInfo,\r
   OUT EFI_IMAGE_OUTPUT               **Blt,\r
   OUT UINTN                          *Baseline OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -662,8 +677,7 @@ HiiGetFontInfo (
   IN  CONST EFI_FONT_DISPLAY_INFO    *StringInfoIn, OPTIONAL\r
   OUT       EFI_FONT_DISPLAY_INFO    **StringInfoOut,\r
   IN  CONST EFI_STRING               String OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // EFI_HII_IMAGE_PROTOCOL interfaces\r
@@ -695,8 +709,7 @@ HiiNewImage (
   IN  EFI_HII_HANDLE                 PackageList,\r
   OUT EFI_IMAGE_ID                   *ImageId,\r
   IN  CONST EFI_IMAGE_INPUT          *Image\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -727,8 +740,7 @@ HiiGetImage (
   IN  EFI_HII_HANDLE                 PackageList,\r
   IN  EFI_IMAGE_ID                   ImageId,\r
   OUT EFI_IMAGE_INPUT                *Image\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -754,8 +766,7 @@ HiiSetImage (
   IN EFI_HII_HANDLE                  PackageList,\r
   IN EFI_IMAGE_ID                    ImageId,\r
   IN CONST EFI_IMAGE_INPUT           *Image\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -796,8 +807,7 @@ HiiDrawImage (
   IN OUT EFI_IMAGE_OUTPUT            **Blt,\r
   IN UINTN                           BltX,\r
   IN UINTN                           BltY\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -894,8 +904,7 @@ HiiNewString (
   IN  CONST CHAR16                    *LanguageName, OPTIONAL\r
   IN  CONST EFI_STRING                String,\r
   IN  CONST EFI_FONT_INFO             *StringFontInfo OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -942,8 +951,7 @@ HiiGetString (
   OUT EFI_STRING                      String,\r
   IN  OUT UINTN                       *StringSize,\r
   OUT EFI_FONT_INFO                   **StringFontInfo OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -977,8 +985,7 @@ HiiSetString (
   IN CONST CHAR8                      *Language,\r
   IN CONST EFI_STRING                 String,\r
   IN CONST EFI_FONT_INFO              *StringFontInfo OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1009,8 +1016,7 @@ HiiGetLanguages (
   IN EFI_HII_HANDLE                   PackageList,\r
   IN OUT CHAR8                        *Languages,\r
   IN OUT UINTN                        *LanguagesSize\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1052,8 +1058,7 @@ HiiGetSecondaryLanguages (
   IN CONST CHAR8                     *FirstLanguage,\r
   IN OUT CHAR8                       *SecondaryLanguages,\r
   IN OUT UINTN                       *SecondaryLanguagesSize\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // EFI_HII_DATABASE_PROTOCOL protocol interfaces\r
@@ -1086,8 +1091,7 @@ HiiNewPackageList (
   IN CONST EFI_HII_PACKAGE_LIST_HEADER  *PackageList,\r
   IN CONST EFI_HANDLE                   DriverHandle,\r
   OUT EFI_HII_HANDLE                    *Handle\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1110,8 +1114,7 @@ EFIAPI
 HiiRemovePackageList (\r
   IN CONST EFI_HII_DATABASE_PROTOCOL    *This,\r
   IN EFI_HII_HANDLE                     Handle\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1138,8 +1141,7 @@ HiiUpdatePackageList (
   IN CONST EFI_HII_DATABASE_PROTOCOL    *This,\r
   IN EFI_HII_HANDLE                     Handle,\r
   IN CONST EFI_HII_PACKAGE_LIST_HEADER  *PackageList\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1184,8 +1186,7 @@ HiiListPackageLists (
   IN  CONST EFI_GUID                    *PackageGuid,\r
   IN  OUT UINTN                         *HandleBufferLength,\r
   OUT EFI_HII_HANDLE                    *Handle\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1222,8 +1223,7 @@ HiiExportPackageLists (
   IN  EFI_HII_HANDLE                    Handle,\r
   IN  OUT UINTN                         *BufferSize,\r
   OUT EFI_HII_PACKAGE_LIST_HEADER       *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1271,8 +1271,7 @@ HiiRegisterPackageNotify (
   IN  CONST EFI_HII_DATABASE_NOTIFY     PackageNotifyFn,\r
   IN  EFI_HII_DATABASE_NOTIFY_TYPE      NotifyType,\r
   OUT EFI_HANDLE                        *NotifyHandle\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1293,8 +1292,7 @@ EFIAPI
 HiiUnregisterPackageNotify (\r
   IN CONST EFI_HII_DATABASE_PROTOCOL    *This,\r
   IN EFI_HANDLE                         NotificationHandle\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1326,8 +1324,7 @@ HiiFindKeyboardLayouts (
   IN  CONST EFI_HII_DATABASE_PROTOCOL   *This,\r
   IN  OUT UINT16                        *KeyGuidBufferLength,\r
   OUT EFI_GUID                          *KeyGuidBuffer\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1358,8 +1355,7 @@ HiiGetKeyboardLayout (
   IN  CONST EFI_GUID                          *KeyGuid,\r
   IN OUT UINT16                         *KeyboardLayoutLength,\r
   OUT EFI_HII_KEYBOARD_LAYOUT           *KeyboardLayout\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1384,8 +1380,7 @@ EFIAPI
 HiiSetKeyboardLayout (\r
   IN CONST EFI_HII_DATABASE_PROTOCOL          *This,\r
   IN CONST EFI_GUID                           *KeyGuid\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1410,8 +1405,7 @@ HiiGetPackageListHandle (
   IN  CONST EFI_HII_DATABASE_PROTOCOL         *This,\r
   IN  EFI_HII_HANDLE                    PackageListHandle,\r
   OUT EFI_HANDLE                        *DriverHandle\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // EFI_HII_CONFIG_ROUTING_PROTOCOL interfaces\r
@@ -1464,8 +1458,7 @@ HiiConfigRoutingExtractConfig (
   IN  CONST EFI_STRING                       Request,\r
   OUT EFI_STRING                             *Progress,\r
   OUT EFI_STRING                             *Results\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1494,8 +1487,7 @@ EFIAPI
 HiiConfigRoutingExportConfig (\r
   IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL  *This,\r
   OUT EFI_STRING                             *Results\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1529,8 +1521,7 @@ HiiConfigRoutingRouteConfig (
   IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL  *This,\r
   IN  CONST EFI_STRING                       Configuration,\r
   OUT EFI_STRING                             *Progress\r
-  )\r
-;\r
+  );\r
 \r
 \r
 \r
@@ -1582,8 +1573,7 @@ HiiBlockToConfig (
   IN  CONST UINTN                            BlockSize,\r
   OUT EFI_STRING                             *Config,\r
   OUT EFI_STRING                             *Progress\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1640,8 +1630,7 @@ HiiConfigToBlock (
   IN OUT UINT8                                 *Block,\r
   IN OUT UINTN                                 *BlockSize,\r
   OUT    EFI_STRING                            *Progress\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -1694,8 +1683,7 @@ HiiGetAltCfg (
   IN  CONST EFI_DEVICE_PATH_PROTOCOL           *DevicePath,\r
   IN  CONST UINT16                             *AltCfgId,\r
   OUT EFI_STRING                               *AltCfgResp\r
-  )\r
-;\r
+  );\r
 \r
 \r
 //\r