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 <glin@suse.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Gary Lin
2016-10-19 15:01:13 +08:00
committed by Jordan Justen
parent 4f0624e87a
commit afa99fac54
7 changed files with 221 additions and 221 deletions

View File

@@ -33,7 +33,7 @@ Routine Description:
Perform a call-back into the SEC simulator to get address of the Firmware Hub Perform a call-back into the SEC simulator to get address of the Firmware Hub
Arguments: Arguments:
FfsHeader - Ffs Header availible to every PEIM FfsHeader - Ffs Header available to every PEIM
PeiServices - General purpose services available to every PEIM. PeiServices - General purpose services available to every PEIM.
Returns: Returns:

View File

@@ -25,7 +25,7 @@
Routine Description: Routine Description:
This service is called from Index == 0 until it returns EFI_UNSUPPORTED. 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: Arguments:
Index - Which memory region to use Index - Which memory region to use

View File

@@ -92,7 +92,7 @@ Routine Description:
Arguments: Arguments:
PlatformConsole - Predfined platform default console device array. PlatformConsole - Predefined platform default console device array.
Returns: Returns:
@@ -113,7 +113,7 @@ Returns:
// //
// Have chance to connect the platform default console, // 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 // the platform should support
// //
while (PlatformConsole[Index].DevicePath != NULL) { while (PlatformConsole[Index].DevicePath != NULL) {
@@ -149,7 +149,7 @@ PlatformBdsConnectSequence (
Routine Description: Routine Description:
Connect with predeined platform connect sequence, Connect with predefined platform connect sequence,
the OEM/IBV can customize with their own connect sequence. the OEM/IBV can customize with their own connect sequence.
Arguments: Arguments:
@@ -288,7 +288,7 @@ PlatformBdsPolicyBehavior (
Routine Description: 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 is driven by boot mode. IBV/OEM can customize this code for their specific
policy action. policy action.

View File

@@ -1,136 +1,136 @@
/** @file /** @file
Static SMBIOS Table for platform Static SMBIOS Table for platform
Copyright (c) 2012, Apple Inc. All rights reserved.<BR> Copyright (c) 2012, Apple Inc. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/ **/
#include <PiDxe.h> #include <PiDxe.h>
#include <IndustryStandard/SmBios.h> #include <IndustryStandard/SmBios.h>
#include <Protocol/Smbios.h> #include <Protocol/Smbios.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/SmbiosLib.h> #include <Library/SmbiosLib.h>
#include <Library/HobLib.h> #include <Library/HobLib.h>
extern SMBIOS_TEMPLATE_ENTRY gSmbiosTemplate[]; extern SMBIOS_TEMPLATE_ENTRY gSmbiosTemplate[];
SMBIOS_TABLE_TYPE19 gSmbiosType19Template = { SMBIOS_TABLE_TYPE19 gSmbiosType19Template = {
{ EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS, sizeof (SMBIOS_TABLE_TYPE19), 0 }, { EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS, sizeof (SMBIOS_TABLE_TYPE19), 0 },
0xffffffff, // StartingAddress; 0xffffffff, // StartingAddress;
0xffffffff, // EndingAddress; 0xffffffff, // EndingAddress;
0, // MemoryArrayHandle; 0, // MemoryArrayHandle;
1, // PartitionWidth; 1, // PartitionWidth;
0, // ExtendedStartingAddress; 0, // ExtendedStartingAddress;
0, // ExtendedEndingAddress; 0, // ExtendedEndingAddress;
}; };
VOID VOID
CreatePlatformSmbiosMemoryRecords ( CreatePlatformSmbiosMemoryRecords (
VOID VOID
) )
{ {
EFI_PEI_HOB_POINTERS HobPtr; EFI_PEI_HOB_POINTERS HobPtr;
SMBIOS_STRUCTURE_POINTER Smbios16; SMBIOS_STRUCTURE_POINTER Smbios16;
SMBIOS_STRUCTURE_POINTER Smbios17; SMBIOS_STRUCTURE_POINTER Smbios17;
EFI_SMBIOS_HANDLE PhyscialMemoryArrayHandle; EFI_SMBIOS_HANDLE PhyscialMemoryArrayHandle;
EFI_SMBIOS_HANDLE SmbiosHandle; EFI_SMBIOS_HANDLE SmbiosHandle;
Smbios16.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY, 0, &PhyscialMemoryArrayHandle); Smbios16.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY, 0, &PhyscialMemoryArrayHandle);
if (Smbios16.Hdr == NULL) { if (Smbios16.Hdr == NULL) {
// Only make a Type19 entry if a Type16 entry exists. // Only make a Type19 entry if a Type16 entry exists.
return; return;
} }
Smbios17.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_MEMORY_DEVICE, 0, &SmbiosHandle); Smbios17.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_MEMORY_DEVICE, 0, &SmbiosHandle);
if (Smbios17.Hdr == NULL) { if (Smbios17.Hdr == NULL) {
// if type17 exits update with type16 Smbios handle // if type17 exits update with type16 Smbios handle
Smbios17.Type17->MemoryArrayHandle = PhyscialMemoryArrayHandle; Smbios17.Type17->MemoryArrayHandle = PhyscialMemoryArrayHandle;
} }
// Generate Type16 records // Generate Type16 records
gSmbiosType19Template.MemoryArrayHandle = PhyscialMemoryArrayHandle; gSmbiosType19Template.MemoryArrayHandle = PhyscialMemoryArrayHandle;
HobPtr.Raw = GetHobList (); HobPtr.Raw = GetHobList ();
while ((HobPtr.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, HobPtr.Raw)) != NULL) { while ((HobPtr.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, HobPtr.Raw)) != NULL) {
if (HobPtr.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) { if (HobPtr.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) {
gSmbiosType19Template.ExtendedStartingAddress = HobPtr.ResourceDescriptor->PhysicalStart; gSmbiosType19Template.ExtendedStartingAddress = HobPtr.ResourceDescriptor->PhysicalStart;
gSmbiosType19Template.ExtendedEndingAddress = gSmbiosType19Template.ExtendedEndingAddress =
HobPtr.ResourceDescriptor->PhysicalStart + HobPtr.ResourceDescriptor->PhysicalStart +
HobPtr.ResourceDescriptor->ResourceLength - 1; HobPtr.ResourceDescriptor->ResourceLength - 1;
SmbiosLibCreateEntry ((SMBIOS_STRUCTURE *)&gSmbiosType19Template, NULL); SmbiosLibCreateEntry ((SMBIOS_STRUCTURE *)&gSmbiosType19Template, NULL);
} }
HobPtr.Raw = GET_NEXT_HOB (HobPtr); HobPtr.Raw = GET_NEXT_HOB (HobPtr);
} }
} }
/** /**
Main entry for this driver. Main entry for this driver.
@param ImageHandle Image handle this driver. @param ImageHandle Image handle this driver.
@param SystemTable Pointer to SystemTable. @param SystemTable Pointer to SystemTable.
@retval EFI_SUCESS This function always complete successfully. @retval EFI_SUCESS This function always complete successfully.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PlatfomrSmbiosDriverEntryPoint ( PlatfomrSmbiosDriverEntryPoint (
IN EFI_HANDLE ImageHandle, IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable IN EFI_SYSTEM_TABLE *SystemTable
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
EFI_SMBIOS_HANDLE SmbiosHandle; EFI_SMBIOS_HANDLE SmbiosHandle;
SMBIOS_STRUCTURE_POINTER Smbios; SMBIOS_STRUCTURE_POINTER Smbios;
// Phase 0 - Patch table to make SMBIOS 2.7 structures smaller to conform // Phase 0 - Patch table to make SMBIOS 2.7 structures smaller to conform
// to an early version of the specification. // to an early version of the specification.
// Phase 1 - Initialize SMBIOS tables from template // Phase 1 - Initialize SMBIOS tables from template
Status = SmbiosLibInitializeFromTemplate (gSmbiosTemplate); Status = SmbiosLibInitializeFromTemplate (gSmbiosTemplate);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
// Phase 2 - Patch SMBIOS table entries // Phase 2 - Patch SMBIOS table entries
Smbios.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_BIOS_INFORMATION, 0, &SmbiosHandle); Smbios.Hdr = SmbiosLibGetRecord (EFI_SMBIOS_TYPE_BIOS_INFORMATION, 0, &SmbiosHandle);
if (Smbios.Type0 != NULL) { if (Smbios.Type0 != NULL) {
// 64K * (n+1) bytes // 64K * (n+1) bytes
Smbios.Type0->BiosSize = (UINT8)DivU64x32 (FixedPcdGet64 (PcdEmuFirmwareFdSize), 64*1024) - 1; Smbios.Type0->BiosSize = (UINT8)DivU64x32 (FixedPcdGet64 (PcdEmuFirmwareFdSize), 64*1024) - 1;
SmbiosLibUpdateUnicodeString ( SmbiosLibUpdateUnicodeString (
SmbiosHandle, SmbiosHandle,
Smbios.Type0->BiosVersion, Smbios.Type0->BiosVersion,
(CHAR16 *) PcdGetPtr (PcdFirmwareVersionString) (CHAR16 *) PcdGetPtr (PcdFirmwareVersionString)
); );
SmbiosLibUpdateUnicodeString ( SmbiosLibUpdateUnicodeString (
SmbiosHandle, SmbiosHandle,
Smbios.Type0->BiosReleaseDate, Smbios.Type0->BiosReleaseDate,
(CHAR16 *) PcdGetPtr (PcdFirmwareReleaseDateString) (CHAR16 *) PcdGetPtr (PcdFirmwareReleaseDateString)
); );
} }
// Phase 3 - Create tables from scratch // Phase 3 - Create tables from scratch
// Create Type 13 record from EFI Variables // Create Type 13 record from EFI Variables
// Do we need this record for EFI as the info is availible from EFI varaibles // 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 // Also language types don't always match between EFI and SMBIOS
// CreateSmbiosLanguageInformation (1, gSmbiosLangToEfiLang); // CreateSmbiosLanguageInformation (1, gSmbiosLangToEfiLang);
CreatePlatformSmbiosMemoryRecords (); CreatePlatformSmbiosMemoryRecords ();
return EFI_SUCCESS; return EFI_SUCCESS;
} }

View File

@@ -1,65 +1,65 @@
/*++ @file /*++ @file
Temp RAM PPI Temp RAM PPI
Copyright (c) 2011, Apple Inc. All rights reserved.<BR> Copyright (c) 2011, Apple Inc. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/ **/
#include <PiPei.h> #include <PiPei.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Ppi/TemporaryRamSupport.h> #include <Ppi/TemporaryRamSupport.h>
VOID VOID
EFIAPI EFIAPI
SecSwitchStack ( SecSwitchStack (
UINT32 TemporaryMemoryBase, UINT32 TemporaryMemoryBase,
UINT32 PermenentMemoryBase UINT32 PermenentMemoryBase
); );
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
SecTemporaryRamSupport ( SecTemporaryRamSupport (
IN CONST EFI_PEI_SERVICES **PeiServices, IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase, IN EFI_PHYSICAL_ADDRESS TemporaryMemoryBase,
IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase, IN EFI_PHYSICAL_ADDRESS PermanentMemoryBase,
IN UINTN CopySize IN UINTN CopySize
) )
{ {
// //
// Migrate the whole temporary memory to permenent memory. // Migrate the whole temporary memory to permanent memory.
// //
CopyMem ( CopyMem (
(VOID*)(UINTN)PermanentMemoryBase, (VOID*)(UINTN)PermanentMemoryBase,
(VOID*)(UINTN)TemporaryMemoryBase, (VOID*)(UINTN)TemporaryMemoryBase,
CopySize CopySize
); );
// //
// SecSwitchStack function must be invoked after the memory migration // SecSwitchStack function must be invoked after the memory migration
// immediatly, also we need fixup the stack change caused by new call into // immediately, also we need fixup the stack change caused by new call into
// permenent memory. // permanent memory.
// //
SecSwitchStack ((UINT32) TemporaryMemoryBase, (UINT32) PermanentMemoryBase); SecSwitchStack ((UINT32) TemporaryMemoryBase, (UINT32) PermanentMemoryBase);
// //
// We need *not* fix the return address because currently, // We need *not* fix the return address because currently,
// The PeiCore is excuted in flash. // The PeiCore is executed in flash.
// //
// //
// Simulate to invalid temporary memory, terminate temporary memory // Simulate to invalid temporary memory, terminate temporary memory
// //
//ZeroMem ((VOID*)(UINTN)TemporaryMemoryBase, CopySize); //ZeroMem ((VOID*)(UINTN)TemporaryMemoryBase, CopySize);
return EFI_SUCCESS; return EFI_SUCCESS;
} }

