From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 23 Feb 2009 04:01:59 +0000 (+0000)
Subject: Update to pass build
X-Git-Tag: edk2-stable201903~18660
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=e89bb6692c9ed496d519d6a15260bb9b655ad9da

Update to pass build

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7590 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
index 21ae8f8501..79f6be6ae5 100644
--- a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
+++ b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
@@ -19,7 +19,7 @@ Revision History
 
 --*/
 
-#include <PiDxe.h>
+#include "PiDxe.h"
 #include <Guid/EventGroup.h>
 #include <Protocol/FvbExtension.h>
 #include <Protocol/FirmwareVolumeBlock.h>
@@ -846,7 +846,7 @@ Returns:
 EFI_STATUS
 EFIAPI
 FvbProtocolGetPhysicalAddress (
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
+  IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
   OUT EFI_PHYSICAL_ADDRESS                        *Address
   )
 /*++
@@ -877,8 +877,8 @@ Returns:
 EFI_STATUS
 EFIAPI
 FvbProtocolGetBlockSize (
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
-  IN CONST EFI_LBA                                     Lba,
+  IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
+  IN  EFI_LBA                                     Lba,
   OUT UINTN                                       *BlockSize,
   OUT UINTN                                       *NumOfBlocks
   )
@@ -921,7 +921,7 @@ Returns:
 EFI_STATUS
 EFIAPI
 FvbProtocolGetAttributes (
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
+  IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
   OUT EFI_FVB_ATTRIBUTES_2                          *Attributes
   )
 /*++
@@ -948,7 +948,7 @@ Returns:
 EFI_STATUS
 EFIAPI
 FvbProtocolSetAttributes (
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
+  IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
   IN OUT EFI_FVB_ATTRIBUTES_2                       *Attributes
   )
 /*++
@@ -975,7 +975,7 @@ Returns:
 EFI_STATUS
 EFIAPI
 FvbProtocolEraseBlocks (
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *This,
+  IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *This,
   ...  
   )
 /*++
@@ -1073,7 +1073,7 @@ Returns:
 EFI_STATUS
 EFIAPI
 FvbProtocolWrite (
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
+  IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
   IN EFI_LBA                                      Lba,
   IN UINTN                                        Offset,
   IN OUT UINTN                                    *NumBytes,
@@ -1115,15 +1115,15 @@ Returns:
 
   FvbDevice = FVB_DEVICE_FROM_THIS (This);
 
-  return FvbWriteBlock (FvbDevice->Instance, (EFI_LBA)Lba, (UINTN)Offset, NumBytes, (UINT8 *)Buffer, mFvbModuleGlobal, EfiGoneVirtual ());
+  return FvbWriteBlock (FvbDevice->Instance, Lba, Offset, NumBytes, Buffer, mFvbModuleGlobal, EfiGoneVirtual ());
 }
 
 EFI_STATUS
 EFIAPI
 FvbProtocolRead (
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
-  IN CONST EFI_LBA                                      Lba,
-  IN CONST UINTN                                        Offset,
+  IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
+  IN EFI_LBA                                      Lba,
+  IN UINTN                                        Offset,
   IN OUT UINTN                                    *NumBytes,
   IN UINT8                                        *Buffer
   )
@@ -1256,7 +1256,7 @@ Returns:
   Ptr           = (UINT16 *) FwVolHeader;
   Checksum      = 0;
   while (HeaderLength > 0) {
-    Checksum = (UINT16)(Checksum + (*Ptr));
+    Checksum = Checksum + (*Ptr);
     HeaderLength--;
     Ptr++;
   }
@@ -1312,8 +1312,12 @@ Returns:
   // Allocate runtime services data for global variable, which contains
   // the private data of all firmware volume block instances
   //
-  mFvbModuleGlobal = AllocateRuntimePool (sizeof (ESAL_FWB_GLOBAL));
-  ASSERT (mFvbModuleGlobal != NULL);
+  Status = gBS->AllocatePool (
+                  EfiRuntimeServicesData,
+                  sizeof (ESAL_FWB_GLOBAL),
+                  (VOID**) &mFvbModuleGlobal
+                  );
+  ASSERT_EFI_ERROR (Status);
 
   //
   // Calculate the total size for all firmware volume block instances
@@ -1362,8 +1366,12 @@ Returns:
   // the private data of each FV instance. But in virtual mode or in physical
   // mode, the address of the the physical memory may be different.
   //
-  mFvbModuleGlobal->FvInstance[FVB_PHYSICAL] = AllocateRuntimePool (BufferSize);
-  ASSERT (mFvbModuleGlobal->FvInstance[FVB_PHYSICAL] != NULL);
+  Status = gBS->AllocatePool (
+                  EfiRuntimeServicesData,
+                  BufferSize,
+                  (VOID**) &mFvbModuleGlobal->FvInstance[FVB_PHYSICAL]
+                  );
+  ASSERT_EFI_ERROR (Status);
 
   //
   // Make a virtual copy of the FvInstance pointer.
@@ -1444,8 +1452,12 @@ Returns:
     //
     // Add a FVB Protocol Instance
     //
-    FvbDevice = AllocateRuntimePool (sizeof (EFI_FW_VOL_BLOCK_DEVICE));
-    ASSERT (FvbDevice != NULL);
+    Status = gBS->AllocatePool (
+                    EfiRuntimeServicesData,
+                    sizeof (EFI_FW_VOL_BLOCK_DEVICE),
+                    (VOID**) &FvbDevice
+                    );
+    ASSERT_EFI_ERROR (Status);
 
     CopyMem (FvbDevice, &mFvbDeviceTemplate, sizeof (EFI_FW_VOL_BLOCK_DEVICE));
 
@@ -1529,8 +1541,12 @@ Returns:
   //
   // Allocate for scratch space, an intermediate buffer for FVB extention
   //
-  mFvbModuleGlobal->FvbScratchSpace[FVB_PHYSICAL] = AllocateRuntimePool (MaxLbaSize);
-  ASSERT (mFvbModuleGlobal->FvbScratchSpace[FVB_PHYSICAL] != NULL);
+  Status = gBS->AllocatePool (
+                  EfiRuntimeServicesData,
+                  MaxLbaSize,
+                  (VOID**)&mFvbModuleGlobal->FvbScratchSpace[FVB_PHYSICAL]
+                  );
+  ASSERT_EFI_ERROR (Status);
 
   mFvbModuleGlobal->FvbScratchSpace[FVB_VIRTUAL] = mFvbModuleGlobal->FvbScratchSpace[FVB_PHYSICAL];