]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
Add unload function for DriverSample
[mirror_edk2.git] / MdeModulePkg / Universal / DriverSampleDxe / DriverSample.c
index f18e31163ff668fe61e0cc3b63f34cd9f9ee9777..8351a3279c19e5e79d41a921be6dc21593a8dc8e 100644 (file)
@@ -1,5 +1,8 @@
 /** @file\r
-Copyright (c) 2004 - 2007, Intel Corporation\r
+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 - 2008, Intel Corporation\r
 All rights reserved. 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
@@ -8,31 +11,82 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-Module Name:\r
-  DriverSample.c\r
-\r
-Abstract:\r
-\r
-  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
-\r
 **/\r
 \r
 \r
 #include "DriverSample.h"\r
 \r
-#define DISPLAY_ONLY_MY_ITEM  0x0002\r
+#define DISPLAY_ONLY_MY_ITEM  0x0000\r
 \r
 EFI_GUID   mFormSetGuid = FORMSET_GUID;\r
 EFI_GUID   mInventoryGuid = INVENTORY_GUID;\r
 \r
 CHAR16     VariableName[] = L"MyIfrNVData";\r
 \r
+EFI_HANDLE                      DriverHandle[2] = {NULL, NULL};\r
+DRIVER_SAMPLE_PRIVATE_DATA      *PrivateData = NULL;\r
+\r
+HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath0 = {\r
+  {\r
+    {\r
+      HARDWARE_DEVICE_PATH,\r
+      HW_VENDOR_DP,\r
+      {\r
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+        (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
+  },\r
+  {\r
+    END_DEVICE_PATH_TYPE,\r
+    END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
+    { \r
+      (UINT8) (END_DEVICE_PATH_LENGTH),\r
+      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+    }\r
+  }\r
+};\r
+\r
+HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath1 = {\r
+  {\r
+    {\r
+      HARDWARE_DEVICE_PATH,\r
+      HW_VENDOR_DP,\r
+      {\r
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+        (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
+  },\r
+  {\r
+    END_DEVICE_PATH_TYPE,\r
+    END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
+    { \r
+      (UINT8) (END_DEVICE_PATH_LENGTH),\r
+      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+    }\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  UINT8                       MaxSize\r
+  IN  UINTN                       MaxSize\r
   )\r
 {\r
   UINTN   Index;\r
@@ -52,14 +106,23 @@ EncodePassword (
 \r
   CopyMem (Password, Buffer, MaxSize);\r
 \r
-  gBS->FreePool (Buffer);\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
-  DRIVER_SAMPLE_PRIVATE_DATA      *PrivateData,\r
-  EFI_STRING_ID                   StringId\r
+  IN       DRIVER_SAMPLE_PRIVATE_DATA      *PrivateData,\r
+  IN       EFI_STRING_ID                   StringId\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -111,9 +174,9 @@ ValidatePassword (
   Password = AllocateZeroPool (BufferSize);\r
   ASSERT (Password != NULL);\r
 \r
-  Status = IfrLibGetString (PrivateData->HiiHandle[0], StringId, Password, &BufferSize);\r
+  Status = HiiLibGetString (PrivateData->HiiHandle[0], StringId, Password, &BufferSize);\r
   if (EFI_ERROR (Status)) {\r
-    gBS->FreePool (Password);\r
+    FreePool (Password);\r
     return Status;\r
   }\r
 \r
@@ -132,21 +195,32 @@ ValidatePassword (
     Status = EFI_SUCCESS;\r
   }\r
 \r
-  gBS->FreePool (Password);\r
-  gBS->FreePool (EncodedPassword);\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
-  DRIVER_SAMPLE_PRIVATE_DATA      *PrivateData,\r
-  EFI_STRING_ID                   StringId\r
+  IN DRIVER_SAMPLE_PRIVATE_DATA      *PrivateData,\r
+  IN EFI_STRING_ID                   StringId\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
   UINTN                           BufferSize;\r
   CHAR16                          *Password;\r
+  UINTN                           PasswordSize;\r
   DRIVER_SAMPLE_CONFIGURATION     *Configuration;\r
 \r
   //\r
@@ -168,8 +242,10 @@ SetPassword (
   // Get user input password\r
   //\r
   Password = &PrivateData->Configuration.WhatIsThePassword2[0];\r
-  ZeroMem (Password, 20 * sizeof (CHAR16));\r
-  Status = IfrLibGetString (PrivateData->HiiHandle[0], StringId, Password, &BufferSize);\r
+  PasswordSize = sizeof (PrivateData->Configuration.WhatIsThePassword2);\r
+  \r
+  ZeroMem (Password, PasswordSize);\r
+  Status = HiiLibGetString (PrivateData->HiiHandle[0], StringId, Password, &BufferSize);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -185,7 +261,7 @@ SetPassword (
     //\r
     // Update password's clear text in the screen\r
     //\r
-    CopyMem (Configuration->PasswordClearText, Password, 20 * sizeof (CHAR16));\r
+    CopyMem (Configuration->PasswordClearText, Password, PasswordSize);\r
 \r
     //\r
     // Update uncommitted data of Browser\r
@@ -199,12 +275,12 @@ SetPassword (
                NULL\r
                );\r
   }\r
-  gBS->FreePool (Configuration);\r
+  FreePool (Configuration);\r
 \r
   //\r
   // Set password\r
   //\r
-  EncodePassword (Password, 20 * sizeof (CHAR16));\r
+  EncodePassword (Password, PasswordSize);\r
   Status = gRT->SetVariable(\r
                   VariableName,\r
                   &mFormSetGuid,\r
@@ -259,6 +335,7 @@ ExtractConfig (
   PrivateData = DRIVER_SAMPLE_PRIVATE_FROM_THIS (This);\r
   HiiConfigRouting = PrivateData->HiiConfigRouting;\r
 \r
+  //\r
   //\r
   // Get Buffer Storage data from EFI variable\r
   //\r
@@ -274,6 +351,39 @@ ExtractConfig (
     return Status;\r
   }\r
 \r
+  if (Request == NULL) {\r
+    //\r
+    // Request is set to NULL, return all configurable elements together with ALTCFG\r
+    //\r
+    Status = ConstructConfigAltResp (\r
+               NULL,\r
+               NULL,\r
+               Results,\r
+               &mFormSetGuid,\r
+               VariableName,\r
+               PrivateData->DriverHandle[0],\r
+               &PrivateData->Configuration,\r
+               BufferSize,\r
+               VfrMyIfrNVDataBlockName,\r
+               2,\r
+               STRING_TOKEN (STR_STANDARD_DEFAULT_PROMPT),\r
+               VfrMyIfrNVDataDefault0000,\r
+               STRING_TOKEN (STR_MANUFACTURE_DEFAULT_PROMPT),\r
+               VfrMyIfrNVDataDefault0001\r
+               );\r
+\r
+    return Status;\r
+  }\r
+\r
+  //\r
+  // Check routing data in <ConfigHdr>.\r
+  // Note: if only one Storage is used, then this checking could be skipped.\r
+  //\r
+  if (!IsConfigHdrMatch (Request, &mFormSetGuid, VariableName)) {\r
+    *Progress = Request;\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
   //\r
   // Convert buffer data to <ConfigResp> by helper function BlockToConfig()\r
   //\r
@@ -320,9 +430,21 @@ RouteConfig (
   DRIVER_SAMPLE_PRIVATE_DATA       *PrivateData;\r
   EFI_HII_CONFIG_ROUTING_PROTOCOL  *HiiConfigRouting;\r
 \r
+  if (Configuration == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
   PrivateData = DRIVER_SAMPLE_PRIVATE_FROM_THIS (This);\r
   HiiConfigRouting = PrivateData->HiiConfigRouting;\r
 \r
+  // Check routing data in <ConfigHdr>.\r
+  // Note: if only one Storage is used, then this checking could be skipped.\r
+  //\r
+  if (!IsConfigHdrMatch (Configuration, &mFormSetGuid, VariableName)) {\r
+    *Progress = Configuration;\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
   //\r
   // Get Buffer Storage data from EFI variable\r
   //\r
@@ -405,6 +527,7 @@ DriverCallback (
   EFI_STATUS                      Status;\r
   EFI_HII_UPDATE_DATA             UpdateData;\r
   IFR_OPTION                      *IfrOptionList;\r
+  UINT8                           MyVar;\r
 \r
   if ((Value == NULL) || (ActionRequest == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -416,12 +539,9 @@ DriverCallback (
   switch (QuestionId) {\r
   case 0x1234:\r
     //\r
-    // Create dynamic page for this interactive goto\r
+    // Initialize the container for dynamic opcodes\r
     //\r
-    UpdateData.BufferSize = 0x1000;\r
-    UpdateData.Offset = 0;\r
-    UpdateData.Data = AllocatePool (0x1000);\r
-    ASSERT (UpdateData.Data != NULL);\r
+    IfrLibInitUpdateData (&UpdateData, 0x1000);\r
 \r
     IfrOptionList = AllocatePool (2 * sizeof (IFR_OPTION));\r
     ASSERT (IfrOptionList != NULL);\r
@@ -433,62 +553,127 @@ DriverCallback (
     IfrOptionList[1].StringToken  = STRING_TOKEN (STR_BOOT_OPTION2);\r
     IfrOptionList[1].Value.u8     = 2;\r
 \r
-    CreateActionOpCode (\r
-      0x1237,\r
-      STRING_TOKEN(STR_EXIT_TEXT),\r
-      STRING_TOKEN(STR_EXIT_TEXT),\r
-      EFI_IFR_FLAG_CALLBACK,\r
-      0,\r
-      &UpdateData\r
-      );\r
-\r
-    CreateOneOfOpCode (\r
-      0x8001,\r
-      0,\r
-      0,\r
-      STRING_TOKEN (STR_ONE_OF_PROMPT),\r
-      STRING_TOKEN (STR_ONE_OF_HELP),\r
-      EFI_IFR_FLAG_CALLBACK,\r
-      EFI_IFR_NUMERIC_SIZE_1,\r
-      IfrOptionList,\r
-      2,\r
-      &UpdateData\r
-      );\r
-\r
-    CreateOrderedListOpCode (\r
-      0x8002,\r
-      0,\r
-      0,\r
-      STRING_TOKEN (STR_BOOT_OPTIONS),\r
-      STRING_TOKEN (STR_BOOT_OPTIONS),\r
-      EFI_IFR_FLAG_RESET_REQUIRED,\r
-      0,\r
-      EFI_IFR_NUMERIC_SIZE_1,\r
-      10,\r
-      IfrOptionList,\r
-      2,\r
-      &UpdateData\r
-      );\r
-\r
-    CreateGotoOpCode (\r
-      1,\r
-      STRING_TOKEN (STR_GOTO_FORM1),\r
-      STRING_TOKEN (STR_GOTO_HELP),\r
-      0,\r
-      0x8003,\r
-      &UpdateData\r
-      );\r
-\r
-    Status = IfrLibUpdateForm (\r
-               PrivateData->HiiHandle[0],\r
-               &mFormSetGuid,\r
-               0x1234,\r
-               0x1234,\r
-               TRUE,\r
-               &UpdateData\r
-               );\r
-    gBS->FreePool (IfrOptionList);\r
-    gBS->FreePool (UpdateData.Data);\r
+      CreateActionOpCode (\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
+        &UpdateData                       // Container for dynamic created opcodes\r
+        );\r
+    \r
+      //\r
+      // Prepare initial value for the dynamic created oneof Question\r
+      //\r
+      PrivateData->Configuration.DynamicOneof = 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
+      CreateOneOfOpCode (\r
+        0x8001,                                    // Question ID (or call it "key")\r
+        CONFIGURATION_VARSTORE_ID,                 // VarStore ID\r
+        (UINT16) DYNAMIC_ONE_OF_VAR_OFFSET,        // Offset in Buffer Storage\r
+        STRING_TOKEN (STR_ONE_OF_PROMPT),          // Question prompt text\r
+        STRING_TOKEN (STR_ONE_OF_HELP),            // Question help text\r
+        EFI_IFR_FLAG_CALLBACK,                     // Question flag\r
+        EFI_IFR_NUMERIC_SIZE_1,                    // Data type of Question Value\r
+        IfrOptionList,                             // Option list\r
+        2,                                         // Number of options in Option list\r
+        &UpdateData                                // Container for dynamic created opcodes\r
+        );\r
+    \r
+      CreateOrderedListOpCode (\r
+        0x8002,                                    // Question ID\r
+        CONFIGURATION_VARSTORE_ID,                 // VarStore ID\r
+        (UINT16) DYNAMIC_ORDERED_LIST_VAR_OFFSET,  // Offset in Buffer Storage\r
+        STRING_TOKEN (STR_BOOT_OPTIONS),           // Question prompt text\r
+        STRING_TOKEN (STR_BOOT_OPTIONS),           // Question help text\r
+        EFI_IFR_FLAG_RESET_REQUIRED,               // Question flag\r
+        0,                                         // Ordered list flag, e.g. EFI_IFR_UNIQUE_SET\r
+        EFI_IFR_NUMERIC_SIZE_1,                    // Data type of Question value\r
+        5,                                         // Maximum container\r
+        IfrOptionList,                             // Option list\r
+        2,                                         // Number of options in Option list\r
+        &UpdateData                                // Container for dynamic created opcodes\r
+        );\r
+    \r
+      CreateGotoOpCode (\r
+        1,                                // Target Form ID\r
+        STRING_TOKEN (STR_GOTO_FORM1),    // Prompt text\r
+        STRING_TOKEN (STR_GOTO_HELP),     // Help text\r
+        0,                                // Question flag\r
+        0x8003,                           // Question ID\r
+        &UpdateData                       // Container for dynamic created opcodes\r
+        );\r
+    \r
+      Status = IfrLibUpdateForm (\r
+                 PrivateData->HiiHandle[0],  // HII handle\r
+                 &mFormSetGuid,              // Formset GUID\r
+                 0x1234,                     // Form ID\r
+                 0x1234,                     // Label for where to insert opcodes\r
+                 TRUE,                       // Append or replace\r
+                 &UpdateData                 // Dynamic created opcodes\r
+                 );\r
+      FreePool (IfrOptionList);\r
+      IfrLibFreeUpdateData (&UpdateData);\r
+      break;\r
+    \r
+    case 0x5678:\r
+      //\r
+      // We will reach here once the Question is refreshed\r
+      //\r
+      IfrLibInitUpdateData (&UpdateData, 0x1000);\r
+    \r
+      IfrOptionList = AllocatePool (2 * sizeof (IFR_OPTION));\r
+      ASSERT (IfrOptionList != NULL);\r
+    \r
+      CreateActionOpCode (\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
+        &UpdateData                       // Container for dynamic created opcodes\r
+        );\r
+    \r
+      Status = IfrLibUpdateForm (\r
+                 PrivateData->HiiHandle[0],  // HII handle\r
+                 &mFormSetGuid,              // Formset GUID\r
+                 3,                          // Form ID\r
+                 0x2234,                     // Label for where to insert opcodes\r
+                 TRUE,                       // Append or replace\r
+                 &UpdateData                 // Dynamic created opcodes\r
+                 );\r
+      IfrLibFreeUpdateData (&UpdateData);\r
+    \r
+      //\r
+      // Refresh the Question value\r
+      //\r
+      PrivateData->Configuration.DynamicRefresh++;\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
+    \r
+      //\r
+      // Change an EFI Variable storage (MyEfiVar) asynchronous, this will cause\r
+      // the first statement in Form 3 be suppressed\r
+      //\r
+      MyVar = 111;\r
+      Status = gRT->SetVariable(\r
+                      L"MyVar",\r
+                      &mFormSetGuid,\r
+                      EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
+                      1,\r
+                      &MyVar\r
+                      );\r
     break;\r
 \r
   case 0x1237:\r
@@ -537,6 +722,15 @@ DriverCallback (
   return Status;\r
 }\r
 \r
+/**\r
+  Main entry for this driver.\r
+  \r
+  @param ImageHandle     Image handle this driver.\r
+  @param SystemTable     Pointer to SystemTable.\r
+\r
+  @retval EFI_SUCESS     This function always complete successfully.\r
+\r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 DriverSampleInit (\r
@@ -548,8 +742,6 @@ DriverSampleInit (
   EFI_STATUS                      SavedStatus;\r
   EFI_HII_PACKAGE_LIST_HEADER     *PackageList;\r
   EFI_HII_HANDLE                  HiiHandle[2];\r
-  EFI_HANDLE                      DriverHandle[2];\r
-  DRIVER_SAMPLE_PRIVATE_DATA      *PrivateData;\r
   EFI_SCREEN_DESCRIPTOR           Screen;\r
   EFI_HII_DATABASE_PROTOCOL       *HiiDatabase;\r
   EFI_HII_STRING_PROTOCOL         *HiiString;\r
@@ -563,7 +755,6 @@ DriverSampleInit (
   //\r
   // Initialize the library and our protocol.\r
   //\r
-  //@MT: EfiInitializeDriverLib (ImageHandle, SystemTable);\r
 \r
   //\r
   // Initialize screen dimensions for SendForm().\r
@@ -626,27 +817,22 @@ DriverSampleInit (
   }\r
   PrivateData->HiiConfigRouting = HiiConfigRouting;\r
 \r
-  //\r
-  // Install Config Access protocol\r
-  //\r
-  Status = HiiLibCreateHiiDriverHandle (&DriverHandle[0]);\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
-  PrivateData->DriverHandle[0] = DriverHandle[0];\r
-\r
-  Status = gBS->InstallProtocolInterface (\r
+  Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &DriverHandle[0],\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  &mHiiVendorDevicePath0,\r
                   &gEfiHiiConfigAccessProtocolGuid,\r
-                  EFI_NATIVE_INTERFACE,\r
-                  &PrivateData->ConfigAccess\r
+                  &PrivateData->ConfigAccess,\r
+                  NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
+  PrivateData->DriverHandle[0] = DriverHandle[0];\r
+\r
   //\r
   // Publish our HII data\r
   //\r
-  PackageList = PreparePackageList (\r
+  PackageList = HiiLibPreparePackageList (\r
                   2,\r
                   &mFormSetGuid,\r
                   DriverSampleStrings,\r
@@ -662,7 +848,7 @@ DriverSampleInit (
                           DriverHandle[0],\r
                           &HiiHandle[0]\r
                           );\r
-  gBS->FreePool (PackageList);\r
+  FreePool (PackageList);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -671,13 +857,17 @@ DriverSampleInit (
   //\r
   // Publish another Fromset\r
   //\r
-  Status = HiiLibCreateHiiDriverHandle (&DriverHandle[1]);\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
+  Status = gBS->InstallMultipleProtocolInterfaces (\r
+                  &DriverHandle[1],\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  &mHiiVendorDevicePath1,\r
+                  NULL\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
   PrivateData->DriverHandle[1] = DriverHandle[1];\r
 \r
-  PackageList = PreparePackageList (\r
+  PackageList = HiiLibPreparePackageList (\r
                   2,\r
                   &mInventoryGuid,\r
                   DriverSampleStrings,\r
@@ -693,7 +883,7 @@ DriverSampleInit (
                           DriverHandle[1],\r
                           &HiiHandle[1]\r
                           );\r
-  gBS->FreePool (PackageList);\r
+  FreePool (PackageList);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -705,7 +895,7 @@ DriverSampleInit (
   //\r
   NewString = L"700 Mhz";\r
 \r
-  Status = IfrLibSetString (HiiHandle[0], STRING_TOKEN (STR_CPU_STRING2), NewString);\r
+  Status = HiiLibSetString (HiiHandle[0], STRING_TOKEN (STR_CPU_STRING2), NewString);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -732,7 +922,7 @@ DriverSampleInit (
     // based on default values stored in IFR\r
     //\r
     BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
-    Status = ExtractDefault (Configuration, &BufferSize, 1, VfrMyIfrNVDataDefault0000);\r
+    Status = IfrLibExtractDefault (Configuration, &BufferSize, 1, VfrMyIfrNVDataDefault0000);\r
 \r
     if (!EFI_ERROR (Status)) {\r
       gRT->SetVariable(\r
@@ -748,40 +938,68 @@ DriverSampleInit (
   //\r
   // Example of how to display only the item we sent to HII\r
   //\r
-  if (DISPLAY_ONLY_MY_ITEM == 0x0001) {\r
-    //\r
-    // Have the browser pull out our copy of the data, and only display our data\r
-    //\r
-    //    Status = FormConfig->SendForm (FormConfig, TRUE, HiiHandle, NULL, NULL, NULL, &Screen, NULL);\r
-    //\r
-    Status = FormBrowser2->SendForm (\r
-                             FormBrowser2,\r
-                             HiiHandle,\r
-                             1,\r
-                             NULL,\r
-                             0,\r
-                             NULL,\r
-                             NULL\r
-                             );\r
-    SavedStatus = Status;\r
-\r
-    Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[0]);\r
-    if (EFI_ERROR (Status)) {\r
-      return Status;\r
-    }\r
+  //\r
+  // Have the browser pull out our copy of the data, and only display our data\r
+  //\r
+  Status = FormBrowser2->SendForm (\r
+                           FormBrowser2,\r
+                           &(HiiHandle[DISPLAY_ONLY_MY_ITEM]),\r
+                           1,\r
+                           NULL,\r
+                           0,\r
+                           NULL,\r
+                           NULL\r
+                           );\r
+  SavedStatus = Status;\r
 \r
-    Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[1]);\r
-    if (EFI_ERROR (Status)) {\r
-      return Status;\r
-    }\r
+  Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[0]);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
 \r
-    return SavedStatus;\r
-  } else {\r
-    //\r
-    // Have the browser pull out all the data in the HII Database and display it.\r
-    //\r
-    //    Status = FormConfig->SendForm (FormConfig, TRUE, 0, NULL, NULL, NULL, NULL, NULL);\r
-    //\r
+  Status = HiiDatabase->RemovePackageList (HiiDatabase, HiiHandle[1]);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  return SavedStatus;\r
+}\r
+\r
+/**\r
+  Unloads the application and its installed protocol.\r
+\r
+  @param[in]  ImageHandle       Handle that identifies the image to be unloaded.\r
+\r
+  @retval EFI_SUCCESS           The image has been unloaded.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+DriverSampleUnload (\r
+  IN EFI_HANDLE  ImageHandle\r
+  )\r
+{\r
+  if (DriverHandle[0] != NULL) {\r
+    gBS->UninstallMultipleProtocolInterfaces (\r
+            DriverHandle[0],\r
+            &gEfiDevicePathProtocolGuid,\r
+            &mHiiVendorDevicePath0,\r
+            &gEfiHiiConfigAccessProtocolGuid,\r
+            &PrivateData->ConfigAccess,\r
+            NULL\r
+           );\r
+  }\r
+\r
+  if (DriverHandle[1] != NULL) {\r
+    gBS->UninstallMultipleProtocolInterfaces (\r
+            DriverHandle[1],\r
+            &gEfiDevicePathProtocolGuid,\r
+            &mHiiVendorDevicePath1,\r
+            NULL\r
+           );\r
+  }\r
+\r
+  if (PrivateData != NULL) {\r
+    FreePool (PrivateData);\r
   }\r
 \r
   return EFI_SUCCESS;\r