/*++\r
\r
-Copyright (c) 2006, Intel Corporation \r
-All rights reserved. This program and the accompanying materials \r
+Copyright (c) 2006 - 2010, 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
http://opensource.org/licenses/bsd-license.php \r
#include "Support.h"\r
#include "Debug.h"\r
#include "PeLoader.h"\r
-#include "TianoDecompress.h"\r
+#include "LzmaDecompress.h"\r
\r
VOID\r
SystemHang(\r
)\r
{\r
BIOS_MEMORY_MAP *BiosMemoryMap; \r
- //EFILDR_HEADER *EFILDRHeader;\r
EFILDR_IMAGE *EFILDRImage;\r
EFI_MEMORY_DESCRIPTOR EfiMemoryDescriptor[EFI_MAX_MEMORY_DESCRIPTORS];\r
EFI_STATUS Status;\r
ClearScreen();\r
\r
PrintHeader ('A');\r
-\r
- AsciiSPrint (PrintBuffer, 256, "Enter DUET Loader ...\n", BiosMemoryMapBaseAddress);\r
+
+ AsciiSPrint (PrintBuffer, 256, "Enter DUET Loader...\n");\r
PrintString (PrintBuffer);\r
\r
AsciiSPrint (PrintBuffer, 256, "BiosMemoryMapBaseAddress = 0x%x\n", BiosMemoryMapBaseAddress);\r
(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),\r
EFILDRImage->Offset);\r
PrintString (PrintBuffer);\r
-\r
- Status = TianoGetInfo (\r
+ Status = LzmaUefiDecompressGetInfo (\r
(VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),\r
EFILDRImage->Length,\r
&DestinationSize, \r
PrintString (PrintBuffer);\r
SystemHang();\r
}\r
-\r
- Status = TianoDecompress (\r
- (VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),\r
- EFILDRImage->Length,\r
- (VOID *)(UINTN)EFI_DECOMPRESSED_BUFFER_ADDRESS,\r
- DestinationSize, \r
- (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000),\r
- ScratchSize\r
- );\r
+ \r
+ AsciiSPrint (PrintBuffer, 256, "BFV decompress: DestinationSize=0x%X, ScratchSize=0x%X!\n",\r
+ DestinationSize, ScratchSize);\r
+ PrintString (PrintBuffer);\r
+ Status = LzmaUefiDecompress (\r
+ (VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),\r
+ EFILDRImage->Length,\r
+ (VOID *)(UINTN)EFI_DECOMPRESSED_BUFFER_ADDRESS, \r
+ (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000)\r
+ );\r
+ \r
\r
if (EFI_ERROR (Status)) {\r
AsciiSPrint (PrintBuffer, 256, "Fail to decompress BFV!\n");\r
EFILDRImage->Offset);\r
PrintString (PrintBuffer);\r
\r
- Status = TianoGetInfo (\r
+ Status = LzmaUefiDecompressGetInfo (\r
(VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),\r
EFILDRImage->Length,\r
&DestinationSize, \r
SystemHang();\r
}\r
\r
- Status = TianoDecompress (\r
+ Status = LzmaUefiDecompress (\r
(VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),\r
EFILDRImage->Length,\r
(VOID *)(UINTN)EFI_DECOMPRESSED_BUFFER_ADDRESS,\r
- DestinationSize, \r
- (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000),\r
- ScratchSize\r
+ (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000)\r
);\r
if (EFI_ERROR (Status)) {\r
AsciiSPrint (PrintBuffer, 256, "Fail to decompress DxeIpl image\n");\r
EFILDRImage->Offset);\r
PrintString (PrintBuffer);\r
\r
- Status = TianoGetInfo (\r
+ Status = LzmaUefiDecompressGetInfo (\r
(VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),\r
EFILDRImage->Length,\r
&DestinationSize, \r
SystemHang();\r
}\r
\r
- Status = TianoDecompress (\r
+ Status = LzmaUefiDecompress (\r
(VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),\r
- EFILDRImage->Length,\r
+ EFILDRImage->Length,\r
(VOID *)(UINTN)EFI_DECOMPRESSED_BUFFER_ADDRESS,\r
- DestinationSize, \r
- (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000),\r
- ScratchSize\r
+ (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000)\r
);\r
if (EFI_ERROR (Status)) {\r
SystemHang();\r