MdeModulePkg: Add match2 opcode support in SetupBrowserDxe and sample code in DriverS...

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

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
index 162c5ecd1f54f8cb6720ff5a0e53ef71f14d9c83..c8262a45a07d3eb1ed3650a8a9740e28279fafbe 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
@@ -1,7 +1,7 @@
 /** @file\r
 \r
-Copyright (c) 2007 - 2008, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php\r
@@ -25,15 +25,10 @@ Revision History:
 #ifndef _NVDATASTRUC_H_\r
 #define _NVDATASTRUC_H_\r
 \r
-#define FORMSET_GUID \\r
-  { \\r
-    0xA04A27f4, 0xDF00, 0x4D42, {0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D} \\r
-  }\r
-\r
-#define INVENTORY_GUID \\r
-  { \\r
-    0xb3f56470, 0x6141, 0x4621, {0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8} \\r
-  }\r
+#include <Guid/HiiPlatformSetupFormset.h>\r
+#include <Guid/HiiFormMapMethodGuid.h>\r
+#include <Guid/DriverSampleHii.h>\r
+#include <Guid/ZeroGuid.h>\r
 \r
 #define CONFIGURATION_VARSTORE_ID    0x1234\r
 \r
@@ -55,11 +50,25 @@ typedef struct {
   UINT8   ChooseToActivateNuclearWeaponry;\r
   UINT8   SuppressGrayOutSomething;\r
   UINT8   OrderedList[8];\r
-  UINT8   BootOrder[8];\r
+  UINT16  BootOrder[8];\r
   UINT8   BootOrderLarge;\r
   UINT8   DynamicRefresh;\r
   UINT8   DynamicOneof;\r
   UINT8   DynamicOrderedList[5];\r
+  UINT8   Reserved;\r
+  EFI_HII_REF RefData;\r
+  UINT8   NameValueVar0;\r
+  UINT16  NameValueVar1;\r
+  UINT16  NameValueVar2[20];\r
+  UINT8   SerialPortNo;\r
+  UINT8   SerialPortStatus;\r
+  UINT16  SerialPortIo;\r
+  UINT8   SerialPortIrq;\r
+  UINT8   GetDefaultValueFromCallBack;\r
+  UINT8   GetDefaultValueFromAccess;\r
+  EFI_HII_TIME  Time;\r
+  UINT8   RefreshGuidCount;\r
+  UINT8   Match2;\r
 } DRIVER_SAMPLE_CONFIGURATION;\r
 \r
 //\r
@@ -69,13 +78,14 @@ typedef struct {
   UINT8         Field8;\r
   UINT16        Field16;\r
   UINT8         OrderedList[3];\r
-} MY_DATA2;\r
+} MY_EFI_VARSTORE_DATA;\r
 \r
 //\r
 // Labels definition\r
 //\r
 #define LABEL_UPDATE1               0x1234\r
 #define LABEL_UPDATE2               0x2234\r
+#define LABEL_UPDATE3               0x3234\r
 #define LABEL_END                   0x2223\r
 \r
 #pragma pack()\r