git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2480
6f19259b-4bc3-4df7-8a09-
765794883524
13 files changed:
<Version>1.0</Version>\r
<Abstract>Component description file for DiskIo module.</Abstract>\r
<Description>DiskIo driver that layers it's self on every Block IO protocol in the system.</Description>\r
<Version>1.0</Version>\r
<Abstract>Component description file for DiskIo module.</Abstract>\r
<Description>DiskIo driver that layers it's self on every Block IO protocol in the system.</Description>\r
- <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+ <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
<License>All rights reserved. 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
<License>All rights reserved. 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
<OutputFileBasename>DiskIo</OutputFileBasename>\r
</ModuleDefinitions>\r
<LibraryClassDefinitions>\r
<OutputFileBasename>DiskIo</OutputFileBasename>\r
</ModuleDefinitions>\r
<LibraryClassDefinitions>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
+ <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
<Keyword>DebugLib</Keyword>\r
<Keyword>DebugLib</Keyword>\r
+ <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiDriverModelLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiDriverModelLib</Keyword>\r
if (EFI_ERROR (Status)) {\r
\r
if (Private != NULL) {\r
if (EFI_ERROR (Status)) {\r
\r
if (Private != NULL) {\r
- gBS->FreePool (Private);\r
}\r
\r
gBS->CloseProtocol (\r
}\r
\r
gBS->CloseProtocol (\r
}\r
\r
if (!EFI_ERROR (Status)) {\r
}\r
\r
if (!EFI_ERROR (Status)) {\r
- gBS->FreePool (Private);\r
\r
Done:\r
if (PreData != NULL) {\r
\r
Done:\r
if (PreData != NULL) {\r
- gBS->FreePool (PreData);\r
\r
Done:\r
if (PreData != NULL) {\r
\r
Done:\r
if (PreData != NULL) {\r
- gBS->FreePool (PreData);\r
- gBS->FreePool (VolDescriptor);\r
+ FreePool (VolDescriptor);\r
\r
Done:\r
if (ProtectiveMbr != NULL) {\r
\r
Done:\r
if (ProtectiveMbr != NULL) {\r
- gBS->FreePool (ProtectiveMbr);\r
+ FreePool (ProtectiveMbr);\r
}\r
if (PrimaryHeader != NULL) {\r
}\r
if (PrimaryHeader != NULL) {\r
- gBS->FreePool (PrimaryHeader);\r
+ FreePool (PrimaryHeader);\r
}\r
if (BackupHeader != NULL) {\r
}\r
if (BackupHeader != NULL) {\r
- gBS->FreePool (BackupHeader);\r
+ FreePool (BackupHeader);\r
}\r
if (PartEntry != NULL) {\r
}\r
if (PartEntry != NULL) {\r
- gBS->FreePool (PartEntry);\r
+ FreePool (PartEntry);\r
}\r
if (PEntryStatus != NULL) {\r
}\r
if (PEntryStatus != NULL) {\r
- gBS->FreePool (PEntryStatus);\r
+ FreePool (PEntryStatus);\r
}\r
\r
return GptValid;\r
}\r
\r
return GptValid;\r
PartHdr\r
);\r
if (EFI_ERROR (Status)) {\r
PartHdr\r
);\r
if (EFI_ERROR (Status)) {\r
- gBS->FreePool (PartHdr);\r
PartHdr->MyLBA != Lba\r
) {\r
DEBUG ((EFI_D_INFO, " !Valid efi partition table header\n"));\r
PartHdr->MyLBA != Lba\r
) {\r
DEBUG ((EFI_D_INFO, " !Valid efi partition table header\n"));\r
- gBS->FreePool (PartHdr);\r
return FALSE;\r
}\r
\r
CopyMem (PartHeader, PartHdr, sizeof (EFI_PARTITION_TABLE_HEADER));\r
if (!PartitionCheckGptEntryArrayCRC (BlockIo, DiskIo, PartHeader)) {\r
return FALSE;\r
}\r
\r
CopyMem (PartHeader, PartHdr, sizeof (EFI_PARTITION_TABLE_HEADER));\r
if (!PartitionCheckGptEntryArrayCRC (BlockIo, DiskIo, PartHeader)) {\r
- gBS->FreePool (PartHdr);\r
return FALSE;\r
}\r
\r
DEBUG ((EFI_D_INFO, " Valid efi partition table header\n"));\r
return FALSE;\r
}\r
\r
DEBUG ((EFI_D_INFO, " Valid efi partition table header\n"));\r
- gBS->FreePool (PartHdr);\r
Ptr\r
);\r
if (EFI_ERROR (Status)) {\r
Ptr\r
);\r
if (EFI_ERROR (Status)) {\r
Status = gBS->CalculateCrc32 (Ptr, Size, &Crc);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((EFI_D_ERROR, "CheckPEntryArrayCRC: Crc calculation failed\n"));\r
Status = gBS->CalculateCrc32 (Ptr, Size, &Crc);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((EFI_D_ERROR, "CheckPEntryArrayCRC: Crc calculation failed\n"));\r
\r
return (BOOLEAN) (PartHeader->PartitionEntryArrayCRC32 == Crc);\r
}\r
\r
return (BOOLEAN) (PartHeader->PartitionEntryArrayCRC32 == Crc);\r
}\r
- gBS->FreePool (PartHdr);\r
- gBS->FreePool (Ptr);\r
+ FreePool (PartHdr);\r
+ FreePool (Ptr);\r
\r
if (EFI_ERROR (Status)) {\r
return FALSE;\r
\r
if (EFI_ERROR (Status)) {\r
return FALSE;\r
if (DevicePathType (LastDevicePathNode) == MEDIA_DEVICE_PATH &&\r
DevicePathSubType (LastDevicePathNode) == MEDIA_HARDDRIVE_DP\r
) {\r
if (DevicePathType (LastDevicePathNode) == MEDIA_DEVICE_PATH &&\r
DevicePathSubType (LastDevicePathNode) == MEDIA_HARDDRIVE_DP\r
) {\r
- gBS->CopyMem (&ParentHdDev, LastDevicePathNode, sizeof (ParentHdDev));\r
+ CopyMem (&ParentHdDev, LastDevicePathNode, sizeof (ParentHdDev));\r
} else {\r
LastDevicePathNode = NULL;\r
}\r
} else {\r
LastDevicePathNode = NULL;\r
}\r
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
);\r
} else {\r
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
);\r
} else {\r
- gBS->FreePool (Private->DevicePath);\r
- gBS->FreePool (Private);\r
+ FreePool (Private->DevicePath);\r
+ FreePool (Private);\r
Private->DevicePath = AppendDevicePathNode (ParentDevicePath, DevicePathNode);\r
\r
if (Private->DevicePath == NULL) {\r
Private->DevicePath = AppendDevicePathNode (ParentDevicePath, DevicePathNode);\r
\r
if (Private->DevicePath == NULL) {\r
- gBS->FreePool (Private);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
);\r
} else {\r
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
);\r
} else {\r
- gBS->FreePool (Private->DevicePath);\r
- gBS->FreePool (Private);\r
+ FreePool (Private->DevicePath);\r
+ FreePool (Private);\r
<GuidValue>1FA1F39E-FEFF-4aae-BD7B-38A070A3B609</GuidValue>\r
<Version>1.0</Version>\r
<Abstract>Component description file for Partition module.</Abstract>\r
<GuidValue>1FA1F39E-FEFF-4aae-BD7B-38A070A3B609</GuidValue>\r
<Version>1.0</Version>\r
<Abstract>Component description file for Partition module.</Abstract>\r
- <Description>Partition driver that produces logical BlockIo devices from a physical BlockIo device.</Description>\r
- <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+ <Description>Partition driver produces the logical BlockIo device \r
+ that represents the bytes Start to End of the Parent Block IO \r
+ device (one partition of physical BlockIo device, \r
+ which can be one of GPT, MBR, ElTorito partition).</Description>\r
+ <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
<License>All rights reserved. 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
<License>All rights reserved. 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
<OutputFileBasename>Partition</OutputFileBasename>\r
</ModuleDefinitions>\r
<LibraryClassDefinitions>\r
<OutputFileBasename>Partition</OutputFileBasename>\r
</ModuleDefinitions>\r
<LibraryClassDefinitions>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
+ <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
<Keyword>DebugLib</Keyword>\r
<Keyword>DebugLib</Keyword>\r
+ <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiDriverModelLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiDriverModelLib</Keyword>\r
<Protocol Usage="TO_START">\r
<ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
</Protocol>\r
<Protocol Usage="TO_START">\r
<ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
</Protocol>\r
+ <Protocol Usage="BY_START">\r
+ <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
+ </Protocol>\r
+ <Protocol Usage="BY_START">\r
+ <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>\r
+ </Protocol>\r
</Protocols>\r
<Guids>\r
<GuidCNames Usage="SOMETIMES_CONSUMED">\r
<GuidCName>gEfiPartTypeSystemPartGuid</GuidCName>\r
</GuidCNames>\r
</Protocols>\r
<Guids>\r
<GuidCNames Usage="SOMETIMES_CONSUMED">\r
<GuidCName>gEfiPartTypeSystemPartGuid</GuidCName>\r
</GuidCNames>\r
- <GuidCNames Usage="ALWAYS_CONSUMED">\r
+ <GuidCNames Usage="SOMETIMES_CONSUMED">\r
<GuidCName>gEfiPartTypeUnusedGuid</GuidCName>\r
</GuidCNames>\r
</Guids>\r
<GuidCName>gEfiPartTypeUnusedGuid</GuidCName>\r
</GuidCNames>\r
</Guids>\r
<GuidValue>CD3BAFB6-50FB-4fe8-8E4E-AB74D2C1A600</GuidValue>\r
<Version>1.0</Version>\r
<Abstract>Component description file for English module for unicode collation.</Abstract>\r
<GuidValue>CD3BAFB6-50FB-4fe8-8E4E-AB74D2C1A600</GuidValue>\r
<Version>1.0</Version>\r
<Abstract>Component description file for English module for unicode collation.</Abstract>\r
- <Description>This driver installs EFI_UNICODE_COLLATION_PROTOCOL protocol to provide Unicode strings function.</Description>\r
- <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+ <Description>This driver installs UEFI EFI_UNICODE_COLLATION_PROTOCOL protocol to provide Unicode strings function.</Description>\r
+ <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
<License>All rights reserved. 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
<License>All rights reserved. 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
<OutputFileBasename>English</OutputFileBasename>\r
</ModuleDefinitions>\r
<LibraryClassDefinitions>\r
<OutputFileBasename>English</OutputFileBasename>\r
</ModuleDefinitions>\r
<LibraryClassDefinitions>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
+ <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
<Keyword>DebugLib</Keyword>\r
<Keyword>DebugLib</Keyword>\r
+ <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiDriverEntryPoint</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiDriverEntryPoint</Keyword>\r
<GuidValue>13AC6DD0-73D0-11D4-B06B-00AA00BD6DE7</GuidValue>\r
<Version>1.0</Version>\r
<Abstract>Component description file for Ebc module.</Abstract>\r
<GuidValue>13AC6DD0-73D0-11D4-B06B-00AA00BD6DE7</GuidValue>\r
<Version>1.0</Version>\r
<Abstract>Component description file for Ebc module.</Abstract>\r
- <Description>This module for the EBC virtual machine implementation.</Description>\r
- <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+ <Description>This module for the EBC virtual machine implementation produces \r
+ EBC and EBC debug support protocols.</Description>\r
+ <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
<License>All rights reserved. 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
<License>All rights reserved. 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
<Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052</Specification>\r
</MsaHeader>\r
<ModuleDefinitions>\r
<Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052</Specification>\r
</MsaHeader>\r
<ModuleDefinitions>\r
- <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+ <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>\r
<BinaryModule>false</BinaryModule>\r
<OutputFileBasename>Ebc</OutputFileBasename>\r
</ModuleDefinitions>\r
<BinaryModule>false</BinaryModule>\r
<OutputFileBasename>Ebc</OutputFileBasename>\r
</ModuleDefinitions>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>BaseLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>BaseLib</Keyword>\r
</LibraryClass>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
+ <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
<Keyword>DebugLib</Keyword>\r
<Keyword>DebugLib</Keyword>\r
+ <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiDriverEntryPoint</Keyword>\r
</LibraryClass>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiDriverEntryPoint</Keyword>\r
</LibraryClass>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
- <Keyword>ReportStatusCodeLib</Keyword>\r
- </LibraryClass>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
- <Keyword>UefiLib</Keyword>\r
- </LibraryClass>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
- <Keyword>BaseLib</Keyword>\r
- </LibraryClass>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
+ <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a">\r
<Keyword>BaseMemoryLib</Keyword>\r
<Keyword>BaseMemoryLib</Keyword>\r
+ <HelpText>Recommended libary Instance is DxeMemoryLib instance in MdePkg.</HelpText>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
- <Keyword>MemoryAllocationLib</Keyword>\r
+ <Keyword>UefiBootServicesTableLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
- <Keyword>UefiBootServicesTableLib</Keyword>\r
+ <Keyword>MemoryAllocationLib</Keyword>\r
</LibraryClass>\r
</LibraryClassDefinitions>\r
<SourceFiles>\r
</LibraryClass>\r
</LibraryClassDefinitions>\r
<SourceFiles>\r
<Filename>EbcExecute.c</Filename>\r
<Filename>EbcExecute.h</Filename>\r
<Filename>Ebc.dxs</Filename>\r
<Filename>EbcExecute.c</Filename>\r
<Filename>EbcExecute.h</Filename>\r
<Filename>Ebc.dxs</Filename>\r
- <Filename SupArchList="IA32">Ia32/EbcLowLevel.asm</Filename>\r
- <Filename SupArchList="IA32">Ia32/EbcLowLevel.S</Filename>\r
+ <Filename SupArchList="IA32" ToolChainFamily="MSFT">Ia32/EbcLowLevel.asm</Filename>\r
+ <Filename SupArchList="IA32" ToolChainFamily="GCC">Ia32/EbcLowLevel.S</Filename>\r
<Filename SupArchList="IA32">Ia32/EbcSupport.c</Filename>\r
<Filename SupArchList="IA32">Ia32/EbcSupport.c</Filename>\r
- <Filename SupArchList="X64">x64/EbcLowLevel.asm</Filename>\r
- <Filename SupArchList="X64" ToolChainFamily="gcc">x64/EbcLowLevel.S</Filename>\r
+ <Filename SupArchList="X64" ToolChainFamily="MSFT">x64/EbcLowLevel.asm</Filename>\r
+ <Filename SupArchList="X64" ToolChainFamily="GCC">x64/EbcLowLevel.S</Filename>\r
<Filename SupArchList="X64">x64/EbcSupport.c</Filename>\r
<Filename SupArchList="IPF">Ipf/EbcLowLevel.s</Filename>\r
<Filename SupArchList="IPF">Ipf/EbcSupport.c</Filename>\r
<Filename SupArchList="X64">x64/EbcSupport.c</Filename>\r
<Filename SupArchList="IPF">Ipf/EbcLowLevel.s</Filename>\r
<Filename SupArchList="IPF">Ipf/EbcSupport.c</Filename>\r
+ <Filename SupArchList="IPF">Ipf/EbcSupport.h</Filename>\r
</SourceFiles>\r
<PackageDependencies>\r
<Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
</SourceFiles>\r
<PackageDependencies>\r
<Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
- <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
</PackageDependencies>\r
<Protocols>\r
<Protocol Usage="ALWAYS_PRODUCED">\r
</PackageDependencies>\r
<Protocols>\r
<Protocol Usage="ALWAYS_PRODUCED">\r
//\r
// Allocate memory for our protocol. Then fill in the blanks.\r
//\r
//\r
// Allocate memory for our protocol. Then fill in the blanks.\r
//\r
- Status = gBS->AllocatePool (\r
- EfiBootServicesData,\r
- sizeof (EFI_EBC_PROTOCOL),\r
- (VOID **) &EbcProtocol\r
- );\r
- if (Status != EFI_SUCCESS) {\r
+ EbcProtocol = AllocatePool (sizeof (EFI_EBC_PROTOCOL));\r
+\r
+ if (EbcProtocol == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
}\r
\r
if (HandleBuffer != NULL) {\r
}\r
\r
if (HandleBuffer != NULL) {\r
- gBS->FreePool (HandleBuffer);\r
+ FreePool (HandleBuffer);\r
HandleBuffer = NULL;\r
}\r
//\r
HandleBuffer = NULL;\r
}\r
//\r
EbcProtocol\r
);\r
if (EFI_ERROR (Status)) {\r
EbcProtocol\r
);\r
if (EFI_ERROR (Status)) {\r
- gBS->FreePool (EbcProtocol);\r
+ FreePool (EbcProtocol);\r
return Status;\r
}\r
}\r
//\r
// Allocate memory for our debug protocol. Then fill in the blanks.\r
//\r
return Status;\r
}\r
}\r
//\r
// Allocate memory for our debug protocol. Then fill in the blanks.\r
//\r
- Status = gBS->AllocatePool (\r
- EfiBootServicesData,\r
- sizeof (EFI_DEBUG_SUPPORT_PROTOCOL),\r
- (VOID **) &EbcDebugProtocol\r
- );\r
- if (Status != EFI_SUCCESS) {\r
+ EbcDebugProtocol = AllocatePool (sizeof (EFI_DEBUG_SUPPORT_PROTOCOL));\r
+\r
+ if (EbcDebugProtocol == NULL) {\r
// This is recoverable, so free the memory and continue.\r
//\r
if (EFI_ERROR (Status)) {\r
// This is recoverable, so free the memory and continue.\r
//\r
if (EFI_ERROR (Status)) {\r
- gBS->FreePool (EbcDebugProtocol);\r
+ FreePool (EbcDebugProtocol);\r
goto ErrorExit;\r
}\r
//\r
goto ErrorExit;\r
}\r
//\r
}\r
\r
if (HandleBuffer != NULL) {\r
}\r
\r
if (HandleBuffer != NULL) {\r
- gBS->FreePool (HandleBuffer);\r
+ FreePool (HandleBuffer);\r
HandleBuffer = NULL;\r
}\r
\r
HandleBuffer = NULL;\r
}\r
\r
- gBS->FreePool (EbcProtocol);\r
+ FreePool (EbcProtocol);\r
ThunkList = ImageList->ThunkList;\r
while (ThunkList != NULL) {\r
NextThunkList = ThunkList->Next;\r
ThunkList = ImageList->ThunkList;\r
while (ThunkList != NULL) {\r
NextThunkList = ThunkList->Next;\r
- gBS->FreePool (ThunkList->ThunkBuffer);\r
- gBS->FreePool (ThunkList);\r
+ FreePool (ThunkList->ThunkBuffer);\r
+ FreePool (ThunkList);\r
ThunkList = NextThunkList;\r
}\r
//\r
ThunkList = NextThunkList;\r
}\r
//\r
//\r
// Now free up the image list element\r
//\r
//\r
// Now free up the image list element\r
//\r
- gBS->FreePool (ImageList);\r
+ FreePool (ImageList);\r
return EFI_SUCCESS;\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
//\r
// Allocate a new one\r
//\r
//\r
// Allocate a new one\r
//\r
- Status = gBS->AllocatePool (\r
- EfiBootServicesData,\r
- sizeof (EBC_IMAGE_LIST),\r
- (VOID **) &ImageList\r
- );\r
- if (Status != EFI_SUCCESS) {\r
+ ImageList = AllocatePool (sizeof (EBC_IMAGE_LIST));\r
+\r
+ if (ImageList == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
//\r
// Ok, now create a new thunk element to add to the list\r
//\r
//\r
// Ok, now create a new thunk element to add to the list\r
//\r
- Status = gBS->AllocatePool (\r
- EfiBootServicesData,\r
- sizeof (EBC_THUNK_LIST),\r
- (VOID **) &ThunkList\r
- );\r
- if (Status != EFI_SUCCESS) {\r
+ ThunkList = AllocatePool (sizeof (EBC_THUNK_LIST));\r
+\r
+ if (ThunkList == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
//\r
return EFI_OUT_OF_RESOURCES;\r
}\r
//\r
//\r
// Allocate memory for the protocol, then fill in the fields\r
//\r
//\r
// Allocate memory for the protocol, then fill in the fields\r
//\r
- Status = gBS->AllocatePool (EfiBootServicesData, sizeof (EFI_EBC_VM_TEST_PROTOCOL), (VOID **) &EbcVmTestProtocol);\r
- if (Status != EFI_SUCCESS) {\r
+ EbcVmTestProtocol = AllocatePool (sizeof (EFI_EBC_VM_TEST_PROTOCOL));\r
+ if (EbcVmTestProtocol == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
EbcVmTestProtocol->Execute = (EBC_VM_TEST_EXECUTE) EbcExecuteInstructions;\r
return EFI_OUT_OF_RESOURCES;\r
}\r
EbcVmTestProtocol->Execute = (EBC_VM_TEST_EXECUTE) EbcExecuteInstructions;\r
Handle = NULL;\r
Status = gBS->InstallProtocolInterface (&Handle, &mEfiEbcVmTestProtocolGuid, EFI_NATIVE_INTERFACE, EbcVmTestProtocol);\r
if (EFI_ERROR (Status)) {\r
Handle = NULL;\r
Status = gBS->InstallProtocolInterface (&Handle, &mEfiEbcVmTestProtocolGuid, EFI_NATIVE_INTERFACE, EbcVmTestProtocol);\r
if (EFI_ERROR (Status)) {\r
- gBS->FreePool (EbcVmTestProtocol);\r
+ FreePool (EbcVmTestProtocol);\r
UINT32 Addr;\r
INT32 Size;\r
INT32 ThunkSize;\r
UINT32 Addr;\r
INT32 Size;\r
INT32 ThunkSize;\r
\r
//\r
// Check alignment of pointer to EBC code\r
\r
//\r
// Check alignment of pointer to EBC code\r
Size = EBC_THUNK_SIZE;\r
ThunkSize = Size;\r
\r
Size = EBC_THUNK_SIZE;\r
ThunkSize = Size;\r
\r
- Status = gBS->AllocatePool (\r
- EfiBootServicesData,\r
- Size,\r
- (VOID *) &Ptr\r
- );\r
- if (Status != EFI_SUCCESS) {\r
+ Ptr = AllocatePool (Size);\r
+\r
+ if (Ptr == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
//\r
return EFI_OUT_OF_RESOURCES;\r
}\r
//\r
UINT64 *Data64Ptr;\r
UINT32 ThunkSize;\r
UINT32 Size;\r
UINT64 *Data64Ptr;\r
UINT32 ThunkSize;\r
UINT32 Size;\r
\r
//\r
// Check alignment of pointer to EBC code, which must always be aligned\r
\r
//\r
// Check alignment of pointer to EBC code, which must always be aligned\r
//\r
Size = EBC_THUNK_SIZE + EBC_THUNK_ALIGNMENT - 1;\r
ThunkSize = Size;\r
//\r
Size = EBC_THUNK_SIZE + EBC_THUNK_ALIGNMENT - 1;\r
ThunkSize = Size;\r
- Status = gBS->AllocatePool (\r
- EfiBootServicesData,\r
- Size,\r
- (VOID *) &Ptr\r
- );\r
- if (Status != EFI_SUCCESS) {\r
+ Ptr = AllocatePool (Size);\r
+\r
+ if (Ptr == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
//\r
return EFI_OUT_OF_RESOURCES;\r
}\r
//\r
Source = (VOID *) EbcSp;\r
Destination = (VOID *) ((UINT8 *) EbcSp - FrameSize - CPU_STACK_ALIGNMENT);\r
Destination = (VOID *) ((UINTN) ((UINTN) Destination + CPU_STACK_ALIGNMENT - 1) &~((UINTN) CPU_STACK_ALIGNMENT - 1));\r
Source = (VOID *) EbcSp;\r
Destination = (VOID *) ((UINT8 *) EbcSp - FrameSize - CPU_STACK_ALIGNMENT);\r
Destination = (VOID *) ((UINTN) ((UINTN) Destination + CPU_STACK_ALIGNMENT - 1) &~((UINTN) CPU_STACK_ALIGNMENT - 1));\r
- gBS->CopyMem (Destination, Source, FrameSize);\r
+ CopyMem (Destination, Source, FrameSize);\r
EbcAsmLLCALLEX ((UINTN) CallAddr, (UINTN) Destination);\r
}\r
EbcAsmLLCALLEX ((UINTN) CallAddr, (UINTN) Destination);\r
}\r
UINT64 Addr;\r
INT32 Size;\r
INT32 ThunkSize;\r
UINT64 Addr;\r
INT32 Size;\r
INT32 ThunkSize;\r
\r
//\r
// Check alignment of pointer to EBC code\r
\r
//\r
// Check alignment of pointer to EBC code\r
Size = EBC_THUNK_SIZE;\r
ThunkSize = Size;\r
\r
Size = EBC_THUNK_SIZE;\r
ThunkSize = Size;\r
\r
- Status = gBS->AllocatePool (\r
- EfiBootServicesData,\r
- Size,\r
- (VOID *) &Ptr\r
- );\r
- if (Status != EFI_SUCCESS) {\r
+ Ptr = AllocatePool (Size);\r
+\r
+ if (Ptr == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
//\r
return EFI_OUT_OF_RESOURCES;\r
}\r
//\r