EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
); \r
\r
- if (BlockIo != NULL) {\r
- Private = PARTITION_DEVICE_FROM_BLOCK_IO_THIS (BlockIo);\r
- } else if (BlockIo2 != NULL) {\r
- Private = PARTITION_DEVICE_FROM_BLOCK_IO2_THIS (BlockIo2);\r
- } else {\r
- ASSERT (FALSE);\r
- }\r
+\r
+ Private = PARTITION_DEVICE_FROM_BLOCK_IO_THIS (BlockIo);\r
\r
Status = gBS->CloseProtocol (\r
ControllerHandle,\r
Private->ParentBlockIo2 = ParentBlockIo2;\r
Private->DiskIo = ParentDiskIo;\r
\r
- if (Private->ParentBlockIo != NULL) {\r
- Private->BlockIo.Revision = ParentBlockIo->Revision;\r
-\r
- Private->BlockIo.Media = &Private->Media;\r
- CopyMem (Private->BlockIo.Media, ParentBlockIo->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r
-\r
+ //\r
+ // Set the BlockIO into Private Data.\r
+ //\r
+ Private->BlockIo.Revision = ParentBlockIo->Revision;\r
+ \r
+ Private->BlockIo.Media = &Private->Media;\r
+ CopyMem (Private->BlockIo.Media, ParentBlockIo->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r
\r
- Private->BlockIo.Reset = PartitionReset;\r
- Private->BlockIo.ReadBlocks = PartitionReadBlocks;\r
- Private->BlockIo.WriteBlocks = PartitionWriteBlocks;\r
- Private->BlockIo.FlushBlocks = PartitionFlushBlocks;\r
- }\r
+ Private->BlockIo.Reset = PartitionReset;\r
+ Private->BlockIo.ReadBlocks = PartitionReadBlocks;\r
+ Private->BlockIo.WriteBlocks = PartitionWriteBlocks;\r
+ Private->BlockIo.FlushBlocks = PartitionFlushBlocks;\r
\r
+ //\r
+ // Set the BlockIO2 into Private Data.\r
+ //\r
if (Private->ParentBlockIo2 != NULL) {\r
Private->BlockIo2.Media = &Private->Media2;\r
CopyMem (Private->BlockIo2.Media, ParentBlockIo2->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r
Private->Media.LastBlock = DivU64x32 (\r
MultU64x32 (\r
End - Start + 1,\r
- (ParentBlockIo != NULL) ? ParentBlockIo->Media->BlockSize : ParentBlockIo2->Media->BlockSize\r
+ ParentBlockIo->Media->BlockSize\r
),\r
BlockSize\r
) - 1;\r
// here.\r
//\r
Private->Handle = NULL;\r
- if ((Private->ParentBlockIo != NULL) &&\r
- (Private->ParentBlockIo2 != NULL) &&\r
+ if ((Private->ParentBlockIo2 != NULL) &&\r
(Private->ParentBlockIo2->Media->BlockSize == BlockSize)\r
) {\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
NULL,\r
NULL\r
);\r
- } else {\r
- if (Private->ParentBlockIo != NULL) {\r
- Status = gBS->InstallMultipleProtocolInterfaces (\r
- &Private->Handle,\r
- &gEfiDevicePathProtocolGuid,\r
- Private->DevicePath,\r
- &gEfiBlockIoProtocolGuid,\r
- &Private->BlockIo,\r
- Private->EspGuid,\r
- NULL,\r
- NULL\r
- );\r
- }\r
- if (Private->ParentBlockIo2 != NULL && \r
- Private->ParentBlockIo2->Media->BlockSize == BlockSize\r
- ) {\r
- Status = gBS->InstallMultipleProtocolInterfaces (\r
- &Private->Handle,\r
- &gEfiDevicePathProtocolGuid,\r
- Private->DevicePath,\r
- &gEfiBlockIo2ProtocolGuid,\r
- &Private->BlockIo2,\r
- Private->EspGuid,\r
- NULL,\r
- NULL\r
- );\r
- }\r
+ } else { \r
+ Status = gBS->InstallMultipleProtocolInterfaces (\r
+ &Private->Handle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ Private->DevicePath,\r
+ &gEfiBlockIoProtocolGuid,\r
+ &Private->BlockIo,\r
+ Private->EspGuid,\r
+ NULL,\r
+ NULL\r
+ );\r
}\r
\r
if (!EFI_ERROR (Status)) {\r