X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=DuetPkg%2FEfiLdr%2FEfiLoader.c;h=609e5474832b4bf4ab0033519eb0fb64925b39c4;hb=685f8c760077cb2fb11b74c5758a6d54aebf539f;hp=6b8f5984e9ed3646a340a4ad2401e62c01d1e197;hpb=49794755ba41d962f4448364d301939e26eb2bf2;p=mirror_edk2.git

diff --git a/DuetPkg/EfiLdr/EfiLoader.c b/DuetPkg/EfiLdr/EfiLoader.c
index 6b8f5984e9..609e547483 100644
--- a/DuetPkg/EfiLdr/EfiLoader.c
+++ b/DuetPkg/EfiLdr/EfiLoader.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+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                                            
@@ -22,7 +22,7 @@ Revision History:
 #include "Support.h"
 #include "Debug.h"
 #include "PeLoader.h"
-#include "TianoDecompress.h"
+#include "LzmaDecompress.h"
 
 VOID
 SystemHang(
@@ -40,7 +40,6 @@ EfiLoader (
   )
 {
   BIOS_MEMORY_MAP       *BiosMemoryMap;    
-  //EFILDR_HEADER         *EFILDRHeader;
   EFILDR_IMAGE          *EFILDRImage;
   EFI_MEMORY_DESCRIPTOR EfiMemoryDescriptor[EFI_MAX_MEMORY_DESCRIPTORS];
   EFI_STATUS            Status;
@@ -57,9 +56,7 @@ EfiLoader (
   
   PrintHeader ('A');
   
-  CpuDeadLoop();
-
-  AsciiSPrint (PrintBuffer, 256, "Enter DUET Loader ...\n", BiosMemoryMapBaseAddress);
+  AsciiSPrint (PrintBuffer, 256, "Enter DUET Loader...\n");
   PrintString (PrintBuffer);
 
   AsciiSPrint (PrintBuffer, 256, "BiosMemoryMapBaseAddress = 0x%x\n", BiosMemoryMapBaseAddress);
@@ -98,8 +95,7 @@ EfiLoader (
                (UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),
                EFILDRImage->Offset);
   PrintString (PrintBuffer);
-
-  Status = TianoGetInfo (
+  Status = LzmaUefiDecompressGetInfo (
              (VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),
              EFILDRImage->Length,
              &DestinationSize, 
@@ -115,15 +111,13 @@ EfiLoader (
   AsciiSPrint (PrintBuffer, 256, "BFV decompress: DestinationSize=0x%X, ScratchSize=0x%X!\n",
                DestinationSize, ScratchSize);
   PrintString (PrintBuffer);
+  Status =  LzmaUefiDecompress (
+    (VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),
+    EFILDRImage->Length,
+    (VOID *)(UINTN)EFI_DECOMPRESSED_BUFFER_ADDRESS, 
+    (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000)
+    );
   
-  Status = TianoDecompress (
-             (VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),
-             EFILDRImage->Length,
-             (VOID *)(UINTN)EFI_DECOMPRESSED_BUFFER_ADDRESS,
-             DestinationSize, 
-             (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000),
-             ScratchSize
-             );
 
   if (EFI_ERROR (Status)) {
     AsciiSPrint (PrintBuffer, 256, "Fail to decompress BFV!\n");
@@ -155,7 +149,7 @@ EfiLoader (
                EFILDRImage->Offset);
   PrintString (PrintBuffer);
 
-  Status = TianoGetInfo (
+  Status = LzmaUefiDecompressGetInfo (
              (VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),
              EFILDRImage->Length,
              &DestinationSize, 
@@ -167,13 +161,11 @@ EfiLoader (
     SystemHang();
   }
 
-  Status = TianoDecompress (
+  Status = LzmaUefiDecompress (
              (VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),
              EFILDRImage->Length,
              (VOID *)(UINTN)EFI_DECOMPRESSED_BUFFER_ADDRESS,
-             DestinationSize, 
-             (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000),
-             ScratchSize
+             (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000)
              );
   if (EFI_ERROR (Status)) {
     AsciiSPrint (PrintBuffer, 256, "Fail to decompress DxeIpl image\n");
@@ -222,7 +214,7 @@ PrintHeader ('C');
                EFILDRImage->Offset);
   PrintString (PrintBuffer);
 
-  Status = TianoGetInfo (
+  Status = LzmaUefiDecompressGetInfo (
              (VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),
              EFILDRImage->Length,
              &DestinationSize, 
@@ -234,13 +226,11 @@ PrintHeader ('C');
     SystemHang();
   }
 
-  Status = TianoDecompress (
+  Status = LzmaUefiDecompress (
              (VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),
-             EFILDRImage->Length,
+              EFILDRImage->Length,
              (VOID *)(UINTN)EFI_DECOMPRESSED_BUFFER_ADDRESS,
-             DestinationSize, 
-             (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000),
-             ScratchSize
+             (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000)
              );
   if (EFI_ERROR (Status)) {
     SystemHang();