Add two new methods to get default value, also add sample code in sample driver.

Add sample code to use time opcode

Signed-off-by:  ydong10
Reviewed-by: lgao4


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11688 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 613 insertions, 5 deletions

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index 947df96b2c..618aa92dc9 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -334,6 +334,277 @@ LoadNameValueNames (
   return EFI_SUCCESS;

 }

 

+

+/**

+  Get the value of <Number> in <BlockConfig> format, i.e. the value of OFFSET

+  or WIDTH or VALUE.

+  <BlockConfig> ::= 'OFFSET='<Number>&'WIDTH='<Number>&'VALUE'=<Number>

+

+  This is a internal function.

+

+  @param  StringPtr              String in <BlockConfig> format and points to the

+                                 first character of <Number>.

+  @param  Number                 The output value. Caller takes the responsibility

+                                 to free memory.

+  @param  Len                    Length of the <Number>, in characters.

+

+  @retval EFI_OUT_OF_RESOURCES   Insufficient resources to store neccessary

+                                 structures.

+  @retval EFI_SUCCESS            Value of <Number> is outputted in Number

+                                 successfully.

+

+**/

+EFI_STATUS

+GetValueOfNumber (

+  IN EFI_STRING                    StringPtr,

+  OUT UINT8                        **Number,

+  OUT UINTN                        *Len

+  )

+{

+  EFI_STRING               TmpPtr;

+  UINTN                    Length;

+  EFI_STRING               Str;

+  UINT8                    *Buf;

+  EFI_STATUS               Status;

+  UINT8                    DigitUint8;

+  UINTN                    Index;

+  CHAR16                   TemStr[2];

+

+  if (StringPtr == NULL || *StringPtr == L'\0' || Number == NULL || Len == NULL) {

+    return EFI_INVALID_PARAMETER;

+  }

+

+  Buf = NULL;

+

+  TmpPtr = StringPtr;

+  while (*StringPtr != L'\0' && *StringPtr != L'&') {

+    StringPtr++;

+  }

+  *Len   = StringPtr - TmpPtr;

+  Length = *Len + 1;

+

+  Str = (EFI_STRING) AllocateZeroPool (Length * sizeof (CHAR16));

+  if (Str == NULL) {

+    Status = EFI_OUT_OF_RESOURCES;

+    goto Exit;

+  }

+  CopyMem (Str, TmpPtr, *Len * sizeof (CHAR16));

+  *(Str + *Len) = L'\0';

+

+  Length = (Length + 1) / 2;

+  Buf = (UINT8 *) AllocateZeroPool (Length);

+  if (Buf == NULL) {

+    Status = EFI_OUT_OF_RESOURCES;

+    goto Exit;

+  }

+  

+  Length = *Len;

+  ZeroMem (TemStr, sizeof (TemStr));

+  for (Index = 0; Index < Length; Index ++) {

+    TemStr[0] = Str[Length - Index - 1];

+    DigitUint8 = (UINT8) StrHexToUint64 (TemStr);

+    if ((Index & 1) == 0) {

+      Buf [Index/2] = DigitUint8;

+    } else {

+      Buf [Index/2] = (UINT8) ((DigitUint8 << 4) + Buf [Index/2]);

+    }

+  }

+

+  *Number = Buf;

+  Status  = EFI_SUCCESS;

+

+Exit:

+  if (Str != NULL) {

+    FreePool (Str);

+  }

+

+  return Status;

+}

+

+/**

+  Create altcfg string. 

+

+  @param  Result               The request result string.

+  @param  ConfigHdr            The request head info. <ConfigHdr> format.

+  @param  Offset               The offset of the parameter int he structure.

+  @param  Width                The width of the parameter.

+

+

+  @retval  The string with altcfg info append at the end.

+**/

+EFI_STRING 

+CreateAltCfgString (

+  IN     EFI_STRING     Result,

+  IN     EFI_STRING     ConfigHdr,

+  IN     UINTN          Offset,

+  IN     UINTN          Width

+  )

