diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2016-02-18 14:25:56 +0800 |
|---|---|---|
| committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2016-02-19 10:50:09 +0800 |
| commit | e665a69d9d222cceb925f6e2423e75ed7adabd42 (patch) | |
| tree | 09d4627bfd0d0029242d5d9c4a404d4cfd8800b5 /MdeModulePkg/Universal | |
| parent | cc260e629ce130d316cb4a9a6ea1d3f47301b6bd (diff) | |
| download | edk2-e665a69d9d222cceb925f6e2423e75ed7adabd42.tar.gz edk2-e665a69d9d222cceb925f6e2423e75ed7adabd42.tar.bz2 edk2-e665a69d9d222cceb925f6e2423e75ed7adabd42.zip | |
MdeModulePkg/Partition: Use proper partition number for MBR
UEFI Spec 2.3.1.D Section 9.3.5.1 says Partitions are numbered
according to their entry in their respective partition table,
starting with 1.
Update the code for MBR partition to follow this rule.
Ref: https://github.com/tianocore/edk2/issues/50
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Diffstat (limited to 'MdeModulePkg/Universal')
| -rw-r--r-- | MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c index 4b0159c4fa..1946334525 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c @@ -12,7 +12,7 @@ the legacy boot strap code.
Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -136,7 +136,6 @@ PartitionInstallMbrChildHandles ( HARDDRIVE_DEVICE_PATH HdDev;
HARDDRIVE_DEVICE_PATH ParentHdDev;
EFI_STATUS Found;
- UINT32 PartitionNumber;
EFI_DEVICE_PATH_PROTOCOL *DevicePathNode;
EFI_DEVICE_PATH_PROTOCOL *LastDevicePathNode;
UINT32 BlockSize;
@@ -192,8 +191,6 @@ PartitionInstallMbrChildHandles ( }
}
- PartitionNumber = 1;
-
ZeroMem (&HdDev, sizeof (HdDev));
HdDev.Header.Type = MEDIA_DEVICE_PATH;
HdDev.Header.SubType = MEDIA_HARDDRIVE_DP;
@@ -223,7 +220,7 @@ PartitionInstallMbrChildHandles ( continue;
}
- HdDev.PartitionNumber = PartitionNumber ++;
+ HdDev.PartitionNumber = Index + 1;
HdDev.PartitionStart = UNPACK_UINT32 (Mbr->Partition[Index].StartingLBA);
HdDev.PartitionSize = UNPACK_UINT32 (Mbr->Partition[Index].SizeInLBA);
CopyMem (HdDev.Signature, &(Mbr->UniqueMbrSignature[0]), sizeof (Mbr->UniqueMbrSignature));
@@ -252,6 +249,7 @@ PartitionInstallMbrChildHandles ( // It's an extended partition. Follow the extended partition
// chain to get all the logical drives
//
+ Index = 0;
ExtMbrStartingLba = 0;
do {
@@ -277,7 +275,7 @@ PartitionInstallMbrChildHandles ( ExtMbrStartingLba = UNPACK_UINT32 (Mbr->Partition[0].StartingLBA);
continue;
}
- HdDev.PartitionNumber = PartitionNumber ++;
+ HdDev.PartitionNumber = ++Index;
HdDev.PartitionStart = UNPACK_UINT32 (Mbr->Partition[0].StartingLBA) + ExtMbrStartingLba + ParentHdDev.PartitionStart;
HdDev.PartitionSize = UNPACK_UINT32 (Mbr->Partition[0].SizeInLBA);
if ((HdDev.PartitionStart + HdDev.PartitionSize - 1 >= ParentHdDev.PartitionStart + ParentHdDev.PartitionSize) ||
|