View File

@@ -87,7 +87,7 @@ Routine Description:
Arguments: Arguments:
Argc - Number of command line arguments Argc - Number of command line arguments
Argv - Array of command line argument strings Argv - Array of command line argument strings
Envp - Array of environmemt variable strings Envp - Array of environment variable strings
Returns: Returns:
0 - Normal exit 0 - Normal exit
@@ -175,7 +175,7 @@ main (
// //
// Allocate space for gSystemMemory Array // Allocate space for gSystemMemory Array
// //
gSystemMemoryCount = CountSeperatorsInString (MemorySizeStr, '!') + 1; gSystemMemoryCount = CountSeparatorsInString (MemorySizeStr, '!') + 1;
gSystemMemory = AllocateZeroPool (gSystemMemoryCount * sizeof (EMU_SYSTEM_MEMORY)); gSystemMemory = AllocateZeroPool (gSystemMemoryCount * sizeof (EMU_SYSTEM_MEMORY));
if (gSystemMemory == NULL) { if (gSystemMemory == NULL) {
printf ("ERROR : Can not allocate memory for system. Exiting.\n"); printf ("ERROR : Can not allocate memory for system. Exiting.\n");
@@ -184,7 +184,7 @@ main (
// //
// Allocate space for gSystemMemory Array // Allocate space for gSystemMemory Array
// //
gFdInfoCount = CountSeperatorsInString (FirmwareVolumesStr, '!') + 1; gFdInfoCount = CountSeparatorsInString (FirmwareVolumesStr, '!') + 1;
gFdInfo = AllocateZeroPool (gFdInfoCount * sizeof (EMU_FD_INFO)); gFdInfo = AllocateZeroPool (gFdInfoCount * sizeof (EMU_FD_INFO));
if (gFdInfo == NULL) { if (gFdInfo == NULL) {
printf ("ERROR : Can not allocate memory for fd info. Exiting.\n"); printf ("ERROR : Can not allocate memory for fd info. Exiting.\n");
@@ -249,7 +249,7 @@ main (
); );
} else { } 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 // Maps Read Only
// //
Status = MapFile ( Status = MapFile (
@@ -614,7 +614,7 @@ SecLoadFromCore (
Routine Description: Routine Description:
This service is called from Index == 0 until it returns EFI_UNSUPPORTED. 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 It uses gSystemMemory[] and gSystemMemoryCount that were created by
parsing the host environment variable EFI_MEMORY_SIZE. parsing the host environment variable EFI_MEMORY_SIZE.
The size comes from the varaible and the address comes from the call to The size comes from the varaible and the address comes from the call to
@@ -703,7 +703,7 @@ EfiSystemMemoryRange (
Routine Description: Routine Description:
Since the SEC is the only Unix program in stack it must export 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: Arguments:
InterfaceSize - sizeof (EFI_WIN_NT_THUNK_PROTOCOL); InterfaceSize - sizeof (EFI_WIN_NT_THUNK_PROTOCOL);
@@ -830,26 +830,26 @@ SecUnixFdAddress (
/*++ /*++
Routine Description: Routine Description:
Count the number of seperators in String Count the number of separators in String
Arguments: Arguments:
String - String to process String - String to process
Seperator - Item to count Separator - Item to count
Returns: Returns:
Number of Seperator in String Number of Separator in String
**/ **/
UINTN UINTN
CountSeperatorsInString ( CountSeparatorsInString (
IN const CHAR16 *String, IN const CHAR16 *String,
IN CHAR16 Seperator IN CHAR16 Separator
) )
{ {
UINTN Count; UINTN Count;
for (Count = 0; *String != '\0'; String++) { for (Count = 0; *String != '\0'; String++) {
if (*String == Seperator) { if (*String == Separator) {
Count++; Count++;
} }
} }

View File

@@ -255,9 +255,9 @@ AsciiToUnicode (
); );
UINTN UINTN
CountSeperatorsInString ( CountSeparatorsInString (
IN const CHAR16 *String, IN const CHAR16 *String,
IN CHAR16 Seperator IN CHAR16 Separator
); );
EFI_STATUS EFI_STATUS