Using sizeof(EFO_BLOCK_IO_MEDIA) replace Macro.

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

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
index 401facf4759a9bfd1f664c2fba82f061d72431c6..41001fa2b2ee433b2bba63570b5b0b98bdb93066 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
@@ -602,7 +602,7 @@ PartitionInstallChildHandle (
   Private->BlockIo.Revision = ParentBlockIo->Revision;\r
 \r
   Private->BlockIo.Media    = &Private->Media;\r
-  CopyMem (Private->BlockIo.Media, ParentBlockIo->Media, SIZE_OF_EFI_BLOCK_IO_MEDIA_REV1);\r
+  CopyMem (Private->BlockIo.Media, ParentBlockIo->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r
   Private->Media.LogicalPartition = TRUE;\r
   Private->Media.LastBlock = DivU64x32 (\r
                                MultU64x32 (\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
index f36c9d411ef7fb0bf1464b0960a6c9603c92a8b8..d0d0d52a25965d12bebeefa8ae9dfaf0dbab47cf 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
@@ -86,9 +86,6 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gPartitionComponentName2;
                                    (((UINT8 *) a)[3] << 24) )\r
 \r
 \r
-#define SIZE_OF_EFI_BLOCK_IO_MEDIA_REV1  ((UINTN)&((EFI_BLOCK_IO_MEDIA *)0)->LastBlock + sizeof(EFI_LBA))\r
-#define SIZE_OF_EFI_BLOCK_IO_MEDIA_REV2  sizeof(EFI_BLOCK_IO_MEDIA)\r
-\r
 //\r
 // GPT Partition Entry Status\r
 //\r