Retire Extended HII library class.

[mirror_edk2.git] / MdeModulePkg / Universal / DriverSampleDxe / DriverSample.h

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index 0468fbd04f4be36c2720d1c0bb7787cf269d6b97..cdecddbfe78b0ddb076d57ee5533e85b3389addf 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -21,8 +21,8 @@ Revision History
 \r
 **/\r
 \r
-#ifndef _DRIVER_SAMPLE_H\r
-#define _DRIVER_SAMPLE_H\r
+#ifndef _DRIVER_SAMPLE_H_\r
+#define _DRIVER_SAMPLE_H_\r
 \r
 #include <Uefi.h>\r
 \r
@@ -32,6 +32,7 @@ Revision History
 #include <Protocol/HiiDatabase.h>\r
 #include <Protocol/HiiString.h>\r
 \r
+#include <Guid/MdeModuleHii.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
@@ -41,10 +42,7 @@ Revision History
 #include <Library/IfrSupportLib.h>\r
 #include <Library/ExtendedIfrSupportLib.h>\r
 #include <Library/HiiLib.h>\r
-#include <Library/ExtendedHiiLib.h>\r
-\r
-#include <MdeModuleHii.h>\r
-\r
+#include <Library/DevicePathLib.h>\r
 \r
 #include "NVDataStruc.h"\r
 \r
@@ -52,6 +50,8 @@ Revision History
 // This is the generated <AltResp> for defaults defined in VFR\r
 //\r
 extern UINT8 VfrMyIfrNVDataDefault0000[];\r
+extern UINT8 VfrMyIfrNVDataDefault0001[];\r
+extern UINT8 VfrMyIfrNVDataBlockName[];\r
 \r
 //\r
 // This is the generated IFR binary data for each formset defined in VFR.\r
@@ -68,9 +68,10 @@ extern UINT8  InventoryBin[];
 //\r
 extern UINT8  DriverSampleStrings[];\r
 \r
-#define SAMPLE_STRING               L"This is an error!"\r
+#define DYNAMIC_ONE_OF_VAR_OFFSET        OFFSET_OF (DRIVER_SAMPLE_CONFIGURATION, DynamicOneof)\r
+#define DYNAMIC_ORDERED_LIST_VAR_OFFSET  OFFSET_OF (DRIVER_SAMPLE_CONFIGURATION, DynamicOrderedList)\r
 \r
-#define DRIVER_SAMPLE_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('D', 'S', 'p', 's')\r
+#define DRIVER_SAMPLE_PRIVATE_SIGNATURE SIGNATURE_32 ('D', 'S', 'p', 's')\r
 \r
 typedef struct {\r
   UINTN                            Signature;\r
@@ -96,4 +97,16 @@ typedef struct {
 \r
 #define DRIVER_SAMPLE_PRIVATE_FROM_THIS(a)  CR (a, DRIVER_SAMPLE_PRIVATE_DATA, ConfigAccess, DRIVER_SAMPLE_PRIVATE_SIGNATURE)\r
 \r
+#pragma pack(1)\r
+\r
+///\r
+/// HII specific Vendor Device Path definition.\r
+///\r
+typedef struct {\r
+  VENDOR_DEVICE_PATH             VendorDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL       End;\r
+} HII_VENDOR_DEVICE_PATH;\r
+\r
+#pragma pack()\r
+\r
 #endif\r