+{

+  EFI_STRING StringPtr;

+  EFI_STRING TmpStr;

+  UINTN      NewLen;

+

+  NewLen = (((1 + StrLen (ConfigHdr) + 8 + 4) + (8 + 4 + 7 + 4 + 7 + 4)) * 2 + StrLen (Result)) * sizeof (CHAR16);

+  StringPtr = AllocateZeroPool (NewLen);

+  if (StringPtr == NULL) {

+    return NULL;

+  }

+

+  TmpStr = StringPtr;

+  if (Result != NULL) {

+    StrCpy (StringPtr, Result);

+    StringPtr += StrLen (Result);  

+    FreePool (Result);

+  }

+  

+  UnicodeSPrint (

+  StringPtr, 

+  (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16), 

+  L"&%s&ALTCFG=%04x", 

+  ConfigHdr, 

+  EFI_HII_DEFAULT_CLASS_STANDARD

+  );

+  StringPtr += StrLen (StringPtr);

+

+  UnicodeSPrint (

+    StringPtr, 

+    (8 + 4 + 7 + 4 + 7 + 4 + 1) * sizeof (CHAR16),

+    L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x", 

+    Offset, 

+    Width,

+    DEFAULT_CLASS_STANDARD_VALUE

+    );

+  StringPtr += StrLen (StringPtr);  

+

+  UnicodeSPrint (

+  StringPtr, 

+  (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16), 

+  L"&%s&ALTCFG=%04x", 

+  ConfigHdr, 

+  EFI_HII_DEFAULT_CLASS_MANUFACTURING

+  );

+  StringPtr += StrLen (StringPtr);

+

+  UnicodeSPrint (

+    StringPtr, 

+    (8 + 4 + 7 + 4 + 7 + 4 + 1) * sizeof (CHAR16),

+    L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x", 

+    Offset, 

+    Width,

+    DEFAULT_CLASS_MANUFACTURING_VALUE

+    );

+  StringPtr += StrLen (StringPtr); 

+

+  return TmpStr;

+}

+

+/**

+  Check whether need to add the altcfg string. if need to add, add the altcfg 

+  string.

+

+  @param  RequestResult              The request result string.

+  @param  ConfigRequestHdr           The request head info. <ConfigHdr> format.

+

+**/

+VOID 

+AppendAltCfgString (

+  IN OUT EFI_STRING                       *RequestResult,

+  IN     EFI_STRING                       ConfigRequestHdr

+  )

+{

+  EFI_STRING                          StringPtr;

+  EFI_STRING                          TmpPtr;

+  UINTN                               Length;

+  UINT8                               *TmpBuffer;

+  UINTN                               Offset;

+  UINTN                               Width;

+  UINTN                               BlockSize;

+  UINTN                               ValueOffset;

+  UINTN                               ValueWidth;

+  EFI_STATUS                          Status;

+

+  StringPtr = *RequestResult;

+  StringPtr = StrStr (StringPtr, L"OFFSET");

+  BlockSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);

+  ValueOffset = OFFSET_OF (DRIVER_SAMPLE_CONFIGURATION, GetDefaultValueFromAccess);

+  ValueWidth  = sizeof (((DRIVER_SAMPLE_CONFIGURATION *)0)->GetDefaultValueFromAccess);

+

+  if (StringPtr == NULL) {

+    return;

+  }

+

+  while (*StringPtr != 0 && StrnCmp (StringPtr, L"OFFSET=", StrLen (L"OFFSET=")) == 0) {

+    //

+    // Back up the header of one <BlockName>

+    //

+    TmpPtr = StringPtr;

+

+    StringPtr += StrLen (L"OFFSET=");

+    //

+    // Get Offset

+    //

+    Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);

+    if (EFI_ERROR (Status)) {

+      return;

+    }

+    Offset = 0;

+    CopyMem (

+     &Offset,

+     TmpBuffer,

+     (((Length + 1) / 2) < sizeof (UINTN)) ? ((Length + 1) / 2) : sizeof (UINTN)

+     );

+    FreePool (TmpBuffer);

+

+    StringPtr += Length;

+    if (StrnCmp (StringPtr, L"&WIDTH=", StrLen (L"&WIDTH=")) != 0) {

+      return;

+    }

+    StringPtr += StrLen (L"&WIDTH=");

+

+    //

+    // Get Width

+    //

+    Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);

+    if (EFI_ERROR (Status)) {

+      return;

+    }

+    Width = 0;

+    CopyMem (

+     &Width,

+     TmpBuffer,

+     (((Length + 1) / 2) < sizeof (UINTN)) ? ((Length + 1) / 2) : sizeof (UINTN)

+     );

+    FreePool (TmpBuffer);

