Fix the conflicted function names to new HII library.

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiOnUefiHiiThunk / HiiDatabase.h

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
index 94b79e5e2d09f95fdb7ec99c7bd497d981fd4999..a1e9c1a4c692513b04cb608a7a8c7692ecbe8a8d 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
@@ -45,7 +45,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 #include <Library/HiiLib.h>\r
-#include <Library/DevicePathLib.h>\r
 #include <Library/UefiLib.h>\r
 \r
 #include <Library/IfrSupportLib.h>\r
@@ -186,15 +185,22 @@ typedef struct {
 } BUFFER_STORAGE_ENTRY;\r
 \r
 #pragma pack(1)\r
+///\r
+/// HII specific Vendor Device Path Node definition.\r
+///\r
+typedef struct {\r
+  VENDOR_DEVICE_PATH             VendorDevicePath;\r
+  UINT32                         Reserved;\r
+  UINT64                         UniqueId;\r
+} HII_VENDOR_DEVICE_PATH_NODE;\r
 \r
 ///\r
 /// HII specific Vendor Device Path definition.\r
 ///\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH             VendorDevicePath;\r
+  HII_VENDOR_DEVICE_PATH_NODE    Node;\r
   EFI_DEVICE_PATH_PROTOCOL       End;\r
 } HII_VENDOR_DEVICE_PATH;\r
-\r
 #pragma pack()\r
 \r
 #define CONFIG_ACCESS_PRIVATE_SIGNATURE            SIGNATURE_32 ('H', 'T', 'c', 'a')\r
@@ -305,7 +311,7 @@ HiiNewString (
 \r
 EFI_STATUS\r
 EFIAPI\r
-HiiGetString (\r
+HiiThunkGetString (\r
   IN     EFI_HII_PROTOCOL           *This,\r
   IN     FRAMEWORK_EFI_HII_HANDLE   Handle,\r
   IN     STRING_REF                 Token,\r
@@ -382,7 +388,7 @@ HiiGetDefaultImage (
 \r
 EFI_STATUS\r
 EFIAPI\r
-HiiUpdateForm (\r
+HiiThunkUpdateForm (\r
   IN EFI_HII_PROTOCOL                   *This,\r
   IN FRAMEWORK_EFI_HII_HANDLE           Handle,\r
   IN EFI_FORM_LABEL                     Label,\r