]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
MdeModulePkg: Replace [Ascii|Unicode]ValueToString
[mirror_edk2.git] / MdeModulePkg / Universal / DriverSampleDxe / DriverSample.c
index e20e030be8fbf0fba1c20855a9bf2ab3eecc70b8..f103b9ca21485e47d39fa8e8b793f048a8c2002c 100644 (file)
@@ -2,7 +2,7 @@
 This is an example of how a driver might export data to the HII protocol to be\r
 later utilized by the Setup Protocol\r
 \r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2017, 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
@@ -18,13 +18,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #define DISPLAY_ONLY_MY_ITEM  0x0002\r
 \r
-EFI_GUID   mFormSetGuid = FORMSET_GUID;\r
-EFI_GUID   mInventoryGuid = INVENTORY_GUID;\r
-EFI_GUID   MyEventGroupGuid = EFI_IFR_REFRESH_ID_OP_GUID;\r
-\r
 CHAR16     VariableName[] = L"MyIfrNVData";\r
+CHAR16     MyEfiVar[] = L"MyEfiVar";\r
 EFI_HANDLE                      DriverHandle[2] = {NULL, NULL};\r
-DRIVER_SAMPLE_PRIVATE_DATA      *PrivateData = NULL;\r
+DRIVER_SAMPLE_PRIVATE_DATA      *mPrivateData = NULL;\r
 EFI_EVENT                       mEvent;\r
 \r
 HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath0 = {\r
@@ -37,10 +34,7 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath0 = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {C153B68D-EBFC-488e-B110-662867745B87}\r
-    //\r
-    { 0xc153b68d, 0xebfc, 0x488e, { 0xb1, 0x10, 0x66, 0x28, 0x67, 0x74, 0x5b, 0x87 } }\r
+    DRIVER_SAMPLE_FORMSET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -62,10 +56,7 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath1 = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {06F37F07-0C48-40e9-8436-0A08A0BB76B0}\r
-    //\r
-    { 0x6f37f07, 0xc48, 0x40e9, { 0x84, 0x36, 0xa, 0x8, 0xa0, 0xbb, 0x76, 0xb0 } }\r
+    DRIVER_SAMPLE_INVENTORY_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -78,19 +69,45 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath1 = {
 };\r
 \r
 /**\r
-  Add empty function for event process function.\r
+  Set value of a data element in an Array by its Index.\r
 \r
-  @param Event    The Event need to be process\r
-  @param Context  The context of the event.\r
+  @param  Array                  The data array.\r
+  @param  Type                   Type of the data in this array.\r
+  @param  Index                  Zero based index for data in this array.\r
+  @param  Value                  The value to be set.\r
 \r
 **/\r
 VOID\r
-EFIAPI\r
-DriverSampleInternalEmptyFunction (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+SetArrayData (\r
+  IN VOID                     *Array,\r
+  IN UINT8                    Type,\r
+  IN UINTN                    Index,\r
+  IN UINT64                   Value\r
   )\r
 {\r
+\r
+  ASSERT (Array != NULL);\r
+\r
+  switch (Type) {\r
+  case EFI_IFR_TYPE_NUM_SIZE_8:\r
+    *(((UINT8 *) Array) + Index) = (UINT8) Value;\r
+    break;\r
+\r
+  case EFI_IFR_TYPE_NUM_SIZE_16:\r
+    *(((UINT16 *) Array) + Index) = (UINT16) Value;\r
+    break;\r
+\r
+  case EFI_IFR_TYPE_NUM_SIZE_32:\r
+    *(((UINT32 *) Array) + Index) = (UINT32) Value;\r
+    break;\r
+\r
+  case EFI_IFR_TYPE_NUM_SIZE_64:\r
+    *(((UINT64 *) Array) + Index) = (UINT64) Value;\r
+    break;\r
+\r
+  default:\r
+    break;\r
+  }\r
 }\r
 \r
 /**\r
@@ -228,233 +245,6 @@ InternalStopMonitor(
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-/**\r
-  Encode the password using a simple algorithm.\r
-\r
-  @param Password The string to be encoded.\r
-  @param MaxSize  The size of the string.\r
-\r
-**/\r
-VOID\r
-EncodePassword (\r
-  IN  CHAR16                      *Password,\r
-  IN  UINTN                       MaxSize\r
-  )\r
-{\r
-  UINTN   Index;\r
-  UINTN   Loop;\r
-  CHAR16  *Buffer;\r
-  CHAR16  *Key;\r
-\r
-  Key     = L"MAR10648567";\r
-  Buffer  = AllocateZeroPool (MaxSize);\r
-  ASSERT (Buffer != NULL);\r
-\r
-  for (Index = 0; Key[Index] != 0; Index++) {\r
-    for (Loop = 0; Loop < (UINT8) (MaxSize / 2); Loop++) {\r
-      Buffer[Loop] = (CHAR16) (Password[Loop] ^ Key[Index]);\r
-    }\r
-  }\r
-\r
-  CopyMem (Password, Buffer, MaxSize);\r
-\r
-  FreePool (Buffer);\r
-  return ;\r
-}\r
-\r
-/**\r
-  Validate the user's password.\r
-\r
-  @param PrivateData This driver's private context data.\r
-  @param StringId    The user's input.\r
-\r
-  @retval EFI_SUCCESS   The user's input matches the password.\r
-  @retval EFI_NOT_READY The user's input does not match the password.\r
-**/\r
-EFI_STATUS\r
-ValidatePassword (\r
-  IN       DRIVER_SAMPLE_PRIVATE_DATA      *PrivateData,\r
-  IN       EFI_STRING_ID                   StringId\r
-  )\r
-{\r
-  EFI_STATUS                      Status;\r
-  UINTN                           Index;\r
-  UINTN                           BufferSize;\r
-  UINTN                           PasswordMaxSize;\r
-  CHAR16                          *Password;\r
-  CHAR16                          *EncodedPassword;\r
-  BOOLEAN                         OldPassword;\r
-\r
-  //\r
-  // Get encoded password first\r
-  //\r
-  BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
-  Status = gRT->GetVariable (\r
-                  VariableName,\r
-                  &mFormSetGuid,\r
-                  NULL,\r
-                  &BufferSize,\r
-                  &PrivateData->Configuration\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    //\r
-    // Old password not exist, prompt for new password\r
-    //\r
-    return EFI_SUCCESS;\r
-  }\r
-\r
-  OldPassword = FALSE;\r
-  PasswordMaxSize = sizeof (PrivateData->Configuration.WhatIsThePassword2);\r
-  //\r
-  // Check whether we have any old password set\r
-  //\r
-  for (Index = 0; Index < PasswordMaxSize / sizeof (UINT16); Index++) {\r
-    if (PrivateData->Configuration.WhatIsThePassword2[Index] != 0) {\r
-      OldPassword = TRUE;\r
-      break;\r
-    }\r
-  }\r
-  if (!OldPassword) {\r
-    //\r
-    // Old password not exist, return EFI_SUCCESS to prompt for new password\r
-    //\r
-    return EFI_SUCCESS;\r
-  }\r
-\r
-  //\r
-  // Get user input password\r
-  //\r
-  Password = HiiGetString (PrivateData->HiiHandle[0], StringId, NULL);\r
-  if (Password == NULL) {\r
-    return EFI_NOT_READY;\r
-  }\r
-  if (StrSize (Password) > PasswordMaxSize) {\r
-    FreePool (Password);\r
-    return EFI_NOT_READY;\r
-  }\r
-\r
-  //\r
-  // Validate old password\r
-  //\r
-  EncodedPassword = AllocateZeroPool (PasswordMaxSize);\r
-  ASSERT (EncodedPassword != NULL);\r
-  StrnCpy (EncodedPassword, Password, StrLen (Password));\r
-  EncodePassword (EncodedPassword, StrLen (EncodedPassword) * sizeof (CHAR16));\r
-  if (CompareMem (EncodedPassword, PrivateData->Configuration.WhatIsThePassword2, PasswordMaxSize) != 0) {\r
-    //\r
-    // Old password mismatch, return EFI_NOT_READY to prompt for error message\r
-    //\r
-    Status = EFI_NOT_READY;\r
-  } else {\r
-    Status = EFI_SUCCESS;\r
-  }\r
-\r
-  FreePool (Password);\r
-  FreePool (EncodedPassword);\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-  Encode the password using a simple algorithm.\r
-\r
-  @param PrivateData This driver's private context data.\r
-  @param StringId    The password from User.\r
-\r
-  @retval  EFI_SUCESS The operation is successful.\r
-  @return  Other value if gRT->SetVariable () fails.\r
-\r
-**/\r
-EFI_STATUS\r
-SetPassword (\r
-  IN DRIVER_SAMPLE_PRIVATE_DATA      *PrivateData,\r
-  IN EFI_STRING_ID                   StringId\r
-  )\r
-{\r
-  EFI_STATUS                      Status;\r
-  CHAR16                          *Password;\r
-  CHAR16                          *TempPassword;\r
-  UINTN                           PasswordSize;\r
-  DRIVER_SAMPLE_CONFIGURATION     *Configuration;\r
-  UINTN                           BufferSize;\r
-\r
-  //\r
-  // Get Buffer Storage data from EFI variable\r
-  //\r
-  BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
-  Status = gRT->GetVariable (\r
-                  VariableName,\r
-                  &mFormSetGuid,\r
-                  NULL,\r
-                  &BufferSize,\r
-                  &PrivateData->Configuration\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
-\r
-  //\r
-  // Get user input password\r
-  //\r
-  Password = &PrivateData->Configuration.WhatIsThePassword2[0];\r
-  PasswordSize = sizeof (PrivateData->Configuration.WhatIsThePassword2);\r
-  ZeroMem (Password, PasswordSize);\r
-\r
-  TempPassword = HiiGetString (PrivateData->HiiHandle[0], StringId, NULL);\r
-  if (TempPassword == NULL) {\r
-    return EFI_NOT_READY;\r
-  }\r
-  if (StrSize (TempPassword) > PasswordSize) {\r
-    FreePool (TempPassword);\r
-    return EFI_NOT_READY;\r
-  }\r
-  StrnCpy (Password, TempPassword, StrLen (TempPassword));\r
-  FreePool (TempPassword);\r
-\r
-  //\r
-  // Retrive uncommitted data from Browser\r
-  //\r
-  Configuration = AllocateZeroPool (sizeof (DRIVER_SAMPLE_CONFIGURATION));\r
-  ASSERT (Configuration != NULL);\r
-  if (HiiGetBrowserData (&mFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {\r
-    //\r
-    // Update password's clear text in the screen\r
-    //\r
-    CopyMem (Configuration->PasswordClearText, Password, StrSize (Password));\r
-\r
-    //\r
-    // Update uncommitted data of Browser\r
-    //\r
-    HiiSetBrowserData (\r
-       &mFormSetGuid,\r
-       VariableName,\r
-       sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
-       (UINT8 *) Configuration,\r
-       NULL\r
-       );\r
-  }\r
-\r
-  //\r
-  // Free Configuration Buffer\r
-  //\r
-  FreePool (Configuration);\r
-\r
-\r
-  //\r
-  // Set password\r
-  //\r
-  EncodePassword (Password, StrLen (Password) * 2);\r
-  Status = gRT->SetVariable(\r
-                  VariableName,\r
-                  &mFormSetGuid,\r
-                  EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
-                  sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
-                  &PrivateData->Configuration\r
-                  );\r
-  return Status;\r
-}\r
-\r
 /**\r
  Update names of Name/Value storage to current language.\r
 \r
@@ -610,7 +400,7 @@ CreateAltCfgString (
 \r
   TmpStr = StringPtr;\r
   if (Result != NULL) {\r
-    StrCpy (StringPtr, Result);\r
+    StrCpyS (StringPtr, NewLen / sizeof (CHAR16), Result);\r
     StringPtr += StrLen (Result);  \r
     FreePool (Result);\r
   }\r
@@ -671,7 +461,6 @@ AppendAltCfgString (
   )\r
 {\r
   EFI_STRING                          StringPtr;\r
-  EFI_STRING                          TmpPtr;\r
   UINTN                               Length;\r
   UINT8                               *TmpBuffer;\r
   UINTN                               Offset;\r
@@ -681,6 +470,7 @@ AppendAltCfgString (
   UINTN                               ValueWidth;\r
   EFI_STATUS                          Status;\r
 \r
+  TmpBuffer = NULL;\r
   StringPtr = *RequestResult;\r
   StringPtr = StrStr (StringPtr, L"OFFSET");\r
   BlockSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
@@ -692,11 +482,6 @@ AppendAltCfgString (
   }\r
 \r
   while (*StringPtr != 0 && StrnCmp (StringPtr, L"OFFSET=", StrLen (L"OFFSET=")) == 0) {\r
-    //\r
-    // Back up the header of one <BlockName>\r
-    //\r
-    TmpPtr = StringPtr;\r
-\r
     StringPtr += StrLen (L"OFFSET=");\r
     //\r
     // Get Offset\r
@@ -749,6 +534,11 @@ AppendAltCfgString (
     }\r
     StringPtr += Length;\r
 \r
+    //\r
+    // Skip the character "&" before "OFFSET".\r
+    //\r
+    StringPtr ++;\r
+\r
     //\r
     // Calculate Value and convert it to hex string.\r
     //\r
@@ -833,7 +623,7 @@ ExtractConfig (
   BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
   Status = gRT->GetVariable (\r
             VariableName,\r
-            &mFormSetGuid,\r
+            &gDriverSampleFormSetGuid,\r
             NULL,\r
             &BufferSize,\r
             &PrivateData->Configuration\r
@@ -851,7 +641,7 @@ ExtractConfig (
     // Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
-    ConfigRequestHdr = HiiConstructConfigHdr (&mFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
+    ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
     Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
@@ -864,10 +654,17 @@ ExtractConfig (
     // Check routing data in <ConfigHdr>.\r
     // Note: if only one Storage is used, then this checking could be skipped.\r
     //\r
-    if (!HiiIsConfigHdrMatch (Request, &mFormSetGuid, NULL)) {\r
+    if (!HiiIsConfigHdrMatch (Request, &gDriverSampleFormSetGuid, NULL)) {\r
       return EFI_NOT_FOUND;\r
     }\r
     //\r
+    // Check whether request for EFI Varstore. EFI varstore get data\r
+    // through hii database, not support in this path.\r
+    //\r
+    if (HiiIsConfigHdrMatch(Request, &gDriverSampleFormSetGuid, MyEfiVar)) {\r
+      return EFI_UNSUPPORTED;\r
+    }\r
+    //\r
     // Set Request to the unified request string.\r
     //\r
     ConfigRequest = Request;\r
@@ -915,7 +712,7 @@ ExtractConfig (
       1 + sizeof (PrivateData->Configuration.NameValueVar2) * 2 + 1) * sizeof (CHAR16);\r
     *Results = AllocateZeroPool (BufferSize);\r
     ASSERT (*Results != NULL);\r
-    StrCpy (*Results, ConfigRequest);\r
+    StrCpyS (*Results, BufferSize / sizeof (CHAR16), ConfigRequest);\r
     Value = *Results;\r
 \r
     //\r
@@ -928,12 +725,14 @@ ExtractConfig (
 \r
       BackupChar = Value[ValueStrLen];\r
       *Value++   = L'=';\r
-      Value += UnicodeValueToString (\r
-                 Value, \r
-                 PREFIX_ZERO | RADIX_HEX, \r
-                 PrivateData->Configuration.NameValueVar0, \r
-                 sizeof (PrivateData->Configuration.NameValueVar0) * 2\r
-                 );\r
+      UnicodeValueToStringS (\r
+        Value,\r
+        BufferSize - ((UINTN)Value - (UINTN)*Results),\r
+        PREFIX_ZERO | RADIX_HEX,\r
+        PrivateData->Configuration.NameValueVar0,\r
+        sizeof (PrivateData->Configuration.NameValueVar0) * 2\r
+        );\r
+      Value += StrnLenS (Value, (BufferSize - ((UINTN)Value - (UINTN)*Results)) / sizeof (CHAR16));\r
       *Value = BackupChar;\r
     }\r
 \r
@@ -947,12 +746,14 @@ ExtractConfig (
 \r
       BackupChar = Value[ValueStrLen];\r
       *Value++   = L'=';\r
-      Value += UnicodeValueToString (\r
-                Value, \r
-                PREFIX_ZERO | RADIX_HEX, \r
-                PrivateData->Configuration.NameValueVar1, \r
-                sizeof (PrivateData->Configuration.NameValueVar1) * 2\r
-                );\r
+      UnicodeValueToStringS (\r
+        Value,\r
+        BufferSize - ((UINTN)Value - (UINTN)*Results),\r
+        PREFIX_ZERO | RADIX_HEX,\r
+        PrivateData->Configuration.NameValueVar1,\r
+        sizeof (PrivateData->Configuration.NameValueVar1) * 2\r
+        );\r
+      Value += StrnLenS (Value, (BufferSize - ((UINTN)Value - (UINTN)*Results)) / sizeof (CHAR16));\r
       *Value = BackupChar;\r
     }\r
 \r
@@ -970,7 +771,14 @@ ExtractConfig (
       //\r
       StrPointer = (CHAR16 *) PrivateData->Configuration.NameValueVar2;\r
       for (; *StrPointer != L'\0'; StrPointer++) {\r
-        Value += UnicodeValueToString (Value, PREFIX_ZERO | RADIX_HEX, *StrPointer, 4);\r
+        UnicodeValueToStringS (\r
+          Value,\r
+          BufferSize - ((UINTN)Value - (UINTN)*Results),\r
+          PREFIX_ZERO | RADIX_HEX,\r
+          *StrPointer,\r
+          4\r
+          );\r
+        Value += StrnLenS (Value, (BufferSize - ((UINTN)Value - (UINTN)*Results)) / sizeof (CHAR16));\r
       }\r
     }\r
     \r
@@ -988,7 +796,7 @@ ExtractConfig (
                                   Progress\r
                                   );\r
     if (!EFI_ERROR (Status)) {\r
-      ConfigRequestHdr = HiiConstructConfigHdr (&mFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
+      ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
       AppendAltCfgString(Results, ConfigRequestHdr);\r
     }\r
   }\r
@@ -1066,17 +874,25 @@ RouteConfig (
   // Check routing data in <ConfigHdr>.\r
   // Note: if only one Storage is used, then this checking could be skipped.\r
   //\r
-  if (!HiiIsConfigHdrMatch (Configuration, &mFormSetGuid, NULL)) {\r
+  if (!HiiIsConfigHdrMatch (Configuration, &gDriverSampleFormSetGuid, NULL)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
+  //\r
+  // Check whether request for EFI Varstore. EFI varstore get data\r
+  // through hii database, not support in this path.\r
+  //\r
+  if (HiiIsConfigHdrMatch(Configuration, &gDriverSampleFormSetGuid, MyEfiVar)) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
   //\r
   // Get Buffer Storage data from EFI variable\r
   //\r
   BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
   Status = gRT->GetVariable (\r
             VariableName,\r
-            &mFormSetGuid,\r
+            &gDriverSampleFormSetGuid,\r
             NULL,\r
             &BufferSize,\r
             &PrivateData->Configuration\r
@@ -1183,7 +999,7 @@ RouteConfig (
       StrBuffer = (CHAR16 *) PrivateData->Configuration.NameValueVar2;\r
       ZeroMem (TemStr, sizeof (TemStr));\r
       while (Value < StrPtr) {\r
-        StrnCpy (TemStr, Value, 4);\r
+        StrnCpyS (TemStr, sizeof (TemStr) / sizeof (CHAR16), Value, 4);\r
         *(StrBuffer++) = (CHAR16) StrHexToUint64 (TemStr);\r
         Value += 4;\r
       }\r
@@ -1195,7 +1011,7 @@ RouteConfig (
     //\r
     Status = gRT->SetVariable(\r
       VariableName,\r
-      &mFormSetGuid,\r
+      &gDriverSampleFormSetGuid,\r
       EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
       sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
       &PrivateData->Configuration\r
@@ -1224,7 +1040,7 @@ RouteConfig (
   //\r
   Status = gRT->SetVariable(\r
                   VariableName,\r
-                  &mFormSetGuid,\r
+                  &gDriverSampleFormSetGuid,\r
                   EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                   sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
                   &PrivateData->Configuration\r
@@ -1269,7 +1085,6 @@ DriverCallback (
 {\r
   DRIVER_SAMPLE_PRIVATE_DATA      *PrivateData;\r
   EFI_STATUS                      Status;\r
-  UINT8                           MyVar;\r
   VOID                            *StartOpCodeHandle;\r
   VOID                            *OptionsOpCodeHandle;\r
   EFI_IFR_GUID_LABEL              *StartLabel;\r
@@ -1277,9 +1092,15 @@ DriverCallback (
   EFI_IFR_GUID_LABEL              *EndLabel;\r
   EFI_INPUT_KEY                   Key;\r
   DRIVER_SAMPLE_CONFIGURATION     *Configuration;\r
-  UINTN                           MyVarSize;\r
+  MY_EFI_VARSTORE_DATA            *EfiData;\r
   EFI_FORM_ID                     FormId;\r
-  \r
+  EFI_STRING                      Progress;\r
+  EFI_STRING                      Results;\r
+  UINT32                          ProgressErr;\r
+  CHAR16                          *TmpStr;\r
+  UINTN                           Index;\r
+  UINT64                          BufferValue;\r
+\r
   if (((Value == NULL) && (Action != EFI_BROWSER_ACTION_FORM_OPEN) && (Action != EFI_BROWSER_ACTION_FORM_CLOSE))||\r
     (ActionRequest == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1287,7 +1108,9 @@ DriverCallback (
 \r
 \r
   FormId = 0;\r
+  ProgressErr = 0;\r
   Status = EFI_SUCCESS;\r
+  BufferValue = 3;\r
   PrivateData = DRIVER_SAMPLE_PRIVATE_FROM_THIS (This);\r
 \r
   switch (Action) {\r
@@ -1325,7 +1148,7 @@ DriverCallback (
 \r
         HiiUpdateForm (\r
           PrivateData->HiiHandle[0],  // HII handle\r
-          &mFormSetGuid,              // Formset GUID\r
+          &gDriverSampleFormSetGuid,  // Formset GUID\r
           0x3,                        // Form ID\r
           StartOpCodeHandle,          // Label for where to insert opcodes\r
           NULL                        // Insert data\r
@@ -1370,21 +1193,90 @@ DriverCallback (
     \r
   case EFI_BROWSER_ACTION_RETRIEVE:\r
     {\r
-      if (QuestionId == 0x1111) {\r
+      switch (QuestionId ) {\r
+      case 0x1248:\r
+        if (Type != EFI_IFR_TYPE_REF) {\r
+          return EFI_INVALID_PARAMETER;\r
+        }\r
+        Value->ref.FormId = 0x3;\r
+        break;\r
+\r
+      case 0x5678:\r
+      case 0x1247:\r
+        //\r
+        // We will reach here once the Question is refreshed\r
+        //\r
+\r
+        //\r
+        // Initialize the container for dynamic opcodes\r
+        //\r
+        StartOpCodeHandle = HiiAllocateOpCodeHandle ();\r
+        ASSERT (StartOpCodeHandle != NULL);\r
+\r
+        //\r
+        // Create Hii Extend Label OpCode as the start opcode\r
+        //\r
+        StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
+        StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
+        if (QuestionId == 0x5678) {\r
+          StartLabel->Number       = LABEL_UPDATE2;\r
+          FormId                   = 0x03;\r
+          PrivateData->Configuration.DynamicRefresh++;\r
+        } else if (QuestionId == 0x1247 ) {\r
+          StartLabel->Number       = LABEL_UPDATE3;\r
+          FormId                   = 0x06;\r
+          PrivateData->Configuration.RefreshGuidCount++;\r
+        }\r
+\r
+        HiiCreateActionOpCode (\r
+          StartOpCodeHandle,                // Container for dynamic created opcodes\r
+          0x1237,                           // Question ID\r
+          STRING_TOKEN(STR_EXIT_TEXT),      // Prompt text\r
+          STRING_TOKEN(STR_EXIT_TEXT),      // Help text\r
+          EFI_IFR_FLAG_CALLBACK,            // Question flag\r
+          0                                 // Action String ID\r
+        );\r
+      \r
+        HiiUpdateForm (\r
+          PrivateData->HiiHandle[0],        // HII handle\r
+          &gDriverSampleFormSetGuid,        // Formset GUID\r
+          FormId,                           // Form ID\r
+          StartOpCodeHandle,                // Label for where to insert opcodes\r
+          NULL                              // Insert data\r
+        );\r
+\r
+        HiiFreeOpCodeHandle (StartOpCodeHandle);\r
+\r
         //\r
-        // EfiVarstore question takes sample action (print value as debug information) \r
-        // after read/write question.\r
+        // Refresh the Question value\r
         //\r
-        MyVarSize = 1;\r
-        Status = gRT->GetVariable(\r
-                        L"MyVar",\r
-                        &mFormSetGuid,\r
-                        NULL,\r
-                        &MyVarSize,\r
-                        &MyVar\r
+        Status = gRT->SetVariable(\r
+                        VariableName,\r
+                        &gDriverSampleFormSetGuid,\r
+                        EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
+                        sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
+                        &PrivateData->Configuration\r
                         );\r
-        ASSERT_EFI_ERROR (Status);\r
-        DEBUG ((DEBUG_INFO, "EfiVarstore question: Tall value is %d with value width %d\n", MyVar, MyVarSize));\r
+\r
+        if (QuestionId == 0x5678) {\r
+          //\r
+          // Update uncommitted data of Browser\r
+          //\r
+          EfiData = AllocateZeroPool (sizeof (MY_EFI_VARSTORE_DATA));\r
+          ASSERT (EfiData != NULL);\r
+          if (HiiGetBrowserData (&gDriverSampleFormSetGuid, MyEfiVar, sizeof (MY_EFI_VARSTORE_DATA), (UINT8 *) EfiData)) {\r
+            EfiData->Field8 = 111;\r
+            HiiSetBrowserData (\r
+              &gDriverSampleFormSetGuid,\r
+              MyEfiVar,\r
+              sizeof (MY_EFI_VARSTORE_DATA),\r
+              (UINT8 *) EfiData,\r
+              NULL\r
+            );\r
+          }\r
+          FreePool (EfiData);\r
+        }\r
+        break;\r
       }\r
     }\r
     break;\r
@@ -1396,6 +1288,12 @@ DriverCallback (
         Value->u8 = DEFAULT_CLASS_STANDARD_VALUE;\r
       break;\r
 \r
+      case 0x1252:\r
+        for (Index = 0; Index < 3; Index ++) {\r
+          SetArrayData (Value, EFI_IFR_TYPE_NUM_SIZE_8, Index, BufferValue--);\r
+        }\r
+      break;\r
+\r
       default:\r
         Status = EFI_UNSUPPORTED;\r
       break;\r
@@ -1420,6 +1318,15 @@ DriverCallback (
   case EFI_BROWSER_ACTION_CHANGING:\r
   {\r
     switch (QuestionId) {\r
+    case 0x1249:\r
+      {\r
+        if (Type != EFI_IFR_TYPE_REF) {\r
+          return EFI_INVALID_PARAMETER;\r
+        }\r
+\r
+        Value->ref.FormId = 0x1234;\r
+      }\r
+    break;\r
     case 0x1234:\r
       //\r
       // Initialize the container for dynamic opcodes\r
@@ -1481,7 +1388,7 @@ DriverCallback (
       PrivateData->Configuration.DynamicOneof = 2;\r
       Status = gRT->SetVariable(\r
                       VariableName,\r
-                      &mFormSetGuid,\r
+                      &gDriverSampleFormSetGuid,\r
                       EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                       sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
                       &PrivateData->Configuration\r
@@ -1492,14 +1399,14 @@ DriverCallback (
       //\r
       Configuration = AllocateZeroPool (sizeof (DRIVER_SAMPLE_CONFIGURATION));\r
       ASSERT (Configuration != NULL);\r
-      if (HiiGetBrowserData (&mFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {\r
+      if (HiiGetBrowserData (&gDriverSampleFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {\r
         Configuration->DynamicOneof = 2;\r
 \r
         //\r
         // Update uncommitted data of Browser\r
         //\r
         HiiSetBrowserData (\r
-          &mFormSetGuid,\r
+          &gDriverSampleFormSetGuid,\r
           VariableName,\r
           sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
           (UINT8 *) Configuration,\r
@@ -1578,7 +1485,7 @@ DriverCallback (
 \r
       HiiUpdateForm (\r
         PrivateData->HiiHandle[0],  // HII handle\r
-        &mFormSetGuid,              // Formset GUID\r
+        &gDriverSampleFormSetGuid,  // Formset GUID\r
         0x1234,                     // Form ID\r
         StartOpCodeHandle,          // Label for where to insert opcodes\r
         EndOpCodeHandle             // Replace data\r
@@ -1589,179 +1496,156 @@ DriverCallback (
       HiiFreeOpCodeHandle (EndOpCodeHandle);\r
       break;\r
 \r
-    case 0x5678:\r
-    case 0x1247:\r
-      //\r
-      // We will reach here once the Question is refreshed\r
-      //\r
-\r
-      //\r
-      // Initialize the container for dynamic opcodes\r
-      //\r
-      StartOpCodeHandle = HiiAllocateOpCodeHandle ();\r
-      ASSERT (StartOpCodeHandle != NULL);\r
-\r
-      //\r
-      // Create Hii Extend Label OpCode as the start opcode\r
-      //\r
-      StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
-      StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
-      if (QuestionId == 0x5678) {\r
-        StartLabel->Number       = LABEL_UPDATE2;\r
-        FormId                   = 0x03;\r
-        PrivateData->Configuration.DynamicRefresh++;\r
-      } else if (QuestionId == 0x1247 ) {\r
-        StartLabel->Number       = LABEL_UPDATE3;\r
-        FormId                   = 0x05;\r
-        PrivateData->Configuration.RefreshGuidCount++;\r
-      }\r
-\r
-      HiiCreateActionOpCode (\r
-        StartOpCodeHandle,                // Container for dynamic created opcodes\r
-        0x1237,                           // Question ID\r
-        STRING_TOKEN(STR_EXIT_TEXT),      // Prompt text\r
-        STRING_TOKEN(STR_EXIT_TEXT),      // Help text\r
-        EFI_IFR_FLAG_CALLBACK,            // Question flag\r
-        0                                 // Action String ID\r
-      );\r
-\r
-      HiiUpdateForm (\r
-        PrivateData->HiiHandle[0],  // HII handle\r
-        &mFormSetGuid,              // Formset GUID\r
-        FormId,                        // Form ID\r
-        StartOpCodeHandle,          // Label for where to insert opcodes\r
-        NULL                        // Insert data\r
-        );\r
-\r
-      HiiFreeOpCodeHandle (StartOpCodeHandle);\r
-\r
-      //\r
-      // Refresh the Question value\r
-      //\r
-      Status = gRT->SetVariable(\r
-                      VariableName,\r
-                      &mFormSetGuid,\r
-                      EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
-                      sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
-                      &PrivateData->Configuration\r
-                      );\r
+    default:\r
+      break;\r
+    }\r
+  }\r
+  break;\r
 \r
-      if (QuestionId == 0x5678) {\r
+  case EFI_BROWSER_ACTION_CHANGED:\r
+    switch (QuestionId) {\r
+      case 0x1237:\r
         //\r
-        // Change an EFI Variable storage (MyEfiVar) asynchronous, this will cause\r
-        // the first statement in Form 3 be suppressed\r
+        // User press "Exit now", request Browser to exit\r
         //\r
-        MyVarSize = 1;\r
-        MyVar = 111;\r
-        Status = gRT->SetVariable(\r
-                        L"MyVar",\r
-                        &mFormSetGuid,\r
-                        EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
-                        MyVarSize,\r
-                        &MyVar\r
-                        );\r
-      }\r
-      break;\r
-\r
-    case 0x1237:\r
-      //\r
-      // User press "Exit now", request Browser to exit\r
-      //\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
-      break;\r
-\r
-    case 0x1238:\r
-      //\r
-      // User press "Save now", request Browser to save the uncommitted data.\r
-      //\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
-      break;\r
-\r
-    case 0x1241:\r
-    case 0x1246:\r
-      //\r
-      // User press "Submit current form and Exit now", request Browser to submit current form and exit\r
-      //\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
-      break;\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
+        break;\r
+      \r
+      case 0x1238:\r
+        //\r
+        // User press "Save now", request Browser to save the uncommitted data.\r
+        //\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+        break;\r
+      \r
+      case 0x1241:\r
+      case 0x1246:\r
+        //\r
+        // User press "Submit current form and Exit now", request Browser to submit current form and exit\r
+        //\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
+        break;\r
+      \r
+      case 0x1242:\r
+        //\r
+        // User press "Discard current form now", request Browser to discard the uncommitted data.\r
+        //\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;\r
+        break;\r
+      \r
+      case 0x1243:\r
+        //\r
+        // User press "Submit current form now", request Browser to save the uncommitted data.\r
+        //\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+        break;\r
+      \r
+      case 0x1244:\r
+      case 0x1245:\r
+        //\r
+        // User press "Discard current form and Exit now", request Browser to discard the uncommitted data and exit.\r
+        //\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+        break;\r
 \r
-    case 0x1242:\r
-      //\r
-      // User press "Discard current form now", request Browser to discard the uncommitted data.\r
-      //\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;\r
-      break;\r
+      case 0x1231:\r
+        //\r
+        // 1. Check to see whether system support keyword.\r
+        //\r
+        Status = PrivateData->HiiKeywordHandler->GetData (PrivateData->HiiKeywordHandler,\r
+                                                          L"NAMESPACE=x-UEFI-ns",\r
+                                                          L"KEYWORD=iSCSIBootEnable",\r
+                                                          &Progress,\r
+                                                          &ProgressErr,\r
+                                                          &Results\r
+                                                         );\r
+        if (EFI_ERROR (Status)) {\r
+          do {\r
+            CreatePopUp (\r
+              EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+              &Key,\r
+              L"",\r
+              L"This system not support this keyword!",\r
+              L"Press ENTER to continue ...",\r
+              L"",\r
+              NULL\r
+              );\r
+          } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
 \r
-    case 0x1243:\r
-      //\r
-      // User press "Submit current form now", request Browser to save the uncommitted data.\r
-      //\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
-      break;\r
+          Status = EFI_SUCCESS;\r
+          break;\r
+        }\r
 \r
-    case 0x1244:\r
-    case 0x1245:\r
-      //\r
-      // User press "Discard current form and Exit now", request Browser to discard the uncommitted data and exit.\r
-      //\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
-      break;\r
+        //\r
+        // 2. If system support this keyword, just try to change value.\r
+        //\r
+        \r
+        //\r
+        // Change value from '0' to '1' or from '1' to '0'\r
+        //\r
+        TmpStr = StrStr (Results, L"&VALUE=");\r
+        ASSERT (TmpStr != NULL);\r
+        TmpStr += StrLen (L"&VALUE=");\r
+        TmpStr++;\r
+        if (*TmpStr == L'0') {\r
+          *TmpStr = L'1';\r
+        } else {\r
+          *TmpStr = L'0';\r
+        }\r
 \r
-    case 0x2000:\r
-      //\r
-      // Only used to update the state.\r
-      //\r
-      if ((Type == EFI_IFR_TYPE_STRING) && (Value->string == 0) && \r
-        (PrivateData->PasswordState == BROWSER_STATE_SET_PASSWORD)) {\r
-        PrivateData->PasswordState = BROWSER_STATE_VALIDATE_PASSWORD;\r
-        return EFI_INVALID_PARAMETER;\r
-      }\r
+        //\r
+        // 3. Call the keyword handler protocol to change the value.\r
+        //\r
+        Status = PrivateData->HiiKeywordHandler->SetData (PrivateData->HiiKeywordHandler,\r
+                                                          Results,\r
+                                                          &Progress,\r
+                                                          &ProgressErr\r
+                                                         );\r
+        if (EFI_ERROR (Status)) {\r
+          do {\r
+            CreatePopUp (\r
+              EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+              &Key,\r
+              L"",\r
+              L"Set keyword to the system failed!",\r
+              L"Press ENTER to continue ...",\r
+              L"",\r
+              NULL\r
+              );\r
+          } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
 \r
-      //\r
-      // When try to set a new password, user will be chanlleged with old password.\r
-      // The Callback is responsible for validating old password input by user,\r
-      // If Callback return EFI_SUCCESS, it indicates validation pass.\r
-      //\r
-      switch (PrivateData->PasswordState) {\r
-      case BROWSER_STATE_VALIDATE_PASSWORD:\r
-        Status = ValidatePassword (PrivateData, Value->string);\r
-        if (Status == EFI_SUCCESS) {\r
-          PrivateData->PasswordState = BROWSER_STATE_SET_PASSWORD;\r
+          Status = EFI_SUCCESS;\r
+          break;\r
         }\r
         break;\r
 \r
-      case BROWSER_STATE_SET_PASSWORD:\r
-        Status = SetPassword (PrivateData, Value->string);\r
-        PrivateData->PasswordState = BROWSER_STATE_VALIDATE_PASSWORD;\r
-        break;\r
-\r
       default:\r
-        break;\r
-      }\r
-\r
-      break;\r
-\r
-    case 0x1111:\r
-      //\r
-      // EfiVarstore question takes sample action (print value as debug information) \r
-      // after read/write question.\r
-      //\r
-      MyVarSize = 1;\r
-      Status = gRT->GetVariable(\r
-                      L"MyVar",\r
-                      &mFormSetGuid,\r
-                      NULL,\r
-                      &MyVarSize,\r
-                      &MyVar\r
-                      );\r
-      ASSERT_EFI_ERROR (Status);\r
-      DEBUG ((DEBUG_INFO, "EfiVarstore question: Tall value is %d with value width %d\n", MyVar, MyVarSize));\r
-    default:\r
       break;\r
     }\r
-  }\r
   break;\r
 \r
+  case EFI_BROWSER_ACTION_SUBMITTED:\r
+    {\r
+      if (QuestionId == 0x1250) {\r
+        //\r
+        // Sample CallBack for EFI_BROWSER_ACTION_SUBMITTED action:\r
+        // Show up a pop-up to show SUBMITTED callback has been triggered.\r
+        //\r
+        do {\r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"",\r
+            L"EfiVarstore value has been submitted!",\r
+            L"Press ESC or ENTER to continue ...",\r
+            L"",\r
+            NULL\r
+            );\r
+        } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
+      }\r
+    }\r
+    break;\r
+\r
   default:\r
     Status = EFI_UNSUPPORTED;\r
     break;\r
@@ -1793,16 +1677,23 @@ DriverSampleInit (
   EFI_HII_STRING_PROTOCOL         *HiiString;\r
   EFI_FORM_BROWSER2_PROTOCOL      *FormBrowser2;\r
   EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting;\r
+  EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *HiiKeywordHandler;\r
   CHAR16                          *NewString;\r
   UINTN                           BufferSize;\r
   DRIVER_SAMPLE_CONFIGURATION     *Configuration;\r
   BOOLEAN                         ActionFlag;\r
   EFI_STRING                      ConfigRequestHdr;\r
+  EFI_STRING                      NameRequestHdr;\r
+  MY_EFI_VARSTORE_DATA            *VarStoreConfig;\r
+  EFI_INPUT_KEY                   HotKey;\r
+  EDKII_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx;\r
 \r
   //\r
   // Initialize the local variables.\r
   //\r
   ConfigRequestHdr = NULL;\r
+  NewString        = NULL;\r
+\r
   //\r
   // Initialize screen dimensions for SendForm().\r
   // Remove 3 characters from top and bottom\r
@@ -1816,17 +1707,16 @@ DriverSampleInit (
   //\r
   // Initialize driver private data\r
   //\r
-  PrivateData = AllocateZeroPool (sizeof (DRIVER_SAMPLE_PRIVATE_DATA));\r
-  if (PrivateData == NULL) {\r
+  mPrivateData = AllocateZeroPool (sizeof (DRIVER_SAMPLE_PRIVATE_DATA));\r
+  if (mPrivateData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  PrivateData->Signature = DRIVER_SAMPLE_PRIVATE_SIGNATURE;\r
+  mPrivateData->Signature = DRIVER_SAMPLE_PRIVATE_SIGNATURE;\r
 \r
-  PrivateData->ConfigAccess.ExtractConfig = ExtractConfig;\r
-  PrivateData->ConfigAccess.RouteConfig = RouteConfig;\r
-  PrivateData->ConfigAccess.Callback = DriverCallback;\r
-  PrivateData->PasswordState = BROWSER_STATE_VALIDATE_PASSWORD;\r
+  mPrivateData->ConfigAccess.ExtractConfig = ExtractConfig;\r
+  mPrivateData->ConfigAccess.RouteConfig = RouteConfig;\r
+  mPrivateData->ConfigAccess.Callback = DriverCallback;\r
 \r
   //\r
   // Locate Hii Database protocol\r
@@ -1835,7 +1725,7 @@ DriverSampleInit (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
-  PrivateData->HiiDatabase = HiiDatabase;\r
+  mPrivateData->HiiDatabase = HiiDatabase;\r
 \r
   //\r
   // Locate HiiString protocol\r
@@ -1844,7 +1734,7 @@ DriverSampleInit (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
-  PrivateData->HiiString = HiiString;\r
+  mPrivateData->HiiString = HiiString;\r
 \r
   //\r
   // Locate Formbrowser2 protocol\r
@@ -1853,7 +1743,7 @@ DriverSampleInit (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
-  PrivateData->FormBrowser2 = FormBrowser2;\r
+  mPrivateData->FormBrowser2 = FormBrowser2;\r
 \r
   //\r
   // Locate ConfigRouting protocol\r
@@ -1862,25 +1752,34 @@ DriverSampleInit (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
-  PrivateData->HiiConfigRouting = HiiConfigRouting;\r
+  mPrivateData->HiiConfigRouting = HiiConfigRouting;\r
+\r
+  //\r
+  // Locate keyword handler protocol\r
+  //\r
+  Status = gBS->LocateProtocol (&gEfiConfigKeywordHandlerProtocolGuid, NULL, (VOID **) &HiiKeywordHandler);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+  mPrivateData->HiiKeywordHandler = HiiKeywordHandler;\r
 \r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &DriverHandle[0],\r
                   &gEfiDevicePathProtocolGuid,\r
                   &mHiiVendorDevicePath0,\r
                   &gEfiHiiConfigAccessProtocolGuid,\r
-                  &PrivateData->ConfigAccess,\r
+                  &mPrivateData->ConfigAccess,\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  PrivateData->DriverHandle[0] = DriverHandle[0];\r
+  mPrivateData->DriverHandle[0] = DriverHandle[0];\r
 \r
   //\r
   // Publish our HII data\r
   //\r
   HiiHandle[0] = HiiAddPackages (\r
-                   &mFormSetGuid,\r
+                   &gDriverSampleFormSetGuid,\r
                    DriverHandle[0],\r
                    DriverSampleStrings,\r
                    VfrBin,\r
@@ -1890,7 +1789,7 @@ DriverSampleInit (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  PrivateData->HiiHandle[0] = HiiHandle[0];\r
+  mPrivateData->HiiHandle[0] = HiiHandle[0];\r
 \r
   //\r
   // Publish another Fromset\r
@@ -1899,14 +1798,16 @@ DriverSampleInit (
                   &DriverHandle[1],\r
                   &gEfiDevicePathProtocolGuid,\r
                   &mHiiVendorDevicePath1,\r
+                  &gEfiHiiConfigAccessProtocolGuid,\r
+                  &mPrivateData->ConfigAccess,\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  PrivateData->DriverHandle[1] = DriverHandle[1];\r
+  mPrivateData->DriverHandle[1] = DriverHandle[1];\r
 \r
   HiiHandle[1] = HiiAddPackages (\r
-                   &mInventoryGuid,\r
+                   &gDriverSampleInventoryGuid,\r
                    DriverHandle[1],\r
                    DriverSampleStrings,\r
                    InventoryBin,\r
@@ -1917,7 +1818,19 @@ DriverSampleInit (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  PrivateData->HiiHandle[1] = HiiHandle[1];\r
+  mPrivateData->HiiHandle[1] = HiiHandle[1];\r
+\r
+  //\r
+  // Update the device path string.\r
+  //\r
+  NewString = ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)&mHiiVendorDevicePath0, FALSE, FALSE);\r
+  if (HiiSetString (HiiHandle[0], STRING_TOKEN (STR_DEVICE_PATH), NewString, NULL) == 0) {\r
+    DriverSampleUnload (ImageHandle);\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+  if (NewString != NULL) {\r
+    FreePool (NewString);\r
+  }\r
 \r
   //\r
   // Very simple example of how one would update a string that is already\r
@@ -1935,61 +1848,159 @@ DriverSampleInit (
   //\r
   // Initialize Name/Value name String ID\r
   //\r
-  PrivateData->NameStringId[0] = STR_NAME_VALUE_VAR_NAME0;\r
-  PrivateData->NameStringId[1] = STR_NAME_VALUE_VAR_NAME1;\r
-  PrivateData->NameStringId[2] = STR_NAME_VALUE_VAR_NAME2;\r
+  mPrivateData->NameStringId[0] = STR_NAME_VALUE_VAR_NAME0;\r
+  mPrivateData->NameStringId[1] = STR_NAME_VALUE_VAR_NAME1;\r
+  mPrivateData->NameStringId[2] = STR_NAME_VALUE_VAR_NAME2;\r
 \r
   //\r
   // Initialize configuration data\r
   //\r
-  Configuration = &PrivateData->Configuration;\r
+  Configuration = &mPrivateData->Configuration;\r
   ZeroMem (Configuration, sizeof (DRIVER_SAMPLE_CONFIGURATION));\r
 \r
   //\r
   // Try to read NV config EFI variable first\r
   //\r
-  ConfigRequestHdr = HiiConstructConfigHdr (&mFormSetGuid, VariableName, DriverHandle[0]);\r
+  ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, VariableName, DriverHandle[0]);\r
   ASSERT (ConfigRequestHdr != NULL);\r
 \r
+  NameRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, NULL, DriverHandle[0]);\r
+  ASSERT (NameRequestHdr != NULL);\r
+\r
   BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
-  Status = gRT->GetVariable (VariableName, &mFormSetGuid, NULL, &BufferSize, Configuration);\r
+  Status = gRT->GetVariable (VariableName, &gDriverSampleFormSetGuid, NULL, &BufferSize, Configuration);\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // Store zero data Buffer Storage to EFI variable\r
     //\r
     Status = gRT->SetVariable(\r
                     VariableName,\r
-                    &mFormSetGuid,\r
+                    &gDriverSampleFormSetGuid,\r
                     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                     sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
                     Configuration\r
                     );\r
-    ASSERT (Status == EFI_SUCCESS);\r
+    if (EFI_ERROR (Status)) {\r
+      DriverSampleUnload (ImageHandle);\r
+      return Status;\r
+    }\r
     //\r
     // EFI variable for NV config doesn't exit, we should build this variable\r
     // based on default values stored in IFR\r
     //\r
+    ActionFlag = HiiSetToDefaults (NameRequestHdr, EFI_HII_DEFAULT_CLASS_STANDARD);\r
+    if (!ActionFlag) {\r
+      DriverSampleUnload (ImageHandle);\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
+\r
     ActionFlag = HiiSetToDefaults (ConfigRequestHdr, EFI_HII_DEFAULT_CLASS_STANDARD);\r
-    ASSERT (ActionFlag);\r
+    if (!ActionFlag) {\r
+      DriverSampleUnload (ImageHandle);\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
   } else {\r
     //\r
     // EFI variable does exist and Validate Current Setting\r
     //\r
+    ActionFlag = HiiValidateSettings (NameRequestHdr);\r
+    if (!ActionFlag) {\r
+      DriverSampleUnload (ImageHandle);\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
+\r
     ActionFlag = HiiValidateSettings (ConfigRequestHdr);\r
-    ASSERT (ActionFlag);\r
+    if (!ActionFlag) {\r
+      DriverSampleUnload (ImageHandle);\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
   }\r
+  FreePool (ConfigRequestHdr);\r
 \r
+  //\r
+  // Initialize efi varstore configuration data\r
+  //\r
+  VarStoreConfig = &mPrivateData->VarStoreConfig;\r
+  ZeroMem (VarStoreConfig, sizeof (MY_EFI_VARSTORE_DATA));\r
+\r
+  ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, MyEfiVar, DriverHandle[0]);\r
+  ASSERT (ConfigRequestHdr != NULL);\r
+\r
+  BufferSize = sizeof (MY_EFI_VARSTORE_DATA);\r
+  Status = gRT->GetVariable (MyEfiVar, &gDriverSampleFormSetGuid, NULL, &BufferSize, VarStoreConfig);\r
+  if (EFI_ERROR (Status)) {\r
+    //\r
+    // Store zero data to EFI variable Storage.\r
+    //\r
+    Status = gRT->SetVariable(\r
+                    MyEfiVar,\r
+                    &gDriverSampleFormSetGuid,\r
+                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
+                    sizeof (MY_EFI_VARSTORE_DATA),\r
+                    VarStoreConfig\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      DriverSampleUnload (ImageHandle);\r
+      return Status;\r
+    }\r
+    //\r
+    // EFI variable for NV config doesn't exit, we should build this variable\r
+    // based on default values stored in IFR\r
+    //\r
+    ActionFlag = HiiSetToDefaults (ConfigRequestHdr, EFI_HII_DEFAULT_CLASS_STANDARD);\r
+    if (!ActionFlag) {\r
+      DriverSampleUnload (ImageHandle);\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
+  } else {\r
+    //\r
+    // EFI variable does exist and Validate Current Setting\r
+    //\r
+    ActionFlag = HiiValidateSettings (ConfigRequestHdr);\r
+    if (!ActionFlag) {\r
+      DriverSampleUnload (ImageHandle);\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
+  }\r
   FreePool (ConfigRequestHdr);\r
 \r
   Status = gBS->CreateEventEx (\r
         EVT_NOTIFY_SIGNAL, \r
         TPL_NOTIFY,\r
-        DriverSampleInternalEmptyFunction,\r
+        EfiEventEmptyFunction,\r
         NULL,\r
-        &MyEventGroupGuid,\r
+        &gEfiIfrRefreshIdOpGuid,\r
         &mEvent\r
         );\r
   ASSERT_EFI_ERROR (Status);\r
+\r
+  //\r
+  // Example of how to use BrowserEx protocol to register HotKey.\r
+  // \r
+  Status = gBS->LocateProtocol (&gEdkiiFormBrowserExProtocolGuid, NULL, (VOID **) &FormBrowserEx);\r
+  if (!EFI_ERROR (Status)) {\r
+    //\r
+    // First unregister the default hot key F9 and F10.\r
+    //\r
+    HotKey.UnicodeChar = CHAR_NULL;\r
+    HotKey.ScanCode    = SCAN_F9;\r
+    FormBrowserEx->RegisterHotKey (&HotKey, 0, 0, NULL);\r
+    HotKey.ScanCode    = SCAN_F10;\r
+    FormBrowserEx->RegisterHotKey (&HotKey, 0, 0, NULL);\r
+    \r
+    //\r
+    // Register the default HotKey F9 and F10 again.\r
+    //\r
+    HotKey.ScanCode   = SCAN_F10;\r
+    NewString         = HiiGetString (mPrivateData->HiiHandle[0], STRING_TOKEN (FUNCTION_TEN_STRING), NULL);\r
+    ASSERT (NewString != NULL);\r
+    FormBrowserEx->RegisterHotKey (&HotKey, BROWSER_ACTION_SUBMIT, 0, NewString);\r
+    HotKey.ScanCode   = SCAN_F9;\r
+    NewString         = HiiGetString (mPrivateData->HiiHandle[0], STRING_TOKEN (FUNCTION_NINE_STRING), NULL);\r
+    ASSERT (NewString != NULL);\r
+    FormBrowserEx->RegisterHotKey (&HotKey, BROWSER_ACTION_DEFAULT, EFI_HII_DEFAULT_CLASS_STANDARD, NewString);\r
+  }\r
+\r
   //\r
   // In default, this driver is built into Flash device image,\r
   // the following code doesn't run.\r
@@ -2037,7 +2048,7 @@ DriverSampleUnload (
 {\r
   UINTN Index;\r
 \r
-  ASSERT (PrivateData != NULL);\r
+  ASSERT (mPrivateData != NULL);\r
 \r
   if (DriverHandle[0] != NULL) {\r
     gBS->UninstallMultipleProtocolInterfaces (\r
@@ -2045,7 +2056,7 @@ DriverSampleUnload (
             &gEfiDevicePathProtocolGuid,\r
             &mHiiVendorDevicePath0,\r
             &gEfiHiiConfigAccessProtocolGuid,\r
-            &PrivateData->ConfigAccess,\r
+            &mPrivateData->ConfigAccess,\r
             NULL\r
            );\r
     DriverHandle[0] = NULL;\r
@@ -2056,26 +2067,28 @@ DriverSampleUnload (
             DriverHandle[1],\r
             &gEfiDevicePathProtocolGuid,\r
             &mHiiVendorDevicePath1,\r
+            &gEfiHiiConfigAccessProtocolGuid,\r
+            &mPrivateData->ConfigAccess,\r
             NULL\r
            );\r
     DriverHandle[1] = NULL;\r
   }\r
 \r
-  if (PrivateData->HiiHandle[0] != NULL) {\r
-    HiiRemovePackages (PrivateData->HiiHandle[0]);\r
+  if (mPrivateData->HiiHandle[0] != NULL) {\r
+    HiiRemovePackages (mPrivateData->HiiHandle[0]);\r
   }\r
 \r
-  if (PrivateData->HiiHandle[1] != NULL) {\r
-    HiiRemovePackages (PrivateData->HiiHandle[1]);\r
+  if (mPrivateData->HiiHandle[1] != NULL) {\r
+    HiiRemovePackages (mPrivateData->HiiHandle[1]);\r
   }\r
 \r
   for (Index = 0; Index < NAME_VALUE_NAME_NUMBER; Index++) {\r
-    if (PrivateData->NameValueName[Index] != NULL) {\r
-      FreePool (PrivateData->NameValueName[Index]);\r
+    if (mPrivateData->NameValueName[Index] != NULL) {\r
+      FreePool (mPrivateData->NameValueName[Index]);\r
     }\r
   }\r
-  FreePool (PrivateData);\r
-  PrivateData = NULL;\r
+  FreePool (mPrivateData);\r
+  mPrivateData = NULL;\r
 \r
   gBS->CloseEvent (mEvent);\r
 \r