+

+    StringPtr += Length;

+    if (StrnCmp (StringPtr, L"&VALUE=", StrLen (L"&VALUE=")) != 0) {

+      return;

+    }

+    StringPtr += StrLen (L"&VALUE=");

+

+    //

+    // Get Width

+    //

+    Status = GetValueOfNumber (StringPtr, &TmpBuffer, &Length);

+    if (EFI_ERROR (Status)) {

+      return;

+    }

+    StringPtr += Length;

+

+    //

+    // Calculate Value and convert it to hex string.

+    //

+    if (Offset + Width > BlockSize) {

+      return;

+    }

+

+    if (Offset <= ValueOffset && Offset + Width >= ValueOffset + ValueWidth) {

+      *RequestResult = CreateAltCfgString(*RequestResult, ConfigRequestHdr, Offset, Width);

+	    return;

+    }

+  }

+}

+

 /**

   This function allows a caller to extract the current configuration for one

   or more named elements from the target driver.

@@ -429,6 +700,7 @@ ExtractConfig (
     AllocatedRequest = TRUE;

     UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);

     FreePool (ConfigRequestHdr);

+    ConfigRequestHdr = NULL;

   } else {

     //

     // Check routing data in <ConfigHdr>.

@@ -557,6 +829,8 @@ ExtractConfig (
                                   Results,

                                   Progress

                                   );

+    ConfigRequestHdr = HiiConstructConfigHdr (&mFormSetGuid, VariableName, PrivateData->DriverHandle[0]);

+    AppendAltCfgString(Results, ConfigRequestHdr);

   }

 

   //

@@ -565,6 +839,10 @@ ExtractConfig (
   if (AllocatedRequest) {

     FreePool (ConfigRequest);

   }

+

+  if (ConfigRequestHdr != NULL) {

+    FreePool (ConfigRequestHdr);

+  }

   //

   // Set Progress string to the original request string.

   //

@@ -939,6 +1217,34 @@ DriverCallback (
     }

     break;

 

+  case EFI_BROWSER_ACTION_DEFAULT_STANDARD:

+    {

+      switch (QuestionId) {

+      case 0x1240:

+        Value->u8 = DEFAULT_CLASS_STANDARD_VALUE;

+      break;

+

+      default:

+        Status = EFI_UNSUPPORTED;

+      break;

+      }

+    }

+    break;

+

+  case EFI_BROWSER_ACTION_DEFAULT_MANUFACTURING:

+    {

+      switch (QuestionId) {

+      case 0x1240:

+        Value->u8 = DEFAULT_CLASS_MANUFACTURING_VALUE;

+      break;

+

+      default:

+        Status = EFI_UNSUPPORTED;      

+      break;

+      }

+    }

+    break;

+

   case EFI_BROWSER_ACTION_CHANGING:

   {

     switch (QuestionId) {

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index 728c44abce..a6445664df 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -65,6 +65,9 @@ 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 DEFAULT_CLASS_MANUFACTURING_VALUE     0xFF

+#define DEFAULT_CLASS_STANDARD_VALUE          0x0

+

 //

 // Number of name in Name/Value storage

 //

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
index cf71dfce39..8926ab0177 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
@@ -74,6 +74,9 @@ typedef struct {
   UINT8   SerialPortStatus;

   UINT16  SerialPortIo;

   UINT8   SerialPortIrq;

+  UINT8   GetDefaultValueFromCallBack;

+  UINT8   GetDefaultValueFromAccess;

+  EFI_HII_TIME  Time;

 } DRIVER_SAMPLE_CONFIGURATION;

 

 //

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 00982700b7..fce22fef2f 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -385,6 +385,28 @@ formset
         

       endnumeric;

     endif;

+

+    numeric varid   = MyIfrNVData.GetDefaultValueFromAccess,

+            questionid = 0x1239,

+            prompt  = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_ACCESS_PROMPT),

+            help    = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_ACCESS_HELP),

+            flags   = DISPLAY_UINT_HEX | INTERACTIVE, 

+            minimum = 0,

+            maximum = 255,

+            step    = 1,

+            default = 18,

+    endnumeric;

+

+    numeric varid   = MyIfrNVData.GetDefaultValueFromCallBack,

+            questionid = 0x1240,

+            prompt  = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_PROMPT),

+            help    = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_HELP),

+            flags   = DISPLAY_UINT_HEX | INTERACTIVE, 

+            minimum = 0,

+            maximum = 255,

+            step    = 1,

+            default = 18,

+    endnumeric;

         

     resetbutton

       defaultstore = MyStandardDefault,

@@ -533,7 +555,16 @@ formset
               default       = 0,

 

       endtime;

-

+      

+      time 

+            name    = MyTime, 

+            varid   = MyIfrNVData.Time, 

+            prompt  = STRING_TOKEN(STR_TIME_PROMPT), 

+            help    = STRING_TOKEN(STR_TIME_PROMPT), 

+            flags   = STORAGE_NORMAL, 

+            default = 15:33:33, 

+      endtime;

+      

       checkbox varid   = MyIfrNVData.ChooseToActivateNuclearWeaponry,

               prompt   = STRING_TOKEN(STR_CHECK_BOX_PROMPT),

               help     = STRING_TOKEN(STR_CHECK_BOX_HELP),

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
index 5b65a1bc1b..1901fd8d2e 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index ca766a24bc..8dc1651950 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1027,6 +1027,11 @@ SetupBrowser (
           default:

             break;

           }

+        } else if (Status == EFI_UNSUPPORTED) {

+          //

+          // If return EFI_UNSUPPORTED, also consider Hii driver suceess deal with it.

+          //

+          Status = EFI_SUCCESS;

         }

       }

       if (SubmitFormIsRequired) {

@@ -1151,6 +1156,11 @@ SetupBrowser (
             Selection->FormId = Selection->Form->FormId;

             Selection->QuestionId = 0;

           }

+        } else {

+          //

+          // If return EFI_UNSUPPORTED, also consider Hii driver suceess deal with it.

+          //

+          Status = EFI_SUCCESS;

         }

       }

 

@@ -1216,6 +1226,11 @@ SetupBrowser (
           default:

             break;

           }

+        } else if (Status == EFI_UNSUPPORTED) {

+          //

+          // If return EFI_UNSUPPORTED, also consider Hii driver suceess deal with it.

+          //

+          Status = EFI_SUCCESS;

         }

       }

       if (SubmitFormIsRequired) {

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index ea98d46db9..67a4aeb7ec 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -1804,6 +1804,221 @@ SubmitForm (
   return EFI_SUCCESS;

 }

 

+/**

+  Get Question default value from AltCfg string.

+

+  @param  FormSet                The form set.

+  @param  Question               The question.

+  @param  DefaultId              The default Id.

+

+  @retval EFI_SUCCESS            Question is reset to default value.

+

+**/

