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 - 2015, 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
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
};\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
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
- &gDriverSampleFormSetGuid,\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
- &gDriverSampleFormSetGuid,\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;\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 (&gDriverSampleFormSetGuid, 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
- &gDriverSampleFormSetGuid,\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
- &gDriverSampleFormSetGuid,\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
\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
}\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
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
\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
\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
//\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
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
EFI_STRING Results;\r
UINT32 ProgressErr;\r
CHAR16 *TmpStr;\r
- \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
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
\r
case EFI_BROWSER_ACTION_RETRIEVE:\r
{\r
- if (QuestionId == 0x1248) {\r
- {\r
- if (Type != EFI_IFR_TYPE_REF) {\r
- return EFI_INVALID_PARAMETER;\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
+ // Refresh the Question value\r
+ //\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
+\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
- \r
- Value->ref.FormId = 0x3;\r
+ FreePool (EfiData);\r
}\r
+ break;\r
}\r
}\r
break;\r
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
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 = 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
- // Refresh the Question value\r
- //\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
-\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
- 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
- //\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
- }\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
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
EFI_STRING NameRequestHdr;\r
MY_EFI_VARSTORE_DATA *VarStoreConfig;\r
EFI_INPUT_KEY HotKey;\r
- EFI_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx;\r
+ EDKII_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx;\r
\r
//\r
// Initialize the local variables.\r
//\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
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
- PrivateData->HiiDatabase = HiiDatabase;\r
+ mPrivateData->HiiDatabase = HiiDatabase;\r
\r
//\r
// Locate HiiString protocol\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
- PrivateData->HiiString = HiiString;\r
+ mPrivateData->HiiString = HiiString;\r
\r
//\r
// Locate Formbrowser2 protocol\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
- PrivateData->FormBrowser2 = FormBrowser2;\r
+ mPrivateData->FormBrowser2 = FormBrowser2;\r
\r
//\r
// Locate ConfigRouting protocol\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
- PrivateData->HiiConfigRouting = HiiConfigRouting;\r
+ mPrivateData->HiiConfigRouting = HiiConfigRouting;\r
\r
//\r
// Locate keyword handler protocol\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
- PrivateData->HiiKeywordHandler = HiiKeywordHandler;\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
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
&gEfiDevicePathProtocolGuid,\r
&mHiiVendorDevicePath1,\r
&gEfiHiiConfigAccessProtocolGuid,\r
- &PrivateData->ConfigAccess,\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
&gDriverSampleInventoryGuid,\r
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
// 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
//\r
// Initialize efi varstore configuration data\r
//\r
- VarStoreConfig = &PrivateData->VarStoreConfig;\r
+ VarStoreConfig = &mPrivateData->VarStoreConfig;\r
ZeroMem (VarStoreConfig, sizeof (MY_EFI_VARSTORE_DATA));\r
\r
ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, MyEfiVar, DriverHandle[0]);\r
Status = gBS->CreateEventEx (\r
EVT_NOTIFY_SIGNAL, \r
TPL_NOTIFY,\r
- DriverSampleInternalEmptyFunction,\r
+ EfiEventEmptyFunction,\r
NULL,\r
&gEfiIfrRefreshIdOpGuid,\r
&mEvent\r
//\r
// Example of how to use BrowserEx protocol to register HotKey.\r
// \r
- Status = gBS->LocateProtocol (&gEfiFormBrowserExProtocolGuid, NULL, (VOID **) &FormBrowserEx);\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
// Register the default HotKey F9 and F10 again.\r
//\r
HotKey.ScanCode = SCAN_F10;\r
- NewString = HiiGetString (PrivateData->HiiHandle[0], STRING_TOKEN (FUNCTION_TEN_STRING), NULL);\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 (PrivateData->HiiHandle[0], STRING_TOKEN (FUNCTION_NINE_STRING), NULL);\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
UINTN Index;\r
\r
- ASSERT (PrivateData != NULL);\r
+ ASSERT (mPrivateData != NULL);\r
\r
if (DriverHandle[0] != NULL) {\r
gBS->UninstallMultipleProtocolInterfaces (\r
&gEfiDevicePathProtocolGuid,\r
&mHiiVendorDevicePath0,\r
&gEfiHiiConfigAccessProtocolGuid,\r
- &PrivateData->ConfigAccess,\r
+ &mPrivateData->ConfigAccess,\r
NULL\r
);\r
DriverHandle[0] = NULL;\r
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
projects / mirror_edk2.git / blobdiff