tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to pass build 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7590 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8 2009-02-23 04:01:59 +00:00
parent d1b04ae458
commit e89bb6692c
1 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
View File

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