+EFI_STATUS

+GetDefaultValueFromAltCfg (

+  IN     FORM_BROWSER_FORMSET             *FormSet,

+  IN OUT FORM_BROWSER_STATEMENT           *Question,

+  IN     UINT16                           DefaultId

+  )

+{

+  BOOLEAN             IsBufferStorage;

+  BOOLEAN             IsString;  

+  UINTN               Length;

+  FORMSET_STORAGE     *Storage;

+  CHAR16              *ConfigRequest;

+  CHAR16              *Progress;

+  CHAR16              *Result;

+  CHAR16              *ConfigResp;

+  CHAR16              *Value;

+  CHAR16              *StringPtr;

+  UINTN               LengthStr;

+  UINT8               *Dst;

+  CHAR16              TemStr[5];

+  UINTN               Index;

+  UINT8               DigitUint8;

+  EFI_STATUS          Status;

+

+  Status        = EFI_NOT_FOUND;

+  Length        = 0;

+  Dst           = NULL;

+  ConfigRequest = NULL;

+  Result        = NULL;

+  ConfigResp    = NULL;

+  Storage       = Question->Storage;

+

+  if ((Storage == NULL) || (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE)) {

+    return Status;

+  }

+

+  //

+  // Question Value is provided by Buffer Storage or NameValue Storage

+  //

+  if (Question->BufferValue != NULL) {

+    //

+    // This Question is password or orderedlist

+    //

+    Dst = Question->BufferValue;

+  } else {

+    //

+    // Other type of Questions

+    //

+    Dst = (UINT8 *) &Question->HiiValue.Value;

+  }

+

+  IsBufferStorage = (BOOLEAN) ((Storage->Type == EFI_HII_VARSTORE_BUFFER) ? TRUE : FALSE);

+  IsString = (BOOLEAN) ((Question->HiiValue.Type == EFI_IFR_TYPE_STRING) ?  TRUE : FALSE);

+

+  //

+  // <ConfigRequest> ::= <ConfigHdr> + <BlockName> ||

+  //                   <ConfigHdr> + "&" + <VariableName>

+  //

+  if (IsBufferStorage) {

+    Length  = StrLen (Storage->ConfigHdr);

+    Length += StrLen (Question->BlockName);

+  } else {

+    Length  = StrLen (Storage->ConfigHdr);

+    Length += StrLen (Question->VariableName) + 1;

+  }

+  ConfigRequest = AllocateZeroPool ((Length + 1) * sizeof (CHAR16));

+  ASSERT (ConfigRequest != NULL);

+

+  StrCpy (ConfigRequest, Storage->ConfigHdr);

+  if (IsBufferStorage) {

+    StrCat (ConfigRequest, Question->BlockName);

+  } else {

+    StrCat (ConfigRequest, L"&");

+    StrCat (ConfigRequest, Question->VariableName);

+  }

+

+  Status = FormSet->ConfigAccess->ExtractConfig (

+                                    FormSet->ConfigAccess,

+                                    ConfigRequest,

+                                    &Progress,

+                                    &Result

+                                    );

+  if (EFI_ERROR (Status)) {

+    goto Done;

+  }

+

+  //

+  // Call ConfigRouting GetAltCfg(ConfigRoute, <ConfigResponse>, Guid, Name, DevicePath, AltCfgId, AltCfgResp)

+  //    Get the default configuration string according to the default ID.

+  //

+  Status = mHiiConfigRouting->GetAltConfig (

+                                mHiiConfigRouting,

+                                Result,

+                                &Storage->Guid,

+                                Storage->Name,

+                                NULL,

+                                &DefaultId,  // it can be NULL to get the current setting.

+                                &ConfigResp

+                              );

+  

+  //

+  // The required setting can't be found. So, it is not required to be validated and set.

+  //

+  if (EFI_ERROR (Status)) {

+    goto Done;

+  }

+

+  //

+  // Skip <ConfigRequest>

+  //

+  Value = StrStr (ConfigResp, L"&VALUE");

+  if (IsBufferStorage) {

+    //

+    // Skip "&VALUE"

+    //

+    Value = Value + 6;

+  }

+  if (*Value != '=') {

+    Status = EFI_NOT_FOUND;

+    goto Done;

+  }

+  //

+  // Skip '=', point to value

+  //

+  Value = Value + 1;

+

+  //

+  // Suppress <AltResp> if any

+  //

+  StringPtr = Value;

+  while (*StringPtr != L'\0' && *StringPtr != L'&') {

+    StringPtr++;

+  }

+  *StringPtr = L'\0';

+

+  LengthStr = StrLen (Value);

+  if (!IsBufferStorage && IsString) {

+    StringPtr = (CHAR16 *) Dst;

+    ZeroMem (TemStr, sizeof (TemStr));

+    for (Index = 0; Index < LengthStr; Index += 4) {

+      StrnCpy (TemStr, Value + Index, 4);

+      StringPtr[Index/4] = (CHAR16) StrHexToUint64 (TemStr);

+    }

+    //

+    // Add tailing L'\0' character

+    //

+    StringPtr[Index/4] = L'\0';

+  } else {

+    ZeroMem (TemStr, sizeof (TemStr));

+    for (Index = 0; Index < LengthStr; Index ++) {

+      TemStr[0] = Value[LengthStr - Index - 1];

+      DigitUint8 = (UINT8) StrHexToUint64 (TemStr);

+      if ((Index & 1) == 0) {

+        Dst [Index/2] = DigitUint8;

+      } else {

+        Dst [Index/2] = (UINT8) ((DigitUint8 << 4) + Dst [Index/2]);

+      }

+    }

+  }

+

+Done:

+  if (ConfigRequest != NULL){

+    FreePool (ConfigRequest);

+  }

+

+  if (ConfigResp != NULL) {

+    FreePool (ConfigResp);

+  }

+  

+  if (Result != NULL) {

+    FreePool (Result);

+  }

+

+  return Status;

+}

