From afa99fac5481ec3934f95429ae753991ce9538c1 Mon Sep 17 00:00:00 2001 From: Gary Lin Date: Wed, 19 Oct 2016 15:01:13 +0800 Subject: [PATCH] EmulatorPkg: Fix typos in comments and variables - Predfined -> Predefined - minimue -> minimum - predeined -> predefined - excute -> execute - availible -> available - discontiguous -> discontinuous - permenent -> permanent - immediatly -> immediately - environmemt -> environment - Seperator -> Separator - remmeber -> remember - initailized -> initialized Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Gary Lin Reviewed-by: Jordan Justen --- .../FirmwareVolumePei/FirmwareVolumePei.c | 2 +- EmulatorPkg/Include/Ppi/EmuThunk.h | 2 +- EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c | 8 +- .../PlatformSmbiosDxe/PlatformSmbiosDxe.c | 272 +++++++++--------- EmulatorPkg/Sec/Ia32/TempRam.c | 130 ++++----- EmulatorPkg/Unix/Host/Host.c | 24 +- EmulatorPkg/Unix/Host/Host.h | 4 +- 7 files changed, 221 insertions(+), 221 deletions(-) diff --git a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c index 91d1197b4f..a7f548b00e 100644 --- a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c +++ b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c @@ -33,7 +33,7 @@ Routine Description: Perform a call-back into the SEC simulator to get address of the Firmware Hub Arguments: - FfsHeader - Ffs Header availible to every PEIM + FfsHeader - Ffs Header available to every PEIM PeiServices - General purpose services available to every PEIM. Returns: diff --git a/EmulatorPkg/Include/Ppi/EmuThunk.h b/EmulatorPkg/Include/Ppi/EmuThunk.h index 7788d7b569..61e90bfb69 100644 --- a/EmulatorPkg/Include/Ppi/EmuThunk.h +++ b/EmulatorPkg/Include/Ppi/EmuThunk.h @@ -25,7 +25,7 @@ Routine Description: This service is called from Index == 0 until it returns EFI_UNSUPPORTED. - It allows discontiguous memory regions to be supported by the emulator. + It allows discontinuous memory regions to be supported by the emulator. Arguments: Index - Which memory region to use diff --git a/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c index 46d2a7ee03..3580d36779 100644 --- a/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c +++ b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.c @@ -92,7 +92,7 @@ Routine Description: Arguments: - PlatformConsole - Predfined platform default console device array. + PlatformConsole - Predefined platform default console device array. Returns: @@ -113,7 +113,7 @@ Returns: // // Have chance to connect the platform default console, - // the platform default console is the minimue device group + // the platform default console is the minimum device group // the platform should support // while (PlatformConsole[Index].DevicePath != NULL) { @@ -149,7 +149,7 @@ PlatformBdsConnectSequence ( Routine Description: - Connect with predeined platform connect sequence, + Connect with predefined platform connect sequence, the OEM/IBV can customize with their own connect sequence. Arguments: @@ -288,7 +288,7 @@ PlatformBdsPolicyBehavior ( Routine Description: - The function will excute with as the platform policy, current policy + The function will execute with as the platform policy, current policy is driven by boot mode. IBV/OEM can customize this code for their specific policy action. diff --git a/EmulatorPkg/PlatformSmbiosDxe/PlatformSmbiosDxe.c b/EmulatorPkg/PlatformSmbiosDxe/PlatformSmbiosDxe.c index 2c75f85f47..123e090ed0 100644 --- a/EmulatorPkg/PlatformSmbiosDxe/PlatformSmbiosDxe.c +++ b/EmulatorPkg/PlatformSmbiosDxe/PlatformSmbiosDxe.c @@ -1,136 +1,136 @@ -/** @file - Static SMBIOS Table for platform - - - Copyright (c) 2012, Apple Inc. All rights reserved.
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include -#include -#include - -#include -#include -#include -#include -#include - -extern SMBIOS_TEMPLATE_ENTRY gSmbiosTemplate[]; - - - -SMBIOS_TABLE_TYPE19 gSmbiosType19Template = { - { EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS, sizeof (SMBIOS_TABLE_TYPE19), 0 }, - 0xffffffff, // StartingAddress; - 0xffffffff, // EndingAddress; - 0, // MemoryArrayHandle; - 1, // PartitionWidth; - 0, // ExtendedStartingAddress; - 0, // ExtendedEndingAddress; -}; - -VOID -CreatePlatformSmbiosMemoryRecords ( - VOID - ) -{ - EFI_PEI_HOB_POINTERS HobPtr; - SMBIOS_STRUCTURE_POINTER Smbios16; - SMBIOS_STRUCTURE_POINTER Smbios17; - EFI_SMBIOS_HANDLE PhyscialMemoryArrayHandle; - EFI_SMBIOS_HANDLE SmbiosHandle; - - Smbios16.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY, 0, &PhyscialMemoryArrayHandle); - if (Smbios16.Hdr == NULL) { - // Only make a Type19 entry if a Type16 entry exists. - return; - } - - Smbios17.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_MEMORY_DEVICE, 0, &SmbiosHandle); - if (Smbios17.Hdr == NULL) { - // if type17 exits update with type16 Smbios handle - Smbios17.Type17->MemoryArrayHandle = PhyscialMemoryArrayHandle; - } - - // Generate Type16 records - gSmbiosType19Template.MemoryArrayHandle = PhyscialMemoryArrayHandle; - HobPtr.Raw = GetHobList (); - while ((HobPtr.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, HobPtr.Raw)) != NULL) { - if (HobPtr.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) { - gSmbiosType19Template.ExtendedStartingAddress = HobPtr.ResourceDescriptor->PhysicalStart; - gSmbiosType19Template.ExtendedEndingAddress = - HobPtr.ResourceDescriptor->PhysicalStart + - HobPtr.ResourceDescriptor->ResourceLength - 1; - - SmbiosLibCreateEntry ((SMBIOS_STRUCTURE *)&gSmbiosType19Template, NULL); - } - HobPtr.Raw = GET_NEXT_HOB (HobPtr); - } -} - - -/** - Main entry for this driver. - - @param ImageHandle Image handle this driver. - @param SystemTable Pointer to SystemTable. - - @retval EFI_SUCESS This function always complete successfully. - -**/ -EFI_STATUS -EFIAPI -PlatfomrSmbiosDriverEntryPoint ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - EFI_SMBIOS_HANDLE SmbiosHandle; - SMBIOS_STRUCTURE_POINTER Smbios; - - // Phase 0 - Patch table to make SMBIOS 2.7 structures smaller to conform - // to an early version of the specification. - - // Phase 1 - Initialize SMBIOS tables from template - Status = SmbiosLibInitializeFromTemplate (gSmbiosTemplate); - ASSERT_EFI_ERROR (Status); - - // Phase 2 - Patch SMBIOS table entries - - Smbios.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_BIOS_INFORMATION, 0, &SmbiosHandle); - if (Smbios.Type0 != NULL) { - // 64K * (n+1) bytes - Smbios.Type0->BiosSize = (UINT8)DivU64x32 (FixedPcdGet64 (PcdEmuFirmwareFdSize), 64*1024) - 1; - - SmbiosLibUpdateUnicodeString ( - SmbiosHandle, - Smbios.Type0->BiosVersion, - (CHAR16 *) PcdGetPtr (PcdFirmwareVersionString) - ); - SmbiosLibUpdateUnicodeString ( - SmbiosHandle, - Smbios.Type0->BiosReleaseDate, - (CHAR16 *) PcdGetPtr (PcdFirmwareReleaseDateString) - ); - } - - // Phase 3 - Create tables from scratch - - // Create Type 13 record from EFI Variables - // Do we need this record for EFI as the info is availible from EFI varaibles - // Also language types don't always match between EFI and SMBIOS - // CreateSmbiosLanguageInformation (1, gSmbiosLangToEfiLang); - - CreatePlatformSmbiosMemoryRecords (); - - return EFI_SUCCESS; -} \ No newline at end of file +/** @file + Static SMBIOS Table for platform + + + Copyright (c) 2012, Apple Inc. All rights reserved.
+ This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#include +#include +#include + +#include +#include +#include +#include +#include + +extern SMBIOS_TEMPLATE_ENTRY gSmbiosTemplate[]; + + + +SMBIOS_TABLE_TYPE19 gSmbiosType19Template = { + { EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS, sizeof (SMBIOS_TABLE_TYPE19), 0 }, + 0xffffffff, // StartingAddress; + 0xffffffff, // EndingAddress; + 0, // MemoryArrayHandle; + 1, // PartitionWidth; + 0, // ExtendedStartingAddress; + 0, // ExtendedEndingAddress; +}; + +VOID +CreatePlatformSmbiosMemoryRecords ( + VOID + ) +{ + EFI_PEI_HOB_POINTERS HobPtr; + SMBIOS_STRUCTURE_POINTER Smbios16; + SMBIOS_STRUCTURE_POINTER Smbios17; + EFI_SMBIOS_HANDLE PhyscialMemoryArrayHandle; + EFI_SMBIOS_HANDLE SmbiosHandle; + + Smbios16.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY, 0, &PhyscialMemoryArrayHandle); + if (Smbios16.Hdr == NULL) { + // Only make a Type19 entry if a Type16 entry exists. + return; + } + + Smbios17.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_MEMORY_DEVICE, 0, &SmbiosHandle); + if (Smbios17.Hdr == NULL) { + // if type17 exits update with type16 Smbios handle + Smbios17.Type17->MemoryArrayHandle = PhyscialMemoryArrayHandle; + } + + // Generate Type16 records + gSmbiosType19Template.MemoryArrayHandle = PhyscialMemoryArrayHandle; + HobPtr.Raw = GetHobList (); + while ((HobPtr.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, HobPtr.Raw)) != NULL) { + if (HobPtr.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) { + gSmbiosType19Template.ExtendedStartingAddress = HobPtr.ResourceDescriptor->PhysicalStart; + gSmbiosType19Template.ExtendedEndingAddress = + HobPtr.ResourceDescriptor->PhysicalStart + + HobPtr.ResourceDescriptor->ResourceLength - 1; + + SmbiosLibCreateEntry ((SMBIOS_STRUCTURE *)&gSmbiosType19Template, NULL); + } + HobPtr.Raw = GET_NEXT_HOB (HobPtr); + } +} + + +/** + Main entry for this driver. + + @param ImageHandle Image handle this driver. + @param SystemTable Pointer to SystemTable. + + @retval EFI_SUCESS This function always complete successfully. + +**/ +EFI_STATUS +EFIAPI +PlatfomrSmbiosDriverEntryPoint ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + EFI_SMBIOS_HANDLE SmbiosHandle; + SMBIOS_STRUCTURE_POINTER Smbios; + + // Phase 0 - Patch table to make SMBIOS 2.7 structures smaller to conform + // to an early version of the specification. + + // Phase 1 - Initialize SMBIOS tables from template + Status = SmbiosLibInitializeFromTemplate (gSmbiosTemplate); + ASSERT_EFI_ERROR (Status); + + // Phase 2 - Patch SMBIOS table entries + + Smbios.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_BIOS_INFORMATION, 0, &SmbiosHandle); + if (Smbios.Type0 != NULL) { + // 64K * (n+1) bytes + Smbios.Type0->BiosSize = (UINT8)DivU64x32 (FixedPcdGet64 (PcdEmuFirmwareFdSize), 64*1024) - 1; + + SmbiosLibUpdateUnicodeString ( + SmbiosHandle, + Smbios.Type0->BiosVersion, + (CHAR16 *) PcdGetPtr (PcdFirmwareVersionString) + ); + SmbiosLibUpdateUnicodeString ( + SmbiosHandle, + Smbios.Type0->BiosReleaseDate, + (CHAR16 *) PcdGetPtr (PcdFirmwareReleaseDateString) + ); + } + + // Phase 3 - Create tables from scratch + + // Create Type 13 record from EFI Variables + // Do we need this record for EFI as the info is available from EFI varaibles + // Also language types don't always match between EFI and SMBIOS + // CreateSmbiosLanguageInformation (1, gSmbiosLangToEfiLang); + + CreatePlatformSmbiosMemoryRecords (); + + return EFI_SUCCESS; +} diff --git a/EmulatorPkg/Sec/Ia32/TempRam.c b/EmulatorPkg/Sec/Ia32/TempRam.c index 525fb95d48..591354970b 100644 --- a/EmulatorPkg/Sec/Ia32/TempRam.c +++ b/EmulatorPkg/Sec/Ia32/TempRam.c @@ -1,65 +1,65 @@ -/*++ @file - Temp RAM PPI - -Copyright (c) 2011, Apple Inc. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include -#include -#include - -#include - -VOID -EFIAPI -SecSwitchStack ( - UINT32 TemporaryMemoryBase, - UINT32 PermenentMemoryBase - ); - - -EFI_STATUS -EFIAPI -SecTemporaryRamSupport ( - IN CONST EFI_PEI_SERVICES **PeiServices, - IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase, - IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase, - IN UINTN CopySize - ) -{ - // - // Migrate the whole temporary memory to permenent memory. - // - CopyMem ( - (VOID*)(UINTN)PermanentMemoryBase, - (VOID*)(UINTN)TemporaryMemoryBase, - CopySize - ); - - // - // SecSwitchStack function must be invoked after the memory migration - // immediatly, also we need fixup the stack change caused by new call into - // permenent memory. - // - SecSwitchStack ((UINT32) TemporaryMemoryBase, (UINT32) PermanentMemoryBase); - - // - // We need *not* fix the return address because currently, - // The PeiCore is excuted in flash. - // - - // - // Simulate to invalid temporary memory, terminate temporary memory - // - //ZeroMem ((VOID*)(UINTN)TemporaryMemoryBase, CopySize); - - return EFI_SUCCESS; -} +/*++ @file + Temp RAM PPI + +Copyright (c) 2011, Apple Inc. All rights reserved.
+This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#include +#include +#include + +#include + +VOID +EFIAPI +SecSwitchStack ( + UINT32 TemporaryMemoryBase, + UINT32 PermenentMemoryBase + ); + + +EFI_STATUS +EFIAPI +SecTemporaryRamSupport ( + IN CONST EFI_PEI_SERVICES **PeiServices, + IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase, + IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase, + IN UINTN CopySize + ) +{ + // + // Migrate the whole temporary memory to permanent memory. + // + CopyMem ( + (VOID*)(UINTN)PermanentMemoryBase, + (VOID*)(UINTN)TemporaryMemoryBase, + CopySize + ); + + // + // SecSwitchStack function must be invoked after the memory migration + // immediately, also we need fixup the stack change caused by new call into + // permanent memory. + // + SecSwitchStack ((UINT32) TemporaryMemoryBase, (UINT32) PermanentMemoryBase); + + // + // We need *not* fix the return address because currently, + // The PeiCore is executed in flash. + // + + // + // Simulate to invalid temporary memory, terminate temporary memory + // + //ZeroMem ((VOID*)(UINTN)TemporaryMemoryBase, CopySize); + + return EFI_SUCCESS; +} diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c index 977fe87fa6..f84b22f576 100644 --- a/EmulatorPkg/Unix/Host/Host.c +++ b/EmulatorPkg/Unix/Host/Host.c @@ -87,7 +87,7 @@ Routine Description: Arguments: Argc - Number of command line arguments Argv - Array of command line argument strings - Envp - Array of environmemt variable strings + Envp - Array of environment variable strings Returns: 0 - Normal exit @@ -175,7 +175,7 @@ main ( // // Allocate space for gSystemMemory Array // - gSystemMemoryCount = CountSeperatorsInString (MemorySizeStr, '!') + 1; + gSystemMemoryCount = CountSeparatorsInString (MemorySizeStr, '!') + 1; gSystemMemory = AllocateZeroPool (gSystemMemoryCount * sizeof (EMU_SYSTEM_MEMORY)); if (gSystemMemory == NULL) { printf ("ERROR : Can not allocate memory for system. Exiting.\n"); @@ -184,7 +184,7 @@ main ( // // Allocate space for gSystemMemory Array // - gFdInfoCount = CountSeperatorsInString (FirmwareVolumesStr, '!') + 1; + gFdInfoCount = CountSeparatorsInString (FirmwareVolumesStr, '!') + 1; gFdInfo = AllocateZeroPool (gFdInfoCount * sizeof (EMU_FD_INFO)); if (gFdInfo == NULL) { printf ("ERROR : Can not allocate memory for fd info. Exiting.\n"); @@ -249,7 +249,7 @@ main ( ); } else { // - // Open the FD and remmeber where it got mapped into our processes address space + // Open the FD and remember where it got mapped into our processes address space // Maps Read Only // Status = MapFile ( @@ -614,7 +614,7 @@ SecLoadFromCore ( Routine Description: This service is called from Index == 0 until it returns EFI_UNSUPPORTED. - It allows discontiguous memory regions to be supported by the emulator. + It allows discontinuous memory regions to be supported by the emulator. It uses gSystemMemory[] and gSystemMemoryCount that were created by parsing the host environment variable EFI_MEMORY_SIZE. The size comes from the varaible and the address comes from the call to @@ -703,7 +703,7 @@ EfiSystemMemoryRange ( Routine Description: Since the SEC is the only Unix program in stack it must export - an interface to do POSIX calls. gUnix is initailized in UnixThunk.c. + an interface to do POSIX calls. gUnix is initialized in UnixThunk.c. Arguments: InterfaceSize - sizeof (EFI_WIN_NT_THUNK_PROTOCOL); @@ -830,26 +830,26 @@ SecUnixFdAddress ( /*++ Routine Description: - Count the number of seperators in String + Count the number of separators in String Arguments: String - String to process - Seperator - Item to count + Separator - Item to count Returns: - Number of Seperator in String + Number of Separator in String **/ UINTN -CountSeperatorsInString ( +CountSeparatorsInString ( IN const CHAR16 *String, - IN CHAR16 Seperator + IN CHAR16 Separator ) { UINTN Count; for (Count = 0; *String != '\0'; String++) { - if (*String == Seperator) { + if (*String == Separator) { Count++; } } diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h index aff7c36d79..9d6d36ee71 100644 --- a/EmulatorPkg/Unix/Host/Host.h +++ b/EmulatorPkg/Unix/Host/Host.h @@ -255,9 +255,9 @@ AsciiToUnicode ( ); UINTN -CountSeperatorsInString ( +CountSeparatorsInString ( IN const CHAR16 *String, - IN CHAR16 Seperator + IN CHAR16 Separator ); EFI_STATUS -- 2.39.2