- Reenable partition table exploration, but switch off disk error reporting before doing it.

svn path=/trunk/; revision=40684
This commit is contained in:
Aleksey Bragin 2009-04-24 18:38:10 +00:00
parent 58105388f3
commit c9c9947227

View file

@ -500,9 +500,7 @@ SetHarddiskIdentifier(PCONFIGURATION_COMPONENT_DATA DiskKey,
ULONG Signature; ULONG Signature;
CHAR Identifier[20]; CHAR Identifier[20];
CHAR ArcName[256]; CHAR ArcName[256];
#if 0
PARTITION_TABLE_ENTRY PartitionTableEntry; PARTITION_TABLE_ENTRY PartitionTableEntry;
#endif
/* Read the MBR */ /* Read the MBR */
if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER))
@ -538,9 +536,9 @@ SetHarddiskIdentifier(PCONFIGURATION_COMPONENT_DATA DiskKey,
sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)partition(0)", DriveNumber - 0x80); sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)partition(0)", DriveNumber - 0x80);
FsRegisterDevice(ArcName, &DiskVtbl); FsRegisterDevice(ArcName, &DiskVtbl);
#if 0
/* Add partitions */ /* Add partitions */
i = 0; i = 0;
DiskReportError(FALSE);
while (MachDiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) while (MachDiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry))
{ {
if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED)
@ -550,7 +548,7 @@ SetHarddiskIdentifier(PCONFIGURATION_COMPONENT_DATA DiskKey,
} }
i++; i++;
} }
#endif DiskReportError(TRUE);
/* Convert checksum and signature to identifier string */ /* Convert checksum and signature to identifier string */
Identifier[0] = Hex[(Checksum >> 28) & 0x0F]; Identifier[0] = Hex[(Checksum >> 28) & 0x0F];