mirror of https://github.com/acidanthera/audk.git
Use DiskIo->ReadDisk() API to avoid alignment issue.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8144 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
15a7c2f1fe
commit
96f99e1df8
|
@ -97,13 +97,13 @@ PartitionInstallElToritoChildHandles (
|
|||
break;
|
||||
}
|
||||
|
||||
Status = BlockIo->ReadBlocks (
|
||||
BlockIo,
|
||||
Media->MediaId,
|
||||
VolDescriptorLba,
|
||||
Media->BlockSize,
|
||||
VolDescriptor
|
||||
);
|
||||
Status = DiskIo->ReadDisk (
|
||||
DiskIo,
|
||||
Media->MediaId,
|
||||
VolDescriptorLba,
|
||||
Media->BlockSize,
|
||||
VolDescriptor
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
Found = Status;
|
||||
break;
|
||||
|
@ -140,13 +140,13 @@ PartitionInstallElToritoChildHandles (
|
|||
continue;
|
||||
}
|
||||
|
||||
Status = BlockIo->ReadBlocks (
|
||||
BlockIo,
|
||||
Media->MediaId,
|
||||
Lba,
|
||||
Media->BlockSize,
|
||||
Catalog
|
||||
);
|
||||
Status = DiskIo->ReadDisk (
|
||||
DiskIo,
|
||||
Media->MediaId,
|
||||
Lba,
|
||||
Media->BlockSize,
|
||||
Catalog
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
DEBUG ((EFI_D_ERROR, "EltCheckDevice: error reading catalog %r\n", Status));
|
||||
continue;
|
||||
|
|
|
@ -217,13 +217,13 @@ PartitionInstallGptChildHandles (
|
|||
//
|
||||
// Read the Protective MBR from LBA #0
|
||||
//
|
||||
Status = BlockIo->ReadBlocks (
|
||||
BlockIo,
|
||||
BlockIo->Media->MediaId,
|
||||
0,
|
||||
BlockIo->Media->BlockSize,
|
||||
ProtectiveMbr
|
||||
);
|
||||
Status = DiskIo->ReadDisk (
|
||||
DiskIo,
|
||||
BlockIo->Media->MediaId,
|
||||
0,
|
||||
BlockIo->Media->BlockSize,
|
||||
ProtectiveMbr
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
GptValidStatus = Status;
|
||||
goto Done;
|
||||
|
@ -304,7 +304,7 @@ PartitionInstallGptChildHandles (
|
|||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
GptValidStatus = Status;
|
||||
DEBUG ((EFI_D_ERROR, " Partition Entry ReadBlocks error\n"));
|
||||
DEBUG ((EFI_D_ERROR, " Partition Entry ReadDisk error\n"));
|
||||
goto Done;
|
||||
}
|
||||
|
||||
|
@ -433,13 +433,13 @@ PartitionValidGptTable (
|
|||
//
|
||||
// Read the EFI Partition Table Header
|
||||
//
|
||||
Status = BlockIo->ReadBlocks (
|
||||
BlockIo,
|
||||
BlockIo->Media->MediaId,
|
||||
Lba,
|
||||
BlockSize,
|
||||
PartHdr
|
||||
);
|
||||
Status = DiskIo->ReadDisk (
|
||||
DiskIo,
|
||||
BlockIo->Media->MediaId,
|
||||
Lba,
|
||||
BlockSize,
|
||||
PartHdr
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
FreePool (PartHdr);
|
||||
return FALSE;
|
||||
|
|
|
@ -132,7 +132,6 @@ PartitionInstallMbrChildHandles (
|
|||
EFI_DEVICE_PATH_PROTOCOL *DevicePathNode;
|
||||
EFI_DEVICE_PATH_PROTOCOL *LastDevicePathNode;
|
||||
|
||||
Mbr = NULL;
|
||||
Found = EFI_NOT_FOUND;
|
||||
|
||||
Mbr = AllocatePool (BlockIo->Media->BlockSize);
|
||||
|
@ -140,13 +139,13 @@ PartitionInstallMbrChildHandles (
|
|||
goto Done;
|
||||
}
|
||||
|
||||
Status = BlockIo->ReadBlocks (
|
||||
BlockIo,
|
||||
BlockIo->Media->MediaId,
|
||||
0,
|
||||
BlockIo->Media->BlockSize,
|
||||
Mbr
|
||||
);
|
||||
Status = DiskIo->ReadDisk (
|
||||
DiskIo,
|
||||
BlockIo->Media->MediaId,
|
||||
0,
|
||||
BlockIo->Media->BlockSize,
|
||||
Mbr
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
Found = Status;
|
||||
goto Done;
|
||||
|
@ -240,13 +239,13 @@ PartitionInstallMbrChildHandles (
|
|||
|
||||
do {
|
||||
|
||||
Status = BlockIo->ReadBlocks (
|
||||
BlockIo,
|
||||
BlockIo->Media->MediaId,
|
||||
ExtMbrStartingLba,
|
||||
BlockIo->Media->BlockSize,
|
||||
Mbr
|
||||
);
|
||||
Status = DiskIo->ReadDisk (
|
||||
DiskIo,
|
||||
BlockIo->Media->MediaId,
|
||||
ExtMbrStartingLba,
|
||||
BlockIo->Media->BlockSize,
|
||||
Mbr
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
Found = Status;
|
||||
goto Done;
|
||||
|
|
Loading…
Reference in New Issue