From 1d451ff9cf3427c5dc4ba1650d33b1b5aad76d7f Mon Sep 17 00:00:00 2001 From: lgao4 Date: Mon, 27 Apr 2009 04:55:02 +0000 Subject: Update HiiGetBrowserData API git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8176 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/BdsDxe/BootMaint/BootMaint.c | 22 ++-------------------- .../Universal/BdsDxe/BootMaint/FileExplorer.c | 7 +------ 2 files changed, 3 insertions(+), 26 deletions(-) (limited to 'IntelFrameworkModulePkg') diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c index 1e8e593059..da5611d2de 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c @@ -271,18 +271,8 @@ BootMaintCallback ( // // Retrive uncommitted data from Form Browser // - CurrentFakeNVMap = (BMM_FAKE_NV_DATA *) HiiGetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA)); - DisMap = (UINT8 *) CurrentFakeNVMap; - for (Index = 0; Index < sizeof (BMM_FAKE_NV_DATA); Index ++) { - if (DisMap [Index] != 0) { - break; - } - } - - if (Index == sizeof (BMM_FAKE_NV_DATA)) { - FreePool (CurrentFakeNVMap); - CurrentFakeNVMap = &Private->BmmFakeNvData; - } + CurrentFakeNVMap = &Private->BmmFakeNvData; + HiiGetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap); // // need to be subtituded. @@ -595,14 +585,6 @@ BootMaintCallback ( // Status = HiiSetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL); - // - // Update local settting. - // - if (CurrentFakeNVMap != &Private->BmmFakeNvData) { - CopyMem (&Private->BmmFakeNvData, CurrentFakeNVMap, sizeof (BMM_FAKE_NV_DATA)); - FreePool (CurrentFakeNVMap); - } - return Status; } diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c index 366aceda18..2cde6e0d0f 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c @@ -260,13 +260,8 @@ FileExplorerCallback ( // // Retrieve uncommitted data from Form Browser // - NvRamMap = (FILE_EXPLORER_NV_DATA *) HiiGetBrowserData (&mFileExplorerGuid, mFileExplorerStorageName, sizeof (FILE_EXPLORER_NV_DATA)); - if (NvRamMap == NULL) { - return EFI_NOT_FOUND; - } - CopyMem (&Private->FeFakeNvData, NvRamMap, sizeof (FILE_EXPLORER_NV_DATA)); - FreePool (NvRamMap); NvRamMap = &Private->FeFakeNvData; + HiiGetBrowserData (&mFileExplorerGuid, mFileExplorerStorageName, sizeof (FILE_EXPLORER_NV_DATA), (UINT8 *) NvRamMap); if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT || QuestionId == KEY_VALUE_SAVE_AND_EXIT_DRIVER) { // -- cgit v1.2.3