+

+/**

+  Get default Id value used for browser.

+

+  @param  DefaultId              The default id value used by hii.

+

+  @retval Browser used default value.

+

+**/

+INTN

+GetDefaultIdForCallBack (

+  UINTN DefaultId

+  )

+{ 

+  if (DefaultId == EFI_HII_DEFAULT_CLASS_STANDARD) {

+    return EFI_BROWSER_ACTION_DEFAULT_STANDARD;

+  } else if (DefaultId == EFI_HII_DEFAULT_CLASS_MANUFACTURING) {

+    return EFI_BROWSER_ACTION_DEFAULT_MANUFACTURING;

+  } else if (DefaultId == EFI_HII_DEFAULT_CLASS_SAFE) {

+    return EFI_BROWSER_ACTION_DEFAULT_SAFE;

+  } else if (DefaultId >= EFI_HII_DEFAULT_CLASS_PLATFORM_BEGIN && DefaultId < EFI_HII_DEFAULT_CLASS_PLATFORM_BEGIN + 0x1000) {

+    return EFI_BROWSER_ACTION_DEFAULT_PLATFORM + DefaultId - EFI_HII_DEFAULT_CLASS_PLATFORM_BEGIN;

+  } else if (DefaultId >= EFI_HII_DEFAULT_CLASS_HARDWARE_BEGIN && DefaultId < EFI_HII_DEFAULT_CLASS_HARDWARE_BEGIN + 0x1000) {

+    return EFI_BROWSER_ACTION_DEFAULT_HARDWARE + DefaultId - EFI_HII_DEFAULT_CLASS_HARDWARE_BEGIN;

+  } else if (DefaultId >= EFI_HII_DEFAULT_CLASS_FIRMWARE_BEGIN && DefaultId < EFI_HII_DEFAULT_CLASS_FIRMWARE_BEGIN + 0x1000) {

+    return EFI_BROWSER_ACTION_DEFAULT_FIRMWARE + DefaultId - EFI_HII_DEFAULT_CLASS_FIRMWARE_BEGIN;

+  } else {

+    return -1;

+  }

+}

 

 /**

   Reset Question to its default value.

@@ -1831,6 +2046,9 @@ GetQuestionDefault (
   EFI_HII_VALUE           *HiiValue;

   UINT8                   Index;

   EFI_STRING              StrValue;

+  EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess;

+  EFI_BROWSER_ACTION_REQUEST      ActionRequest;

+  INTN                            Action;

 

   Status   = EFI_SUCCESS;

   StrValue = NULL;

@@ -1843,14 +2061,46 @@ GetQuestionDefault (
   }

 

   //

-  // There are three ways to specify default value for a Question:

-  //  1, use nested EFI_IFR_DEFAULT (highest priority)

-  //  2, set flags of EFI_ONE_OF_OPTION (provide Standard and Manufacturing default)

-  //  3, set flags of EFI_IFR_CHECKBOX (provide Standard and Manufacturing default) (lowest priority)

+  // There are Five ways to specify default value for a Question:

+  //  1, use call back function (highest priority)

+  //  2, use ExtractConfig function

+  //  3, use nested EFI_IFR_DEFAULT 

+  //  4, set flags of EFI_ONE_OF_OPTION (provide Standard and Manufacturing default)

+  //  5, set flags of EFI_IFR_CHECKBOX (provide Standard and Manufacturing default) (lowest priority)

   //

   HiiValue = &Question->HiiValue;

 

   //

+  // Get Question defaut value from call back function.

+  //

+  ConfigAccess = FormSet->ConfigAccess;

+  Action = GetDefaultIdForCallBack (DefaultId);

+  if ((Action > 0) && ((Question->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != 0) && (ConfigAccess != NULL)) {

+    ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;

+    Status = ConfigAccess->Callback (

+                             ConfigAccess,

+                             Action,

+                             Question->QuestionId,

+                             HiiValue->Type,

+                             &HiiValue->Value,

+                             &ActionRequest

+                             );

+    if (!EFI_ERROR (Status)) {

+      return Status;

+    }

+  }

+

+  //

+  // Get default value from altcfg string.

+  //

+  if (ConfigAccess != NULL) {  

+    Status = GetDefaultValueFromAltCfg(FormSet, Question, DefaultId);

+    if (!EFI_ERROR (Status)) {

+        return Status;

+    }

+  }

+

+  //

   // EFI_IFR_DEFAULT has highest priority

   //

   if (!IsListEmpty (&Question->DefaultListHead)) {