X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FDriverSampleDxe%2FDriverSample.h;h=a1d0705ba06393d5107afad8509efc079929298d;hp=3317e4fdc2740a063f00b1600b7f41944b475440;hb=HEAD;hpb=7e3bcccb0eed449e95c18b01ae8cbace1a759d01

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index 3317e4fdc2..a1d0705ba0 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -1,13 +1,7 @@
 /** @file
 
-Copyright (c) 2007, Intel Corporation
-All rights reserved. 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
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 Module Name:
 
@@ -31,9 +25,13 @@ Revision History
 #include <Protocol/HiiConfigAccess.h>
 #include <Protocol/HiiDatabase.h>
 #include <Protocol/HiiString.h>
+#include <Protocol/FormBrowserEx.h>
+#include <Protocol/HiiConfigKeyword.h>
+#include <Protocol/HiiPopup.h>
 
 #include <Guid/MdeModuleHii.h>
 #include <Library/DebugLib.h>
+#include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/UefiDriverEntryPoint.h>
@@ -41,19 +39,14 @@ Revision History
 #include <Library/MemoryAllocationLib.h>
 #include <Library/HiiLib.h>
 #include <Library/DevicePathLib.h>
+#include <Library/PrintLib.h>
+#include <Library/UefiLib.h>
 
 #include "NVDataStruc.h"
 
-//
-// This is the generated <AltResp> for defaults defined in VFR
-//
-extern UINT8 VfrMyIfrNVDataDefault0000[];
-extern UINT8 VfrMyIfrNVDataDefault0001[];
-extern UINT8 VfrMyIfrNVDataBlockName[];
-
 //
 // This is the generated IFR binary data for each formset defined in VFR.
-// This data array is ready to be used as input of HiiLibPreparePackageList() to
+// This data array is ready to be used as input of HiiAddPackages() to
 // create a packagelist (which contains Form packages, String packages, etc).
 //
 extern UINT8  VfrBin[];
@@ -61,7 +54,7 @@ extern UINT8  InventoryBin[];
 
 //
 // This is the generated String package data for all .UNI files.
-// This data array is ready to be used as input of HiiLibPreparePackageList() to
+// This data array is ready to be used as input of HiiAddPackages() to
 // create a packagelist (which contains Form packages, String packages, etc).
 //
 extern UINT8  DriverSampleStrings[];
@@ -69,28 +62,47 @@ extern UINT8  DriverSampleStrings[];
 #define DYNAMIC_ONE_OF_VAR_OFFSET        OFFSET_OF (DRIVER_SAMPLE_CONFIGURATION, DynamicOneof)
 #define DYNAMIC_ORDERED_LIST_VAR_OFFSET  OFFSET_OF (DRIVER_SAMPLE_CONFIGURATION, DynamicOrderedList)
 
-#define DRIVER_SAMPLE_PRIVATE_SIGNATURE SIGNATURE_32 ('D', 'S', 'p', 's')
+#define DEFAULT_CLASS_MANUFACTURING_VALUE  0xFF
+#define DEFAULT_CLASS_STANDARD_VALUE       0x0
+
+//
+// Number of name in Name/Value storage
+//
+#define NAME_VALUE_NAME_NUMBER  3
+
+#define DRIVER_SAMPLE_PRIVATE_SIGNATURE  SIGNATURE_32 ('D', 'S', 'p', 's')
 
 typedef struct {
-  UINTN                            Signature;
+  UINTN                                  Signature;
+
+  EFI_HANDLE                             DriverHandle[2];
+  EFI_HII_HANDLE                         HiiHandle[2];
+  DRIVER_SAMPLE_CONFIGURATION            Configuration;
+  MY_EFI_VARSTORE_DATA                   VarStoreConfig;
+  MY_EFI_BITS_VARSTORE_DATA              BitsVarStoreConfig;
+  MY_EFI_UNION_DATA                      UnionConfig;
 
-  EFI_HANDLE                       DriverHandle[2];
-  EFI_HII_HANDLE                   HiiHandle[2];
-  DRIVER_SAMPLE_CONFIGURATION      Configuration;
-  UINT8                            PasswordState;
+  //
+  // Name/Value storage Name list
+  //
+  EFI_STRING_ID                          NameStringId[NAME_VALUE_NAME_NUMBER];
+  EFI_STRING                             NameValueName[NAME_VALUE_NAME_NUMBER];
 
   //
   // Consumed protocol
   //
-  EFI_HII_DATABASE_PROTOCOL        *HiiDatabase;
-  EFI_HII_STRING_PROTOCOL          *HiiString;
-  EFI_HII_CONFIG_ROUTING_PROTOCOL  *HiiConfigRouting;
-  EFI_FORM_BROWSER2_PROTOCOL       *FormBrowser2;
+  EFI_HII_DATABASE_PROTOCOL              *HiiDatabase;
+  EFI_HII_STRING_PROTOCOL                *HiiString;
+  EFI_HII_CONFIG_ROUTING_PROTOCOL        *HiiConfigRouting;
+  EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL    *HiiKeywordHandler;
+  EFI_HII_POPUP_PROTOCOL                 *HiiPopup;
+
+  EFI_FORM_BROWSER2_PROTOCOL             *FormBrowser2;
 
   //
   // Produced protocol
   //
-  EFI_HII_CONFIG_ACCESS_PROTOCOL   ConfigAccess;
+  EFI_HII_CONFIG_ACCESS_PROTOCOL         ConfigAccess;
 } DRIVER_SAMPLE_PRIVATE_DATA;
 
 #define DRIVER_SAMPLE_PRIVATE_FROM_THIS(a)  CR (a, DRIVER_SAMPLE_PRIVATE_DATA, ConfigAccess, DRIVER_SAMPLE_PRIVATE_SIGNATURE)
@@ -101,8 +113,8 @@ typedef struct {
 /// HII specific Vendor Device Path definition.
 ///
 typedef struct {
-  VENDOR_DEVICE_PATH             VendorDevicePath;
-  EFI_DEVICE_PATH_PROTOCOL       End;
+  VENDOR_DEVICE_PATH          VendorDevicePath;
+  EFI_DEVICE_PATH_PROTOCOL    End;
 } HII_VENDOR_DEVICE_PATH;
 
 #pragma pack()