diff --git a/DiscImageChef.CommonTypes/Partition.cs b/DiscImageChef.CommonTypes/Partition.cs
index ad86bf2d..930b20d9 100644
--- a/DiscImageChef.CommonTypes/Partition.cs
+++ b/DiscImageChef.CommonTypes/Partition.cs
@@ -38,23 +38,23 @@ namespace DiscImageChef.CommonTypes
public struct Partition
{
/// Partition number, 0-started
- public ulong PartitionSequence;
+ public ulong Sequence;
/// Partition type
- public string PartitionType;
+ public string Type;
/// Partition name (if the scheme supports it)
- public string PartitionName;
+ public string Name;
/// Start of the partition, in bytes
- public ulong PartitionStart;
+ public ulong Offset;
/// LBA of partition start
- public ulong PartitionStartSector;
+ public ulong Start;
/// Length in bytes of the partition
- public ulong PartitionLength;
+ public ulong Size;
/// Length in sectors of the partition
- public ulong PartitionSectors;
+ public ulong Length;
/// Information that does not find space in this struct
- public string PartitionDescription;
+ public string Description;
/// LBA of last partition sector
- public ulong PartitionEndSector { get { return PartitionStartSector + PartitionSectors - 1; }}
+ public ulong End { get { return Start + Length - 1; }}
}
}
diff --git a/DiscImageChef.Core/Devices/Dumping/ATA.cs b/DiscImageChef.Core/Devices/Dumping/ATA.cs
index 5d5e8fa0..02f3b3b0 100644
--- a/DiscImageChef.Core/Devices/Dumping/ATA.cs
+++ b/DiscImageChef.Core/Devices/Dumping/ATA.cs
@@ -471,12 +471,12 @@ namespace DiscImageChef.Core.Devices.Dumping
{
xmlFileSysInfo[i] = new PartitionType
{
- Description = partitions[i].PartitionDescription,
- EndSector = (int)(partitions[i].PartitionStartSector + partitions[i].PartitionSectors - 1),
- Name = partitions[i].PartitionName,
- Sequence = (int)partitions[i].PartitionSequence,
- StartSector = (int)partitions[i].PartitionStartSector,
- Type = partitions[i].PartitionType
+ Description = partitions[i].Description,
+ EndSector = (int)(partitions[i].Start + partitions[i].Length - 1),
+ Name = partitions[i].Name,
+ Sequence = (int)partitions[i].Sequence,
+ StartSector = (int)partitions[i].Start,
+ Type = partitions[i].Type
};
List lstFs = new List();
@@ -515,9 +515,9 @@ namespace DiscImageChef.Core.Devices.Dumping
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = blocks,
- PartitionLength = blocks * blockSize
+ Name = "Whole device",
+ Length = blocks,
+ Size = blocks * blockSize
};
foreach(Filesystem _plugin in plugins.PluginsList.Values)
diff --git a/DiscImageChef.Core/Devices/Dumping/SBC.cs b/DiscImageChef.Core/Devices/Dumping/SBC.cs
index 2cf435a3..e87d220f 100644
--- a/DiscImageChef.Core/Devices/Dumping/SBC.cs
+++ b/DiscImageChef.Core/Devices/Dumping/SBC.cs
@@ -623,12 +623,12 @@ namespace DiscImageChef.Core.Devices.Dumping
{
xmlFileSysInfo[i] = new PartitionType
{
- Description = partitions[i].PartitionDescription,
- EndSector = (int)(partitions[i].PartitionStartSector + partitions[i].PartitionSectors - 1),
- Name = partitions[i].PartitionName,
- Sequence = (int)partitions[i].PartitionSequence,
- StartSector = (int)partitions[i].PartitionStartSector,
- Type = partitions[i].PartitionType
+ Description = partitions[i].Description,
+ EndSector = (int)(partitions[i].Start + partitions[i].Length - 1),
+ Name = partitions[i].Name,
+ Sequence = (int)partitions[i].Sequence,
+ StartSector = (int)partitions[i].Start,
+ Type = partitions[i].Type
};
List lstFs = new List();
@@ -676,9 +676,9 @@ namespace DiscImageChef.Core.Devices.Dumping
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = blocks,
- PartitionLength = blocks * blockSize
+ Name = "Whole device",
+ Length = blocks,
+ Size = blocks * blockSize
};
foreach(Filesystem _plugin in plugins.PluginsList.Values)
diff --git a/DiscImageChef.Core/Devices/Dumping/XGD.cs b/DiscImageChef.Core/Devices/Dumping/XGD.cs
index 8a7c0cdc..60e8c390 100644
--- a/DiscImageChef.Core/Devices/Dumping/XGD.cs
+++ b/DiscImageChef.Core/Devices/Dumping/XGD.cs
@@ -779,12 +779,12 @@ namespace DiscImageChef.Core.Devices.Dumping
{
xmlFileSysInfo[i] = new PartitionType
{
- Description = partitions[i].PartitionDescription,
- EndSector = (int)(partitions[i].PartitionStartSector + partitions[i].PartitionSectors - 1),
- Name = partitions[i].PartitionName,
- Sequence = (int)partitions[i].PartitionSequence,
- StartSector = (int)partitions[i].PartitionStartSector,
- Type = partitions[i].PartitionType
+ Description = partitions[i].Description,
+ EndSector = (int)(partitions[i].Start + partitions[i].Length - 1),
+ Name = partitions[i].Name,
+ Sequence = (int)partitions[i].Sequence,
+ StartSector = (int)partitions[i].Start,
+ Type = partitions[i].Type
};
List lstFs = new List();
@@ -832,9 +832,9 @@ namespace DiscImageChef.Core.Devices.Dumping
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = blocks,
- PartitionLength = blocks * blockSize
+ Name = "Whole device",
+ Length = blocks,
+ Size = blocks * blockSize
};
foreach(Filesystem _plugin in plugins.PluginsList.Values)
diff --git a/DiscImageChef.Core/Sidecar.cs b/DiscImageChef.Core/Sidecar.cs
index 5a76d122..06ef2d36 100644
--- a/DiscImageChef.Core/Sidecar.cs
+++ b/DiscImageChef.Core/Sidecar.cs
@@ -547,19 +547,19 @@ namespace DiscImageChef.Core
if(partitions.Count > 0)
{
partitions.Add(new Partition {
- PartitionStartSector = (ulong)xmlTrk.StartSector,
- PartitionSectors = (ulong)((xmlTrk.EndSector - xmlTrk.StartSector) + 1)
+ Start = (ulong)xmlTrk.StartSector,
+ Length = (ulong)((xmlTrk.EndSector - xmlTrk.StartSector) + 1)
});
xmlTrk.FileSystemInformation = new PartitionType[partitions.Count];
for(int i = 0; i < partitions.Count; i++)
{
xmlTrk.FileSystemInformation[i] = new PartitionType();
- xmlTrk.FileSystemInformation[i].Description = partitions[i].PartitionDescription;
- xmlTrk.FileSystemInformation[i].EndSector = (int)(partitions[i].PartitionEndSector);
- xmlTrk.FileSystemInformation[i].Name = partitions[i].PartitionName;
- xmlTrk.FileSystemInformation[i].Sequence = (int)partitions[i].PartitionSequence;
- xmlTrk.FileSystemInformation[i].StartSector = (int)partitions[i].PartitionStartSector;
- xmlTrk.FileSystemInformation[i].Type = partitions[i].PartitionType;
+ xmlTrk.FileSystemInformation[i].Description = partitions[i].Description;
+ xmlTrk.FileSystemInformation[i].EndSector = (int)(partitions[i].End);
+ xmlTrk.FileSystemInformation[i].Name = partitions[i].Name;
+ xmlTrk.FileSystemInformation[i].Sequence = (int)partitions[i].Sequence;
+ xmlTrk.FileSystemInformation[i].StartSector = (int)partitions[i].Start;
+ xmlTrk.FileSystemInformation[i].Type = partitions[i].Type;
List lstFs = new List();
@@ -605,11 +605,11 @@ namespace DiscImageChef.Core
Partition xmlPart = new Partition
{
- PartitionStartSector = (ulong)xmlTrk.StartSector,
- PartitionSectors = (ulong)((xmlTrk.EndSector - xmlTrk.StartSector) + 1),
- PartitionType = xmlTrk.TrackType1.ToString(),
- PartitionLength = (ulong)xmlTrk.Size,
- PartitionSequence = (ulong)xmlTrk.Sequence.TrackNumber
+ Start = (ulong)xmlTrk.StartSector,
+ Length = (ulong)((xmlTrk.EndSector - xmlTrk.StartSector) + 1),
+ Type = xmlTrk.TrackType1.ToString(),
+ Size = (ulong)xmlTrk.Size,
+ Sequence = (ulong)xmlTrk.Sequence.TrackNumber
};
foreach(Filesystem _plugin in plugins.PluginsList.Values)
{
@@ -873,12 +873,12 @@ namespace DiscImageChef.Core
for(int i = 0; i < partitions.Count; i++)
{
sidecar.BlockMedia[0].FileSystemInformation[i] = new PartitionType();
- sidecar.BlockMedia[0].FileSystemInformation[i].Description = partitions[i].PartitionDescription;
- sidecar.BlockMedia[0].FileSystemInformation[i].EndSector = (int)(partitions[i].PartitionEndSector);
- sidecar.BlockMedia[0].FileSystemInformation[i].Name = partitions[i].PartitionName;
- sidecar.BlockMedia[0].FileSystemInformation[i].Sequence = (int)partitions[i].PartitionSequence;
- sidecar.BlockMedia[0].FileSystemInformation[i].StartSector = (int)partitions[i].PartitionStartSector;
- sidecar.BlockMedia[0].FileSystemInformation[i].Type = partitions[i].PartitionType;
+ sidecar.BlockMedia[0].FileSystemInformation[i].Description = partitions[i].Description;
+ sidecar.BlockMedia[0].FileSystemInformation[i].EndSector = (int)(partitions[i].End);
+ sidecar.BlockMedia[0].FileSystemInformation[i].Name = partitions[i].Name;
+ sidecar.BlockMedia[0].FileSystemInformation[i].Sequence = (int)partitions[i].Sequence;
+ sidecar.BlockMedia[0].FileSystemInformation[i].StartSector = (int)partitions[i].Start;
+ sidecar.BlockMedia[0].FileSystemInformation[i].Type = partitions[i].Type;
List lstFs = new List();
@@ -914,9 +914,9 @@ namespace DiscImageChef.Core
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.GetSectors(),
- PartitionLength = image.GetSectors() * image.GetSectorSize()
+ Name = "Whole device",
+ Length = image.GetSectors(),
+ Size = image.GetSectors() * image.GetSectorSize()
};
List lstFs = new List();
diff --git a/DiscImageChef.DiscImages/Alcohol120.cs b/DiscImageChef.DiscImages/Alcohol120.cs
index 983a60a4..cc27c0ea 100644
--- a/DiscImageChef.DiscImages/Alcohol120.cs
+++ b/DiscImageChef.DiscImages/Alcohol120.cs
@@ -597,17 +597,17 @@ namespace DiscImageChef.ImagePlugins
{
Partition partition = new Partition();
- partition.PartitionDescription = string.Format("Track {0}.", trk.point);
- partition.PartitionStartSector = trk.startLba;
- partition.PartitionLength = extra.sectors * trk.sectorSize;
- partition.PartitionSectors = extra.sectors;
- partition.PartitionSequence = trk.point;
- partition.PartitionStart = byte_offset;
- partition.PartitionType = trk.mode.ToString();
+ partition.Description = string.Format("Track {0}.", trk.point);
+ partition.Start = trk.startLba;
+ partition.Size = extra.sectors * trk.sectorSize;
+ partition.Length = extra.sectors;
+ partition.Sequence = trk.point;
+ partition.Offset = byte_offset;
+ partition.Type = trk.mode.ToString();
partitions.Add(partition);
ImageInfo.sectors += extra.sectors;
- byte_offset += partition.PartitionLength;
+ byte_offset += partition.Size;
}
if(!offsetmap.ContainsKey(trk.point))
@@ -666,14 +666,14 @@ namespace DiscImageChef.ImagePlugins
DicConsole.DebugWriteLine("Alcohol 120% plugin", "printing partition map");
foreach(Partition partition in partitions)
{
- DicConsole.DebugWriteLine("Alcohol 120% plugin", "Partition sequence: {0}", partition.PartitionSequence);
- DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition name: {0}", partition.PartitionName);
- DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition description: {0}", partition.PartitionDescription);
- DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition type: {0}", partition.PartitionType);
- DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting sector: {0}", partition.PartitionStartSector);
- DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition sectors: {0}", partition.PartitionSectors);
- DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting offset: {0}", partition.PartitionStart);
- DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition size in bytes: {0}", partition.PartitionLength);
+ DicConsole.DebugWriteLine("Alcohol 120% plugin", "Partition sequence: {0}", partition.Sequence);
+ DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition name: {0}", partition.Name);
+ DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition description: {0}", partition.Description);
+ DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition type: {0}", partition.Type);
+ DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting sector: {0}", partition.Start);
+ DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition sectors: {0}", partition.Length);
+ DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting offset: {0}", partition.Offset);
+ DicConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition size in bytes: {0}", partition.Size);
}
ImageInfo.imageApplication = "Alcohol 120%";
diff --git a/DiscImageChef.DiscImages/BlindWrite4.cs b/DiscImageChef.DiscImages/BlindWrite4.cs
index 560dccc5..cfda0623 100644
--- a/DiscImageChef.DiscImages/BlindWrite4.cs
+++ b/DiscImageChef.DiscImages/BlindWrite4.cs
@@ -751,17 +751,17 @@ namespace DiscImageChef.ImagePlugins
Partition partition = new Partition();
if(bwTrack.pregap > 0)
currentPos += (ulong)(bwTrack.startSector - bwTrack.pregap) * 2352;
- partition.PartitionDescription = track.TrackDescription;
- partition.PartitionLength = (track.TrackEndSector - track.TrackStartSector + 1) * 2352;
- partition.PartitionSectors = track.TrackEndSector - track.TrackStartSector;
- partition.PartitionSequence = track.TrackSequence;
- partition.PartitionStart = currentPos;
- partition.PartitionStartSector = track.TrackStartSector;
- partition.PartitionType = track.TrackType.ToString();
+ partition.Description = track.TrackDescription;
+ partition.Size = (track.TrackEndSector - track.TrackStartSector + 1) * 2352;
+ partition.Length = track.TrackEndSector - track.TrackStartSector;
+ partition.Sequence = track.TrackSequence;
+ partition.Offset = currentPos;
+ partition.Start = track.TrackStartSector;
+ partition.Type = track.TrackType.ToString();
partitions.Add(partition);
tracks.Add(track);
- currentPos += partition.PartitionLength;
+ currentPos += partition.Size;
if(!offsetmap.ContainsKey(track.TrackSequence))
offsetmap.Add(track.TrackSequence, track.TrackStartSector);
diff --git a/DiscImageChef.DiscImages/BlindWrite5.cs b/DiscImageChef.DiscImages/BlindWrite5.cs
index f3f657de..1cee1cd0 100644
--- a/DiscImageChef.DiscImages/BlindWrite5.cs
+++ b/DiscImageChef.DiscImages/BlindWrite5.cs
@@ -851,20 +851,20 @@ namespace DiscImageChef.ImagePlugins
track.Indexes = new Dictionary();
track.Indexes.Add(1, track.TrackStartSector);
- partition.PartitionDescription = track.TrackDescription;
- partition.PartitionLength = (track.TrackEndSector - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector;
- partition.PartitionSectors = (track.TrackEndSector - track.TrackStartSector);
- partition.PartitionSequence = track.TrackSequence;
- partition.PartitionStart = offsetBytes;
- partition.PartitionStartSector = track.TrackStartSector;
- partition.PartitionType = track.TrackType.ToString();
+ partition.Description = track.TrackDescription;
+ partition.Size = (track.TrackEndSector - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector;
+ partition.Length = (track.TrackEndSector - track.TrackStartSector);
+ partition.Sequence = track.TrackSequence;
+ partition.Offset = offsetBytes;
+ partition.Start = track.TrackStartSector;
+ partition.Type = track.TrackType.ToString();
- offsetBytes += partition.PartitionLength;
+ offsetBytes += partition.Size;
tracks.Add(track);
partitions.Add(partition);
offsetmap.Add(track.TrackSequence, track.TrackStartSector);
- ImageInfo.sectors += partition.PartitionSectors;
+ ImageInfo.sectors += partition.Length;
}
}
}
@@ -882,14 +882,14 @@ namespace DiscImageChef.ImagePlugins
DicConsole.DebugWriteLine("BlindWrite5 plugin", "printing partition map");
foreach(Partition partition in partitions)
{
- DicConsole.DebugWriteLine("BlindWrite5 plugin", "Partition sequence: {0}", partition.PartitionSequence);
- DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition name: {0}", partition.PartitionName);
- DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition description: {0}", partition.PartitionDescription);
- DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition type: {0}", partition.PartitionType);
- DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting sector: {0}", partition.PartitionStartSector);
- DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition sectors: {0}", partition.PartitionSectors);
- DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting offset: {0}", partition.PartitionStart);
- DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition size in bytes: {0}", partition.PartitionLength);
+ DicConsole.DebugWriteLine("BlindWrite5 plugin", "Partition sequence: {0}", partition.Sequence);
+ DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition name: {0}", partition.Name);
+ DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition description: {0}", partition.Description);
+ DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition type: {0}", partition.Type);
+ DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting sector: {0}", partition.Start);
+ DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition sectors: {0}", partition.Length);
+ DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting offset: {0}", partition.Offset);
+ DicConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition size in bytes: {0}", partition.Size);
}
if(!isDvd)
diff --git a/DiscImageChef.DiscImages/CDRDAO.cs b/DiscImageChef.DiscImages/CDRDAO.cs
index eafcc3b3..6f513ad6 100644
--- a/DiscImageChef.DiscImages/CDRDAO.cs
+++ b/DiscImageChef.DiscImages/CDRDAO.cs
@@ -820,29 +820,29 @@ namespace DiscImageChef.ImagePlugins
Partition partition = new Partition();
// Index 01
- partition.PartitionDescription = string.Format("Track {0}.", discimage.tracks[i].sequence);
- partition.PartitionName = discimage.tracks[i].title;
- partition.PartitionStartSector = discimage.tracks[i].startSector;
- partition.PartitionLength = (discimage.tracks[i].sectors - index0_len) * discimage.tracks[i].bps;
- partition.PartitionSectors = (discimage.tracks[i].sectors - index0_len);
- partition.PartitionSequence = partitionSequence;
- partition.PartitionStart = byte_offset;
- partition.PartitionType = discimage.tracks[i].tracktype;
+ partition.Description = string.Format("Track {0}.", discimage.tracks[i].sequence);
+ partition.Name = discimage.tracks[i].title;
+ partition.Start = discimage.tracks[i].startSector;
+ partition.Size = (discimage.tracks[i].sectors - index0_len) * discimage.tracks[i].bps;
+ partition.Length = (discimage.tracks[i].sectors - index0_len);
+ partition.Sequence = partitionSequence;
+ partition.Offset = byte_offset;
+ partition.Type = discimage.tracks[i].tracktype;
- byte_offset += partition.PartitionLength;
+ byte_offset += partition.Size;
partitionSequence++;
if(!offsetmap.ContainsKey(discimage.tracks[i].sequence))
- offsetmap.Add(discimage.tracks[i].sequence, partition.PartitionStartSector);
+ offsetmap.Add(discimage.tracks[i].sequence, partition.Start);
else
{
ulong old_start;
offsetmap.TryGetValue(discimage.tracks[i].sequence, out old_start);
- if(partition.PartitionStartSector < old_start)
+ if(partition.Start < old_start)
{
offsetmap.Remove(discimage.tracks[i].sequence);
- offsetmap.Add(discimage.tracks[i].sequence, partition.PartitionStartSector);
+ offsetmap.Add(discimage.tracks[i].sequence, partition.Start);
}
}
@@ -854,14 +854,14 @@ namespace DiscImageChef.ImagePlugins
DicConsole.DebugWriteLine("CDRDAO plugin", "printing partition map");
foreach(Partition partition in partitions)
{
- DicConsole.DebugWriteLine("CDRDAO plugin", "Partition sequence: {0}", partition.PartitionSequence);
- DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition name: {0}", partition.PartitionName);
- DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition description: {0}", partition.PartitionDescription);
- DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition type: {0}", partition.PartitionType);
- DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting sector: {0}", partition.PartitionStartSector);
- DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition sectors: {0}", partition.PartitionSectors);
- DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting offset: {0}", partition.PartitionStart);
- DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition size in bytes: {0}", partition.PartitionLength);
+ DicConsole.DebugWriteLine("CDRDAO plugin", "Partition sequence: {0}", partition.Sequence);
+ DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition name: {0}", partition.Name);
+ DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition description: {0}", partition.Description);
+ DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition type: {0}", partition.Type);
+ DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting sector: {0}", partition.Start);
+ DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition sectors: {0}", partition.Length);
+ DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting offset: {0}", partition.Offset);
+ DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition size in bytes: {0}", partition.Size);
}
foreach(CDRDAOTrack track in discimage.tracks)
diff --git a/DiscImageChef.DiscImages/CDRWin.cs b/DiscImageChef.DiscImages/CDRWin.cs
index 60749998..907c7fec 100644
--- a/DiscImageChef.DiscImages/CDRWin.cs
+++ b/DiscImageChef.DiscImages/CDRWin.cs
@@ -1145,30 +1145,30 @@ namespace DiscImageChef.ImagePlugins
}*/
// Index 01
- partition.PartitionDescription = string.Format("Track {0}.", discimage.tracks[i].sequence);
- partition.PartitionName = discimage.tracks[i].title;
- partition.PartitionStartSector = sector_offset;
- partition.PartitionLength = (discimage.tracks[i].sectors - index0_len) * discimage.tracks[i].bps;
- partition.PartitionSectors = (discimage.tracks[i].sectors - index0_len);
- partition.PartitionSequence = partitionSequence;
- partition.PartitionStart = byte_offset;
- partition.PartitionType = discimage.tracks[i].tracktype;
+ partition.Description = string.Format("Track {0}.", discimage.tracks[i].sequence);
+ partition.Name = discimage.tracks[i].title;
+ partition.Start = sector_offset;
+ partition.Size = (discimage.tracks[i].sectors - index0_len) * discimage.tracks[i].bps;
+ partition.Length = (discimage.tracks[i].sectors - index0_len);
+ partition.Sequence = partitionSequence;
+ partition.Offset = byte_offset;
+ partition.Type = discimage.tracks[i].tracktype;
- sector_offset += partition.PartitionSectors;
- byte_offset += partition.PartitionLength;
+ sector_offset += partition.Length;
+ byte_offset += partition.Size;
partitionSequence++;
if(!offsetmap.ContainsKey(discimage.tracks[i].sequence))
- offsetmap.Add(discimage.tracks[i].sequence, partition.PartitionStartSector);
+ offsetmap.Add(discimage.tracks[i].sequence, partition.Start);
else
{
ulong old_start;
offsetmap.TryGetValue(discimage.tracks[i].sequence, out old_start);
- if(partition.PartitionStartSector < old_start)
+ if(partition.Start < old_start)
{
offsetmap.Remove(discimage.tracks[i].sequence);
- offsetmap.Add(discimage.tracks[i].sequence, partition.PartitionStartSector);
+ offsetmap.Add(discimage.tracks[i].sequence, partition.Start);
}
}
@@ -1180,14 +1180,14 @@ namespace DiscImageChef.ImagePlugins
DicConsole.DebugWriteLine("CDRWin plugin", "printing partition map");
foreach(Partition partition in partitions)
{
- DicConsole.DebugWriteLine("CDRWin plugin", "Partition sequence: {0}", partition.PartitionSequence);
- DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition name: {0}", partition.PartitionName);
- DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition description: {0}", partition.PartitionDescription);
- DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition type: {0}", partition.PartitionType);
- DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting sector: {0}", partition.PartitionStartSector);
- DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition sectors: {0}", partition.PartitionSectors);
- DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting offset: {0}", partition.PartitionStart);
- DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition size in bytes: {0}", partition.PartitionLength);
+ DicConsole.DebugWriteLine("CDRWin plugin", "Partition sequence: {0}", partition.Sequence);
+ DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition name: {0}", partition.Name);
+ DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition description: {0}", partition.Description);
+ DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition type: {0}", partition.Type);
+ DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting sector: {0}", partition.Start);
+ DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition sectors: {0}", partition.Length);
+ DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting offset: {0}", partition.Offset);
+ DicConsole.DebugWriteLine("CDRWin plugin", "\tPartition size in bytes: {0}", partition.Size);
}
foreach(CDRWinTrack track in discimage.tracks)
diff --git a/DiscImageChef.DiscImages/CHD.cs b/DiscImageChef.DiscImages/CHD.cs
index 18ddce10..08b3cd99 100644
--- a/DiscImageChef.DiscImages/CHD.cs
+++ b/DiscImageChef.DiscImages/CHD.cs
@@ -1471,14 +1471,14 @@ namespace DiscImageChef.ImagePlugins
foreach(Track _track in tracks.Values)
{
Partition partition = new Partition();
- partition.PartitionDescription = _track.TrackDescription;
- partition.PartitionLength = (_track.TrackEndSector - _track.TrackStartSector + 1) * (ulong)_track.TrackRawBytesPerSector;
- partition.PartitionSectors = (_track.TrackEndSector - _track.TrackStartSector + 1);
- partition.PartitionSequence = _track.TrackSequence;
- partition.PartitionStart = partPos;
- partition.PartitionStartSector = _track.TrackStartSector;
- partition.PartitionType = _track.TrackType.ToString();
- partPos += partition.PartitionSectors;
+ partition.Description = _track.TrackDescription;
+ partition.Size = (_track.TrackEndSector - _track.TrackStartSector + 1) * (ulong)_track.TrackRawBytesPerSector;
+ partition.Length = (_track.TrackEndSector - _track.TrackStartSector + 1);
+ partition.Sequence = _track.TrackSequence;
+ partition.Offset = partPos;
+ partition.Start = _track.TrackStartSector;
+ partition.Type = _track.TrackType.ToString();
+ partPos += partition.Length;
offsetmap.Add(_track.TrackStartSector, _track.TrackSequence);
if(_track.TrackSubchannelType != TrackSubchannelType.None)
diff --git a/DiscImageChef.DiscImages/CloneCD.cs b/DiscImageChef.DiscImages/CloneCD.cs
index d610d93a..6f5faab7 100644
--- a/DiscImageChef.DiscImages/CloneCD.cs
+++ b/DiscImageChef.DiscImages/CloneCD.cs
@@ -751,14 +751,14 @@ namespace DiscImageChef.DiscImages
}
Partition partition = new Partition();
- partition.PartitionDescription = track.TrackDescription;
- partition.PartitionLength = (track.TrackEndSector - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector;
- partition.PartitionSectors = (track.TrackEndSector - track.TrackStartSector);
- ImageInfo.sectors += partition.PartitionSectors;
- partition.PartitionSequence = track.TrackSequence;
- partition.PartitionStart = track.TrackFileOffset;
- partition.PartitionStartSector = track.TrackStartSector;
- partition.PartitionType = track.TrackType.ToString();
+ partition.Description = track.TrackDescription;
+ partition.Size = (track.TrackEndSector - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector;
+ partition.Length = (track.TrackEndSector - track.TrackStartSector);
+ ImageInfo.sectors += partition.Length;
+ partition.Sequence = track.TrackSequence;
+ partition.Offset = track.TrackFileOffset;
+ partition.Start = track.TrackStartSector;
+ partition.Type = track.TrackType.ToString();
partitions.Add(partition);
offsetmap.Add(track.TrackSequence, track.TrackStartSector);
}
diff --git a/DiscImageChef.DiscImages/DiscJuggler.cs b/DiscImageChef.DiscImages/DiscJuggler.cs
index 7f2527f0..2dd7fe27 100644
--- a/DiscImageChef.DiscImages/DiscJuggler.cs
+++ b/DiscImageChef.DiscImages/DiscJuggler.cs
@@ -510,14 +510,14 @@ namespace DiscImageChef.DiscImages
}
Partition partition = new Partition();
- partition.PartitionDescription = track.TrackDescription;
- partition.PartitionLength = (ulong)(trackLen * track.TrackBytesPerSector);
- partition.PartitionSectors = trackLen;
- ImageInfo.sectors += partition.PartitionSectors;
- partition.PartitionSequence = track.TrackSequence;
- partition.PartitionStart = track.TrackFileOffset;
- partition.PartitionStartSector = track.TrackStartSector;
- partition.PartitionType = track.TrackType.ToString();
+ partition.Description = track.TrackDescription;
+ partition.Size = (ulong)(trackLen * track.TrackBytesPerSector);
+ partition.Length = trackLen;
+ ImageInfo.sectors += partition.Length;
+ partition.Sequence = track.TrackSequence;
+ partition.Offset = track.TrackFileOffset;
+ partition.Start = track.TrackStartSector;
+ partition.Type = track.TrackType.ToString();
partitions.Add(partition);
offsetmap.Add(track.TrackSequence, track.TrackStartSector);
tracks.Add(track);
diff --git a/DiscImageChef.DiscImages/GDI.cs b/DiscImageChef.DiscImages/GDI.cs
index eb5dfbaa..ee0ed256 100644
--- a/DiscImageChef.DiscImages/GDI.cs
+++ b/DiscImageChef.DiscImages/GDI.cs
@@ -387,17 +387,17 @@ namespace DiscImageChef.ImagePlugins
Partition partition = new Partition();
// Index 01
- partition.PartitionDescription = string.Format("Track {0}.", discimage.tracks[i].sequence);
- partition.PartitionName = null;
- partition.PartitionStartSector = discimage.tracks[i].startSector;
- partition.PartitionLength = discimage.tracks[i].sectors * discimage.tracks[i].bps;
- partition.PartitionSectors = discimage.tracks[i].sectors;
- partition.PartitionSequence = discimage.tracks[i].sequence;
- partition.PartitionStart = byte_offset;
- partition.PartitionType = discimage.tracks[i].tracktype.ToString();
+ partition.Description = string.Format("Track {0}.", discimage.tracks[i].sequence);
+ partition.Name = null;
+ partition.Start = discimage.tracks[i].startSector;
+ partition.Size = discimage.tracks[i].sectors * discimage.tracks[i].bps;
+ partition.Length = discimage.tracks[i].sectors;
+ partition.Sequence = discimage.tracks[i].sequence;
+ partition.Offset = byte_offset;
+ partition.Type = discimage.tracks[i].tracktype.ToString();
- byte_offset += partition.PartitionLength;
- offsetmap.Add(discimage.tracks[i].sequence, partition.PartitionStartSector);
+ byte_offset += partition.Size;
+ offsetmap.Add(discimage.tracks[i].sequence, partition.Start);
partitions.Add(partition);
}
diff --git a/DiscImageChef.DiscImages/Nero.cs b/DiscImageChef.DiscImages/Nero.cs
index 5f11234f..1fce49d6 100644
--- a/DiscImageChef.DiscImages/Nero.cs
+++ b/DiscImageChef.DiscImages/Nero.cs
@@ -1643,17 +1643,17 @@ namespace DiscImageChef.ImagePlugins
}*/
partition = new Partition();
- partition.PartitionDescription = string.Format("Track {0} Index 1", _track.TrackSequence);
- partition.PartitionLength = (_neroTrack.EndOfTrack - _neroTrack.Index1);
- partition.PartitionName = StringHandlers.CToString(_neroTrack.ISRC);
- partition.PartitionSectors = partition.PartitionLength / _neroTrack.SectorSize;
- partition.PartitionSequence = PartitionSequence;
- partition.PartitionStart = partitionStartByte;
- partition.PartitionStartSector = _neroTrack.StartLBA + ((_neroTrack.Index1 - _neroTrack.Index0) / _neroTrack.SectorSize);
- partition.PartitionType = NeroTrackModeToTrackType((DAOMode)_neroTrack.Mode).ToString();
+ partition.Description = string.Format("Track {0} Index 1", _track.TrackSequence);
+ partition.Size = (_neroTrack.EndOfTrack - _neroTrack.Index1);
+ partition.Name = StringHandlers.CToString(_neroTrack.ISRC);
+ partition.Length = partition.Size / _neroTrack.SectorSize;
+ partition.Sequence = PartitionSequence;
+ partition.Offset = partitionStartByte;
+ partition.Start = _neroTrack.StartLBA + ((_neroTrack.Index1 - _neroTrack.Index0) / _neroTrack.SectorSize);
+ partition.Type = NeroTrackModeToTrackType((DAOMode)_neroTrack.Mode).ToString();
ImagePartitions.Add(partition);
PartitionSequence++;
- partitionStartByte += partition.PartitionLength;
+ partitionStartByte += partition.Size;
}
}
diff --git a/DiscImageChef.DiscImages/ZZZRawImage.cs b/DiscImageChef.DiscImages/ZZZRawImage.cs
index 477fa0f7..3ad7f692 100644
--- a/DiscImageChef.DiscImages/ZZZRawImage.cs
+++ b/DiscImageChef.DiscImages/ZZZRawImage.cs
@@ -881,12 +881,12 @@ namespace DiscImageChef.ImagePlugins
List parts = new List();
Partition part = new Partition
{
- PartitionStartSector = 0,
- PartitionSectors = ImageInfo.sectors,
- PartitionStart = 0,
- PartitionSequence = 0,
- PartitionType = "MODE1/2048",
- PartitionLength = ImageInfo.sectors * ImageInfo.sectorSize
+ Start = 0,
+ Length = ImageInfo.sectors,
+ Offset = 0,
+ Sequence = 0,
+ Type = "MODE1/2048",
+ Size = ImageInfo.sectors * ImageInfo.sectorSize
};
parts.Add(part);
return parts;
diff --git a/DiscImageChef.Filesystems/APFS.cs b/DiscImageChef.Filesystems/APFS.cs
index 28b21e9a..d94da21d 100644
--- a/DiscImageChef.Filesystems/APFS.cs
+++ b/DiscImageChef.Filesystems/APFS.cs
@@ -72,10 +72,10 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(partition.Start >= partition.End)
return false;
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ byte[] sector = imagePlugin.ReadSector(partition.Start);
ApfsContainerSuperBlock nxSb;
try
@@ -101,10 +101,10 @@ namespace DiscImageChef.Filesystems
xmlFSType = new Schemas.FileSystemType();
information = "";
- if(partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(partition.Start >= partition.End)
return;
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ byte[] sector = imagePlugin.ReadSector(partition.Start);
ApfsContainerSuperBlock nxSb;
try
diff --git a/DiscImageChef.Filesystems/Acorn.cs b/DiscImageChef.Filesystems/Acorn.cs
index d95a7fdc..08e0e9e2 100644
--- a/DiscImageChef.Filesystems/Acorn.cs
+++ b/DiscImageChef.Filesystems/Acorn.cs
@@ -272,7 +272,7 @@ namespace DiscImageChef.Filesystems
// TODO: BBC Master hard disks are untested...
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(partition.Start >= partition.End)
return false;
ulong sbSector;
@@ -285,7 +285,7 @@ namespace DiscImageChef.Filesystems
GCHandle ptr;
// ADFS-S, ADFS-M, ADFS-L, ADFS-D without partitions
- if(partition.PartitionStartSector == 0)
+ if(partition.Start == 0)
{
OldMapSector0 oldMap0;
OldMapSector1 oldMap1;
@@ -381,7 +381,7 @@ namespace DiscImageChef.Filesystems
// Partitioning or not, new formats follow:
DiscRecord drSb;
- sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ sector = imagePlugin.ReadSector(partition.Start);
byte newChk = NewMapChecksum(sector);
DicConsole.DebugWriteLine("ADFS Plugin", "newChk = {0}", newChk);
DicConsole.DebugWriteLine("ADFS Plugin", "map.zoneChecksum = {0}", sector[0]);
@@ -391,7 +391,7 @@ namespace DiscImageChef.Filesystems
if(bootBlockSize % imagePlugin.ImageInfo.sectorSize > 0)
sectorsToRead++;
- byte[] bootSector = imagePlugin.ReadSectors(sbSector + partition.PartitionStartSector, sectorsToRead);
+ byte[] bootSector = imagePlugin.ReadSectors(sbSector + partition.Start, sectorsToRead);
int bootChk = 0;
for(int i = 0; i < 0x1FF; i++)
bootChk = ((bootChk & 0xFF) + (bootChk >> 8) + bootSector[i]);
@@ -460,7 +460,7 @@ namespace DiscImageChef.Filesystems
string discname;
// ADFS-S, ADFS-M, ADFS-L, ADFS-D without partitions
- if(partition.PartitionStartSector == 0)
+ if(partition.Start == 0)
{
OldMapSector0 oldMap0;
OldMapSector1 oldMap1;
@@ -595,7 +595,7 @@ namespace DiscImageChef.Filesystems
// Partitioning or not, new formats follow:
DiscRecord drSb;
- sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ sector = imagePlugin.ReadSector(partition.Start);
byte newChk = NewMapChecksum(sector);
DicConsole.DebugWriteLine("ADFS Plugin", "newChk = {0}", newChk);
DicConsole.DebugWriteLine("ADFS Plugin", "map.zoneChecksum = {0}", sector[0]);
@@ -605,7 +605,7 @@ namespace DiscImageChef.Filesystems
if(bootBlockSize % imagePlugin.ImageInfo.sectorSize > 0)
sectorsToRead++;
- byte[] bootSector = imagePlugin.ReadSectors(sbSector + partition.PartitionStartSector, sectorsToRead);
+ byte[] bootSector = imagePlugin.ReadSectors(sbSector + partition.Start, sectorsToRead);
int bootChk = 0;
for(int i = 0; i < 0x1FF; i++)
bootChk = ((bootChk & 0xFF) + (bootChk >> 8) + bootSector[i]);
diff --git a/DiscImageChef.Filesystems/AmigaDOS.cs b/DiscImageChef.Filesystems/AmigaDOS.cs
index 35dd45f7..d7ce59c3 100644
--- a/DiscImageChef.Filesystems/AmigaDOS.cs
+++ b/DiscImageChef.Filesystems/AmigaDOS.cs
@@ -206,7 +206,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(partition.Start >= partition.End)
return false;
BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
@@ -217,14 +217,14 @@ namespace DiscImageChef.Filesystems
// However while you can set a block size different from the sector size on formatting, the bootblock block
// size for floppies is the sector size, and for RDB is usually is the hard disk sector size,
// so this is not entirely wrong...
- byte[] sector = imagePlugin.ReadSectors(0 + partition.PartitionStartSector, 2);
+ byte[] sector = imagePlugin.ReadSectors(0 + partition.Start, 2);
BootBlock bblk = BigEndianMarshal.ByteArrayToStructureBigEndian(sector);
// AROS boot floppies...
if(sector.Length >= 512 && sector[510] == 0x55 && sector[511] == 0xAA &&
(bblk.diskType & FFS_Mask) != FFS_Mask && (bblk.diskType & MuFS_Mask) != MuFS_Mask)
{
- sector = imagePlugin.ReadSectors(1 + partition.PartitionStartSector, 2);
+ sector = imagePlugin.ReadSectors(1 + partition.Start, 2);
bblk = BigEndianMarshal.ByteArrayToStructureBigEndian(sector);
}
@@ -245,19 +245,19 @@ namespace DiscImageChef.Filesystems
// If bootblock is correct, let's take its rootblock pointer
if(bsum == bblk.checksum)
{
- b_root_ptr = bblk.root_ptr + partition.PartitionStartSector;
+ b_root_ptr = bblk.root_ptr + partition.Start;
DicConsole.DebugWriteLine("AmigaDOS plugin", "Bootblock points to {0} as Rootblock", b_root_ptr);
}
- ulong[] root_ptrs = { b_root_ptr + partition.PartitionStartSector, ((partition.PartitionEndSector - partition.PartitionStartSector) + 1) / 2 + partition.PartitionStartSector - 2,
- ((partition.PartitionEndSector - partition.PartitionStartSector) + 1) / 2 + partition.PartitionStartSector - 1, ((partition.PartitionEndSector - partition.PartitionStartSector) + 1) / 2 + partition.PartitionStartSector};
+ ulong[] root_ptrs = { b_root_ptr + partition.Start, ((partition.End - partition.Start) + 1) / 2 + partition.Start - 2,
+ ((partition.End - partition.Start) + 1) / 2 + partition.Start - 1, ((partition.End - partition.Start) + 1) / 2 + partition.Start};
RootBlock rblk = new RootBlock();
// So to handle even number of sectors
foreach(ulong root_ptr in root_ptrs)
{
- if(root_ptr >= partition.PartitionEndSector || root_ptr < partition.PartitionStartSector)
+ if(root_ptr >= partition.End || root_ptr < partition.Start)
continue;
DicConsole.DebugWriteLine("AmigaDOS plugin", "Searching for Rootblock in sector {0}", root_ptr);
@@ -282,7 +282,7 @@ namespace DiscImageChef.Filesystems
if(blockSize % sector.Length > 0)
sectorsPerBlock++;
- if(root_ptr + sectorsPerBlock >= partition.PartitionEndSector)
+ if(root_ptr + sectorsPerBlock >= partition.End)
continue;
sector = imagePlugin.ReadSectors(root_ptr, sectorsPerBlock);
@@ -312,7 +312,7 @@ namespace DiscImageChef.Filesystems
information = null;
BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
- byte[] BootBlockSectors = imagePlugin.ReadSectors(0 + partition.PartitionStartSector, 2);
+ byte[] BootBlockSectors = imagePlugin.ReadSectors(0 + partition.Start, 2);
BootBlock bootBlk = BigEndianMarshal.ByteArrayToStructureBigEndian(BootBlockSectors);
bootBlk.bootCode = new byte[BootBlockSectors.Length - 12];
@@ -325,12 +325,12 @@ namespace DiscImageChef.Filesystems
// If bootblock is correct, let's take its rootblock pointer
if(bsum == bootBlk.checksum)
{
- b_root_ptr = bootBlk.root_ptr + partition.PartitionStartSector;
+ b_root_ptr = bootBlk.root_ptr + partition.Start;
DicConsole.DebugWriteLine("AmigaDOS plugin", "Bootblock points to {0} as Rootblock", b_root_ptr);
}
- ulong[] root_ptrs = { b_root_ptr + partition.PartitionStartSector, ((partition.PartitionEndSector - partition.PartitionStartSector) + 1) / 2 + partition.PartitionStartSector - 2,
- ((partition.PartitionEndSector - partition.PartitionStartSector) + 1) / 2 + partition.PartitionStartSector - 1, ((partition.PartitionEndSector - partition.PartitionStartSector) + 1) / 2 + partition.PartitionStartSector};
+ ulong[] root_ptrs = { b_root_ptr + partition.Start, ((partition.End - partition.Start) + 1) / 2 + partition.Start - 2,
+ ((partition.End - partition.Start) + 1) / 2 + partition.Start - 1, ((partition.End - partition.Start) + 1) / 2 + partition.Start};
RootBlock rootBlk = new RootBlock();
byte[] RootBlockSector = null;
@@ -341,7 +341,7 @@ namespace DiscImageChef.Filesystems
// So to handle even number of sectors
foreach(ulong root_ptr in root_ptrs)
{
- if(root_ptr >= partition.PartitionEndSector || root_ptr < partition.PartitionStartSector)
+ if(root_ptr >= partition.End || root_ptr < partition.Start)
continue;
DicConsole.DebugWriteLine("AmigaDOS plugin", "Searching for Rootblock in sector {0}", root_ptr);
@@ -366,7 +366,7 @@ namespace DiscImageChef.Filesystems
if(blockSize % RootBlockSector.Length > 0)
sectorsPerBlock++;
- if(root_ptr + sectorsPerBlock >= partition.PartitionEndSector)
+ if(root_ptr + sectorsPerBlock >= partition.End)
continue;
RootBlockSector = imagePlugin.ReadSectors(root_ptr, sectorsPerBlock);
@@ -458,7 +458,7 @@ namespace DiscImageChef.Filesystems
if((bootBlk.diskType & 0xFF) == 4 || (bootBlk.diskType & 0xFF) == 5)
sbInformation.AppendFormat("Directory cache starts at block {0}", rootBlk.extension).AppendLine();
- long blocks = (long)((((partition.PartitionEndSector - partition.PartitionStartSector) + 1) * imagePlugin.ImageInfo.sectorSize) / blockSize);
+ long blocks = (long)((((partition.End - partition.Start) + 1) * imagePlugin.ImageInfo.sectorSize) / blockSize);
sbInformation.AppendFormat("Volume block size is {0} bytes", blockSize).AppendLine();
sbInformation.AppendFormat("Volume has {0} blocks", blocks).AppendLine();
diff --git a/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs b/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs
index f502e3e2..0930de1e 100644
--- a/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs
+++ b/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs
@@ -83,7 +83,7 @@ namespace DiscImageChef.Filesystems.AppleDOS
public AppleDOS(ImagePlugin imagePlugin, Partition partition, Encoding encoding)
{
device = imagePlugin;
- start = partition.PartitionStartSector;
+ start = partition.Start;
Name = "Apple DOS File System";
PluginUUID = new Guid("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n");
if(encoding == null) // TODO: Until Apple ][ encoding is implemented
diff --git a/DiscImageChef.Filesystems/AppleDOS/Info.cs b/DiscImageChef.Filesystems/AppleDOS/Info.cs
index ec3de2a7..f813355a 100644
--- a/DiscImageChef.Filesystems/AppleDOS/Info.cs
+++ b/DiscImageChef.Filesystems/AppleDOS/Info.cs
@@ -45,7 +45,7 @@ namespace DiscImageChef.Filesystems.AppleDOS
if(imagePlugin.ImageInfo.sectors != 455 && imagePlugin.ImageInfo.sectors != 560)
return false;
- if(partition.PartitionStartSector > 0 || imagePlugin.ImageInfo.sectorSize != 256)
+ if(partition.Start > 0 || imagePlugin.ImageInfo.sectorSize != 256)
return false;
int spt = 0;
diff --git a/DiscImageChef.Filesystems/AppleHFS.cs b/DiscImageChef.Filesystems/AppleHFS.cs
index 979fd40c..89380e4b 100644
--- a/DiscImageChef.Filesystems/AppleHFS.cs
+++ b/DiscImageChef.Filesystems/AppleHFS.cs
@@ -73,7 +73,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
byte[] mdb_sector;
@@ -81,7 +81,7 @@ namespace DiscImageChef.Filesystems
if(imagePlugin.GetSectorSize() == 2352 || imagePlugin.GetSectorSize() == 2448 || imagePlugin.GetSectorSize() == 2048)
{
- mdb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ mdb_sector = imagePlugin.ReadSector(2 + partition.Start);
drSigWord = BigEndianBitConverter.ToUInt16(mdb_sector, 0);
if(drSigWord == HFS_MAGIC)
@@ -90,7 +90,7 @@ namespace DiscImageChef.Filesystems
return drSigWord != HFSP_MAGIC;
}
- mdb_sector = Read2048SectorAs512(imagePlugin, 2 + partition.PartitionStartSector * 4);
+ mdb_sector = Read2048SectorAs512(imagePlugin, 2 + partition.Start * 4);
drSigWord = BigEndianBitConverter.ToUInt16(mdb_sector, 0);
if(drSigWord == HFS_MAGIC)
@@ -104,7 +104,7 @@ namespace DiscImageChef.Filesystems
}
else
{
- mdb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ mdb_sector = imagePlugin.ReadSector(2 + partition.Start);
drSigWord = BigEndianBitConverter.ToUInt16(mdb_sector, 0);
if(drSigWord == HFS_MAGIC)
@@ -136,21 +136,21 @@ namespace DiscImageChef.Filesystems
if(imagePlugin.GetSectorSize() == 2352 || imagePlugin.GetSectorSize() == 2448 || imagePlugin.GetSectorSize() == 2048)
{
- mdb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ mdb_sector = imagePlugin.ReadSector(2 + partition.Start);
drSigWord = BigEndianBitConverter.ToUInt16(mdb_sector, 0);
if(drSigWord == HFS_MAGIC)
{
- bb_sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ bb_sector = imagePlugin.ReadSector(partition.Start);
}
else
{
- mdb_sector = Read2048SectorAs512(imagePlugin, 2 + partition.PartitionStartSector * 4);
+ mdb_sector = Read2048SectorAs512(imagePlugin, 2 + partition.Start * 4);
drSigWord = BigEndianBitConverter.ToUInt16(mdb_sector, 0);
if(drSigWord == HFS_MAGIC)
{
- bb_sector = Read2048SectorAs512(imagePlugin, partition.PartitionStartSector * 4);
+ bb_sector = Read2048SectorAs512(imagePlugin, partition.Start * 4);
APMFromHDDOnCD = true;
}
else
@@ -159,11 +159,11 @@ namespace DiscImageChef.Filesystems
}
else
{
- mdb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ mdb_sector = imagePlugin.ReadSector(2 + partition.Start);
drSigWord = BigEndianBitConverter.ToUInt16(mdb_sector, 0);
if(drSigWord == HFS_MAGIC)
- bb_sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ bb_sector = imagePlugin.ReadSector(partition.Start);
else
return;
}
diff --git a/DiscImageChef.Filesystems/AppleHFSPlus.cs b/DiscImageChef.Filesystems/AppleHFSPlus.cs
index e54979df..345c9a32 100644
--- a/DiscImageChef.Filesystems/AppleHFSPlus.cs
+++ b/DiscImageChef.Filesystems/AppleHFSPlus.cs
@@ -71,7 +71,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
ushort drSigWord;
@@ -82,7 +82,7 @@ namespace DiscImageChef.Filesystems
byte[] vh_sector;
ulong hfsp_offset;
- vh_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector); // Read volume header, of HFS Wrapper MDB
+ vh_sector = imagePlugin.ReadSector(2 + partition.Start); // Read volume header, of HFS Wrapper MDB
drSigWord = BigEndianBitConverter.ToUInt16(vh_sector, 0); // Check for HFS Wrapper MDB
@@ -110,7 +110,7 @@ namespace DiscImageChef.Filesystems
hfsp_offset = 0;
}
- vh_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector + hfsp_offset); // Read volume header
+ vh_sector = imagePlugin.ReadSector(2 + partition.Start + hfsp_offset); // Read volume header
drSigWord = BigEndianBitConverter.ToUInt16(vh_sector, 0);
if(drSigWord == HFSP_MAGIC || drSigWord == HFSX_MAGIC)
@@ -132,7 +132,7 @@ namespace DiscImageChef.Filesystems
bool wrapped;
byte[] vh_sector;
- vh_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector); // Read volume header, of HFS Wrapper MDB
+ vh_sector = imagePlugin.ReadSector(2 + partition.Start); // Read volume header, of HFS Wrapper MDB
drSigWord = BigEndianBitConverter.ToUInt16(vh_sector, 0); // Check for HFS Wrapper MDB
@@ -163,7 +163,7 @@ namespace DiscImageChef.Filesystems
wrapped = false;
}
- vh_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector + hfsp_offset); // Read volume header
+ vh_sector = imagePlugin.ReadSector(2 + partition.Start + hfsp_offset); // Read volume header
HPVH.signature = BigEndianBitConverter.ToUInt16(vh_sector, 0x000);
if(HPVH.signature == HFSP_MAGIC || HPVH.signature == HFSX_MAGIC)
diff --git a/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs b/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs
index 3583a537..8263da07 100644
--- a/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs
+++ b/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs
@@ -74,7 +74,7 @@ namespace DiscImageChef.Filesystems.AppleMFS
Name = "Apple Macintosh File System";
PluginUUID = new Guid("36405F8D-0D26-4066-6538-5DBF5D065C3A");
device = imagePlugin;
- partitionStart = partition.PartitionStartSector;
+ partitionStart = partition.Start;
if(encoding == null)
CurrentEncoding = Encoding.GetEncoding("macintosh");
}
diff --git a/DiscImageChef.Filesystems/AppleMFS/Info.cs b/DiscImageChef.Filesystems/AppleMFS/Info.cs
index 8f0689b2..8f8c314c 100644
--- a/DiscImageChef.Filesystems/AppleMFS/Info.cs
+++ b/DiscImageChef.Filesystems/AppleMFS/Info.cs
@@ -43,10 +43,10 @@ namespace DiscImageChef.Filesystems.AppleMFS
{
ushort drSigWord;
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
- byte[] mdb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ byte[] mdb_sector = imagePlugin.ReadSector(2 + partition.Start);
BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
@@ -67,8 +67,8 @@ namespace DiscImageChef.Filesystems.AppleMFS
byte[] pString = new byte[16];
byte[] variable_size;
- byte[] mdb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
- byte[] bb_sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] mdb_sector = imagePlugin.ReadSector(2 + partition.Start);
+ byte[] bb_sector = imagePlugin.ReadSector(0 + partition.Start);
BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
diff --git a/DiscImageChef.Filesystems/BFS.cs b/DiscImageChef.Filesystems/BFS.cs
index e350bef1..85ff350d 100644
--- a/DiscImageChef.Filesystems/BFS.cs
+++ b/DiscImageChef.Filesystems/BFS.cs
@@ -69,13 +69,13 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
uint magic;
uint magic_be;
- byte[] sb_sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] sb_sector = imagePlugin.ReadSector(0 + partition.Start);
magic = BitConverter.ToUInt32(sb_sector, 0x20);
magic_be = BigEndianBitConverter.ToUInt32(sb_sector, 0x20);
@@ -92,7 +92,7 @@ namespace DiscImageChef.Filesystems
if(magic == BEFS_MAGIC1 || magic_be == BEFS_MAGIC1)
return true;
- sb_sector = imagePlugin.ReadSector(1 + partition.PartitionStartSector);
+ sb_sector = imagePlugin.ReadSector(1 + partition.Start);
magic = BitConverter.ToUInt32(sb_sector, 0x20);
magic_be = BigEndianBitConverter.ToUInt32(sb_sector, 0x20);
@@ -111,7 +111,7 @@ namespace DiscImageChef.Filesystems
BeSuperBlock besb = new BeSuperBlock();
- byte[] sb_sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] sb_sector = imagePlugin.ReadSector(0 + partition.Start);
BigEndianBitConverter.IsLittleEndian = true; // Default for little-endian
@@ -122,7 +122,7 @@ namespace DiscImageChef.Filesystems
}
else
{
- sb_sector = imagePlugin.ReadSector(1 + partition.PartitionStartSector);
+ sb_sector = imagePlugin.ReadSector(1 + partition.Start);
besb.magic1 = BigEndianBitConverter.ToUInt32(sb_sector, 0x20);
if(besb.magic1 == BEFS_MAGIC1 || besb.magic1 == BEFS_CIGAM1) // There is a boot sector
@@ -131,7 +131,7 @@ namespace DiscImageChef.Filesystems
}
else if(sb_sector.Length >= 0x400)
{
- byte[] temp = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] temp = imagePlugin.ReadSector(0 + partition.Start);
besb.magic1 = BigEndianBitConverter.ToUInt32(temp, 0x220);
if(besb.magic1 == BEFS_MAGIC1 || besb.magic1 == BEFS_CIGAM1) // There is a boot sector
diff --git a/DiscImageChef.Filesystems/BTRFS.cs b/DiscImageChef.Filesystems/BTRFS.cs
index f82c6616..609fdf6d 100644
--- a/DiscImageChef.Filesystems/BTRFS.cs
+++ b/DiscImageChef.Filesystems/BTRFS.cs
@@ -124,16 +124,16 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(partition.Start >= partition.End)
return false;
ulong sbSectorOff = 0x10000 / imagePlugin.GetSectorSize();
uint sbSectorSize = 0x1000 / imagePlugin.GetSectorSize();
- if((sbSectorOff + sbSectorSize) >= partition.PartitionEndSector)
+ if((sbSectorOff + sbSectorSize) >= partition.End)
return false;
- byte[] sector = imagePlugin.ReadSectors(sbSectorOff + partition.PartitionStartSector, sbSectorSize);
+ byte[] sector = imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSectorSize);
SuperBlock btrfsSb;
try
@@ -150,7 +150,7 @@ namespace DiscImageChef.Filesystems
DicConsole.DebugWriteLine("BTRFS Plugin", "sbSectorOff = {0}", sbSectorOff);
DicConsole.DebugWriteLine("BTRFS Plugin", "sbSectorSize = {0}", sbSectorSize);
- DicConsole.DebugWriteLine("BTRFS Plugin", "partition.PartitionStartSector = {0}", partition.PartitionStartSector);
+ DicConsole.DebugWriteLine("BTRFS Plugin", "partition.PartitionStartSector = {0}", partition.Start);
DicConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.magic = 0x{0:X16}", btrfsSb.magic);
return btrfsSb.magic == btrfsMagic;
@@ -165,7 +165,7 @@ namespace DiscImageChef.Filesystems
ulong sbSectorOff = 0x10000 / imagePlugin.GetSectorSize();
uint sbSectorSize = 0x1000 / imagePlugin.GetSectorSize();
- byte[] sector = imagePlugin.ReadSectors(sbSectorOff + partition.PartitionStartSector, sbSectorSize);
+ byte[] sector = imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSectorSize);
SuperBlock btrfsSb;
GCHandle handle = GCHandle.Alloc(sector, GCHandleType.Pinned);
diff --git a/DiscImageChef.Filesystems/CBM.cs b/DiscImageChef.Filesystems/CBM.cs
index 6ee6c1c7..45994f73 100644
--- a/DiscImageChef.Filesystems/CBM.cs
+++ b/DiscImageChef.Filesystems/CBM.cs
@@ -182,7 +182,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector > 0)
+ if(partition.Start > 0)
return false;
if(imagePlugin.ImageInfo.sectorSize != 256)
diff --git a/DiscImageChef.Filesystems/CPM/Info.cs b/DiscImageChef.Filesystems/CPM/Info.cs
index 865ca16f..229f8bc3 100644
--- a/DiscImageChef.Filesystems/CPM/Info.cs
+++ b/DiscImageChef.Filesystems/CPM/Info.cs
@@ -62,7 +62,7 @@ namespace DiscImageChef.Filesystems.CPM
if(!cpmFound)
{
// Read CHS = {0,0,1}
- sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ sector = imagePlugin.ReadSector(0 + partition.Start);
int amsSbOffset = 0;
uint sig1, sig2, sig3;
@@ -123,7 +123,7 @@ namespace DiscImageChef.Filesystems.CPM
dpb.phm += (byte)Math.Pow(2, i);
dpb.spt = (ushort)(amsSb.spt * (sectorSize / 128));
uint directoryLength = (uint)((((ulong)dpb.drm + 1) * 32) / sectorSize);
- directory = imagePlugin.ReadSector(firstDirectorySector + partition.PartitionStartSector, directoryLength);
+ directory = imagePlugin.ReadSector(firstDirectorySector + partition.Start, directoryLength);
// Build a CP/M disk definition
workingDefinition = new CpmDefinition();
@@ -180,7 +180,7 @@ namespace DiscImageChef.Filesystems.CPM
if(!cpmFound)
{
// Read CHS = {0,0,4}
- sector = imagePlugin.ReadSector(3 + partition.PartitionStartSector);
+ sector = imagePlugin.ReadSector(3 + partition.Start);
ushort sum = 0;
// Sum of all 16-bit words that make this sector must be 0
@@ -205,8 +205,8 @@ namespace DiscImageChef.Filesystems.CPM
// If volume size corresponds with working partition (this variant will be inside MBR partitioning)
if(sectorSize == imagePlugin.GetSectorSize() &&
- startingSector == partition.PartitionStartSector &&
- sectorsInPartition + partition.PartitionStartSector <= partition.PartitionEndSector)
+ startingSector == partition.Start &&
+ sectorsInPartition + partition.Start <= partition.End)
{
cpmFound = true;
firstDirectorySector = (ulong)((hddSb.off * hddSb.sectorsPerTrack));
@@ -226,7 +226,7 @@ namespace DiscImageChef.Filesystems.CPM
dpb.psh = 0; // Needed?
dpb.spt = hddSb.spt;
uint directoryLength = (uint)((((ulong)dpb.drm + 1) * 32) / sectorSize);
- directory = imagePlugin.ReadSector(firstDirectorySector + partition.PartitionStartSector, directoryLength);
+ directory = imagePlugin.ReadSector(firstDirectorySector + partition.Start, directoryLength);
DicConsole.DebugWriteLine("CP/M Plugin", "Found CP/M-86 hard disk superblock.");
// Build a CP/M disk definition
@@ -268,7 +268,7 @@ namespace DiscImageChef.Filesystems.CPM
if(!cpmFound)
{
// Read CHS = {0,0,1}
- sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ sector = imagePlugin.ReadSector(0 + partition.Start);
byte formatByte;
// Check for alternate location of format ID
@@ -650,7 +650,7 @@ namespace DiscImageChef.Filesystems.CPM
if(cpmFound)
{
uint directoryLength = (uint)((((ulong)dpb.drm + 1) * 32) / imagePlugin.GetSectorSize());
- directory = imagePlugin.ReadSector(firstDirectorySector86 + partition.PartitionStartSector, directoryLength);
+ directory = imagePlugin.ReadSector(firstDirectorySector86 + partition.Start, directoryLength);
DicConsole.DebugWriteLine("CP/M Plugin", "Found CP/M-86 floppy identifier.");
}
}
@@ -741,7 +741,7 @@ namespace DiscImageChef.Filesystems.CPM
MemoryStream ms = new MemoryStream();
for(int p = 0; p < dirLen; p++)
{
- byte[] dirSector = imagePlugin.ReadSector((ulong)((int)offset + (int)partition.PartitionStartSector + (p / sectorMask.Length) * sectorMask.Length + sectorMask[p % sectorMask.Length]));
+ byte[] dirSector = imagePlugin.ReadSector((ulong)((int)offset + (int)partition.Start + (p / sectorMask.Length) * sectorMask.Length + sectorMask[p % sectorMask.Length]));
ms.Write(dirSector, 0, dirSector.Length);
}
directory = ms.ToArray();
@@ -923,7 +923,7 @@ namespace DiscImageChef.Filesystems.CPM
if(dpb.dsm > 0)
xmlFSType.Clusters = ((dpb.dsm + 1) * 128) / (128 << dpb.bsh);
else
- xmlFSType.Clusters = (long)(partition.PartitionEndSector - partition.PartitionStartSector);
+ xmlFSType.Clusters = (long)(partition.End - partition.Start);
if(labelCreationDate != null)
{
xmlFSType.CreationDate = DateHandlers.CPMToDateTime(labelCreationDate);
diff --git a/DiscImageChef.Filesystems/CPM/Super.cs b/DiscImageChef.Filesystems/CPM/Super.cs
index 76c428ae..98ef3593 100644
--- a/DiscImageChef.Filesystems/CPM/Super.cs
+++ b/DiscImageChef.Filesystems/CPM/Super.cs
@@ -111,9 +111,9 @@ namespace DiscImageChef.Filesystems.CPM
{
DicConsole.DebugWriteLine("CP/M Plugin", "Deinterleaving whole volume.");
- for(int p = 0; p <= (int)(partition.PartitionEndSector - partition.PartitionStartSector); p++)
+ for(int p = 0; p <= (int)(partition.End - partition.Start); p++)
{
- byte[] readSector = device.ReadSector((ulong)((int)partition.PartitionStartSector + (p / sectorMask.Length) * sectorMask.Length + sectorMask[p % sectorMask.Length]));
+ byte[] readSector = device.ReadSector((ulong)((int)partition.Start + (p / sectorMask.Length) * sectorMask.Length + sectorMask[p % sectorMask.Length]));
if(workingDefinition.complement)
{
for(int b = 0; b < readSector.Length; b++)
diff --git a/DiscImageChef.Filesystems/Cram.cs b/DiscImageChef.Filesystems/Cram.cs
index 31fc6bff..e85f1aff 100644
--- a/DiscImageChef.Filesystems/Cram.cs
+++ b/DiscImageChef.Filesystems/Cram.cs
@@ -89,10 +89,10 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(partition.Start >= partition.End)
return false;
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ byte[] sector = imagePlugin.ReadSector(partition.Start);
uint magic = BitConverter.ToUInt32(sector, 0x00);
@@ -101,7 +101,7 @@ namespace DiscImageChef.Filesystems
public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, Partition partition, out string information)
{
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ byte[] sector = imagePlugin.ReadSector(partition.Start);
uint magic = BitConverter.ToUInt32(sector, 0x00);
CramSuperBlock crSb = new CramSuperBlock();
diff --git a/DiscImageChef.Filesystems/ECMA67.cs b/DiscImageChef.Filesystems/ECMA67.cs
index 60149c58..c7d62cc4 100644
--- a/DiscImageChef.Filesystems/ECMA67.cs
+++ b/DiscImageChef.Filesystems/ECMA67.cs
@@ -88,10 +88,10 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector > 0)
+ if(partition.Start > 0)
return false;
- if(partition.PartitionEndSector < 8)
+ if(partition.End < 8)
return false;
byte[] sector = imagePlugin.ReadSector(6);
@@ -128,7 +128,7 @@ namespace DiscImageChef.Filesystems
xmlFSType = new Schemas.FileSystemType();
xmlFSType.Type = "ECMA-67";
xmlFSType.ClusterSize = 256;
- xmlFSType.Clusters = (long)(partition.PartitionEndSector - partition.PartitionStartSector + 1);
+ xmlFSType.Clusters = (long)(partition.End - partition.Start + 1);
xmlFSType.VolumeName = Encoding.ASCII.GetString(vol.volumeIdentifier);
information = sbInformation.ToString();
diff --git a/DiscImageChef.Filesystems/F2FS.cs b/DiscImageChef.Filesystems/F2FS.cs
index b0726c68..1bfe192c 100644
--- a/DiscImageChef.Filesystems/F2FS.cs
+++ b/DiscImageChef.Filesystems/F2FS.cs
@@ -139,7 +139,7 @@ namespace DiscImageChef.Filesystems
if(Marshal.SizeOf(f2fsSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector + sbAddr, sbSize);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
if(sector.Length < Marshal.SizeOf(f2fsSb))
return false;
@@ -167,7 +167,7 @@ namespace DiscImageChef.Filesystems
if(Marshal.SizeOf(f2fsSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector + sbAddr, sbSize);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
if(sector.Length < Marshal.SizeOf(f2fsSb))
return;
diff --git a/DiscImageChef.Filesystems/FAT.cs b/DiscImageChef.Filesystems/FAT.cs
index b54de39c..01d984c1 100644
--- a/DiscImageChef.Filesystems/FAT.cs
+++ b/DiscImageChef.Filesystems/FAT.cs
@@ -59,7 +59,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
ushort bps;
@@ -81,8 +81,8 @@ namespace DiscImageChef.Filesystems
byte[] atari_oem = new byte[6];
ushort bootable = 0;
- byte[] bpb_sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
- byte[] fat_sector = imagePlugin.ReadSector(1 + partition.PartitionStartSector);
+ byte[] bpb_sector = imagePlugin.ReadSector(0 + partition.Start);
+ byte[] fat_sector = imagePlugin.ReadSector(1 + partition.Start);
Array.Copy(bpb_sector, 0x02, atari_oem, 0, 6);
Array.Copy(bpb_sector, 0x03, dos_oem, 0, 8);
@@ -145,7 +145,7 @@ namespace DiscImageChef.Filesystems
// HPFS
uint hpfs_magic1, hpfs_magic2;
- byte[] hpfs_sb_sector = imagePlugin.ReadSector(16 + partition.PartitionStartSector); // Seek to superblock, on logical sector 16
+ byte[] hpfs_sb_sector = imagePlugin.ReadSector(16 + partition.Start); // Seek to superblock, on logical sector 16
hpfs_magic1 = BitConverter.ToUInt32(hpfs_sb_sector, 0x000);
hpfs_magic2 = BitConverter.ToUInt32(hpfs_sb_sector, 0x004);
@@ -157,20 +157,20 @@ namespace DiscImageChef.Filesystems
return true;
// short FAT32
if(bits_in_bps == 1 && correct_spc && fats_no <= 2 && sectors == 0 && fat_sectors == 0 && fat32_signature == 0x28)
- return big_sectors == 0 ? huge_sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1 : big_sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1;
+ return big_sectors == 0 ? huge_sectors <= (partition.End - partition.Start) + 1 : big_sectors <= (partition.End - partition.Start) + 1;
// MSX-DOS FAT12
- if(bits_in_bps == 1 && correct_spc && fats_no <= 2 && root_entries > 0 && sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1 && fat_sectors > 0 && msx_string == "VOL_ID")
+ if(bits_in_bps == 1 && correct_spc && fats_no <= 2 && root_entries > 0 && sectors <= (partition.End - partition.Start) + 1 && fat_sectors > 0 && msx_string == "VOL_ID")
return true;
// EBPB
if(bits_in_bps == 1 && correct_spc && fats_no <= 2 && root_entries > 0 && fat_sectors > 0 && (bpb_signature == 0x28 || bpb_signature == 0x29))
- return sectors == 0 ? big_sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1 : sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1;
+ return sectors == 0 ? big_sectors <= (partition.End - partition.Start) + 1 : sectors <= (partition.End - partition.Start) + 1;
// BPB
- if(bits_in_bps == 1 && correct_spc && reserved_secs < (partition.PartitionEndSector - partition.PartitionStartSector) && fats_no <= 2 && root_entries > 0 && fat_sectors > 0)
- return sectors == 0 ? big_sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1 : sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1;
+ if(bits_in_bps == 1 && correct_spc && reserved_secs < (partition.End - partition.Start) && fats_no <= 2 && root_entries > 0 && fat_sectors > 0)
+ return sectors == 0 ? big_sectors <= (partition.End - partition.Start) + 1 : sectors <= (partition.End - partition.Start) + 1;
// All FAT12 without BPB can only be used on floppies, without partitions.
- if(partition.PartitionStartSector != 0)
+ if(partition.Start != 0)
return false;
byte fat2 = fat_sector[1];
@@ -218,7 +218,7 @@ namespace DiscImageChef.Filesystems
break;
}
- if(fat2_sector_no > partition.PartitionEndSector)
+ if(fat2_sector_no > partition.End)
return false;
DicConsole.DebugWriteLine("FAT plugin", "2nd fat starts at = {0}", fat2_sector_no);
@@ -263,7 +263,7 @@ namespace DiscImageChef.Filesystems
FAT32ParameterBlockShort shortFat32BPB = new FAT32ParameterBlockShort();
FAT32ParameterBlock Fat32BPB = new FAT32ParameterBlock();
- byte[] bpb_sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ byte[] bpb_sector = imagePlugin.ReadSector(partition.Start);
if(imagePlugin.ImageInfo.sectorSize >= 512)
{
@@ -313,9 +313,9 @@ namespace DiscImageChef.Filesystems
else if(bits_in_bps_fat32_short == 1 && correct_spc_fat32_short && shortFat32BPB.fats_no <= 2 && shortFat32BPB.sectors == 0 && shortFat32BPB.spfat == 0 && shortFat32BPB.signature == 0x28)
{
DicConsole.DebugWriteLine("FAT plugin", "Using short FAT32 BPB");
- useShortFAT32 = shortFat32BPB.big_sectors == 0 ? shortFat32BPB.huge_sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1 : shortFat32BPB.big_sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1;
+ useShortFAT32 = shortFat32BPB.big_sectors == 0 ? shortFat32BPB.huge_sectors <= (partition.End - partition.Start) + 1 : shortFat32BPB.big_sectors <= (partition.End - partition.Start) + 1;
}
- else if(bits_in_bps_msx == 1 && correct_spc_msx && msxBPB.fats_no <= 2 && msxBPB.root_ent > 0 && msxBPB.sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1 && msxBPB.spfat > 0 && Encoding.ASCII.GetString(msxBPB.vol_id) == "VOL_ID")
+ else if(bits_in_bps_msx == 1 && correct_spc_msx && msxBPB.fats_no <= 2 && msxBPB.root_ent > 0 && msxBPB.sectors <= (partition.End - partition.Start) + 1 && msxBPB.spfat > 0 && Encoding.ASCII.GetString(msxBPB.vol_id) == "VOL_ID")
{
DicConsole.DebugWriteLine("FAT plugin", "Using MSX BPB");
useMSXBPB = true;
@@ -324,7 +324,7 @@ namespace DiscImageChef.Filesystems
{
if(EBPB.sectors == 0)
{
- if(EBPB.big_sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1)
+ if(EBPB.big_sectors <= (partition.End - partition.Start) + 1)
{
if(EBPB.signature == 0x29)
{
@@ -338,7 +338,7 @@ namespace DiscImageChef.Filesystems
}
}
}
- else if(EBPB.sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1)
+ else if(EBPB.sectors <= (partition.End - partition.Start) + 1)
{
if(EBPB.signature == 0x29)
{
@@ -352,14 +352,14 @@ namespace DiscImageChef.Filesystems
}
}
}
- else if(bits_in_bps_dos33 == 1 && correct_spc_dos33 && dos33BPB.rsectors < (partition.PartitionEndSector - partition.PartitionStartSector) && dos33BPB.fats_no <= 2 && dos33BPB.root_ent > 0 && dos33BPB.spfat > 0)
+ else if(bits_in_bps_dos33 == 1 && correct_spc_dos33 && dos33BPB.rsectors < (partition.End - partition.Start) && dos33BPB.fats_no <= 2 && dos33BPB.root_ent > 0 && dos33BPB.spfat > 0)
{
- if(dos33BPB.sectors == 0 && dos33BPB.hsectors <= partition.PartitionStartSector && dos33BPB.big_sectors > 0 && dos33BPB.big_sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1)
+ if(dos33BPB.sectors == 0 && dos33BPB.hsectors <= partition.Start && dos33BPB.big_sectors > 0 && dos33BPB.big_sectors <= (partition.End - partition.Start) + 1)
{
DicConsole.DebugWriteLine("FAT plugin", "Using DOS 3.3 BPB");
useDOS33BPB = true;
}
- else if(dos33BPB.big_sectors == 0 && dos33BPB.hsectors <= partition.PartitionStartSector && dos33BPB.sectors > 0 && dos33BPB.sectors <= (partition.PartitionEndSector - partition.PartitionStartSector) + 1)
+ else if(dos33BPB.big_sectors == 0 && dos33BPB.hsectors <= partition.Start && dos33BPB.sectors > 0 && dos33BPB.sectors <= (partition.End - partition.Start) + 1)
{
if(atariBPB.jump[0] == 0x60 || (atariBPB.jump[0] == 0xE9 && atariBPB.jump[1] == 0x00) && Encoding.ASCII.GetString(dos33BPB.oem_name) != "NEXT ")
{
@@ -374,7 +374,7 @@ namespace DiscImageChef.Filesystems
}
else
{
- if(dos32BPB.hsectors <= partition.PartitionStartSector && dos32BPB.hsectors + dos32BPB.sectors == dos32BPB.total_sectors)
+ if(dos32BPB.hsectors <= partition.Start && dos32BPB.hsectors + dos32BPB.sectors == dos32BPB.total_sectors)
{
DicConsole.DebugWriteLine("FAT plugin", "Using DOS 3.2 BPB");
useDOS32BPB = true;
@@ -429,7 +429,7 @@ namespace DiscImageChef.Filesystems
if(!useAtariBPB && !useMSXBPB && !useDOS2BPB && !useDOS3BPB && !useDOS32BPB && !useDOS33BPB && !useShortEBPB && !useEBPB && !useShortFAT32 && !useLongFAT32)
{
isFAT12 = true;
- fat_sector = imagePlugin.ReadSector(1 + partition.PartitionStartSector);
+ fat_sector = imagePlugin.ReadSector(1 + partition.Start);
switch(fat_sector[0])
{
case 0xE5:
@@ -671,9 +671,9 @@ namespace DiscImageChef.Filesystems
root_directory_sector = (ulong)((Fat32BPB.root_cluster - 2) * Fat32BPB.spc + Fat32BPB.big_spfat * Fat32BPB.fats_no + Fat32BPB.rsectors) * sectors_per_real_sector;
sectors_for_root_directory = 1;
- if(Fat32BPB.fsinfo_sector + partition.PartitionStartSector <= partition.PartitionEndSector)
+ if(Fat32BPB.fsinfo_sector + partition.Start <= partition.End)
{
- byte[] fsinfo_sector = imagePlugin.ReadSector(Fat32BPB.fsinfo_sector + partition.PartitionStartSector);
+ byte[] fsinfo_sector = imagePlugin.ReadSector(Fat32BPB.fsinfo_sector + partition.Start);
IntPtr fsinfo_ptr = Marshal.AllocHGlobal(512);
Marshal.Copy(fsinfo_sector, 0, fsinfo_ptr, 512);
FSInfoSector fs_info = (FSInfoSector)Marshal.PtrToStructure(fsinfo_ptr, typeof(FSInfoSector));
@@ -874,7 +874,7 @@ namespace DiscImageChef.Filesystems
if(!isFAT12 && !isFAT16)
{
sectors_per_real_sector = fakeBPB.bps / imagePlugin.ImageInfo.sectorSize;
- fat_sector = imagePlugin.ReadSector((fakeBPB.rsectors + partition.PartitionStartSector) * sectors_per_real_sector);
+ fat_sector = imagePlugin.ReadSector((fakeBPB.rsectors + partition.Start) * sectors_per_real_sector);
ulong clusters;
if(fakeBPB.sectors == 0)
@@ -971,7 +971,7 @@ namespace DiscImageChef.Filesystems
sb.AppendFormat("{0} heads.", fakeBPB.heads).AppendLine();
}
- if(fakeBPB.hsectors <= partition.PartitionStartSector)
+ if(fakeBPB.hsectors <= partition.Start)
sb.AppendFormat("{0} hidden sectors before BPB.", fakeBPB.hsectors).AppendLine();
if(fakeBPB.signature == 0x28 || fakeBPB.signature == 0x29)
@@ -1017,9 +1017,9 @@ namespace DiscImageChef.Filesystems
if(extraInfo != null)
sb.Append(extraInfo);
- if(root_directory_sector + partition.PartitionStartSector < partition.PartitionEndSector)
+ if(root_directory_sector + partition.Start < partition.End)
{
- byte[] root_directory = imagePlugin.ReadSectors(root_directory_sector + partition.PartitionStartSector, sectors_for_root_directory);
+ byte[] root_directory = imagePlugin.ReadSectors(root_directory_sector + partition.Start, sectors_for_root_directory);
for(int i = 0; i < root_directory.Length; i += 32)
{
// Not a correct entry
diff --git a/DiscImageChef.Filesystems/FATX.cs b/DiscImageChef.Filesystems/FATX.cs
index 802f72c2..e52f5124 100644
--- a/DiscImageChef.Filesystems/FATX.cs
+++ b/DiscImageChef.Filesystems/FATX.cs
@@ -72,7 +72,7 @@ namespace DiscImageChef.Filesystems
return false;
FATX_Superblock fatxSb = new FATX_Superblock();
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ byte[] sector = imagePlugin.ReadSector(partition.Start);
fatxSb = BigEndianMarshal.ByteArrayToStructureBigEndian(sector);
@@ -87,7 +87,7 @@ namespace DiscImageChef.Filesystems
FATX_Superblock fatxSb = new FATX_Superblock();
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ byte[] sector = imagePlugin.ReadSector(partition.Start);
fatxSb = BigEndianMarshal.ByteArrayToStructureBigEndian(sector);
@@ -106,7 +106,7 @@ namespace DiscImageChef.Filesystems
xmlFSType = new Schemas.FileSystemType();
xmlFSType.Type = "FATX filesystem";
xmlFSType.ClusterSize = (int)(fatxSb.sectorsPerCluster * imagePlugin.ImageInfo.sectorSize);
- xmlFSType.Clusters = (long)((partition.PartitionEndSector - partition.PartitionStartSector + 1) * imagePlugin.ImageInfo.sectorSize / (ulong)xmlFSType.ClusterSize);
+ xmlFSType.Clusters = (long)((partition.End - partition.Start + 1) * imagePlugin.ImageInfo.sectorSize / (ulong)xmlFSType.ClusterSize);
}
public override Errno Mount()
diff --git a/DiscImageChef.Filesystems/FFS.cs b/DiscImageChef.Filesystems/FFS.cs
index c4f82eec..75b22cae 100644
--- a/DiscImageChef.Filesystems/FFS.cs
+++ b/DiscImageChef.Filesystems/FFS.cs
@@ -61,7 +61,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
uint magic;
@@ -73,45 +73,45 @@ namespace DiscImageChef.Filesystems
else
sb_size_in_sectors = block_size / imagePlugin.GetSectorSize();
- if(partition.PartitionEndSector > (partition.PartitionStartSector + sb_start_floppy * sb_size_in_sectors + sb_size_in_sectors))
+ if(partition.End > (partition.Start + sb_start_floppy * sb_size_in_sectors + sb_size_in_sectors))
{
- ufs_sb_sectors = imagePlugin.ReadSectors(partition.PartitionStartSector + sb_start_floppy * sb_size_in_sectors, sb_size_in_sectors);
+ ufs_sb_sectors = imagePlugin.ReadSectors(partition.Start + sb_start_floppy * sb_size_in_sectors, sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
if(magic == UFS_MAGIC || magic == UFS_MAGIC_BW || magic == UFS2_MAGIC || magic == UFS_CIGAM || magic == UFS_BAD_MAGIC)
return true;
}
- if(partition.PartitionEndSector > (partition.PartitionStartSector + sb_start_ufs1 * sb_size_in_sectors + sb_size_in_sectors))
+ if(partition.End > (partition.Start + sb_start_ufs1 * sb_size_in_sectors + sb_size_in_sectors))
{
- ufs_sb_sectors = imagePlugin.ReadSectors(partition.PartitionStartSector + sb_start_ufs1 * sb_size_in_sectors, sb_size_in_sectors);
+ ufs_sb_sectors = imagePlugin.ReadSectors(partition.Start + sb_start_ufs1 * sb_size_in_sectors, sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
if(magic == UFS_MAGIC || magic == UFS_MAGIC_BW || magic == UFS2_MAGIC || magic == UFS_CIGAM || magic == UFS_BAD_MAGIC)
return true;
}
- if(partition.PartitionEndSector > (partition.PartitionStartSector + sb_start_ufs2 * sb_size_in_sectors + sb_size_in_sectors))
+ if(partition.End > (partition.Start + sb_start_ufs2 * sb_size_in_sectors + sb_size_in_sectors))
{
- ufs_sb_sectors = imagePlugin.ReadSectors(partition.PartitionStartSector + sb_start_ufs2 * sb_size_in_sectors, sb_size_in_sectors);
+ ufs_sb_sectors = imagePlugin.ReadSectors(partition.Start + sb_start_ufs2 * sb_size_in_sectors, sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
if(magic == UFS_MAGIC || magic == UFS_MAGIC_BW || magic == UFS2_MAGIC || magic == UFS_CIGAM || magic == UFS_BAD_MAGIC)
return true;
}
- if(partition.PartitionEndSector > (partition.PartitionStartSector + sb_start_piggy * sb_size_in_sectors + sb_size_in_sectors))
+ if(partition.End > (partition.Start + sb_start_piggy * sb_size_in_sectors + sb_size_in_sectors))
{
- ufs_sb_sectors = imagePlugin.ReadSectors(partition.PartitionStartSector + sb_start_piggy * sb_size_in_sectors, sb_size_in_sectors);
+ ufs_sb_sectors = imagePlugin.ReadSectors(partition.Start + sb_start_piggy * sb_size_in_sectors, sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
if(magic == UFS_MAGIC || magic == UFS_MAGIC_BW || magic == UFS2_MAGIC || magic == UFS_CIGAM || magic == UFS_BAD_MAGIC)
return true;
}
- if(partition.PartitionEndSector > (partition.PartitionStartSector + sb_start_atari / imagePlugin.GetSectorSize() + sb_size_in_sectors))
+ if(partition.End > (partition.Start + sb_start_atari / imagePlugin.GetSectorSize() + sb_size_in_sectors))
{
- ufs_sb_sectors = imagePlugin.ReadSectors(partition.PartitionStartSector + (sb_start_atari / imagePlugin.GetSectorSize()), sb_size_in_sectors);
+ ufs_sb_sectors = imagePlugin.ReadSectors(partition.Start + (sb_start_atari / imagePlugin.GetSectorSize()), sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
if(magic == UFS_MAGIC || magic == UFS_MAGIC_BW || magic == UFS2_MAGIC || magic == UFS_CIGAM || magic == UFS_BAD_MAGIC)
@@ -129,7 +129,7 @@ namespace DiscImageChef.Filesystems
uint magic = 0;
uint sb_size_in_sectors;
byte[] ufs_sb_sectors;
- ulong sb_offset = partition.PartitionStartSector;
+ ulong sb_offset = partition.Start;
bool fs_type_42bsd = false;
bool fs_type_43bsd = false;
bool fs_type_44bsd = false;
@@ -143,57 +143,57 @@ namespace DiscImageChef.Filesystems
else
sb_size_in_sectors = block_size / imagePlugin.GetSectorSize();
- if(partition.PartitionEndSector > (partition.PartitionStartSector + sb_start_floppy * sb_size_in_sectors + sb_size_in_sectors) && magic == 0)
+ if(partition.End > (partition.Start + sb_start_floppy * sb_size_in_sectors + sb_size_in_sectors) && magic == 0)
{
- ufs_sb_sectors = imagePlugin.ReadSectors(partition.PartitionStartSector + sb_start_floppy * sb_size_in_sectors, sb_size_in_sectors);
+ ufs_sb_sectors = imagePlugin.ReadSectors(partition.Start + sb_start_floppy * sb_size_in_sectors, sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
if(magic == UFS_MAGIC || magic == UFS_MAGIC_BW || magic == UFS2_MAGIC || magic == UFS_CIGAM || magic == UFS_BAD_MAGIC)
- sb_offset = partition.PartitionStartSector + sb_start_floppy * sb_size_in_sectors;
+ sb_offset = partition.Start + sb_start_floppy * sb_size_in_sectors;
else
magic = 0;
}
- if(partition.PartitionEndSector > (partition.PartitionStartSector + sb_start_ufs1 * sb_size_in_sectors + sb_size_in_sectors) && magic == 0)
+ if(partition.End > (partition.Start + sb_start_ufs1 * sb_size_in_sectors + sb_size_in_sectors) && magic == 0)
{
- ufs_sb_sectors = imagePlugin.ReadSectors(partition.PartitionStartSector + sb_start_ufs1 * sb_size_in_sectors, sb_size_in_sectors);
+ ufs_sb_sectors = imagePlugin.ReadSectors(partition.Start + sb_start_ufs1 * sb_size_in_sectors, sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
if(magic == UFS_MAGIC || magic == UFS_MAGIC_BW || magic == UFS2_MAGIC || magic == UFS_CIGAM || magic == UFS_BAD_MAGIC)
- sb_offset = partition.PartitionStartSector + sb_start_ufs1 * sb_size_in_sectors;
+ sb_offset = partition.Start + sb_start_ufs1 * sb_size_in_sectors;
else
magic = 0;
}
- if(partition.PartitionEndSector > (partition.PartitionStartSector + sb_start_ufs2 * sb_size_in_sectors + sb_size_in_sectors) && magic == 0)
+ if(partition.End > (partition.Start + sb_start_ufs2 * sb_size_in_sectors + sb_size_in_sectors) && magic == 0)
{
- ufs_sb_sectors = imagePlugin.ReadSectors(partition.PartitionStartSector + sb_start_ufs2 * sb_size_in_sectors, sb_size_in_sectors);
+ ufs_sb_sectors = imagePlugin.ReadSectors(partition.Start + sb_start_ufs2 * sb_size_in_sectors, sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
if(magic == UFS_MAGIC || magic == UFS_MAGIC_BW || magic == UFS2_MAGIC || magic == UFS_CIGAM || magic == UFS_BAD_MAGIC)
- sb_offset = partition.PartitionStartSector + sb_start_ufs2 * sb_size_in_sectors;
+ sb_offset = partition.Start + sb_start_ufs2 * sb_size_in_sectors;
else
magic = 0;
}
- if(partition.PartitionEndSector > (partition.PartitionStartSector + sb_start_piggy * sb_size_in_sectors + sb_size_in_sectors) && magic == 0)
+ if(partition.End > (partition.Start + sb_start_piggy * sb_size_in_sectors + sb_size_in_sectors) && magic == 0)
{
- ufs_sb_sectors = imagePlugin.ReadSectors(partition.PartitionStartSector + sb_start_piggy * sb_size_in_sectors, sb_size_in_sectors);
+ ufs_sb_sectors = imagePlugin.ReadSectors(partition.Start + sb_start_piggy * sb_size_in_sectors, sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
if(magic == UFS_MAGIC || magic == UFS_MAGIC_BW || magic == UFS2_MAGIC || magic == UFS_CIGAM || magic == UFS_BAD_MAGIC)
- sb_offset = partition.PartitionStartSector + sb_start_piggy * sb_size_in_sectors;
+ sb_offset = partition.Start + sb_start_piggy * sb_size_in_sectors;
else
magic = 0;
}
- if(partition.PartitionEndSector > (partition.PartitionStartSector + sb_start_atari / imagePlugin.GetSectorSize() + sb_size_in_sectors) && magic == 0)
+ if(partition.End > (partition.Start + sb_start_atari / imagePlugin.GetSectorSize() + sb_size_in_sectors) && magic == 0)
{
- ufs_sb_sectors = imagePlugin.ReadSectors(partition.PartitionStartSector + sb_start_atari / imagePlugin.GetSectorSize(), sb_size_in_sectors);
+ ufs_sb_sectors = imagePlugin.ReadSectors(partition.Start + sb_start_atari / imagePlugin.GetSectorSize(), sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
if(magic == UFS_MAGIC || magic == UFS_MAGIC_BW || magic == UFS2_MAGIC || magic == UFS_CIGAM || magic == UFS_BAD_MAGIC)
- sb_offset = partition.PartitionStartSector + sb_start_atari / imagePlugin.GetSectorSize();
+ sb_offset = partition.Start + sb_start_atari / imagePlugin.GetSectorSize();
else
magic = 0;
}
diff --git a/DiscImageChef.Filesystems/HPFS.cs b/DiscImageChef.Filesystems/HPFS.cs
index 200eedf1..98fe00ac 100644
--- a/DiscImageChef.Filesystems/HPFS.cs
+++ b/DiscImageChef.Filesystems/HPFS.cs
@@ -59,7 +59,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
if(imagePlugin.ImageInfo.sectors <= 16)
@@ -67,7 +67,7 @@ namespace DiscImageChef.Filesystems
uint magic1, magic2;
- byte[] hpfs_sb_sector = imagePlugin.ReadSector(16 + partition.PartitionStartSector); // Seek to superblock, on logical sector 16
+ byte[] hpfs_sb_sector = imagePlugin.ReadSector(16 + partition.Start); // Seek to superblock, on logical sector 16
magic1 = BitConverter.ToUInt32(hpfs_sb_sector, 0x000);
magic2 = BitConverter.ToUInt32(hpfs_sb_sector, 0x004);
@@ -89,9 +89,9 @@ namespace DiscImageChef.Filesystems
byte[] oem_name = new byte[8];
byte[] volume_name = new byte[11];
- byte[] hpfs_bpb_sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector); // Seek to BIOS parameter block, on logical sector 0
- byte[] hpfs_sb_sector = imagePlugin.ReadSector(16 + partition.PartitionStartSector); // Seek to superblock, on logical sector 16
- byte[] hpfs_sp_sector = imagePlugin.ReadSector(17 + partition.PartitionStartSector); // Seek to spareblock, on logical sector 17
+ byte[] hpfs_bpb_sector = imagePlugin.ReadSector(0 + partition.Start); // Seek to BIOS parameter block, on logical sector 0
+ byte[] hpfs_sb_sector = imagePlugin.ReadSector(16 + partition.Start); // Seek to superblock, on logical sector 16
+ byte[] hpfs_sp_sector = imagePlugin.ReadSector(17 + partition.Start); // Seek to spareblock, on logical sector 17
IntPtr bpbPtr = Marshal.AllocHGlobal(512);
Marshal.Copy(hpfs_bpb_sector, 0, bpbPtr, 512);
diff --git a/DiscImageChef.Filesystems/ISO9660.cs b/DiscImageChef.Filesystems/ISO9660.cs
index e35040d5..b51af7fe 100644
--- a/DiscImageChef.Filesystems/ISO9660.cs
+++ b/DiscImageChef.Filesystems/ISO9660.cs
@@ -92,11 +92,11 @@ namespace DiscImageChef.Filesystems
return false;
// ISO9660 Primary Volume Descriptor starts at sector 16, so that's minimal size.
- if(partition.PartitionEndSector <= (16 + partition.PartitionStartSector))
+ if(partition.End <= (16 + partition.Start))
return false;
// Read to Volume Descriptor
- byte[] vd_sector = imagePlugin.ReadSector(16 + partition.PartitionStartSector);
+ byte[] vd_sector = imagePlugin.ReadSector(16 + partition.Start);
int xa_off = 0;
if(vd_sector.Length == 2336)
@@ -159,7 +159,7 @@ namespace DiscImageChef.Filesystems
return;
// ISO9660 Primary Volume Descriptor starts at sector 16, so that's minimal size.
- if(partition.PartitionEndSector < 16)
+ if(partition.End < 16)
return;
ulong counter = 0;
@@ -168,8 +168,8 @@ namespace DiscImageChef.Filesystems
{
DicConsole.DebugWriteLine("ISO9660 plugin", "Processing VD loop no. {0}", counter);
// Seek to Volume Descriptor
- DicConsole.DebugWriteLine("ISO9660 plugin", "Reading sector {0}", 16 + counter + partition.PartitionStartSector);
- byte[] vd_sector_tmp = imagePlugin.ReadSector(16 + counter + partition.PartitionStartSector);
+ DicConsole.DebugWriteLine("ISO9660 plugin", "Reading sector {0}", 16 + counter + partition.Start);
+ byte[] vd_sector_tmp = imagePlugin.ReadSector(16 + counter + partition.Start);
byte[] vd_sector;
if(vd_sector_tmp.Length == 2336)
{
@@ -286,16 +286,16 @@ namespace DiscImageChef.Filesystems
ulong i = (ulong)BitConverter.ToInt32(VDPathTableStart, 0);
- DicConsole.DebugWriteLine("ISO9660 plugin", "VDPathTableStart = {0} + {1} = {2}", i, partition.PartitionStartSector, i + partition.PartitionStartSector);
+ DicConsole.DebugWriteLine("ISO9660 plugin", "VDPathTableStart = {0} + {1} = {2}", i, partition.Start, i + partition.Start);
// TODO: Check this
- if((i + partition.PartitionStartSector) < partition.PartitionEndSector)
+ if((i + partition.Start) < partition.End)
{
- byte[] path_table = imagePlugin.ReadSector(i + partition.PartitionStartSector);
+ byte[] path_table = imagePlugin.ReadSector(i + partition.Start);
Array.Copy(path_table, 2, RootDirectoryLocation, 0, 4);
// Check for Rock Ridge
- byte[] root_dir = imagePlugin.ReadSector((ulong)BitConverter.ToInt32(RootDirectoryLocation, 0) + partition.PartitionStartSector);
+ byte[] root_dir = imagePlugin.ReadSector((ulong)BitConverter.ToInt32(RootDirectoryLocation, 0) + partition.Start);
byte[] SUSPMagic = new byte[2];
byte[] RRMagic = new byte[2];
@@ -316,7 +316,7 @@ namespace DiscImageChef.Filesystems
StringBuilder IPBinInformation = new StringBuilder();
byte[] SegaHardwareID = new byte[16];
- byte[] ipbin_sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] ipbin_sector = imagePlugin.ReadSector(0 + partition.Start);
Array.Copy(ipbin_sector, 0x000, SegaHardwareID, 0, 16);
DicConsole.DebugWriteLine("ISO9660 plugin", "SegaHardwareID = \"{0}\"", CurrentEncoding.GetString(SegaHardwareID));
@@ -984,7 +984,7 @@ namespace DiscImageChef.Filesystems
}
xmlFSType.Bootable |= Bootable || SegaCD || Saturn || Dreamcast;
- xmlFSType.Clusters = (long)(partition.PartitionEndSector - partition.PartitionStartSector + 1);
+ xmlFSType.Clusters = (long)(partition.End - partition.Start + 1);
xmlFSType.ClusterSize = 2048;
information = ISOMetadata.ToString();
diff --git a/DiscImageChef.Filesystems/JFS.cs b/DiscImageChef.Filesystems/JFS.cs
index f3a30d13..5656206c 100644
--- a/DiscImageChef.Filesystems/JFS.cs
+++ b/DiscImageChef.Filesystems/JFS.cs
@@ -152,7 +152,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
uint bootSectors = JFS_BootBlocksSize / imagePlugin.GetSectorSize();
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector + bootSectors);
+ byte[] sector = imagePlugin.ReadSector(partition.Start + bootSectors);
if(sector.Length < 512)
return false;
@@ -170,7 +170,7 @@ namespace DiscImageChef.Filesystems
information = "";
StringBuilder sb = new StringBuilder();
uint bootSectors = JFS_BootBlocksSize / imagePlugin.GetSectorSize();
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector + bootSectors);
+ byte[] sector = imagePlugin.ReadSector(partition.Start + bootSectors);
if(sector.Length < 512)
return;
diff --git a/DiscImageChef.Filesystems/MinixFS.cs b/DiscImageChef.Filesystems/MinixFS.cs
index 9139c02d..0cb0e6d8 100644
--- a/DiscImageChef.Filesystems/MinixFS.cs
+++ b/DiscImageChef.Filesystems/MinixFS.cs
@@ -79,11 +79,11 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
ushort magic;
- byte[] minix_sb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ byte[] minix_sb_sector = imagePlugin.ReadSector(2 + partition.Start);
magic = BitConverter.ToUInt16(minix_sb_sector, 0x010); // Here should reside magic number on Minix V1 & V2
@@ -107,7 +107,7 @@ namespace DiscImageChef.Filesystems
int filenamesize;
string minixVersion;
ushort magic;
- byte[] minix_sb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ byte[] minix_sb_sector = imagePlugin.ReadSector(2 + partition.Start);
magic = BigEndianBitConverter.ToUInt16(minix_sb_sector, 0x018);
@@ -213,7 +213,7 @@ namespace DiscImageChef.Filesystems
sb.AppendFormat("On-disk filesystem version: {0}", mnx_sb.s_disk_version).AppendLine();
xmlFSType.ClusterSize = mnx_sb.s_blocksize;
- xmlFSType.Clusters = (long)((partition.PartitionEndSector - partition.PartitionStartSector + 1) * imagePlugin.GetSectorSize() / mnx_sb.s_blocksize);
+ xmlFSType.Clusters = (long)((partition.End - partition.Start + 1) * imagePlugin.GetSectorSize() / mnx_sb.s_blocksize);
}
else
{
@@ -244,7 +244,7 @@ namespace DiscImageChef.Filesystems
sb.AppendFormat("{0} bytes maximum per file", mnx_sb.s_max_size).AppendLine();
sb.AppendFormat("Filesystem state: {0:X4}", mnx_sb.s_state).AppendLine();
xmlFSType.ClusterSize = 1024;
- xmlFSType.Clusters = (long)((partition.PartitionEndSector - partition.PartitionStartSector + 1) * imagePlugin.GetSectorSize() / 1024);
+ xmlFSType.Clusters = (long)((partition.End - partition.Start + 1) * imagePlugin.GetSectorSize() / 1024);
}
information = sb.ToString();
}
diff --git a/DiscImageChef.Filesystems/NILFS2.cs b/DiscImageChef.Filesystems/NILFS2.cs
index cde33330..8c210ff0 100644
--- a/DiscImageChef.Filesystems/NILFS2.cs
+++ b/DiscImageChef.Filesystems/NILFS2.cs
@@ -127,7 +127,7 @@ namespace DiscImageChef.Filesystems
if(Marshal.SizeOf(nilfsSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector + sbAddr, sbSize);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
if(sector.Length < Marshal.SizeOf(nilfsSb))
return false;
@@ -155,7 +155,7 @@ namespace DiscImageChef.Filesystems
if(Marshal.SizeOf(nilfsSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector + sbAddr, sbSize);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
if(sector.Length < Marshal.SizeOf(nilfsSb))
return;
diff --git a/DiscImageChef.Filesystems/NTFS.cs b/DiscImageChef.Filesystems/NTFS.cs
index c2c559d3..a3d3daaa 100644
--- a/DiscImageChef.Filesystems/NTFS.cs
+++ b/DiscImageChef.Filesystems/NTFS.cs
@@ -58,7 +58,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
byte[] eigth_bytes = new byte[8];
@@ -66,7 +66,7 @@ namespace DiscImageChef.Filesystems
ushort spfat, signature;
string oem_name;
- byte[] ntfs_bpb = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] ntfs_bpb = imagePlugin.ReadSector(0 + partition.Start);
Array.Copy(ntfs_bpb, 0x003, eigth_bytes, 0, 8);
oem_name = StringHandlers.CToString(eigth_bytes);
@@ -95,7 +95,7 @@ namespace DiscImageChef.Filesystems
StringBuilder sb = new StringBuilder();
- byte[] ntfs_bpb = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] ntfs_bpb = imagePlugin.ReadSector(0 + partition.Start);
NTFS_BootBlock ntfs_bb = new NTFS_BootBlock();
IntPtr bpbPtr = Marshal.AllocHGlobal(512);
diff --git a/DiscImageChef.Filesystems/Nintendo.cs b/DiscImageChef.Filesystems/Nintendo.cs
index f712c6ba..0222300d 100644
--- a/DiscImageChef.Filesystems/Nintendo.cs
+++ b/DiscImageChef.Filesystems/Nintendo.cs
@@ -57,7 +57,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector != 0)
+ if(partition.Start != 0)
return false;
if((imagePlugin.GetSectors() * imagePlugin.GetSectorSize()) < 0x50000)
diff --git a/DiscImageChef.Filesystems/ODS.cs b/DiscImageChef.Filesystems/ODS.cs
index d9463ea8..c85fc4f3 100644
--- a/DiscImageChef.Filesystems/ODS.cs
+++ b/DiscImageChef.Filesystems/ODS.cs
@@ -65,7 +65,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
if(imagePlugin.GetSectorSize() < 512)
@@ -73,7 +73,7 @@ namespace DiscImageChef.Filesystems
byte[] magic_b = new byte[12];
string magic;
- byte[] hb_sector = imagePlugin.ReadSector(1 + partition.PartitionStartSector);
+ byte[] hb_sector = imagePlugin.ReadSector(1 + partition.Start);
Array.Copy(hb_sector, 0x1F0, magic_b, 0, 12);
magic = Encoding.ASCII.GetString(magic_b);
@@ -91,7 +91,7 @@ namespace DiscImageChef.Filesystems
homeblock.min_class = new byte[20];
homeblock.max_class = new byte[20];
- byte[] hb_sector = imagePlugin.ReadSector(1 + partition.PartitionStartSector);
+ byte[] hb_sector = imagePlugin.ReadSector(1 + partition.Start);
homeblock.homelbn = BitConverter.ToUInt32(hb_sector, 0x000);
homeblock.alhomelbn = BitConverter.ToUInt32(hb_sector, 0x004);
diff --git a/DiscImageChef.Filesystems/Opera.cs b/DiscImageChef.Filesystems/Opera.cs
index 95e94fd6..558743d0 100644
--- a/DiscImageChef.Filesystems/Opera.cs
+++ b/DiscImageChef.Filesystems/Opera.cs
@@ -56,10 +56,10 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
- byte[] sb_sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] sb_sector = imagePlugin.ReadSector(0 + partition.Start);
byte record_type;
byte[] sync_bytes = new byte[5];
@@ -80,7 +80,7 @@ namespace DiscImageChef.Filesystems
information = "";
StringBuilder SuperBlockMetadata = new StringBuilder();
- byte[] sb_sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] sb_sector = imagePlugin.ReadSector(0 + partition.Start);
OperaSuperBlock sb = new OperaSuperBlock();
byte[] cString = new byte[32];
diff --git a/DiscImageChef.Filesystems/PCEngine.cs b/DiscImageChef.Filesystems/PCEngine.cs
index 9663cf9e..51dd9f16 100644
--- a/DiscImageChef.Filesystems/PCEngine.cs
+++ b/DiscImageChef.Filesystems/PCEngine.cs
@@ -56,11 +56,11 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
byte[] system_descriptor = new byte[23];
- byte[] sector = imagePlugin.ReadSector(1 + partition.PartitionStartSector);
+ byte[] sector = imagePlugin.ReadSector(1 + partition.Start);
Array.Copy(sector, 0x20, system_descriptor, 0, 23);
@@ -72,7 +72,7 @@ namespace DiscImageChef.Filesystems
information = "";
xmlFSType = new Schemas.FileSystemType();
xmlFSType.Type = "PC Engine filesystem";
- xmlFSType.Clusters = (long)((partition.PartitionEndSector - partition.PartitionStartSector + 1) / imagePlugin.GetSectorSize() * 2048);
+ xmlFSType.Clusters = (long)((partition.End - partition.Start + 1) / imagePlugin.GetSectorSize() * 2048);
xmlFSType.ClusterSize = 2048;
}
diff --git a/DiscImageChef.Filesystems/PFS.cs b/DiscImageChef.Filesystems/PFS.cs
index 5e21ec09..249896be 100644
--- a/DiscImageChef.Filesystems/PFS.cs
+++ b/DiscImageChef.Filesystems/PFS.cs
@@ -180,12 +180,12 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(partition.Start >= partition.End)
return false;
BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
- byte[] sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ byte[] sector = imagePlugin.ReadSector(2 + partition.Start);
uint magic = BigEndianBitConverter.ToUInt32(sector, 0x00);
@@ -194,7 +194,7 @@ namespace DiscImageChef.Filesystems
public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, Partition partition, out string information)
{
- byte[] RootBlockSector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ byte[] RootBlockSector = imagePlugin.ReadSector(2 + partition.Start);
RootBlock rootBlock = new RootBlock();
rootBlock = BigEndianMarshal.ByteArrayToStructureBigEndian(RootBlockSector);
diff --git a/DiscImageChef.Filesystems/ProDOS.cs b/DiscImageChef.Filesystems/ProDOS.cs
index 6bdd9930..07a8e9a2 100644
--- a/DiscImageChef.Filesystems/ProDOS.cs
+++ b/DiscImageChef.Filesystems/ProDOS.cs
@@ -96,11 +96,11 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionEndSector < 3)
+ if(partition.End < 3)
return false;
// Blocks 0 and 1 are boot code
- byte[] rootDirectoryKeyBlock = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ byte[] rootDirectoryKeyBlock = imagePlugin.ReadSector(2 + partition.Start);
ushort prePointer = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0);
DicConsole.DebugWriteLine("ProDOS plugin", "prePointer = {0}", prePointer);
@@ -124,12 +124,12 @@ namespace DiscImageChef.Filesystems
ushort bit_map_pointer = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0x27);
DicConsole.DebugWriteLine("ProDOS plugin", "bit_map_pointer = {0}", bit_map_pointer);
- if(bit_map_pointer > partition.PartitionEndSector)
+ if(bit_map_pointer > partition.End)
return false;
ushort total_blocks = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0x29);
- DicConsole.DebugWriteLine("ProDOS plugin", "{0} <= ({1} - {2} + 1)? {3}", total_blocks, partition.PartitionEndSector, partition.PartitionStartSector, total_blocks <= (partition.PartitionEndSector - partition.PartitionStartSector + 1));
- return total_blocks <= (partition.PartitionEndSector - partition.PartitionStartSector + 1);
+ DicConsole.DebugWriteLine("ProDOS plugin", "{0} <= ({1} - {2} + 1)? {3}", total_blocks, partition.End, partition.Start, total_blocks <= (partition.End - partition.Start + 1));
+ return total_blocks <= (partition.End - partition.Start + 1);
}
public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, Partition partition, out string information)
@@ -137,7 +137,7 @@ namespace DiscImageChef.Filesystems
StringBuilder sbInformation = new StringBuilder();
// Blocks 0 and 1 are boot code
- byte[] rootDirectoryKeyBlockBytes = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ byte[] rootDirectoryKeyBlockBytes = imagePlugin.ReadSector(2 + partition.Start);
ProDOSRootDirectoryKeyBlock rootDirectoryKeyBlock = new ProDOSRootDirectoryKeyBlock();
rootDirectoryKeyBlock.header = new ProDOSRootDirectoryHeader();
@@ -235,7 +235,7 @@ namespace DiscImageChef.Filesystems
xmlFSType.Files = rootDirectoryKeyBlock.header.file_count;
xmlFSType.FilesSpecified = true;
xmlFSType.Clusters = rootDirectoryKeyBlock.header.total_blocks;
- xmlFSType.ClusterSize = (int)(((partition.PartitionEndSector - partition.PartitionStartSector) + 1) * imagePlugin.ImageInfo.sectorSize / (ulong)xmlFSType.Clusters);
+ xmlFSType.ClusterSize = (int)(((partition.End - partition.Start) + 1) * imagePlugin.ImageInfo.sectorSize / (ulong)xmlFSType.Clusters);
xmlFSType.Type = "ProDOS";
return;
diff --git a/DiscImageChef.Filesystems/QNX4.cs b/DiscImageChef.Filesystems/QNX4.cs
index f2500048..48e566f8 100644
--- a/DiscImageChef.Filesystems/QNX4.cs
+++ b/DiscImageChef.Filesystems/QNX4.cs
@@ -125,7 +125,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector + 1);
+ byte[] sector = imagePlugin.ReadSector(partition.Start + 1);
if(sector.Length < 512)
return false;
@@ -147,10 +147,10 @@ namespace DiscImageChef.Filesystems
return false;
// Check extents are not past device
- if(qnxSb.rootDir.di_first_xtnt.block + partition.PartitionStartSector >= partition.PartitionEndSector ||
- qnxSb.inode.di_first_xtnt.block + partition.PartitionStartSector >= partition.PartitionEndSector ||
- qnxSb.boot.di_first_xtnt.block + partition.PartitionStartSector >= partition.PartitionEndSector ||
- qnxSb.altBoot.di_first_xtnt.block + partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(qnxSb.rootDir.di_first_xtnt.block + partition.Start >= partition.End ||
+ qnxSb.inode.di_first_xtnt.block + partition.Start >= partition.End ||
+ qnxSb.boot.di_first_xtnt.block + partition.Start >= partition.End ||
+ qnxSb.altBoot.di_first_xtnt.block + partition.Start >= partition.End)
return false;
// Check inodes are in use
@@ -166,7 +166,7 @@ namespace DiscImageChef.Filesystems
public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, Partition partition, out string information)
{
information = "";
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector + 1);
+ byte[] sector = imagePlugin.ReadSector(partition.Start + 1);
if(sector.Length < 512)
return;
@@ -255,7 +255,7 @@ namespace DiscImageChef.Filesystems
xmlFSType = new Schemas.FileSystemType();
xmlFSType.Type = "QNX4 filesystem";
- xmlFSType.Clusters = (long)((partition.PartitionEndSector - partition.PartitionStartSector + 1) / imagePlugin.GetSectorSize() * 512);
+ xmlFSType.Clusters = (long)((partition.End - partition.Start + 1) / imagePlugin.GetSectorSize() * 512);
xmlFSType.ClusterSize = 512;
xmlFSType.Bootable |= (qnxSb.boot.di_size != 0 || qnxSb.altBoot.di_size != 0);
xmlFSType.CreationDate = DateHandlers.UNIXUnsignedToDateTime(qnxSb.rootDir.di_ftime);
diff --git a/DiscImageChef.Filesystems/QNX6.cs b/DiscImageChef.Filesystems/QNX6.cs
index 99958321..b3e1326a 100644
--- a/DiscImageChef.Filesystems/QNX6.cs
+++ b/DiscImageChef.Filesystems/QNX6.cs
@@ -123,8 +123,8 @@ namespace DiscImageChef.Filesystems
uint sectors = QNX6_SuperBlockSize / imagePlugin.GetSectorSize();
uint bootSectors = QNX6_BootBlocksSize / imagePlugin.GetSectorSize();
- byte[] audiSector = imagePlugin.ReadSectors(partition.PartitionStartSector, sectors);
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector + bootSectors, sectors);
+ byte[] audiSector = imagePlugin.ReadSectors(partition.Start, sectors);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start + bootSectors, sectors);
if(sector.Length < QNX6_SuperBlockSize)
return false;
@@ -150,8 +150,8 @@ namespace DiscImageChef.Filesystems
uint sectors = QNX6_SuperBlockSize / imagePlugin.GetSectorSize();
uint bootSectors = QNX6_BootBlocksSize / imagePlugin.GetSectorSize();
- byte[] audiSector = imagePlugin.ReadSectors(partition.PartitionStartSector, sectors);
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector + bootSectors, sectors);
+ byte[] audiSector = imagePlugin.ReadSectors(partition.Start, sectors);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start + bootSectors, sectors);
if(sector.Length < QNX6_SuperBlockSize)
return;
diff --git a/DiscImageChef.Filesystems/Reiser.cs b/DiscImageChef.Filesystems/Reiser.cs
index 5e7f6079..42526b69 100644
--- a/DiscImageChef.Filesystems/Reiser.cs
+++ b/DiscImageChef.Filesystems/Reiser.cs
@@ -121,7 +121,7 @@ namespace DiscImageChef.Filesystems
if(Marshal.SizeOf(reiserSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector + sbAddr, sbSize);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
if(sector.Length < Marshal.SizeOf(reiserSb))
return false;
@@ -151,7 +151,7 @@ namespace DiscImageChef.Filesystems
if(Marshal.SizeOf(reiserSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector + sbAddr, sbSize);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
if(sector.Length < Marshal.SizeOf(reiserSb))
return;
diff --git a/DiscImageChef.Filesystems/Reiser4.cs b/DiscImageChef.Filesystems/Reiser4.cs
index 00996eac..d22be7f7 100644
--- a/DiscImageChef.Filesystems/Reiser4.cs
+++ b/DiscImageChef.Filesystems/Reiser4.cs
@@ -86,7 +86,7 @@ namespace DiscImageChef.Filesystems
if(Marshal.SizeOf(reiserSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector + sbAddr, sbSize);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
if(sector.Length < Marshal.SizeOf(reiserSb))
return false;
@@ -114,7 +114,7 @@ namespace DiscImageChef.Filesystems
if(Marshal.SizeOf(reiserSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector + sbAddr, sbSize);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
if(sector.Length < Marshal.SizeOf(reiserSb))
return;
@@ -139,7 +139,7 @@ namespace DiscImageChef.Filesystems
xmlFSType = new Schemas.FileSystemType();
xmlFSType.Type = "Reiser 4 filesystem";
xmlFSType.ClusterSize = reiserSb.blocksize;
- xmlFSType.Clusters = (long)(((partition.PartitionEndSector - partition.PartitionStartSector) * imagePlugin.GetSectorSize()) / reiserSb.blocksize);
+ xmlFSType.Clusters = (long)(((partition.End - partition.Start) * imagePlugin.GetSectorSize()) / reiserSb.blocksize);
xmlFSType.VolumeName = StringHandlers.CToString(reiserSb.label, CurrentEncoding);
xmlFSType.VolumeSerial = reiserSb.uuid.ToString();
}
diff --git a/DiscImageChef.Filesystems/SFS.cs b/DiscImageChef.Filesystems/SFS.cs
index 3080163c..3211098e 100644
--- a/DiscImageChef.Filesystems/SFS.cs
+++ b/DiscImageChef.Filesystems/SFS.cs
@@ -100,12 +100,12 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(partition.Start >= partition.End)
return false;
BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ byte[] sector = imagePlugin.ReadSector(partition.Start);
uint magic = BigEndianBitConverter.ToUInt32(sector, 0x00);
@@ -114,7 +114,7 @@ namespace DiscImageChef.Filesystems
public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, Partition partition, out string information)
{
- byte[] RootBlockSector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ byte[] RootBlockSector = imagePlugin.ReadSector(partition.Start);
RootBlock rootBlock = new RootBlock();
rootBlock = BigEndianMarshal.ByteArrayToStructureBigEndian(RootBlockSector);
diff --git a/DiscImageChef.Filesystems/SolarFS.cs b/DiscImageChef.Filesystems/SolarFS.cs
index 0183ea99..8157b987 100644
--- a/DiscImageChef.Filesystems/SolarFS.cs
+++ b/DiscImageChef.Filesystems/SolarFS.cs
@@ -58,13 +58,13 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
byte signature; /// 0x29
string fs_type; // "SOL_FS "
- byte[] bpb = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] bpb = imagePlugin.ReadSector(0 + partition.Start);
byte[] fs_type_b = new byte[8];
@@ -82,7 +82,7 @@ namespace DiscImageChef.Filesystems
information = "";
StringBuilder sb = new StringBuilder();
- byte[] bpb_sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] bpb_sector = imagePlugin.ReadSector(0 + partition.Start);
byte[] bpb_strings;
SolarOSParameterBlock BPB = new SolarOSParameterBlock();
diff --git a/DiscImageChef.Filesystems/Squash.cs b/DiscImageChef.Filesystems/Squash.cs
index 8d78bf3d..a1f9b785 100644
--- a/DiscImageChef.Filesystems/Squash.cs
+++ b/DiscImageChef.Filesystems/Squash.cs
@@ -96,10 +96,10 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(partition.Start >= partition.End)
return false;
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ byte[] sector = imagePlugin.ReadSector(partition.Start);
uint magic = BitConverter.ToUInt32(sector, 0x00);
@@ -108,7 +108,7 @@ namespace DiscImageChef.Filesystems
public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, Partition partition, out string information)
{
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector);
+ byte[] sector = imagePlugin.ReadSector(partition.Start);
uint magic = BitConverter.ToUInt32(sector, 0x00);
SquashSuperBlock sqSb = new SquashSuperBlock();
@@ -167,7 +167,7 @@ namespace DiscImageChef.Filesystems
xmlFSType.Type = "Squash file system";
xmlFSType.CreationDate = DateHandlers.UNIXUnsignedToDateTime(sqSb.mkfs_time);
xmlFSType.CreationDateSpecified = true;
- xmlFSType.Clusters = (long)(((partition.PartitionEndSector - partition.PartitionStartSector + 1) * imagePlugin.ImageInfo.sectorSize) / sqSb.block_size);
+ xmlFSType.Clusters = (long)(((partition.End - partition.Start + 1) * imagePlugin.ImageInfo.sectorSize) / sqSb.block_size);
xmlFSType.ClusterSize = (int)sqSb.block_size;
xmlFSType.Files = sqSb.inodes;
xmlFSType.FilesSpecified = true;
diff --git a/DiscImageChef.Filesystems/SysV.cs b/DiscImageChef.Filesystems/SysV.cs
index cde685f8..3360933e 100644
--- a/DiscImageChef.Filesystems/SysV.cs
+++ b/DiscImageChef.Filesystems/SysV.cs
@@ -72,7 +72,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
uint magic;
@@ -107,7 +107,7 @@ namespace DiscImageChef.Filesystems
else
sb_size_in_sectors = 1; // If not a single sector can store it
- if(partition.PartitionEndSector <= (partition.PartitionStartSector + 4 * (ulong)sb_size_in_sectors + sb_size_in_sectors)) // Device must be bigger than SB location + SB size + offset
+ if(partition.End <= (partition.Start + 4 * (ulong)sb_size_in_sectors + sb_size_in_sectors)) // Device must be bigger than SB location + SB size + offset
return false;
// Superblock can start on 0x000, 0x200, 0x600 and 0x800, not aligned, so we assume 16 (128 bytes/sector) sectors as a safe value
@@ -116,7 +116,7 @@ namespace DiscImageChef.Filesystems
if(i + sb_size_in_sectors >= (int)imagePlugin.ImageInfo.sectors)
break;
- byte[] sb_sector = imagePlugin.ReadSectors((ulong)i + partition.PartitionStartSector, sb_size_in_sectors);
+ byte[] sb_sector = imagePlugin.ReadSectors((ulong)i + partition.Start, sb_size_in_sectors);
magic = BitConverter.ToUInt32(sb_sector, 0x3F8); // XENIX magic location
@@ -161,7 +161,7 @@ namespace DiscImageChef.Filesystems
{
if(s_fsize < V7_MAXSIZE && s_nfree < V7_NICFREE && s_ninode < V7_NICINOD)
{
- if((s_fsize * 1024) == ((partition.PartitionEndSector - partition.PartitionStartSector) * imagePlugin.GetSectorSize()) || (s_fsize * 512) == ((partition.PartitionEndSector - partition.PartitionStartSector) * imagePlugin.GetSectorSize()))
+ if((s_fsize * 1024) == ((partition.End - partition.Start) * imagePlugin.GetSectorSize()) || (s_fsize * 512) == ((partition.End - partition.Start) * imagePlugin.GetSectorSize()))
return true;
}
}
@@ -199,7 +199,7 @@ namespace DiscImageChef.Filesystems
// Superblock can start on 0x000, 0x200, 0x600 and 0x800, not aligned, so we assume 16 (128 bytes/sector) sectors as a safe value
for(start = 0; start <= 16; start++)
{
- sb_sector = imagePlugin.ReadSectors((ulong)start + partition.PartitionStartSector, sb_size_in_sectors);
+ sb_sector = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(sb_sector, 0x3F8); // XENIX magic location
if(magic == XENIX_MAGIC)
@@ -277,7 +277,7 @@ namespace DiscImageChef.Filesystems
{
if(s_fsize < V7_MAXSIZE && s_nfree < V7_NICFREE && s_ninode < V7_NICINOD)
{
- if((s_fsize * 1024) == ((partition.PartitionEndSector - partition.PartitionStartSector) * imagePlugin.GetSectorSize()) || (s_fsize * 512) == ((partition.PartitionEndSector - partition.PartitionStartSector) * imagePlugin.GetSectorSize()))
+ if((s_fsize * 1024) == ((partition.End - partition.Start) * imagePlugin.GetSectorSize()) || (s_fsize * 512) == ((partition.End - partition.Start) * imagePlugin.GetSectorSize()))
{
sys7th = true;
BigEndianBitConverter.IsLittleEndian = true;
@@ -296,7 +296,7 @@ namespace DiscImageChef.Filesystems
{
byte[] xenix_strings = new byte[6];
XenixSuperBlock xnx_sb = new XenixSuperBlock();
- sb_sector = imagePlugin.ReadSectors((ulong)start + partition.PartitionStartSector, sb_size_in_sectors);
+ sb_sector = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors);
if(xenix3)
{
@@ -418,7 +418,7 @@ namespace DiscImageChef.Filesystems
if(sysv)
{
- sb_sector = imagePlugin.ReadSectors((ulong)start + partition.PartitionStartSector, sb_size_in_sectors);
+ sb_sector = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors);
ushort pad0, pad1, pad2;
byte[] sysv_strings = new byte[6];
@@ -557,7 +557,7 @@ namespace DiscImageChef.Filesystems
if(coherent)
{
- sb_sector = imagePlugin.ReadSectors((ulong)start + partition.PartitionStartSector, sb_size_in_sectors);
+ sb_sector = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors);
CoherentSuperBlock coh_sb = new CoherentSuperBlock();
byte[] coh_strings = new byte[6];
@@ -612,7 +612,7 @@ namespace DiscImageChef.Filesystems
if(sys7th)
{
- sb_sector = imagePlugin.ReadSectors((ulong)start + partition.PartitionStartSector, sb_size_in_sectors);
+ sb_sector = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors);
UNIX7thEditionSuperBlock v7_sb = new UNIX7thEditionSuperBlock();
byte[] sys7_strings = new byte[6];
diff --git a/DiscImageChef.Filesystems/UCSDPascal/Info.cs b/DiscImageChef.Filesystems/UCSDPascal/Info.cs
index e6d84028..d5f5cd23 100644
--- a/DiscImageChef.Filesystems/UCSDPascal/Info.cs
+++ b/DiscImageChef.Filesystems/UCSDPascal/Info.cs
@@ -45,7 +45,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
return false;
// Blocks 0 and 1 are boot code
- byte[] volBlock = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ byte[] volBlock = imagePlugin.ReadSector(2 + partition.Start);
PascalVolumeEntry volEntry = new PascalVolumeEntry();
@@ -98,7 +98,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
return;
// Blocks 0 and 1 are boot code
- byte[] volBlock = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ byte[] volBlock = imagePlugin.ReadSector(2 + partition.Start);
PascalVolumeEntry volEntry = new PascalVolumeEntry();
@@ -148,7 +148,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
information = sbInformation.ToString();
xmlFSType = new Schemas.FileSystemType();
- xmlFSType.Bootable = !ArrayHelpers.ArrayIsNullOrEmpty(imagePlugin.ReadSectors(partition.PartitionStartSector, 2));
+ xmlFSType.Bootable = !ArrayHelpers.ArrayIsNullOrEmpty(imagePlugin.ReadSectors(partition.Start, 2));
xmlFSType.Clusters = volEntry.blocks;
xmlFSType.ClusterSize = (int)imagePlugin.GetSectorSize();
xmlFSType.Files = volEntry.files;
diff --git a/DiscImageChef.Filesystems/UDF.cs b/DiscImageChef.Filesystems/UDF.cs
index 5ec926d4..a8c30a6a 100644
--- a/DiscImageChef.Filesystems/UDF.cs
+++ b/DiscImageChef.Filesystems/UDF.cs
@@ -234,7 +234,7 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
// UDF needs at least that
- if(partition.PartitionEndSector - partition.PartitionStartSector < 256)
+ if(partition.End - partition.Start < 256)
return false;
// UDF needs at least that
@@ -244,12 +244,12 @@ namespace DiscImageChef.Filesystems
byte[] sector;
AnchorVolumeDescriptorPointer anchor = new AnchorVolumeDescriptorPointer();
// All positions where anchor may reside
- ulong[] positions = { 256, 512, partition.PartitionEndSector - 256, partition.PartitionEndSector };
+ ulong[] positions = { 256, 512, partition.End - 256, partition.End };
bool anchorFound = false;
foreach(ulong position in positions)
{
- if(position + partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(position + partition.Start >= partition.End)
continue;
sector = imagePlugin.ReadSector(position);
@@ -274,7 +274,7 @@ namespace DiscImageChef.Filesystems
if(anchor.tag.tagIdentifier == TagIdentifier.AnchorVolumeDescriptorPointer &&
anchor.tag.tagLocation == position &&
- (anchor.mainVolumeDescriptorSequenceExtent.location + partition.PartitionStartSector) < partition.PartitionEndSector)
+ (anchor.mainVolumeDescriptorSequenceExtent.location + partition.Start) < partition.End)
{
anchorFound = true;
break;
@@ -288,11 +288,11 @@ namespace DiscImageChef.Filesystems
while(count < 256)
{
- sector = imagePlugin.ReadSector(partition.PartitionStartSector + anchor.mainVolumeDescriptorSequenceExtent.location + count);
+ sector = imagePlugin.ReadSector(partition.Start + anchor.mainVolumeDescriptorSequenceExtent.location + count);
TagIdentifier tagId = (TagIdentifier)BitConverter.ToUInt16(sector, 0);
uint location = BitConverter.ToUInt32(sector, 0x0C);
- if(location == partition.PartitionStartSector + anchor.mainVolumeDescriptorSequenceExtent.location + count)
+ if(location == partition.Start + anchor.mainVolumeDescriptorSequenceExtent.location + count)
{
if(tagId == TagIdentifier.TerminatingDescriptor)
break;
@@ -327,7 +327,7 @@ namespace DiscImageChef.Filesystems
AnchorVolumeDescriptorPointer anchor = new AnchorVolumeDescriptorPointer();
// All positions where anchor may reside
- ulong[] positions = { 256, 512, partition.PartitionEndSector - 256, partition.PartitionEndSector };
+ ulong[] positions = { 256, 512, partition.End - 256, partition.End };
foreach(ulong position in positions)
{
@@ -340,7 +340,7 @@ namespace DiscImageChef.Filesystems
if(anchor.tag.tagIdentifier == TagIdentifier.AnchorVolumeDescriptorPointer &&
anchor.tag.tagLocation == position &&
- (anchor.mainVolumeDescriptorSequenceExtent.location + partition.PartitionStartSector) < partition.PartitionEndSector)
+ (anchor.mainVolumeDescriptorSequenceExtent.location + partition.Start) < partition.End)
break;
}
@@ -353,11 +353,11 @@ namespace DiscImageChef.Filesystems
while(count < 256)
{
- sector = imagePlugin.ReadSector(partition.PartitionStartSector + anchor.mainVolumeDescriptorSequenceExtent.location + count);
+ sector = imagePlugin.ReadSector(partition.Start + anchor.mainVolumeDescriptorSequenceExtent.location + count);
TagIdentifier tagId = (TagIdentifier)BitConverter.ToUInt16(sector, 0);
uint location = BitConverter.ToUInt32(sector, 0x0C);
- if(location == partition.PartitionStartSector + anchor.mainVolumeDescriptorSequenceExtent.location + count)
+ if(location == partition.Start + anchor.mainVolumeDescriptorSequenceExtent.location + count)
{
if(tagId == TagIdentifier.TerminatingDescriptor)
break;
@@ -421,7 +421,7 @@ namespace DiscImageChef.Filesystems
Convert.ToInt32(string.Format("{0}", lvidiu.maximumWriteUDF & 0xFF), 10));
xmlFSType.ApplicationIdentifier = CurrentEncoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd(new char[] { '\u0000' });
xmlFSType.ClusterSize = (int)lvd.logicalBlockSize;
- xmlFSType.Clusters = (long)(((partition.PartitionEndSector - partition.PartitionStartSector + 1) * imagePlugin.ImageInfo.sectorSize) / (ulong)xmlFSType.ClusterSize);
+ xmlFSType.Clusters = (long)(((partition.End - partition.Start + 1) * imagePlugin.ImageInfo.sectorSize) / (ulong)xmlFSType.ClusterSize);
xmlFSType.ModificationDate = ECMAToDateTime(lvid.recordingDateTime);
xmlFSType.ModificationDateSpecified = true;
xmlFSType.Files = lvidiu.files;
diff --git a/DiscImageChef.Filesystems/UNIXBFS.cs b/DiscImageChef.Filesystems/UNIXBFS.cs
index 7f15f173..87435744 100644
--- a/DiscImageChef.Filesystems/UNIXBFS.cs
+++ b/DiscImageChef.Filesystems/UNIXBFS.cs
@@ -60,12 +60,12 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
uint magic;
- magic = BitConverter.ToUInt32(imagePlugin.ReadSector(0 + partition.PartitionStartSector), 0);
+ magic = BitConverter.ToUInt32(imagePlugin.ReadSector(0 + partition.Start), 0);
return magic == BFS_MAGIC;
}
@@ -75,7 +75,7 @@ namespace DiscImageChef.Filesystems
information = "";
StringBuilder sb = new StringBuilder();
- byte[] bfs_sb_sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] bfs_sb_sector = imagePlugin.ReadSector(0 + partition.Start);
byte[] sb_strings = new byte[6];
BFSSuperBlock bfs_sb = new BFSSuperBlock();
@@ -111,7 +111,7 @@ namespace DiscImageChef.Filesystems
xmlFSType.Type = "BFS";
xmlFSType.VolumeName = bfs_sb.s_volume;
xmlFSType.ClusterSize = (int)imagePlugin.GetSectorSize();
- xmlFSType.Clusters = (long)(partition.PartitionEndSector - partition.PartitionStartSector + 1);
+ xmlFSType.Clusters = (long)(partition.End - partition.Start + 1);
information = sb.ToString();
}
diff --git a/DiscImageChef.Filesystems/VMfs.cs b/DiscImageChef.Filesystems/VMfs.cs
index c38be6ed..1d66de54 100644
--- a/DiscImageChef.Filesystems/VMfs.cs
+++ b/DiscImageChef.Filesystems/VMfs.cs
@@ -92,15 +92,15 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(partition.Start >= partition.End)
return false;
ulong vmfsSuperOff = VMfs_Base / imagePlugin.ImageInfo.sectorSize;
- if(partition.PartitionStartSector + vmfsSuperOff > partition.PartitionEndSector)
+ if(partition.Start + vmfsSuperOff > partition.End)
return false;
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector + vmfsSuperOff);
+ byte[] sector = imagePlugin.ReadSector(partition.Start + vmfsSuperOff);
uint magic = BitConverter.ToUInt32(sector, 0x00);
@@ -110,7 +110,7 @@ namespace DiscImageChef.Filesystems
public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, Partition partition, out string information)
{
ulong vmfsSuperOff = VMfs_Base / imagePlugin.ImageInfo.sectorSize;
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector + vmfsSuperOff);
+ byte[] sector = imagePlugin.ReadSector(partition.Start + vmfsSuperOff);
VolumeInfo volInfo = new VolumeInfo();
IntPtr volInfoPtr = Marshal.AllocHGlobal(Marshal.SizeOf(volInfo));
diff --git a/DiscImageChef.Filesystems/VxFS.cs b/DiscImageChef.Filesystems/VxFS.cs
index d7ab4bb4..b32d9a33 100644
--- a/DiscImageChef.Filesystems/VxFS.cs
+++ b/DiscImageChef.Filesystems/VxFS.cs
@@ -210,11 +210,11 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if(partition.PartitionStartSector >= partition.PartitionEndSector)
+ if(partition.Start >= partition.End)
return false;
ulong vmfsSuperOff = VxFS_Base / imagePlugin.ImageInfo.sectorSize;
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector + vmfsSuperOff);
+ byte[] sector = imagePlugin.ReadSector(partition.Start + vmfsSuperOff);
uint magic = BitConverter.ToUInt32(sector, 0x00);
@@ -224,7 +224,7 @@ namespace DiscImageChef.Filesystems
public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, Partition partition, out string information)
{
ulong vmfsSuperOff = VxFS_Base / imagePlugin.ImageInfo.sectorSize;
- byte[] sector = imagePlugin.ReadSector(partition.PartitionStartSector + vmfsSuperOff);
+ byte[] sector = imagePlugin.ReadSector(partition.Start + vmfsSuperOff);
VxSuperBlock vxSb = new VxSuperBlock();
IntPtr vxSbPtr = Marshal.AllocHGlobal(Marshal.SizeOf(vxSb));
diff --git a/DiscImageChef.Filesystems/XFS.cs b/DiscImageChef.Filesystems/XFS.cs
index 29944040..61245930 100644
--- a/DiscImageChef.Filesystems/XFS.cs
+++ b/DiscImageChef.Filesystems/XFS.cs
@@ -130,7 +130,7 @@ namespace DiscImageChef.Filesystems
if(Marshal.SizeOf(xfsSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector, sbSize);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
if(sector.Length < Marshal.SizeOf(xfsSb))
return false;
@@ -151,7 +151,7 @@ namespace DiscImageChef.Filesystems
if(Marshal.SizeOf(xfsSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
- byte[] sector = imagePlugin.ReadSectors(partition.PartitionStartSector, sbSize);
+ byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
if(sector.Length < Marshal.SizeOf(xfsSb))
return;
diff --git a/DiscImageChef.Filesystems/ZFS.cs b/DiscImageChef.Filesystems/ZFS.cs
index f93f06af..b8ecaab8 100644
--- a/DiscImageChef.Filesystems/ZFS.cs
+++ b/DiscImageChef.Filesystems/ZFS.cs
@@ -249,17 +249,17 @@ namespace DiscImageChef.Filesystems
byte[] sector;
ulong magic;
- if(partition.PartitionStartSector + 31 < partition.PartitionEndSector)
+ if(partition.Start + 31 < partition.End)
{
- sector = imagePlugin.ReadSector(partition.PartitionStartSector + 31);
+ sector = imagePlugin.ReadSector(partition.Start + 31);
magic = BitConverter.ToUInt64(sector, 0x1D8);
if(magic == ZEC_Magic || magic == ZEC_Cigam)
return true;
}
- if(partition.PartitionStartSector + 16 < partition.PartitionEndSector)
+ if(partition.Start + 16 < partition.End)
{
- sector = imagePlugin.ReadSector(partition.PartitionStartSector + 16);
+ sector = imagePlugin.ReadSector(partition.Start + 16);
magic = BitConverter.ToUInt64(sector, 0x1D8);
if(magic == ZEC_Magic || magic == ZEC_Cigam)
return true;
@@ -281,17 +281,17 @@ namespace DiscImageChef.Filesystems
uint nvlistLen = 114688 / imagePlugin.ImageInfo.sectorSize;
byte[] nvlist;
- if(partition.PartitionStartSector + 31 < partition.PartitionEndSector)
+ if(partition.Start + 31 < partition.End)
{
- sector = imagePlugin.ReadSector(partition.PartitionStartSector + 31);
+ sector = imagePlugin.ReadSector(partition.Start + 31);
magic = BitConverter.ToUInt64(sector, 0x1D8);
if(magic == ZEC_Magic || magic == ZEC_Cigam)
nvlistOff = 32;
}
- if(partition.PartitionStartSector + 16 < partition.PartitionEndSector)
+ if(partition.Start + 16 < partition.End)
{
- sector = imagePlugin.ReadSector(partition.PartitionStartSector + 16);
+ sector = imagePlugin.ReadSector(partition.Start + 16);
magic = BitConverter.ToUInt64(sector, 0x1D8);
if(magic == ZEC_Magic || magic == ZEC_Cigam)
nvlistOff = 17;
@@ -300,7 +300,7 @@ namespace DiscImageChef.Filesystems
StringBuilder sb = new StringBuilder();
sb.AppendLine("ZFS filesystem");
- nvlist = imagePlugin.ReadSectors(partition.PartitionStartSector + nvlistOff, nvlistLen);
+ nvlist = imagePlugin.ReadSectors(partition.Start + nvlistOff, nvlistLen);
Dictionary decodedNvList;
if(!DecodeNvList(nvlist, out decodedNvList))
diff --git a/DiscImageChef.Filesystems/exFAT.cs b/DiscImageChef.Filesystems/exFAT.cs
index fef2f25b..99d7431d 100644
--- a/DiscImageChef.Filesystems/exFAT.cs
+++ b/DiscImageChef.Filesystems/exFAT.cs
@@ -60,10 +60,10 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugin imagePlugin, Partition partition)
{
- if((12 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((12 + partition.Start) >= partition.End)
return false;
- byte[] vbrSector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] vbrSector = imagePlugin.ReadSector(0 + partition.Start);
if(vbrSector.Length < 512)
return false;
@@ -83,21 +83,21 @@ namespace DiscImageChef.Filesystems
StringBuilder sb = new StringBuilder();
xmlFSType = new Schemas.FileSystemType();
- byte[] vbrSector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
+ byte[] vbrSector = imagePlugin.ReadSector(0 + partition.Start);
VolumeBootRecord vbr = new VolumeBootRecord();
IntPtr vbrPtr = Marshal.AllocHGlobal(512);
Marshal.Copy(vbrSector, 0, vbrPtr, 512);
vbr = (VolumeBootRecord)Marshal.PtrToStructure(vbrPtr, typeof(VolumeBootRecord));
Marshal.FreeHGlobal(vbrPtr);
- byte[] parametersSector = imagePlugin.ReadSector(9 + partition.PartitionStartSector);
+ byte[] parametersSector = imagePlugin.ReadSector(9 + partition.Start);
OemParameterTable parametersTable = new OemParameterTable();
IntPtr parametersPtr = Marshal.AllocHGlobal(512);
Marshal.Copy(parametersSector, 0, parametersPtr, 512);
parametersTable = (OemParameterTable)Marshal.PtrToStructure(parametersPtr, typeof(OemParameterTable));
Marshal.FreeHGlobal(parametersPtr);
- byte[] chkSector = imagePlugin.ReadSector(11 + partition.PartitionStartSector);
+ byte[] chkSector = imagePlugin.ReadSector(11 + partition.Start);
ChecksumSector chksector = new ChecksumSector();
IntPtr chkPtr = Marshal.AllocHGlobal(512);
Marshal.Copy(chkSector, 0, chkPtr, 512);
diff --git a/DiscImageChef.Filesystems/ext2FS.cs b/DiscImageChef.Filesystems/ext2FS.cs
index 1990ef05..89c8c95d 100644
--- a/DiscImageChef.Filesystems/ext2FS.cs
+++ b/DiscImageChef.Filesystems/ext2FS.cs
@@ -58,10 +58,10 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
- byte[] sb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
+ byte[] sb_sector = imagePlugin.ReadSector(2 + partition.Start);
ushort magic = BitConverter.ToUInt16(sb_sector, 0x038);
@@ -98,7 +98,7 @@ namespace DiscImageChef.Filesystems
return;
}
- byte[] sb_sector = imagePlugin.ReadSectors(2 + partition.PartitionStartSector, sb_size_in_sectors);
+ byte[] sb_sector = imagePlugin.ReadSectors(2 + partition.Start, sb_size_in_sectors);
IntPtr sbPtr = Marshal.AllocHGlobal(512);
Marshal.Copy(sb_sector, 0, sbPtr, 512);
supblk = (ext2FSSuperBlock)Marshal.PtrToStructure(sbPtr, typeof(ext2FSSuperBlock));
diff --git a/DiscImageChef.Filesystems/extFS.cs b/DiscImageChef.Filesystems/extFS.cs
index 362483bd..8a9f76df 100644
--- a/DiscImageChef.Filesystems/extFS.cs
+++ b/DiscImageChef.Filesystems/extFS.cs
@@ -57,10 +57,10 @@ namespace DiscImageChef.Filesystems
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
- if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
+ if((2 + partition.Start) >= partition.End)
return false;
- byte[] sb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector); // Superblock resides at 0x400
+ byte[] sb_sector = imagePlugin.ReadSector(2 + partition.Start); // Superblock resides at 0x400
ushort magic = BitConverter.ToUInt16(sb_sector, 0x038); // Here should reside magic number
@@ -73,7 +73,7 @@ namespace DiscImageChef.Filesystems
StringBuilder sb = new StringBuilder();
- byte[] sb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector); // Superblock resides at 0x400
+ byte[] sb_sector = imagePlugin.ReadSector(2 + partition.Start); // Superblock resides at 0x400
extFSSuperBlock ext_sb = new extFSSuperBlock();
ext_sb.inodes = BitConverter.ToUInt32(sb_sector, 0x000);
@@ -101,7 +101,7 @@ namespace DiscImageChef.Filesystems
xmlFSType.FreeClusters = ext_sb.freecountblk;
xmlFSType.FreeClustersSpecified = true;
xmlFSType.ClusterSize = 1024;
- xmlFSType.Clusters = (long)((partition.PartitionEndSector - partition.PartitionStartSector + 1) * imagePlugin.GetSectorSize() / 1024);
+ xmlFSType.Clusters = (long)((partition.End - partition.Start + 1) * imagePlugin.GetSectorSize() / 1024);
information = sb.ToString();
}
diff --git a/DiscImageChef.Partitions/Acorn.cs b/DiscImageChef.Partitions/Acorn.cs
index 0399ae60..8dad9c5d 100644
--- a/DiscImageChef.Partitions/Acorn.cs
+++ b/DiscImageChef.Partitions/Acorn.cs
@@ -97,12 +97,12 @@ namespace DiscImageChef.PartPlugins
{
Partition part = new Partition
{
- PartitionLength = (ulong)bootBlock.discRecord.disc_size_high * 0x100000000 + bootBlock.discRecord.disc_size,
- PartitionSectors = ((ulong)bootBlock.discRecord.disc_size_high * 0x100000000 + bootBlock.discRecord.disc_size) / imagePlugin.ImageInfo.sectorSize,
- PartitionType = "ADFS",
- PartitionName = StringHandlers.CToString(bootBlock.discRecord.disc_name, Encoding.GetEncoding("iso-8859-1"))
+ Size = (ulong)bootBlock.discRecord.disc_size_high * 0x100000000 + bootBlock.discRecord.disc_size,
+ Length = ((ulong)bootBlock.discRecord.disc_size_high * 0x100000000 + bootBlock.discRecord.disc_size) / imagePlugin.ImageInfo.sectorSize,
+ Type = "ADFS",
+ Name = StringHandlers.CToString(bootBlock.discRecord.disc_name, Encoding.GetEncoding("iso-8859-1"))
};
- if(part.PartitionLength > 0)
+ if(part.Size > 0)
{
partitions.Add(part);
counter++;
@@ -120,11 +120,11 @@ namespace DiscImageChef.PartPlugins
foreach(LinuxEntry entry in table.entries)
{
Partition part = new Partition();
- part.PartitionStartSector = (ulong)(mapSector + entry.start);
- part.PartitionStart = part.PartitionStartSector * (ulong)sector.Length;
- part.PartitionLength = entry.size;
- part.PartitionSectors = (ulong)(entry.size * sector.Length);
- part.PartitionSequence = counter;
+ part.Start = (ulong)(mapSector + entry.start);
+ part.Offset = part.Start * (ulong)sector.Length;
+ part.Size = entry.size;
+ part.Length = (ulong)(entry.size * sector.Length);
+ part.Sequence = counter;
if(entry.magic == LINUX_MAGIC || entry.magic == SWAP_MAGIC)
{
partitions.Add(part);
@@ -146,12 +146,12 @@ namespace DiscImageChef.PartPlugins
foreach(RiscIxEntry entry in table.partitions)
{
Partition part = new Partition();
- part.PartitionStartSector = (ulong)(mapSector + entry.start);
- part.PartitionStart = part.PartitionStartSector * (ulong)sector.Length;
- part.PartitionLength = entry.length;
- part.PartitionSectors = (ulong)(entry.length * sector.Length);
- part.PartitionName = StringHandlers.CToString(entry.name, Encoding.GetEncoding("iso-8859-1"));
- part.PartitionSequence = counter;
+ part.Start = (ulong)(mapSector + entry.start);
+ part.Offset = part.Start * (ulong)sector.Length;
+ part.Size = entry.length;
+ part.Length = (ulong)(entry.length * sector.Length);
+ part.Name = StringHandlers.CToString(entry.name, Encoding.GetEncoding("iso-8859-1"));
+ part.Sequence = counter;
if(entry.length > 0)
{
partitions.Add(part);
diff --git a/DiscImageChef.Partitions/AppleMap.cs b/DiscImageChef.Partitions/AppleMap.cs
index bcaea4ad..d70dd653 100644
--- a/DiscImageChef.Partitions/AppleMap.cs
+++ b/DiscImageChef.Partitions/AppleMap.cs
@@ -111,12 +111,12 @@ namespace DiscImageChef.PartPlugins
CommonTypes.Partition part = new CommonTypes.Partition()
{
- PartitionLength = (ulong)(ddm.sbMap[i].ddSize * 512),
- PartitionSectors = (ulong)((ddm.sbMap[i].ddSize * 512) / sector_size),
- PartitionSequence = sequence,
- PartitionStart = ddm.sbMap[i].ddBlock * sector_size,
- PartitionStartSector = ddm.sbMap[i].ddBlock,
- PartitionType = "Apple_Driver"
+ Size = (ulong)(ddm.sbMap[i].ddSize * 512),
+ Length = (ulong)((ddm.sbMap[i].ddSize * 512) / sector_size),
+ Sequence = sequence,
+ Offset = ddm.sbMap[i].ddBlock * sector_size,
+ Start = ddm.sbMap[i].ddBlock,
+ Type = "Apple_Driver"
};
partitions.Add(part);
@@ -150,17 +150,17 @@ namespace DiscImageChef.PartPlugins
CommonTypes.Partition part = new CommonTypes.Partition
{
- PartitionLength = old_entry.pdStart * ddm.sbBlockSize,
- PartitionSectors = (old_entry.pdStart * ddm.sbBlockSize) / sector_size,
- PartitionSequence = sequence,
- PartitionStart = old_entry.pdSize * ddm.sbBlockSize,
- PartitionStartSector = (old_entry.pdSize * ddm.sbBlockSize) / sector_size,
+ Size = old_entry.pdStart * ddm.sbBlockSize,
+ Length = (old_entry.pdStart * ddm.sbBlockSize) / sector_size,
+ Sequence = sequence,
+ Offset = old_entry.pdSize * ddm.sbBlockSize,
+ Start = (old_entry.pdSize * ddm.sbBlockSize) / sector_size,
};
if(old_entry.pdFSID == HFS_MAGIC_OLD)
- part.PartitionType = "Apple_HFS";
+ part.Type = "Apple_HFS";
else
- part.PartitionType = string.Format("0x{0:X8}", old_entry.pdFSID);
+ part.Type = string.Format("0x{0:X8}", old_entry.pdFSID);
partitions.Add(part);
@@ -267,13 +267,13 @@ namespace DiscImageChef.PartPlugins
CommonTypes.Partition _partition = new CommonTypes.Partition
{
- PartitionSequence = sequence,
- PartitionType = StringHandlers.CToString(entry.type),
- PartitionName = StringHandlers.CToString(entry.name),
- PartitionStart = entry.start * entry_size,
- PartitionLength = entry.sectors * entry_size,
- PartitionStartSector = (entry.start * entry_size) / sector_size,
- PartitionSectors = (entry.sectors * entry_size) / sector_size
+ Sequence = sequence,
+ Type = StringHandlers.CToString(entry.type),
+ Name = StringHandlers.CToString(entry.name),
+ Offset = entry.start * entry_size,
+ Size = entry.sectors * entry_size,
+ Start = (entry.start * entry_size) / sector_size,
+ Length = (entry.sectors * entry_size) / sector_size
};
sb.AppendLine("Partition flags:");
if(flags.HasFlag(AppleMapFlags.Valid))
@@ -302,7 +302,7 @@ namespace DiscImageChef.PartPlugins
sb.AppendLine("Partition's boot code is position independent.");
}
- _partition.PartitionDescription = sb.ToString();
+ _partition.Description = sb.ToString();
partitions.Add(_partition);
sequence++;
}
diff --git a/DiscImageChef.Partitions/Atari.cs b/DiscImageChef.Partitions/Atari.cs
index cc169ce9..af169922 100644
--- a/DiscImageChef.Partitions/Atari.cs
+++ b/DiscImageChef.Partitions/Atari.cs
@@ -149,54 +149,54 @@ namespace DiscImageChef.PartPlugins
sectorSize = 2048;
CommonTypes.Partition part = new CommonTypes.Partition();
- part.PartitionLength = table.entries[i].length * sectorSize;
- part.PartitionSectors = table.entries[i].length;
- part.PartitionSequence = partitionSequence;
- part.PartitionName = "";
- part.PartitionStart = table.entries[i].start * sectorSize;
- part.PartitionStartSector = table.entries[i].start;
+ part.Size = table.entries[i].length * sectorSize;
+ part.Length = table.entries[i].length;
+ part.Sequence = partitionSequence;
+ part.Name = "";
+ part.Offset = table.entries[i].start * sectorSize;
+ part.Start = table.entries[i].start;
byte[] partType = new byte[3];
partType[0] = (byte)((type & 0xFF0000) >> 16);
partType[1] = (byte)((type & 0x00FF00) >> 8);
partType[2] = (byte)(type & 0x0000FF);
- part.PartitionType = Encoding.ASCII.GetString(partType);
+ part.Type = Encoding.ASCII.GetString(partType);
switch(type)
{
case TypeGEMDOS:
- part.PartitionDescription = "Atari GEMDOS partition";
+ part.Description = "Atari GEMDOS partition";
break;
case TypeBigGEMDOS:
- part.PartitionDescription = "Atari GEMDOS partition bigger than 32 MiB";
+ part.Description = "Atari GEMDOS partition bigger than 32 MiB";
break;
case TypeLinux:
- part.PartitionDescription = "Linux partition";
+ part.Description = "Linux partition";
break;
case TypeSwap:
- part.PartitionDescription = "Swap partition";
+ part.Description = "Swap partition";
break;
case TypeRAW:
- part.PartitionDescription = "RAW partition";
+ part.Description = "RAW partition";
break;
case TypeNetBSD:
- part.PartitionDescription = "NetBSD partition";
+ part.Description = "NetBSD partition";
break;
case TypeNetBSDSwap:
- part.PartitionDescription = "NetBSD swap partition";
+ part.Description = "NetBSD swap partition";
break;
case TypeSysV:
- part.PartitionDescription = "Atari UNIX partition";
+ part.Description = "Atari UNIX partition";
break;
case TypeMac:
- part.PartitionDescription = "Macintosh partition";
+ part.Description = "Macintosh partition";
break;
case TypeMinix:
case TypeMinix2:
- part.PartitionDescription = "MINIX partition";
+ part.Description = "MINIX partition";
break;
default:
- part.PartitionDescription = "Unknown partition type";
+ part.Description = "Unknown partition type";
break;
}
@@ -238,54 +238,54 @@ namespace DiscImageChef.PartPlugins
sectorSize = 2048;
CommonTypes.Partition part = new CommonTypes.Partition();
- part.PartitionLength = extendedTable.entries[j].length * sectorSize;
- part.PartitionSectors = extendedTable.entries[j].length;
- part.PartitionSequence = partitionSequence;
- part.PartitionName = "";
- part.PartitionStart = extendedTable.entries[j].start * sectorSize;
- part.PartitionStartSector = extendedTable.entries[j].start;
+ part.Size = extendedTable.entries[j].length * sectorSize;
+ part.Length = extendedTable.entries[j].length;
+ part.Sequence = partitionSequence;
+ part.Name = "";
+ part.Offset = extendedTable.entries[j].start * sectorSize;
+ part.Start = extendedTable.entries[j].start;
byte[] partType = new byte[3];
partType[0] = (byte)((extendedType & 0xFF0000) >> 16);
partType[1] = (byte)((extendedType & 0x00FF00) >> 8);
partType[2] = (byte)(extendedType & 0x0000FF);
- part.PartitionType = Encoding.ASCII.GetString(partType);
+ part.Type = Encoding.ASCII.GetString(partType);
switch(extendedType)
{
case TypeGEMDOS:
- part.PartitionDescription = "Atari GEMDOS partition";
+ part.Description = "Atari GEMDOS partition";
break;
case TypeBigGEMDOS:
- part.PartitionDescription = "Atari GEMDOS partition bigger than 32 MiB";
+ part.Description = "Atari GEMDOS partition bigger than 32 MiB";
break;
case TypeLinux:
- part.PartitionDescription = "Linux partition";
+ part.Description = "Linux partition";
break;
case TypeSwap:
- part.PartitionDescription = "Swap partition";
+ part.Description = "Swap partition";
break;
case TypeRAW:
- part.PartitionDescription = "RAW partition";
+ part.Description = "RAW partition";
break;
case TypeNetBSD:
- part.PartitionDescription = "NetBSD partition";
+ part.Description = "NetBSD partition";
break;
case TypeNetBSDSwap:
- part.PartitionDescription = "NetBSD swap partition";
+ part.Description = "NetBSD swap partition";
break;
case TypeSysV:
- part.PartitionDescription = "Atari UNIX partition";
+ part.Description = "Atari UNIX partition";
break;
case TypeMac:
- part.PartitionDescription = "Macintosh partition";
+ part.Description = "Macintosh partition";
break;
case TypeMinix:
case TypeMinix2:
- part.PartitionDescription = "MINIX partition";
+ part.Description = "MINIX partition";
break;
default:
- part.PartitionDescription = "Unknown partition type";
+ part.Description = "Unknown partition type";
break;
}
@@ -318,54 +318,54 @@ namespace DiscImageChef.PartPlugins
sectorSize = 2048;
CommonTypes.Partition part = new CommonTypes.Partition();
- part.PartitionLength = table.icdEntries[i].length * sectorSize;
- part.PartitionSectors = table.icdEntries[i].length;
- part.PartitionSequence = partitionSequence;
- part.PartitionName = "";
- part.PartitionStart = table.icdEntries[i].start * sectorSize;
- part.PartitionStartSector = table.icdEntries[i].start;
+ part.Size = table.icdEntries[i].length * sectorSize;
+ part.Length = table.icdEntries[i].length;
+ part.Sequence = partitionSequence;
+ part.Name = "";
+ part.Offset = table.icdEntries[i].start * sectorSize;
+ part.Start = table.icdEntries[i].start;
byte[] partType = new byte[3];
partType[0] = (byte)((type & 0xFF0000) >> 16);
partType[1] = (byte)((type & 0x00FF00) >> 8);
partType[2] = (byte)(type & 0x0000FF);
- part.PartitionType = Encoding.ASCII.GetString(partType);
+ part.Type = Encoding.ASCII.GetString(partType);
switch(type)
{
case TypeGEMDOS:
- part.PartitionDescription = "Atari GEMDOS partition";
+ part.Description = "Atari GEMDOS partition";
break;
case TypeBigGEMDOS:
- part.PartitionDescription = "Atari GEMDOS partition bigger than 32 MiB";
+ part.Description = "Atari GEMDOS partition bigger than 32 MiB";
break;
case TypeLinux:
- part.PartitionDescription = "Linux partition";
+ part.Description = "Linux partition";
break;
case TypeSwap:
- part.PartitionDescription = "Swap partition";
+ part.Description = "Swap partition";
break;
case TypeRAW:
- part.PartitionDescription = "RAW partition";
+ part.Description = "RAW partition";
break;
case TypeNetBSD:
- part.PartitionDescription = "NetBSD partition";
+ part.Description = "NetBSD partition";
break;
case TypeNetBSDSwap:
- part.PartitionDescription = "NetBSD swap partition";
+ part.Description = "NetBSD swap partition";
break;
case TypeSysV:
- part.PartitionDescription = "Atari UNIX partition";
+ part.Description = "Atari UNIX partition";
break;
case TypeMac:
- part.PartitionDescription = "Macintosh partition";
+ part.Description = "Macintosh partition";
break;
case TypeMinix:
case TypeMinix2:
- part.PartitionDescription = "MINIX partition";
+ part.Description = "MINIX partition";
break;
default:
- part.PartitionDescription = "Unknown partition type";
+ part.Description = "Unknown partition type";
break;
}
diff --git a/DiscImageChef.Partitions/BSD.cs b/DiscImageChef.Partitions/BSD.cs
index 213b4ce9..cf8e1add 100644
--- a/DiscImageChef.Partitions/BSD.cs
+++ b/DiscImageChef.Partitions/BSD.cs
@@ -77,12 +77,12 @@ namespace DiscImageChef.PartPlugins
foreach(BSDPartition entry in dl.d_partitions)
{
Partition part = new Partition();
- part.PartitionStartSector = entry.p_offset;
- part.PartitionStart = (entry.p_offset * dl.d_secsize);
- part.PartitionLength = entry.p_size;
- part.PartitionSectors = (entry.p_size * dl.d_secsize);
- part.PartitionType = fsTypeToString(entry.p_fstype);
- part.PartitionSequence = counter;
+ part.Start = entry.p_offset;
+ part.Offset = (entry.p_offset * dl.d_secsize);
+ part.Size = entry.p_size;
+ part.Length = (entry.p_size * dl.d_secsize);
+ part.Type = fsTypeToString(entry.p_fstype);
+ part.Sequence = counter;
if(entry.p_fstype != fsType.Unused)
{
partitions.Add(part);
diff --git a/DiscImageChef.Partitions/DEC.cs b/DiscImageChef.Partitions/DEC.cs
index 78bc7700..69c08f80 100644
--- a/DiscImageChef.Partitions/DEC.cs
+++ b/DiscImageChef.Partitions/DEC.cs
@@ -71,12 +71,12 @@ namespace DiscImageChef.PartPlugins
foreach(DECPartition entry in table.pt_part)
{
Partition part = new Partition();
- part.PartitionStartSector = entry.pi_blkoff;
- part.PartitionStart = (ulong)(entry.pi_blkoff * sector.Length);
- part.PartitionLength = (ulong)entry.pi_nblocks;
- part.PartitionSectors = (ulong)(entry.pi_nblocks * sector.Length);
- part.PartitionSequence = counter;
- if(part.PartitionLength > 0)
+ part.Start = entry.pi_blkoff;
+ part.Offset = (ulong)(entry.pi_blkoff * sector.Length);
+ part.Size = (ulong)entry.pi_nblocks;
+ part.Length = (ulong)(entry.pi_nblocks * sector.Length);
+ part.Sequence = counter;
+ if(part.Size > 0)
{
partitions.Add(part);
counter++;
diff --git a/DiscImageChef.Partitions/DragonFlyBSD.cs b/DiscImageChef.Partitions/DragonFlyBSD.cs
index 592dacdf..9cd7bcd7 100644
--- a/DiscImageChef.Partitions/DragonFlyBSD.cs
+++ b/DiscImageChef.Partitions/DragonFlyBSD.cs
@@ -71,16 +71,16 @@ namespace DiscImageChef.PartPlugins
foreach(Partition64 entry in disklabel.d_partitions)
{
Partition part = new Partition();
- part.PartitionStartSector = entry.p_boffset;
- part.PartitionStart = entry.p_boffset;
- part.PartitionLength = entry.p_bsize;
- part.PartitionSectors = entry.p_bsize;
+ part.Start = entry.p_boffset;
+ part.Offset = entry.p_boffset;
+ part.Size = entry.p_bsize;
+ part.Length = entry.p_bsize;
if((BSD.fsType)entry.p_fstype == BSD.fsType.Other)
- part.PartitionType = entry.p_type_uuid.ToString();
+ part.Type = entry.p_type_uuid.ToString();
else
- part.PartitionType = BSD.fsTypeToString((BSD.fsType)entry.p_fstype);
- part.PartitionName = entry.p_stor_uuid.ToString();
- part.PartitionSequence = counter;
+ part.Type = BSD.fsTypeToString((BSD.fsType)entry.p_fstype);
+ part.Name = entry.p_stor_uuid.ToString();
+ part.Sequence = counter;
if(entry.p_bsize > 0 && entry.p_boffset > 0)
{
partitions.Add(part);
diff --git a/DiscImageChef.Partitions/GPT.cs b/DiscImageChef.Partitions/GPT.cs
index af3ab88b..14809762 100644
--- a/DiscImageChef.Partitions/GPT.cs
+++ b/DiscImageChef.Partitions/GPT.cs
@@ -130,15 +130,15 @@ namespace DiscImageChef.PartPlugins
return false;
CommonTypes.Partition part = new CommonTypes.Partition();
- part.PartitionDescription = string.Format("ID: {0}", entry.partitionId);
- part.PartitionLength = (entry.endLBA - entry.startLBA + 1) * imagePlugin.GetSectorSize();
- part.PartitionName = entry.name;
- part.PartitionSectors = (entry.endLBA - entry.startLBA + 1);
- part.PartitionSequence = pseq++;
- part.PartitionStart = entry.startLBA * imagePlugin.GetSectorSize();
- part.PartitionStartSector = entry.startLBA;
- part.PartitionType = GetGuidTypeName(entry.partitionType);
- DicConsole.DebugWriteLine("GPT Plugin", "part.PartitionType = {0}", part.PartitionType);
+ part.Description = string.Format("ID: {0}", entry.partitionId);
+ part.Size = (entry.endLBA - entry.startLBA + 1) * imagePlugin.GetSectorSize();
+ part.Name = entry.name;
+ part.Length = (entry.endLBA - entry.startLBA + 1);
+ part.Sequence = pseq++;
+ part.Offset = entry.startLBA * imagePlugin.GetSectorSize();
+ part.Start = entry.startLBA;
+ part.Type = GetGuidTypeName(entry.partitionType);
+ DicConsole.DebugWriteLine("GPT Plugin", "part.PartitionType = {0}", part.Type);
partitions.Add(part);
}
}
diff --git a/DiscImageChef.Partitions/Human68k.cs b/DiscImageChef.Partitions/Human68k.cs
index 200f528d..eda90d63 100644
--- a/DiscImageChef.Partitions/Human68k.cs
+++ b/DiscImageChef.Partitions/Human68k.cs
@@ -99,12 +99,12 @@ namespace DiscImageChef.PartPlugins
DicConsole.DebugWriteLine("Human68k plugin", "sectsPerUnit = {0} {1}", sectsPerUnit, imagePlugin.GetSectorSize());
Partition part = new Partition();
- part.PartitionStartSector = (entry.stateStart & 0xFFFFFF) * sectsPerUnit;
- part.PartitionStart = part.PartitionStartSector * (ulong)sector.Length;
- part.PartitionSectors = entry.length * sectsPerUnit;
- part.PartitionLength = part.PartitionSectors * (ulong)sector.Length;
- part.PartitionType = StringHandlers.CToString(entry.name, Encoding.GetEncoding(932));
- part.PartitionSequence = counter;
+ part.Start = (entry.stateStart & 0xFFFFFF) * sectsPerUnit;
+ part.Offset = part.Start * (ulong)sector.Length;
+ part.Length = entry.length * sectsPerUnit;
+ part.Size = part.Length * (ulong)sector.Length;
+ part.Type = StringHandlers.CToString(entry.name, Encoding.GetEncoding(932));
+ part.Sequence = counter;
if(entry.length > 0)
{
partitions.Add(part);
diff --git a/DiscImageChef.Partitions/MBR.cs b/DiscImageChef.Partitions/MBR.cs
index 67528bc9..db803712 100644
--- a/DiscImageChef.Partitions/MBR.cs
+++ b/DiscImageChef.Partitions/MBR.cs
@@ -147,16 +147,16 @@ namespace DiscImageChef.PartPlugins
CommonTypes.Partition part = new CommonTypes.Partition();
- part.PartitionSectors = bsdPartition.p_size;
- part.PartitionStartSector = bsdPartition.p_offset;
- part.PartitionLength = bsdPartition.p_size * bsdDisklabel.d_secsize;
- part.PartitionStart = bsdPartition.p_offset * bsdDisklabel.d_secsize;
+ part.Length = bsdPartition.p_size;
+ part.Start = bsdPartition.p_offset;
+ part.Size = bsdPartition.p_size * bsdDisklabel.d_secsize;
+ part.Offset = bsdPartition.p_offset * bsdDisklabel.d_secsize;
- part.PartitionType = string.Format("BSD: {0}", bsdPartition.p_fstype);
- part.PartitionName = BSD.fsTypeToString(bsdPartition.p_fstype);
+ part.Type = string.Format("BSD: {0}", bsdPartition.p_fstype);
+ part.Name = BSD.fsTypeToString(bsdPartition.p_fstype);
- part.PartitionSequence = counter;
- part.PartitionDescription = "Partition inside a BSD disklabel.";
+ part.Sequence = counter;
+ part.Description = "Partition inside a BSD disklabel.";
if(bsdPartition.p_fstype != BSD.fsType.Unused)
{
@@ -246,12 +246,12 @@ namespace DiscImageChef.PartPlugins
{
CommonTypes.Partition part = new CommonTypes.Partition();
// TODO: Check if device bps == disklabel bps
- part.PartitionStartSector = vtoc_ent.start;
- part.PartitionSectors = vtoc_ent.length;
- part.PartitionStart = vtoc_ent.start * dl.bps;
- part.PartitionLength = vtoc_ent.length * dl.bps;
- part.PartitionSequence = counter;
- part.PartitionType = string.Format("UNIX: {0}", UNIX.decodeUNIXTAG(vtoc_ent.tag, isNewDL));
+ part.Start = vtoc_ent.start;
+ part.Length = vtoc_ent.length;
+ part.Offset = vtoc_ent.start * dl.bps;
+ part.Size = vtoc_ent.length * dl.bps;
+ part.Sequence = counter;
+ part.Type = string.Format("UNIX: {0}", UNIX.decodeUNIXTAG(vtoc_ent.tag, isNewDL));
string info = "";
@@ -260,7 +260,7 @@ namespace DiscImageChef.PartPlugins
if((vtoc_ent.flags & 0x10) == 0x10)
info += " (do not mount)";
- part.PartitionDescription = "UNIX slice" + info + ".";
+ part.Description = "UNIX slice" + info + ".";
partitions.Add(part);
counter++;
@@ -283,15 +283,15 @@ namespace DiscImageChef.PartPlugins
for(int j = 0; j < 16; j++)
{
CommonTypes.Partition part = new CommonTypes.Partition();
- part.PartitionStartSector = BitConverter.ToUInt32(disklabel_sector, 68 + j * 12 + 4);
- part.PartitionSectors = BitConverter.ToUInt32(disklabel_sector, 68 + j * 12 + 8);
- part.PartitionStart = part.PartitionStartSector * imagePlugin.GetSectorSize(); // 68+4+j*12
- part.PartitionLength = part.PartitionSectors * imagePlugin.GetSectorSize(); // 68+8+j*12
- part.PartitionDescription = "Solaris slice.";
+ part.Start = BitConverter.ToUInt32(disklabel_sector, 68 + j * 12 + 4);
+ part.Length = BitConverter.ToUInt32(disklabel_sector, 68 + j * 12 + 8);
+ part.Offset = part.Start * imagePlugin.GetSectorSize(); // 68+4+j*12
+ part.Size = part.Length * imagePlugin.GetSectorSize(); // 68+8+j*12
+ part.Description = "Solaris slice.";
- part.PartitionSequence = counter;
+ part.Sequence = counter;
- if(part.PartitionLength > 0)
+ if(part.Size > 0)
{
partitions.Add(part);
counter++;
@@ -315,13 +315,13 @@ namespace DiscImageChef.PartPlugins
{
CommonTypes.Partition part = new CommonTypes.Partition();
minix_subs = true;
- part.PartitionDescription = "Minix subpartition";
- part.PartitionType = "Minix";
- part.PartitionStartSector = BitConverter.ToUInt32(disklabel_sector, 0x1BE + j * 16 + 8);
- part.PartitionSectors = BitConverter.ToUInt32(disklabel_sector, 0x1BE + j * 16 + 12);
- part.PartitionStart = part.PartitionStartSector * imagePlugin.GetSectorSize();
- part.PartitionLength = part.PartitionSectors * imagePlugin.GetSectorSize();
- part.PartitionSequence = counter;
+ part.Description = "Minix subpartition";
+ part.Type = "Minix";
+ part.Start = BitConverter.ToUInt32(disklabel_sector, 0x1BE + j * 16 + 8);
+ part.Length = BitConverter.ToUInt32(disklabel_sector, 0x1BE + j * 16 + 12);
+ part.Offset = part.Start * imagePlugin.GetSectorSize();
+ part.Size = part.Length * imagePlugin.GetSectorSize();
+ part.Sequence = counter;
partitions.Add(part);
counter++;
}
@@ -341,10 +341,10 @@ namespace DiscImageChef.PartPlugins
CommonTypes.Partition part = new CommonTypes.Partition();
if(entry.lba_start > 0 && entry.lba_sectors > 0)
{
- part.PartitionStartSector = entry.lba_start;
- part.PartitionSectors = entry.lba_sectors;
- part.PartitionStart = part.PartitionStartSector * imagePlugin.GetSectorSize();
- part.PartitionLength = part.PartitionSectors * imagePlugin.GetSectorSize();
+ part.Start = entry.lba_start;
+ part.Length = entry.lba_sectors;
+ part.Offset = part.Start * imagePlugin.GetSectorSize();
+ part.Size = part.Length * imagePlugin.GetSectorSize();
}
/* else if(entry.start_head < 255 && entry.end_head < 255 &&
entry.start_sector > 0 && entry.start_sector < 64 &&
@@ -358,10 +358,10 @@ namespace DiscImageChef.PartPlugins
if(valid)
{
- part.PartitionType = string.Format("0x{0:X2}", entry.type);
- part.PartitionName = decodeMBRType(entry.type);
- part.PartitionSequence = counter;
- part.PartitionDescription = entry.status == 0x80 ? "Partition is bootable." : "";
+ part.Type = string.Format("0x{0:X2}", entry.type);
+ part.Name = decodeMBRType(entry.type);
+ part.Sequence = counter;
+ part.Description = entry.status == 0x80 ? "Partition is bootable." : "";
counter++;
@@ -446,16 +446,16 @@ namespace DiscImageChef.PartPlugins
CommonTypes.Partition part = new CommonTypes.Partition();
- part.PartitionSectors = bsdPartition.p_size;
- part.PartitionStartSector = bsdPartition.p_offset;
- part.PartitionLength = bsdPartition.p_size * bsdDisklabel.d_secsize;
- part.PartitionStart = bsdPartition.p_offset * bsdDisklabel.d_secsize;
+ part.Length = bsdPartition.p_size;
+ part.Start = bsdPartition.p_offset;
+ part.Size = bsdPartition.p_size * bsdDisklabel.d_secsize;
+ part.Offset = bsdPartition.p_offset * bsdDisklabel.d_secsize;
- part.PartitionType = string.Format("BSD: {0}", bsdPartition.p_fstype);
- part.PartitionName = BSD.fsTypeToString(bsdPartition.p_fstype);
+ part.Type = string.Format("BSD: {0}", bsdPartition.p_fstype);
+ part.Name = BSD.fsTypeToString(bsdPartition.p_fstype);
- part.PartitionSequence = counter;
- part.PartitionDescription = "Partition inside a BSD disklabel.";
+ part.Sequence = counter;
+ part.Description = "Partition inside a BSD disklabel.";
if(bsdPartition.p_fstype != BSD.fsType.Unused)
{
@@ -545,12 +545,12 @@ namespace DiscImageChef.PartPlugins
{
CommonTypes.Partition part = new CommonTypes.Partition();
// TODO: Check if device bps == disklabel bps
- part.PartitionStartSector = vtoc_ent.start;
- part.PartitionSectors = vtoc_ent.length;
- part.PartitionStart = vtoc_ent.start * dl.bps;
- part.PartitionLength = vtoc_ent.length * dl.bps;
- part.PartitionSequence = counter;
- part.PartitionType = string.Format("UNIX: {0}", UNIX.decodeUNIXTAG(vtoc_ent.tag, isNewDL));
+ part.Start = vtoc_ent.start;
+ part.Length = vtoc_ent.length;
+ part.Offset = vtoc_ent.start * dl.bps;
+ part.Size = vtoc_ent.length * dl.bps;
+ part.Sequence = counter;
+ part.Type = string.Format("UNIX: {0}", UNIX.decodeUNIXTAG(vtoc_ent.tag, isNewDL));
string info = "";
@@ -559,7 +559,7 @@ namespace DiscImageChef.PartPlugins
if((vtoc_ent.flags & 0x10) == 0x10)
info += " (do not mount)";
- part.PartitionDescription = "UNIX slice" + info + ".";
+ part.Description = "UNIX slice" + info + ".";
partitions.Add(part);
counter++;
@@ -582,15 +582,15 @@ namespace DiscImageChef.PartPlugins
for(int j = 0; j < 16; j++)
{
CommonTypes.Partition part = new CommonTypes.Partition();
- part.PartitionStartSector = BitConverter.ToUInt32(disklabel_sector, 68 + j * 12 + 4);
- part.PartitionSectors = BitConverter.ToUInt32(disklabel_sector, 68 + j * 12 + 8);
- part.PartitionStart = part.PartitionStartSector * imagePlugin.GetSectorSize(); // 68+4+j*12
- part.PartitionLength = part.PartitionSectors * imagePlugin.GetSectorSize(); // 68+8+j*12
- part.PartitionDescription = "Solaris slice.";
+ part.Start = BitConverter.ToUInt32(disklabel_sector, 68 + j * 12 + 4);
+ part.Length = BitConverter.ToUInt32(disklabel_sector, 68 + j * 12 + 8);
+ part.Offset = part.Start * imagePlugin.GetSectorSize(); // 68+4+j*12
+ part.Size = part.Length * imagePlugin.GetSectorSize(); // 68+8+j*12
+ part.Description = "Solaris slice.";
- part.PartitionSequence = counter;
+ part.Sequence = counter;
- if(part.PartitionLength > 0)
+ if(part.Size > 0)
{
partitions.Add(part);
counter++;
@@ -614,13 +614,13 @@ namespace DiscImageChef.PartPlugins
{
CommonTypes.Partition part = new CommonTypes.Partition();
minix_subs = true;
- part.PartitionDescription = "Minix subpartition";
- part.PartitionType = "Minix";
- part.PartitionStartSector = BitConverter.ToUInt32(disklabel_sector, 0x1BE + j * 16 + 8);
- part.PartitionSectors = BitConverter.ToUInt32(disklabel_sector, 0x1BE + j * 16 + 12);
- part.PartitionStart = part.PartitionStartSector * imagePlugin.GetSectorSize();
- part.PartitionLength = part.PartitionSectors * imagePlugin.GetSectorSize();
- part.PartitionSequence = counter;
+ part.Description = "Minix subpartition";
+ part.Type = "Minix";
+ part.Start = BitConverter.ToUInt32(disklabel_sector, 0x1BE + j * 16 + 8);
+ part.Length = BitConverter.ToUInt32(disklabel_sector, 0x1BE + j * 16 + 12);
+ part.Offset = part.Start * imagePlugin.GetSectorSize();
+ part.Size = part.Length * imagePlugin.GetSectorSize();
+ part.Sequence = counter;
partitions.Add(part);
counter++;
}
@@ -641,10 +641,10 @@ namespace DiscImageChef.PartPlugins
CommonTypes.Partition part = new CommonTypes.Partition();
if(entry2.lba_start > 0 && entry2.lba_sectors > 0)
{
- part.PartitionStartSector = entry2.lba_start;
- part.PartitionSectors = entry2.lba_sectors;
- part.PartitionStart = part.PartitionStartSector * imagePlugin.GetSectorSize();
- part.PartitionLength = part.PartitionSectors * imagePlugin.GetSectorSize();
+ part.Start = entry2.lba_start;
+ part.Length = entry2.lba_sectors;
+ part.Offset = part.Start * imagePlugin.GetSectorSize();
+ part.Size = part.Length * imagePlugin.GetSectorSize();
}
/* else if(entry2.start_head < 255 && entry2.end_head < 255 &&
entry2.start_sector > 0 && entry2.start_sector < 64 &&
@@ -658,10 +658,10 @@ namespace DiscImageChef.PartPlugins
if(ext_valid)
{
- part.PartitionType = string.Format("0x{0:X2}", entry2.type);
- part.PartitionName = decodeMBRType(entry2.type);
- part.PartitionSequence = counter;
- part.PartitionDescription = entry2.status == 0x80 ? "Partition is bootable." : "";
+ part.Type = string.Format("0x{0:X2}", entry2.type);
+ part.Name = decodeMBRType(entry2.type);
+ part.Sequence = counter;
+ part.Description = entry2.status == 0x80 ? "Partition is bootable." : "";
counter++;
diff --git a/DiscImageChef.Partitions/NeXT.cs b/DiscImageChef.Partitions/NeXT.cs
index 7377b911..e2f36bd5 100644
--- a/DiscImageChef.Partitions/NeXT.cs
+++ b/DiscImageChef.Partitions/NeXT.cs
@@ -155,21 +155,21 @@ namespace DiscImageChef.PartPlugins
CommonTypes.Partition part = new CommonTypes.Partition()
{
- PartitionLength = (ulong)(label.dl_dt.d_partitions[i].p_size * label.dl_dt.d_secsize),
- PartitionStart = (ulong)((label.dl_dt.d_partitions[i].p_base + label.dl_dt.d_front) * label.dl_dt.d_secsize),
- PartitionType = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type),
- PartitionSequence = (ulong)i,
- PartitionName = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt),
- PartitionSectors = (ulong)((label.dl_dt.d_partitions[i].p_size * label.dl_dt.d_secsize) / sector_size),
- PartitionStartSector = (ulong)(((label.dl_dt.d_partitions[i].p_base + label.dl_dt.d_front) * label.dl_dt.d_secsize) / sector_size)
+ Size = (ulong)(label.dl_dt.d_partitions[i].p_size * label.dl_dt.d_secsize),
+ Offset = (ulong)((label.dl_dt.d_partitions[i].p_base + label.dl_dt.d_front) * label.dl_dt.d_secsize),
+ Type = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type),
+ Sequence = (ulong)i,
+ Name = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt),
+ Length = (ulong)((label.dl_dt.d_partitions[i].p_size * label.dl_dt.d_secsize) / sector_size),
+ Start = (ulong)(((label.dl_dt.d_partitions[i].p_base + label.dl_dt.d_front) * label.dl_dt.d_secsize) / sector_size)
};
- if(part.PartitionStartSector + part.PartitionSectors > imagePlugin.ImageInfo.sectors)
+ if(part.Start + part.Length > imagePlugin.ImageInfo.sectors)
{
DicConsole.DebugWriteLine("NeXT Plugin", "Partition bigger than device, reducing...");
- part.PartitionSectors = imagePlugin.ImageInfo.sectors - part.PartitionStartSector;
- part.PartitionLength = part.PartitionSectors * sector_size;
- DicConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_size = {1}", i, part.PartitionSectors);
+ part.Length = imagePlugin.ImageInfo.sectors - part.Start;
+ part.Size = part.Length * sector_size;
+ DicConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_size = {1}", i, part.Length);
}
sb.AppendFormat("{0} bytes per block", label.dl_dt.d_partitions[i].p_bsize).AppendLine();
@@ -188,7 +188,7 @@ namespace DiscImageChef.PartPlugins
if(label.dl_dt.d_partitions[i].p_automnt == 1)
sb.AppendLine("Filesystem should be automatically mounted");
- part.PartitionDescription = sb.ToString();
+ part.Description = sb.ToString();
partitions.Add(part);
}
diff --git a/DiscImageChef.Partitions/PC98.cs b/DiscImageChef.Partitions/PC98.cs
index 6d682943..ab6c0bbe 100644
--- a/DiscImageChef.Partitions/PC98.cs
+++ b/DiscImageChef.Partitions/PC98.cs
@@ -77,18 +77,18 @@ namespace DiscImageChef.PartPlugins
{
Partition part = new Partition();
- part.PartitionStartSector = CHStoLBA(entry.dp_scyl, entry.dp_shd, entry.dp_ssect);
- part.PartitionStart = part.PartitionStartSector * imagePlugin.GetSectorSize();
- part.PartitionSectors = CHStoLBA(entry.dp_ecyl, entry.dp_ehd, entry.dp_esect) - part.PartitionStartSector;
- part.PartitionLength = part.PartitionSectors * imagePlugin.GetSectorSize();
- part.PartitionType = string.Format("{0}", (entry.dp_sid << 8) | entry.dp_mid);
- part.PartitionName = StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932));
- part.PartitionSequence = counter;
+ part.Start = CHStoLBA(entry.dp_scyl, entry.dp_shd, entry.dp_ssect);
+ part.Offset = part.Start * imagePlugin.GetSectorSize();
+ part.Length = CHStoLBA(entry.dp_ecyl, entry.dp_ehd, entry.dp_esect) - part.Start;
+ part.Size = part.Length * imagePlugin.GetSectorSize();
+ part.Type = string.Format("{0}", (entry.dp_sid << 8) | entry.dp_mid);
+ part.Name = StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932));
+ part.Sequence = counter;
if((entry.dp_sid & 0x7F) == 0x44 &&
(entry.dp_mid & 0x7F) == 0x14 &&
- part.PartitionStartSector < imagePlugin.ImageInfo.sectors &&
- part.PartitionSectors + part.PartitionStartSector <= imagePlugin.ImageInfo.sectors)
+ part.Start < imagePlugin.ImageInfo.sectors &&
+ part.Length + part.Start <= imagePlugin.ImageInfo.sectors)
{
partitions.Add(part);
counter++;
diff --git a/DiscImageChef.Partitions/RDB.cs b/DiscImageChef.Partitions/RDB.cs
index 80318370..ebd1c490 100644
--- a/DiscImageChef.Partitions/RDB.cs
+++ b/DiscImageChef.Partitions/RDB.cs
@@ -1337,14 +1337,14 @@ namespace DiscImageChef.PartPlugins
{
CommonTypes.Partition entry = new CommonTypes.Partition();
- entry.PartitionDescription = AmigaDOSTypeToDescriptionString(RDBEntry.dosEnvVec.dosType);
- entry.PartitionName = RDBEntry.driveName;
- entry.PartitionSequence = sequence;
- entry.PartitionSectors = (RDBEntry.dosEnvVec.highCylinder + 1 - RDBEntry.dosEnvVec.lowCylinder) * RDBEntry.dosEnvVec.surfaces * RDBEntry.dosEnvVec.bpt;
- entry.PartitionStartSector = RDBEntry.dosEnvVec.lowCylinder * RDBEntry.dosEnvVec.surfaces * RDBEntry.dosEnvVec.bpt;
- entry.PartitionStart = entry.PartitionStartSector * RDB.block_size;
- entry.PartitionLength = entry.PartitionSectors * RDB.block_size;
- entry.PartitionType = AmigaDOSTypeToString(RDBEntry.dosEnvVec.dosType);
+ entry.Description = AmigaDOSTypeToDescriptionString(RDBEntry.dosEnvVec.dosType);
+ entry.Name = RDBEntry.driveName;
+ entry.Sequence = sequence;
+ entry.Length = (RDBEntry.dosEnvVec.highCylinder + 1 - RDBEntry.dosEnvVec.lowCylinder) * RDBEntry.dosEnvVec.surfaces * RDBEntry.dosEnvVec.bpt;
+ entry.Start = RDBEntry.dosEnvVec.lowCylinder * RDBEntry.dosEnvVec.surfaces * RDBEntry.dosEnvVec.bpt;
+ entry.Offset = entry.Start * RDB.block_size;
+ entry.Size = entry.Length * RDB.block_size;
+ entry.Type = AmigaDOSTypeToString(RDBEntry.dosEnvVec.dosType);
partitions.Add(entry);
sequence++;
diff --git a/DiscImageChef.Partitions/RioKarma.cs b/DiscImageChef.Partitions/RioKarma.cs
index 82c80224..e2ae6b99 100644
--- a/DiscImageChef.Partitions/RioKarma.cs
+++ b/DiscImageChef.Partitions/RioKarma.cs
@@ -71,12 +71,12 @@ namespace DiscImageChef.PartPlugins
foreach(RioKarmaEntry entry in table.entries)
{
Partition part = new Partition();
- part.PartitionStartSector = entry.offset;
- part.PartitionStart = (ulong)(entry.offset * sector.Length);
- part.PartitionLength = entry.size;
- part.PartitionSectors = (ulong)(entry.size * sector.Length);
- part.PartitionType = "Rio Karma";
- part.PartitionSequence = counter;
+ part.Start = entry.offset;
+ part.Offset = (ulong)(entry.offset * sector.Length);
+ part.Size = entry.size;
+ part.Length = (ulong)(entry.size * sector.Length);
+ part.Type = "Rio Karma";
+ part.Sequence = counter;
if(entry.type == EntryMagic)
{
partitions.Add(part);
diff --git a/DiscImageChef.Partitions/SGI.cs b/DiscImageChef.Partitions/SGI.cs
index 17273b9e..c3acc53a 100644
--- a/DiscImageChef.Partitions/SGI.cs
+++ b/DiscImageChef.Partitions/SGI.cs
@@ -70,13 +70,13 @@ namespace DiscImageChef.PartPlugins
foreach(SGIPartition entry in disklabel.partitions)
{
Partition part = new Partition();
- part.PartitionStartSector = entry.first_block;
- part.PartitionStart = (entry.first_block * 512);
- part.PartitionLength = entry.num_blocks;
- part.PartitionSectors = (entry.num_blocks * 512);
- part.PartitionType = string.Format("{0}", entry.type);
- part.PartitionSequence = counter;
- if(part.PartitionLength > 0)
+ part.Start = entry.first_block;
+ part.Offset = (entry.first_block * 512);
+ part.Size = entry.num_blocks;
+ part.Length = (entry.num_blocks * 512);
+ part.Type = string.Format("{0}", entry.type);
+ part.Sequence = counter;
+ if(part.Size > 0)
{
partitions.Add(part);
counter++;
diff --git a/DiscImageChef.Partitions/Sun.cs b/DiscImageChef.Partitions/Sun.cs
index 06bb5496..01e760cc 100644
--- a/DiscImageChef.Partitions/Sun.cs
+++ b/DiscImageChef.Partitions/Sun.cs
@@ -201,20 +201,20 @@ namespace DiscImageChef.PartPlugins
if((SunTypes)sdl.vtoc.infos[i].id != SunTypes.SunWholeDisk && sdl.partitions[i].num_sectors > 0)
{
CommonTypes.Partition part = new CommonTypes.Partition();
- part.PartitionDescription = SunFlagsToString((SunFlags)sdl.vtoc.infos[i].flags);
+ part.Description = SunFlagsToString((SunFlags)sdl.vtoc.infos[i].flags);
#pragma warning disable IDE0004 // Remove Unnecessary Cast
- part.PartitionLength = (ulong)sdl.partitions[i].num_sectors * (ulong)imagePlugin.GetSectorSize();
+ part.Size = (ulong)sdl.partitions[i].num_sectors * (ulong)imagePlugin.GetSectorSize();
#pragma warning restore IDE0004 // Remove Unnecessary Cast
- part.PartitionName = "";
- part.PartitionSectors = sdl.partitions[i].num_sectors;
- part.PartitionSequence = (ulong)i;
+ part.Name = "";
+ part.Length = sdl.partitions[i].num_sectors;
+ part.Sequence = (ulong)i;
#pragma warning disable IDE0004 // Remove Unnecessary Cast
- part.PartitionStart = (ulong)sdl.partitions[i].start_cylinder * (ulong)sectorsPerCylinder * (ulong)imagePlugin.GetSectorSize();
+ part.Offset = (ulong)sdl.partitions[i].start_cylinder * (ulong)sectorsPerCylinder * (ulong)imagePlugin.GetSectorSize();
#pragma warning restore IDE0004 // Remove Unnecessary Cast
- part.PartitionStartSector = sdl.partitions[i].start_cylinder * sectorsPerCylinder;
- part.PartitionType = SunIdToString((SunTypes)sdl.vtoc.infos[i].id);
+ part.Start = sdl.partitions[i].start_cylinder * sectorsPerCylinder;
+ part.Type = SunIdToString((SunTypes)sdl.vtoc.infos[i].id);
- if(part.PartitionStartSector > imagePlugin.GetSectors() || (part.PartitionStartSector + part.PartitionSectors) > imagePlugin.GetSectors())
+ if(part.Start > imagePlugin.GetSectors() || (part.Start + part.Length) > imagePlugin.GetSectors())
return false;
partitions.Add(part);
diff --git a/DiscImageChef.Partitions/UNIX.cs b/DiscImageChef.Partitions/UNIX.cs
index 9382ea1e..45b39ef6 100644
--- a/DiscImageChef.Partitions/UNIX.cs
+++ b/DiscImageChef.Partitions/UNIX.cs
@@ -143,12 +143,12 @@ namespace DiscImageChef.PartPlugins
if((vtoc_ent.flags & 0x200) == 0x200 && vtoc_ent.tag != UNIX_TAG.EMPTY && vtoc_ent.tag != UNIX_TAG.WHOLE)
{
Partition part = new Partition();
- part.PartitionStartSector = vtoc_ent.start;
- part.PartitionSectors = vtoc_ent.length;
- part.PartitionStart = vtoc_ent.start * dl.bps;
- part.PartitionLength = vtoc_ent.length * dl.bps;
- part.PartitionSequence = counter;
- part.PartitionType = string.Format("UNIX: {0}", decodeUNIXTAG(vtoc_ent.tag, isNewDL));
+ part.Start = vtoc_ent.start;
+ part.Length = vtoc_ent.length;
+ part.Offset = vtoc_ent.start * dl.bps;
+ part.Size = vtoc_ent.length * dl.bps;
+ part.Sequence = counter;
+ part.Type = string.Format("UNIX: {0}", decodeUNIXTAG(vtoc_ent.tag, isNewDL));
string info = "";
@@ -157,7 +157,7 @@ namespace DiscImageChef.PartPlugins
if((vtoc_ent.flags & 0x10) == 0x10)
info += " (do not mount)";
- part.PartitionDescription = "UNIX slice" + info + ".";
+ part.Description = "UNIX slice" + info + ".";
partitions.Add(part);
counter++;
diff --git a/DiscImageChef.Partitions/Xbox.cs b/DiscImageChef.Partitions/Xbox.cs
index 61459fa9..28ebdf0c 100644
--- a/DiscImageChef.Partitions/Xbox.cs
+++ b/DiscImageChef.Partitions/Xbox.cs
@@ -91,20 +91,20 @@ namespace DiscImageChef.PartPlugins
table.dashboardOff + table.dashboardLen <= imagePlugin.ImageInfo.sectors)
{
Partition contentPart = new Partition();
- contentPart.PartitionDescription = "Content volume";
- contentPart.PartitionLength = (ulong)table.contentLen * (ulong)imagePlugin.ImageInfo.sectorSize;
- contentPart.PartitionSectors = table.contentLen;
- contentPart.PartitionSequence = 1;
- contentPart.PartitionStart = (ulong)table.contentOff * (ulong)imagePlugin.ImageInfo.sectorSize;
- contentPart.PartitionStartSector = table.contentOff;
+ contentPart.Description = "Content volume";
+ contentPart.Size = (ulong)table.contentLen * (ulong)imagePlugin.ImageInfo.sectorSize;
+ contentPart.Length = table.contentLen;
+ contentPart.Sequence = 1;
+ contentPart.Offset = (ulong)table.contentOff * (ulong)imagePlugin.ImageInfo.sectorSize;
+ contentPart.Start = table.contentOff;
Partition dashboardPart = new Partition();
- dashboardPart.PartitionDescription = "Dashboard volume";
- dashboardPart.PartitionLength = (ulong)table.dashboardLen * (ulong)imagePlugin.ImageInfo.sectorSize;
- dashboardPart.PartitionSectors = table.dashboardLen;
- dashboardPart.PartitionSequence = 2;
- dashboardPart.PartitionStart = (ulong)table.dashboardOff * (ulong)imagePlugin.ImageInfo.sectorSize;
- dashboardPart.PartitionStartSector = table.dashboardOff;
+ dashboardPart.Description = "Dashboard volume";
+ dashboardPart.Size = (ulong)table.dashboardLen * (ulong)imagePlugin.ImageInfo.sectorSize;
+ dashboardPart.Length = table.dashboardLen;
+ dashboardPart.Sequence = 2;
+ dashboardPart.Offset = (ulong)table.dashboardOff * (ulong)imagePlugin.ImageInfo.sectorSize;
+ dashboardPart.Start = table.dashboardOff;
partitions.Add(contentPart);
partitions.Add(dashboardPart);
@@ -122,20 +122,20 @@ namespace DiscImageChef.PartPlugins
if(temp == XboxCigam)
{
Partition sysCachePart = new Partition();
- sysCachePart.PartitionDescription = "System cache";
- sysCachePart.PartitionLength = MemoryUnitDataOff;
- sysCachePart.PartitionSectors = (ulong)(MemoryUnitDataOff / imagePlugin.ImageInfo.sectorSize);
- sysCachePart.PartitionSequence = 1;
- sysCachePart.PartitionStart = 0;
- sysCachePart.PartitionStartSector = 0;
+ sysCachePart.Description = "System cache";
+ sysCachePart.Size = MemoryUnitDataOff;
+ sysCachePart.Length = (ulong)(MemoryUnitDataOff / imagePlugin.ImageInfo.sectorSize);
+ sysCachePart.Sequence = 1;
+ sysCachePart.Offset = 0;
+ sysCachePart.Start = 0;
Partition dataPart = new Partition();
- dataPart.PartitionDescription = "Data volume";
- dataPart.PartitionLength = (ulong)imagePlugin.ImageInfo.sectors * (ulong)imagePlugin.ImageInfo.sectorSize - MemoryUnitDataOff;
- dataPart.PartitionSectors = imagePlugin.ImageInfo.sectors - sysCachePart.PartitionSectors;
- dataPart.PartitionSequence = 2;
- dataPart.PartitionStart = MemoryUnitDataOff;
- dataPart.PartitionStartSector = sysCachePart.PartitionSectors;
+ dataPart.Description = "Data volume";
+ dataPart.Size = (ulong)imagePlugin.ImageInfo.sectors * (ulong)imagePlugin.ImageInfo.sectorSize - MemoryUnitDataOff;
+ dataPart.Length = imagePlugin.ImageInfo.sectors - sysCachePart.Length;
+ dataPart.Sequence = 2;
+ dataPart.Offset = MemoryUnitDataOff;
+ dataPart.Start = sysCachePart.Length;
partitions.Add(sysCachePart);
partitions.Add(dataPart);
@@ -152,60 +152,60 @@ namespace DiscImageChef.PartPlugins
if(temp == XboxCigam)
{
Partition securityPart = new Partition();
- securityPart.PartitionDescription = "Security sectors";
- securityPart.PartitionLength = Xbox360SecuritySectorLen;
- securityPart.PartitionSectors = (ulong)(Xbox360SecuritySectorLen / imagePlugin.ImageInfo.sectorSize);
- securityPart.PartitionSequence = 1;
- securityPart.PartitionStart = Xbox360SecuritySectorOff;
- securityPart.PartitionStartSector = (ulong)(Xbox360SecuritySectorOff / imagePlugin.ImageInfo.sectorSize);
+ securityPart.Description = "Security sectors";
+ securityPart.Size = Xbox360SecuritySectorLen;
+ securityPart.Length = (ulong)(Xbox360SecuritySectorLen / imagePlugin.ImageInfo.sectorSize);
+ securityPart.Sequence = 1;
+ securityPart.Offset = Xbox360SecuritySectorOff;
+ securityPart.Start = (ulong)(Xbox360SecuritySectorOff / imagePlugin.ImageInfo.sectorSize);
Partition sysCachePart = new Partition();
- sysCachePart.PartitionDescription = "System cache";
- sysCachePart.PartitionLength = Xbox360SystemCacheLen;
- sysCachePart.PartitionSectors = (ulong)(Xbox360SystemCacheLen / imagePlugin.ImageInfo.sectorSize);
- sysCachePart.PartitionSequence = 2;
- sysCachePart.PartitionStart = Xbox360SystemCacheOff;
- sysCachePart.PartitionStartSector = (ulong)(Xbox360SystemCacheOff / imagePlugin.ImageInfo.sectorSize);
+ sysCachePart.Description = "System cache";
+ sysCachePart.Size = Xbox360SystemCacheLen;
+ sysCachePart.Length = (ulong)(Xbox360SystemCacheLen / imagePlugin.ImageInfo.sectorSize);
+ sysCachePart.Sequence = 2;
+ sysCachePart.Offset = Xbox360SystemCacheOff;
+ sysCachePart.Start = (ulong)(Xbox360SystemCacheOff / imagePlugin.ImageInfo.sectorSize);
Partition gameCachePart = new Partition();
- gameCachePart.PartitionDescription = "Game cache";
- gameCachePart.PartitionLength = Xbox360GameCacheLen;
- gameCachePart.PartitionSectors = (ulong)(Xbox360GameCacheLen / imagePlugin.ImageInfo.sectorSize);
- gameCachePart.PartitionSequence = 3;
- gameCachePart.PartitionStart = Xbox360GameCacheOff;
- gameCachePart.PartitionStartSector = (ulong)(Xbox360GameCacheOff / imagePlugin.ImageInfo.sectorSize);
+ gameCachePart.Description = "Game cache";
+ gameCachePart.Size = Xbox360GameCacheLen;
+ gameCachePart.Length = (ulong)(Xbox360GameCacheLen / imagePlugin.ImageInfo.sectorSize);
+ gameCachePart.Sequence = 3;
+ gameCachePart.Offset = Xbox360GameCacheOff;
+ gameCachePart.Start = (ulong)(Xbox360GameCacheOff / imagePlugin.ImageInfo.sectorSize);
Partition sysExtPart = new Partition();
- sysExtPart.PartitionDescription = "System volume";
- sysExtPart.PartitionLength = Xbox368SysExtLen;
- sysExtPart.PartitionSectors = (ulong)(Xbox368SysExtLen / imagePlugin.ImageInfo.sectorSize);
- sysExtPart.PartitionSequence = 4;
- sysExtPart.PartitionStart = Xbox368SysExtOff;
- sysExtPart.PartitionStartSector = (ulong)(Xbox368SysExtOff / imagePlugin.ImageInfo.sectorSize);
+ sysExtPart.Description = "System volume";
+ sysExtPart.Size = Xbox368SysExtLen;
+ sysExtPart.Length = (ulong)(Xbox368SysExtLen / imagePlugin.ImageInfo.sectorSize);
+ sysExtPart.Sequence = 4;
+ sysExtPart.Offset = Xbox368SysExtOff;
+ sysExtPart.Start = (ulong)(Xbox368SysExtOff / imagePlugin.ImageInfo.sectorSize);
Partition sysExt2Part = new Partition();
- sysExt2Part.PartitionDescription = "System volume 2";
- sysExt2Part.PartitionLength = Xbox360SysExt2Len;
- sysExt2Part.PartitionSectors = (ulong)(Xbox360SysExt2Len / imagePlugin.ImageInfo.sectorSize);
- sysExt2Part.PartitionSequence = 5;
- sysExt2Part.PartitionStart = Xbox360SysExt2Off;
- sysExt2Part.PartitionStartSector = (ulong)(Xbox360SysExt2Off / imagePlugin.ImageInfo.sectorSize);
+ sysExt2Part.Description = "System volume 2";
+ sysExt2Part.Size = Xbox360SysExt2Len;
+ sysExt2Part.Length = (ulong)(Xbox360SysExt2Len / imagePlugin.ImageInfo.sectorSize);
+ sysExt2Part.Sequence = 5;
+ sysExt2Part.Offset = Xbox360SysExt2Off;
+ sysExt2Part.Start = (ulong)(Xbox360SysExt2Off / imagePlugin.ImageInfo.sectorSize);
Partition xbox1Part = new Partition();
- xbox1Part.PartitionDescription = "Xbox backwards compatibility";
- xbox1Part.PartitionLength = Xbox360CompatLen;
- xbox1Part.PartitionSectors = (ulong)(Xbox360CompatLen / imagePlugin.ImageInfo.sectorSize);
- xbox1Part.PartitionSequence = 6;
- xbox1Part.PartitionStart = Xbox360CompatOff;
- xbox1Part.PartitionStartSector = (ulong)(Xbox360CompatOff / imagePlugin.ImageInfo.sectorSize);
+ xbox1Part.Description = "Xbox backwards compatibility";
+ xbox1Part.Size = Xbox360CompatLen;
+ xbox1Part.Length = (ulong)(Xbox360CompatLen / imagePlugin.ImageInfo.sectorSize);
+ xbox1Part.Sequence = 6;
+ xbox1Part.Offset = Xbox360CompatOff;
+ xbox1Part.Start = (ulong)(Xbox360CompatOff / imagePlugin.ImageInfo.sectorSize);
Partition dataPart = new Partition();
- dataPart.PartitionDescription = "Data volume";
- dataPart.PartitionSequence = 7;
- dataPart.PartitionStart = Xbox360DataOff;
- dataPart.PartitionStartSector = (ulong)(Xbox360DataOff / imagePlugin.ImageInfo.sectorSize);
- dataPart.PartitionSectors = imagePlugin.ImageInfo.sectors - dataPart.PartitionStartSector;
- dataPart.PartitionLength = (ulong)dataPart.PartitionSectors * (ulong)imagePlugin.ImageInfo.sectorSize;
+ dataPart.Description = "Data volume";
+ dataPart.Sequence = 7;
+ dataPart.Offset = Xbox360DataOff;
+ dataPart.Start = (ulong)(Xbox360DataOff / imagePlugin.ImageInfo.sectorSize);
+ dataPart.Length = imagePlugin.ImageInfo.sectors - dataPart.Start;
+ dataPart.Size = (ulong)dataPart.Length * (ulong)imagePlugin.ImageInfo.sectorSize;
partitions.Add(securityPart);
partitions.Add(sysCachePart);
diff --git a/DiscImageChef.Tests/Filesystems/ADFS.cs b/DiscImageChef.Tests/Filesystems/ADFS.cs
index 54b79541..3537da84 100644
--- a/DiscImageChef.Tests/Filesystems/ADFS.cs
+++ b/DiscImageChef.Tests/Filesystems/ADFS.cs
@@ -104,9 +104,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new AcornADFS();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/AFFS.cs b/DiscImageChef.Tests/Filesystems/AFFS.cs
index 399ed6e2..279c0fbf 100644
--- a/DiscImageChef.Tests/Filesystems/AFFS.cs
+++ b/DiscImageChef.Tests/Filesystems/AFFS.cs
@@ -95,9 +95,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new AmigaDOSPlugin();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/AFFS2_RDB.cs b/DiscImageChef.Tests/Filesystems/AFFS2_RDB.cs
index d06502c0..713279ac 100644
--- a/DiscImageChef.Tests/Filesystems/AFFS2_RDB.cs
+++ b/DiscImageChef.Tests/Filesystems/AFFS2_RDB.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "\"DOS\\7\"")
+ if(partitions[j].Type == "\"DOS\\7\"")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/AFFS_MBR.cs b/DiscImageChef.Tests/Filesystems/AFFS_MBR.cs
index f6b2e680..5814e204 100644
--- a/DiscImageChef.Tests/Filesystems/AFFS_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/AFFS_MBR.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x2D" || partitions[j].PartitionType == "0x2E")
+ if(partitions[j].Type == "0x2D" || partitions[j].Type == "0x2E")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/AFFS_RDB.cs b/DiscImageChef.Tests/Filesystems/AFFS_RDB.cs
index 81f1f35c..92dbbd63 100644
--- a/DiscImageChef.Tests/Filesystems/AFFS_RDB.cs
+++ b/DiscImageChef.Tests/Filesystems/AFFS_RDB.cs
@@ -103,7 +103,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "\"DOS\\1\"" || partitions[j].PartitionType == "\"DOS\\3\"" || partitions[j].PartitionType == "\"DOS\\5\"")
+ if(partitions[j].Type == "\"DOS\\1\"" || partitions[j].Type == "\"DOS\\3\"" || partitions[j].Type == "\"DOS\\5\"")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/AOFS.cs b/DiscImageChef.Tests/Filesystems/AOFS.cs
index e90bc789..1d7ca0aa 100644
--- a/DiscImageChef.Tests/Filesystems/AOFS.cs
+++ b/DiscImageChef.Tests/Filesystems/AOFS.cs
@@ -95,9 +95,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new AmigaDOSPlugin();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/AOFS_MBR.cs b/DiscImageChef.Tests/Filesystems/AOFS_MBR.cs
index efd359b7..7e5edaf0 100644
--- a/DiscImageChef.Tests/Filesystems/AOFS_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/AOFS_MBR.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x2C")
+ if(partitions[j].Type == "0x2C")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/AOFS_RDB.cs b/DiscImageChef.Tests/Filesystems/AOFS_RDB.cs
index 84612feb..0882fe45 100644
--- a/DiscImageChef.Tests/Filesystems/AOFS_RDB.cs
+++ b/DiscImageChef.Tests/Filesystems/AOFS_RDB.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "\"DOS\\0\"" || partitions[j].PartitionType == "\"DOS\\2\"" || partitions[j].PartitionType == "\"DOS\\4\"")
+ if(partitions[j].Type == "\"DOS\\0\"" || partitions[j].Type == "\"DOS\\2\"" || partitions[j].Type == "\"DOS\\4\"")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/BeFS.cs b/DiscImageChef.Tests/Filesystems/BeFS.cs
index a996ebcf..8a3c81e7 100644
--- a/DiscImageChef.Tests/Filesystems/BeFS.cs
+++ b/DiscImageChef.Tests/Filesystems/BeFS.cs
@@ -99,9 +99,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new DiscImageChef.Filesystems.BeFS();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/BeFS_APM.cs b/DiscImageChef.Tests/Filesystems/BeFS_APM.cs
index 019d5928..01e151f0 100644
--- a/DiscImageChef.Tests/Filesystems/BeFS_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/BeFS_APM.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Be_BFS")
+ if(partitions[j].Type == "Be_BFS")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/BeFS_GPT.cs b/DiscImageChef.Tests/Filesystems/BeFS_GPT.cs
index a6b1fa83..5f911fe7 100644
--- a/DiscImageChef.Tests/Filesystems/BeFS_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/BeFS_GPT.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Haiku BFS")
+ if(partitions[j].Type == "Haiku BFS")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/BeFS_MBR.cs b/DiscImageChef.Tests/Filesystems/BeFS_MBR.cs
index 26458c03..9647d7d6 100644
--- a/DiscImageChef.Tests/Filesystems/BeFS_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/BeFS_MBR.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0xEB")
+ if(partitions[j].Type == "0xEB")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/F2FS.cs b/DiscImageChef.Tests/Filesystems/F2FS.cs
index f4d48e58..53b581ac 100644
--- a/DiscImageChef.Tests/Filesystems/F2FS.cs
+++ b/DiscImageChef.Tests/Filesystems/F2FS.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x83")
+ if(partitions[j].Type == "0x83")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/FAT12.cs b/DiscImageChef.Tests/Filesystems/FAT12.cs
index e81f3990..06f5f572 100644
--- a/DiscImageChef.Tests/Filesystems/FAT12.cs
+++ b/DiscImageChef.Tests/Filesystems/FAT12.cs
@@ -1645,9 +1645,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new FAT();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/FAT12_APM.cs b/DiscImageChef.Tests/Filesystems/FAT12_APM.cs
index 4aed9d9b..ba7b5ea7 100644
--- a/DiscImageChef.Tests/Filesystems/FAT12_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/FAT12_APM.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "DOS_FAT_12")
+ if(partitions[j].Type == "DOS_FAT_12")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/FAT12_GPT.cs b/DiscImageChef.Tests/Filesystems/FAT12_GPT.cs
index 686872a6..b66bb76b 100644
--- a/DiscImageChef.Tests/Filesystems/FAT12_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/FAT12_GPT.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Microsoft Basic data")
+ if(partitions[j].Type == "Microsoft Basic data")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/FAT16.cs b/DiscImageChef.Tests/Filesystems/FAT16.cs
index dc9ee0ba..cf0b4e80 100644
--- a/DiscImageChef.Tests/Filesystems/FAT16.cs
+++ b/DiscImageChef.Tests/Filesystems/FAT16.cs
@@ -126,9 +126,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new FAT();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/FAT16_APM.cs b/DiscImageChef.Tests/Filesystems/FAT16_APM.cs
index 29927182..53cfe71b 100644
--- a/DiscImageChef.Tests/Filesystems/FAT16_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/FAT16_APM.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "DOS_FAT_16")
+ if(partitions[j].Type == "DOS_FAT_16")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/FAT16_Atari.cs b/DiscImageChef.Tests/Filesystems/FAT16_Atari.cs
index 0f78572a..624fa3e4 100644
--- a/DiscImageChef.Tests/Filesystems/FAT16_Atari.cs
+++ b/DiscImageChef.Tests/Filesystems/FAT16_Atari.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "GEM" || partitions[j].PartitionType == "BGM")
+ if(partitions[j].Type == "GEM" || partitions[j].Type == "BGM")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/FAT16_GPT.cs b/DiscImageChef.Tests/Filesystems/FAT16_GPT.cs
index 4aab8206..7e57c2d0 100644
--- a/DiscImageChef.Tests/Filesystems/FAT16_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/FAT16_GPT.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Microsoft Basic data")
+ if(partitions[j].Type == "Microsoft Basic data")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/FAT32_APM.cs b/DiscImageChef.Tests/Filesystems/FAT32_APM.cs
index a9d91597..91ce6aa2 100644
--- a/DiscImageChef.Tests/Filesystems/FAT32_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/FAT32_APM.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "DOS_FAT_32")
+ if(partitions[j].Type == "DOS_FAT_32")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/FAT32_GPT.cs b/DiscImageChef.Tests/Filesystems/FAT32_GPT.cs
index af915faf..7068607f 100644
--- a/DiscImageChef.Tests/Filesystems/FAT32_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/FAT32_GPT.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Microsoft Basic data")
+ if(partitions[j].Type == "Microsoft Basic data")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/HFS.cs b/DiscImageChef.Tests/Filesystems/HFS.cs
index 560abdc8..06e37c96 100644
--- a/DiscImageChef.Tests/Filesystems/HFS.cs
+++ b/DiscImageChef.Tests/Filesystems/HFS.cs
@@ -103,9 +103,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new AppleHFS();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs b/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs
index 8a66cf75..fa154adc 100644
--- a/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs
@@ -141,7 +141,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Apple_HFS")
+ if(partitions[j].Type == "Apple_HFS")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs b/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs
index 7534c9f2..507f3a14 100644
--- a/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Apple HFS")
+ if(partitions[j].Type == "Apple HFS")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs b/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs
index 9c2e307e..9e3f9584 100644
--- a/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs
@@ -125,7 +125,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0xAF")
+ if(partitions[j].Type == "0xAF")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/HFSX_APM.cs b/DiscImageChef.Tests/Filesystems/HFSX_APM.cs
index 3bbf4a7d..174daab7 100644
--- a/DiscImageChef.Tests/Filesystems/HFSX_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSX_APM.cs
@@ -108,7 +108,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Apple_HFSX")
+ if(partitions[j].Type == "Apple_HFSX")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs b/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs
index 40274072..7b55bdca 100644
--- a/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Apple HFS")
+ if(partitions[j].Type == "Apple HFS")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs b/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs
index 2282090e..27c1e0df 100644
--- a/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs
@@ -108,7 +108,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0xAF")
+ if(partitions[j].Type == "0xAF")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/HFS_APM.cs b/DiscImageChef.Tests/Filesystems/HFS_APM.cs
index 530fe717..07a27795 100644
--- a/DiscImageChef.Tests/Filesystems/HFS_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/HFS_APM.cs
@@ -159,7 +159,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Apple_HFS")
+ if(partitions[j].Type == "Apple_HFS")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/HFS_CDROM.cs b/DiscImageChef.Tests/Filesystems/HFS_CDROM.cs
index 3e9b0966..f876992c 100644
--- a/DiscImageChef.Tests/Filesystems/HFS_CDROM.cs
+++ b/DiscImageChef.Tests/Filesystems/HFS_CDROM.cs
@@ -109,7 +109,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Apple_HFS")
+ if(partitions[j].Type == "Apple_HFS")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/HFS_MBR.cs b/DiscImageChef.Tests/Filesystems/HFS_MBR.cs
index f88c5837..d57867cd 100644
--- a/DiscImageChef.Tests/Filesystems/HFS_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/HFS_MBR.cs
@@ -103,7 +103,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0xAF")
+ if(partitions[j].Type == "0xAF")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/JFS2.cs b/DiscImageChef.Tests/Filesystems/JFS2.cs
index 07c9bba7..238964e2 100644
--- a/DiscImageChef.Tests/Filesystems/JFS2.cs
+++ b/DiscImageChef.Tests/Filesystems/JFS2.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x83" || partitions[j].PartitionType == "0x07")
+ if(partitions[j].Type == "0x83" || partitions[j].Type == "0x07")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/LisaFS.cs b/DiscImageChef.Tests/Filesystems/LisaFS.cs
index cfc6c462..07c2f5b8 100644
--- a/DiscImageChef.Tests/Filesystems/LisaFS.cs
+++ b/DiscImageChef.Tests/Filesystems/LisaFS.cs
@@ -110,9 +110,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new DiscImageChef.Filesystems.LisaFS.LisaFS();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/MFS.cs b/DiscImageChef.Tests/Filesystems/MFS.cs
index fc980be2..ff92fc0f 100644
--- a/DiscImageChef.Tests/Filesystems/MFS.cs
+++ b/DiscImageChef.Tests/Filesystems/MFS.cs
@@ -103,9 +103,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new DiscImageChef.Filesystems.AppleMFS.AppleMFS();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/MINIXv1.cs b/DiscImageChef.Tests/Filesystems/MINIXv1.cs
index 24f0b36e..dd0d4c4c 100644
--- a/DiscImageChef.Tests/Filesystems/MINIXv1.cs
+++ b/DiscImageChef.Tests/Filesystems/MINIXv1.cs
@@ -87,9 +87,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new MinixFS();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/MINIXv1_MBR.cs b/DiscImageChef.Tests/Filesystems/MINIXv1_MBR.cs
index 49e26749..71bd09bb 100644
--- a/DiscImageChef.Tests/Filesystems/MINIXv1_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/MINIXv1_MBR.cs
@@ -88,7 +88,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x81")
+ if(partitions[j].Type == "0x81")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/MINIXv2.cs b/DiscImageChef.Tests/Filesystems/MINIXv2.cs
index 26bf41b1..6f90c9eb 100644
--- a/DiscImageChef.Tests/Filesystems/MINIXv2.cs
+++ b/DiscImageChef.Tests/Filesystems/MINIXv2.cs
@@ -87,9 +87,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new MinixFS();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/MINIXv2_MBR.cs b/DiscImageChef.Tests/Filesystems/MINIXv2_MBR.cs
index 8b011d54..e17dae8b 100644
--- a/DiscImageChef.Tests/Filesystems/MINIXv2_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/MINIXv2_MBR.cs
@@ -88,7 +88,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x81")
+ if(partitions[j].Type == "0x81")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/MINIXv3.cs b/DiscImageChef.Tests/Filesystems/MINIXv3.cs
index 33712900..492e7d37 100644
--- a/DiscImageChef.Tests/Filesystems/MINIXv3.cs
+++ b/DiscImageChef.Tests/Filesystems/MINIXv3.cs
@@ -87,9 +87,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new MinixFS();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/MINIXv3_MBR.cs b/DiscImageChef.Tests/Filesystems/MINIXv3_MBR.cs
index 90da853b..0579907d 100644
--- a/DiscImageChef.Tests/Filesystems/MINIXv3_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/MINIXv3_MBR.cs
@@ -88,7 +88,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x81")
+ if(partitions[j].Type == "0x81")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/NILFS2.cs b/DiscImageChef.Tests/Filesystems/NILFS2.cs
index 75552a39..c252349a 100644
--- a/DiscImageChef.Tests/Filesystems/NILFS2.cs
+++ b/DiscImageChef.Tests/Filesystems/NILFS2.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x83")
+ if(partitions[j].Type == "0x83")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/NTFS_GPT.cs b/DiscImageChef.Tests/Filesystems/NTFS_GPT.cs
index 598a2739..ff9258c0 100644
--- a/DiscImageChef.Tests/Filesystems/NTFS_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/NTFS_GPT.cs
@@ -102,7 +102,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Microsoft Basic data")
+ if(partitions[j].Type == "Microsoft Basic data")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/NTFS_MBR.cs b/DiscImageChef.Tests/Filesystems/NTFS_MBR.cs
index ef02d673..0e75d9af 100644
--- a/DiscImageChef.Tests/Filesystems/NTFS_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/NTFS_MBR.cs
@@ -116,9 +116,9 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x07" ||
+ if(partitions[j].Type == "0x07" ||
// Value incorrectly set by Haiku
- partitions[j].PartitionType == "0x86")
+ partitions[j].Type == "0x86")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/PFS3_RDB.cs b/DiscImageChef.Tests/Filesystems/PFS3_RDB.cs
index 7370a7ae..3f9a2743 100644
--- a/DiscImageChef.Tests/Filesystems/PFS3_RDB.cs
+++ b/DiscImageChef.Tests/Filesystems/PFS3_RDB.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "\"PFS\\1\"")
+ if(partitions[j].Type == "\"PFS\\1\"")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/ProDOS_APM.cs b/DiscImageChef.Tests/Filesystems/ProDOS_APM.cs
index 4564bdca..214b8b00 100644
--- a/DiscImageChef.Tests/Filesystems/ProDOS_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/ProDOS_APM.cs
@@ -103,7 +103,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Apple_ProDOS")
+ if(partitions[j].Type == "Apple_ProDOS")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/QNX4.cs b/DiscImageChef.Tests/Filesystems/QNX4.cs
index 13a17d6e..9a9f6191 100644
--- a/DiscImageChef.Tests/Filesystems/QNX4.cs
+++ b/DiscImageChef.Tests/Filesystems/QNX4.cs
@@ -87,9 +87,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new DiscImageChef.Filesystems.QNX4();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/QNX4_MBR.cs b/DiscImageChef.Tests/Filesystems/QNX4_MBR.cs
index 70de6aca..14a6000a 100644
--- a/DiscImageChef.Tests/Filesystems/QNX4_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/QNX4_MBR.cs
@@ -88,7 +88,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x4D")
+ if(partitions[j].Type == "0x4D")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/ReFS_MBR.cs b/DiscImageChef.Tests/Filesystems/ReFS_MBR.cs
index f3a76928..478af6cd 100644
--- a/DiscImageChef.Tests/Filesystems/ReFS_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/ReFS_MBR.cs
@@ -101,7 +101,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x07")
+ if(partitions[j].Type == "0x07")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/Reiser3.cs b/DiscImageChef.Tests/Filesystems/Reiser3.cs
index 0bd3dbcb..98e9d45a 100644
--- a/DiscImageChef.Tests/Filesystems/Reiser3.cs
+++ b/DiscImageChef.Tests/Filesystems/Reiser3.cs
@@ -92,7 +92,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x83")
+ if(partitions[j].Type == "0x83")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/Reiser4.cs b/DiscImageChef.Tests/Filesystems/Reiser4.cs
index 646a5ed3..a65a635f 100644
--- a/DiscImageChef.Tests/Filesystems/Reiser4.cs
+++ b/DiscImageChef.Tests/Filesystems/Reiser4.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x83")
+ if(partitions[j].Type == "0x83")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/SFS_MBR.cs b/DiscImageChef.Tests/Filesystems/SFS_MBR.cs
index d24884bb..9257091c 100644
--- a/DiscImageChef.Tests/Filesystems/SFS_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/SFS_MBR.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x2F")
+ if(partitions[j].Type == "0x2F")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/SFS_RDB.cs b/DiscImageChef.Tests/Filesystems/SFS_RDB.cs
index cc14c2e3..7b356850 100644
--- a/DiscImageChef.Tests/Filesystems/SFS_RDB.cs
+++ b/DiscImageChef.Tests/Filesystems/SFS_RDB.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "\"SFS\\0\"" || partitions[j].PartitionType == "\"SFS\\2\"")
+ if(partitions[j].Type == "\"SFS\\0\"" || partitions[j].Type == "\"SFS\\2\"")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/SysV.cs b/DiscImageChef.Tests/Filesystems/SysV.cs
index 52577160..1a0f502e 100644
--- a/DiscImageChef.Tests/Filesystems/SysV.cs
+++ b/DiscImageChef.Tests/Filesystems/SysV.cs
@@ -99,9 +99,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new DiscImageChef.Filesystems.SysVfs();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/SysV_MBR.cs b/DiscImageChef.Tests/Filesystems/SysV_MBR.cs
index 263060a4..667555a5 100644
--- a/DiscImageChef.Tests/Filesystems/SysV_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/SysV_MBR.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x02")
+ if(partitions[j].Type == "0x02")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/SysV_RDB.cs b/DiscImageChef.Tests/Filesystems/SysV_RDB.cs
index 36289f87..92b94902 100644
--- a/DiscImageChef.Tests/Filesystems/SysV_RDB.cs
+++ b/DiscImageChef.Tests/Filesystems/SysV_RDB.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "\"UNI\\1\"")
+ if(partitions[j].Type == "\"UNI\\1\"")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/UDF.cs b/DiscImageChef.Tests/Filesystems/UDF.cs
index 257b8f4d..b00ccbf6 100644
--- a/DiscImageChef.Tests/Filesystems/UDF.cs
+++ b/DiscImageChef.Tests/Filesystems/UDF.cs
@@ -126,9 +126,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new DiscImageChef.Filesystems.UDF();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/UFS.cs b/DiscImageChef.Tests/Filesystems/UFS.cs
index b9f58785..e0d8c8a2 100644
--- a/DiscImageChef.Tests/Filesystems/UFS.cs
+++ b/DiscImageChef.Tests/Filesystems/UFS.cs
@@ -108,9 +108,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new DiscImageChef.Filesystems.FFSPlugin();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/UFS_APM.cs b/DiscImageChef.Tests/Filesystems/UFS_APM.cs
index fac1c0e1..c761e8b1 100644
--- a/DiscImageChef.Tests/Filesystems/UFS_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/UFS_APM.cs
@@ -116,7 +116,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Apple_UFS")
+ if(partitions[j].Type == "Apple_UFS")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/UFS_MBR.cs b/DiscImageChef.Tests/Filesystems/UFS_MBR.cs
index b6927956..0ab2ef13 100644
--- a/DiscImageChef.Tests/Filesystems/UFS_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/UFS_MBR.cs
@@ -156,7 +156,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x63" || partitions[j].PartitionType == "0xA8" || partitions[j].PartitionType == "0xA5" || partitions[j].PartitionType == "0xA9")
+ if(partitions[j].Type == "0x63" || partitions[j].Type == "0xA8" || partitions[j].Type == "0xA5" || partitions[j].Type == "0xA9")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/UFS_NeXT.cs b/DiscImageChef.Tests/Filesystems/UFS_NeXT.cs
index 7778b07a..1720e6ad 100644
--- a/DiscImageChef.Tests/Filesystems/UFS_NeXT.cs
+++ b/DiscImageChef.Tests/Filesystems/UFS_NeXT.cs
@@ -108,7 +108,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "4.3BSD" || partitions[j].PartitionType == "4.4BSD")
+ if(partitions[j].Type == "4.3BSD" || partitions[j].Type == "4.4BSD")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/UFS_NeXT_Floppy.cs b/DiscImageChef.Tests/Filesystems/UFS_NeXT_Floppy.cs
index f53f8d6f..c8e41a82 100644
--- a/DiscImageChef.Tests/Filesystems/UFS_NeXT_Floppy.cs
+++ b/DiscImageChef.Tests/Filesystems/UFS_NeXT_Floppy.cs
@@ -132,7 +132,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "4.3BSD" || partitions[j].PartitionType == "4.4BSD")
+ if(partitions[j].Type == "4.3BSD" || partitions[j].Type == "4.4BSD")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/UFS_RDB.cs b/DiscImageChef.Tests/Filesystems/UFS_RDB.cs
index 8939a2fa..758a0673 100644
--- a/DiscImageChef.Tests/Filesystems/UFS_RDB.cs
+++ b/DiscImageChef.Tests/Filesystems/UFS_RDB.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "\"UNI\\2\"")
+ if(partitions[j].Type == "\"UNI\\2\"")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/UFS_Suni86.cs b/DiscImageChef.Tests/Filesystems/UFS_Suni86.cs
index dc7bd20b..a9225738 100644
--- a/DiscImageChef.Tests/Filesystems/UFS_Suni86.cs
+++ b/DiscImageChef.Tests/Filesystems/UFS_Suni86.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType != "Empty")
+ if(partitions[j].Type != "Empty")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/UNIXBFS.cs b/DiscImageChef.Tests/Filesystems/UNIXBFS.cs
index 8c44051f..00015fbf 100644
--- a/DiscImageChef.Tests/Filesystems/UNIXBFS.cs
+++ b/DiscImageChef.Tests/Filesystems/UNIXBFS.cs
@@ -101,9 +101,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new DiscImageChef.Filesystems.BFS();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/UNIXBFS_MBR.cs b/DiscImageChef.Tests/Filesystems/UNIXBFS_MBR.cs
index a9e00a88..2bd3a34c 100644
--- a/DiscImageChef.Tests/Filesystems/UNIXBFS_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/UNIXBFS_MBR.cs
@@ -92,7 +92,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x83")
+ if(partitions[j].Type == "0x83")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/UNIXBFS_RDB.cs b/DiscImageChef.Tests/Filesystems/UNIXBFS_RDB.cs
index b00b1324..be6c66b9 100644
--- a/DiscImageChef.Tests/Filesystems/UNIXBFS_RDB.cs
+++ b/DiscImageChef.Tests/Filesystems/UNIXBFS_RDB.cs
@@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "\"UNI\\0\"")
+ if(partitions[j].Type == "\"UNI\\0\"")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/XFS_MBR.cs b/DiscImageChef.Tests/Filesystems/XFS_MBR.cs
index 35b83f75..e1be7fa5 100644
--- a/DiscImageChef.Tests/Filesystems/XFS_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/XFS_MBR.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x83")
+ if(partitions[j].Type == "0x83")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/ZFS.cs b/DiscImageChef.Tests/Filesystems/ZFS.cs
index d2519739..732550d7 100644
--- a/DiscImageChef.Tests/Filesystems/ZFS.cs
+++ b/DiscImageChef.Tests/Filesystems/ZFS.cs
@@ -91,9 +91,9 @@ namespace DiscImageChef.Tests.Filesystems
Filesystem fs = new DiscImageChef.Filesystems.ZFS();
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = image.ImageInfo.sectors,
- PartitionLength = image.ImageInfo.sectors * image.ImageInfo.sectorSize
+ Name = "Whole device",
+ Length = image.ImageInfo.sectors,
+ Size = image.ImageInfo.sectors * image.ImageInfo.sectorSize
};
Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
fs.GetInformation(image, wholePart, out string information);
diff --git a/DiscImageChef.Tests/Filesystems/btrfs.cs b/DiscImageChef.Tests/Filesystems/btrfs.cs
index fe477040..62355135 100644
--- a/DiscImageChef.Tests/Filesystems/btrfs.cs
+++ b/DiscImageChef.Tests/Filesystems/btrfs.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x83")
+ if(partitions[j].Type == "0x83")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/exFAT_APM.cs b/DiscImageChef.Tests/Filesystems/exFAT_APM.cs
index 1c06c056..00d6a30c 100644
--- a/DiscImageChef.Tests/Filesystems/exFAT_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/exFAT_APM.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Windows_NTFS")
+ if(partitions[j].Type == "Windows_NTFS")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/exFAT_GPT.cs b/DiscImageChef.Tests/Filesystems/exFAT_GPT.cs
index 06dcc050..e2c7969b 100644
--- a/DiscImageChef.Tests/Filesystems/exFAT_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/exFAT_GPT.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "Microsoft Basic data")
+ if(partitions[j].Type == "Microsoft Basic data")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/exFAT_MBR.cs b/DiscImageChef.Tests/Filesystems/exFAT_MBR.cs
index d0fad87e..d1e9833d 100644
--- a/DiscImageChef.Tests/Filesystems/exFAT_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/exFAT_MBR.cs
@@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x07")
+ if(partitions[j].Type == "0x07")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Filesystems/ext2.cs b/DiscImageChef.Tests/Filesystems/ext2.cs
index 70ca774b..6ef6b2fb 100644
--- a/DiscImageChef.Tests/Filesystems/ext2.cs
+++ b/DiscImageChef.Tests/Filesystems/ext2.cs
@@ -108,7 +108,7 @@ namespace DiscImageChef.Tests.Filesystems
int part = -1;
for(int j = 0; j < partitions.Count; j++)
{
- if(partitions[j].PartitionType == "0x83")
+ if(partitions[j].Type == "0x83")
{
part = j;
break;
diff --git a/DiscImageChef.Tests/Partitions/Acorn.cs b/DiscImageChef.Tests/Partitions/Acorn.cs
index c1ab68b9..a55d43f3 100644
--- a/DiscImageChef.Tests/Partitions/Acorn.cs
+++ b/DiscImageChef.Tests/Partitions/Acorn.cs
@@ -58,14 +58,14 @@ namespace DiscImageChef.Tests.Partitions
// Linux (ICS)
// TODO: Values are incorrect
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 31457280, PartitionName = null, PartitionType = "GEM", PartitionStart = 512, PartitionSectors = 61440,
- PartitionSequence = 0, PartitionStartSector = 1 },
- new Partition{ PartitionDescription = null, PartitionLength = 41943040, PartitionName = null, PartitionType = "BGM", PartitionStart = 31457792, PartitionSectors = 81920,
- PartitionSequence = 1, PartitionStartSector = 61441 },
- new Partition{ PartitionDescription = null, PartitionLength = 56402432, PartitionName = null, PartitionType = "LNX", PartitionStart = 73400832, PartitionSectors = 110161,
- PartitionSequence = 2, PartitionStartSector = 143361 },
- new Partition{ PartitionDescription = null, PartitionLength = 43212800, PartitionName = null, PartitionType = "MAC", PartitionStart = 129803264, PartitionSectors = 84400,
- PartitionSequence = 3, PartitionStartSector = 253522 },
+ new Partition{ Description = null, Size = 31457280, Name = null, Type = "GEM", Offset = 512, Length = 61440,
+ Sequence = 0, Start = 1 },
+ new Partition{ Description = null, Size = 41943040, Name = null, Type = "BGM", Offset = 31457792, Length = 81920,
+ Sequence = 1, Start = 61441 },
+ new Partition{ Description = null, Size = 56402432, Name = null, Type = "LNX", Offset = 73400832, Length = 110161,
+ Sequence = 2, Start = 143361 },
+ new Partition{ Description = null, Size = 43212800, Name = null, Type = "MAC", Offset = 129803264, Length = 84400,
+ Sequence = 3, Start = 253522 },
},
};
@@ -86,13 +86,13 @@ namespace DiscImageChef.Tests.Partitions
{
// Too chatty
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionLength, partitions[j].PartitionLength, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionName, partitions[j].PartitionName, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionType, partitions[j].PartitionType, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStart, partitions[j].PartitionStart, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSectors, partitions[j].PartitionSectors, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSequence, partitions[j].PartitionSequence, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStartSector, partitions[j].PartitionStartSector, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
}
}
}
diff --git a/DiscImageChef.Tests/Partitions/AppleMap.cs b/DiscImageChef.Tests/Partitions/AppleMap.cs
index b3f038e1..10808b7b 100644
--- a/DiscImageChef.Tests/Partitions/AppleMap.cs
+++ b/DiscImageChef.Tests/Partitions/AppleMap.cs
@@ -62,412 +62,412 @@ namespace DiscImageChef.Tests.Partitions
readonly Partition[][] wanted = {
// D2
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 1024, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 2,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 42496, PartitionName = "Macintosh", PartitionType = "Apple_Driver43", PartitionStart = 32768, PartitionSectors = 83,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 55808, PartitionName = "Empty", PartitionType = "Apple_Free", PartitionStart = 75264, PartitionSectors = 109,
- PartitionSequence = 2, PartitionStartSector = 147 },
- new Partition{ PartitionDescription = null, PartitionLength = 26083328, PartitionName = "Volume label", PartitionType = "Apple_HFS", PartitionStart = 131072, PartitionSectors = 50944,
- PartitionSequence = 3, PartitionStartSector = 256 },
+ new Partition{ Description = null, Size = 1024, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 2,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 42496, Name = "Macintosh", Type = "Apple_Driver43", Offset = 32768, Length = 83,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 55808, Name = "Empty", Type = "Apple_Free", Offset = 75264, Length = 109,
+ Sequence = 2, Start = 147 },
+ new Partition{ Description = null, Size = 26083328, Name = "Volume label", Type = "Apple_HFS", Offset = 131072, Length = 50944,
+ Sequence = 3, Start = 256 },
},
// HDT 1.8 Encryption Level 1
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 7168, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 14,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 524288, PartitionName = "FWB Disk Driver", PartitionType = "Apple_Driver43", PartitionStart = 32768, PartitionSectors = 1024,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 25657344, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 557056, PartitionSectors = 50112,
- PartitionSequence = 2, PartitionStartSector = 1088 },
+ new Partition{ Description = null, Size = 7168, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 14,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 524288, Name = "FWB Disk Driver", Type = "Apple_Driver43", Offset = 32768, Length = 1024,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 25657344, Name = "MacOS", Type = "Apple_HFS", Offset = 557056, Length = 50112,
+ Sequence = 2, Start = 1088 },
},
// HDT 1.8 Encryption Level 2
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 7168, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 14,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 524288, PartitionName = "FWB Disk Driver", PartitionType = "Apple_Driver43", PartitionStart = 32768, PartitionSectors = 1024,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 25657344, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 557056, PartitionSectors = 50112,
- PartitionSequence = 2, PartitionStartSector = 1088 },
+ new Partition{ Description = null, Size = 7168, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 14,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 524288, Name = "FWB Disk Driver", Type = "Apple_Driver43", Offset = 32768, Length = 1024,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 25657344, Name = "MacOS", Type = "Apple_HFS", Offset = 557056, Length = 50112,
+ Sequence = 2, Start = 1088 },
},
// HDT 1.8 with password
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 7168, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 14,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 524288, PartitionName = "FWB Disk Driver", PartitionType = "Apple_Driver43", PartitionStart = 32768, PartitionSectors = 1024,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 25657344, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 557056, PartitionSectors = 50112,
- PartitionSequence = 2, PartitionStartSector = 1088 },
+ new Partition{ Description = null, Size = 7168, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 14,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 524288, Name = "FWB Disk Driver", Type = "Apple_Driver43", Offset = 32768, Length = 1024,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 25657344, Name = "MacOS", Type = "Apple_HFS", Offset = 557056, Length = 50112,
+ Sequence = 2, Start = 1088 },
},
// HDT 1.8
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 7168, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 14,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 524288, PartitionName = "FWB Disk Driver", PartitionType = "Apple_Driver43", PartitionStart = 32768, PartitionSectors = 1024,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 25657344, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 557056, PartitionSectors = 50112,
- PartitionSequence = 2, PartitionStartSector = 1088 },
+ new Partition{ Description = null, Size = 7168, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 14,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 524288, Name = "FWB Disk Driver", Type = "Apple_Driver43", Offset = 32768, Length = 1024,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 25657344, Name = "MacOS", Type = "Apple_HFS", Offset = 557056, Length = 50112,
+ Sequence = 2, Start = 1088 },
},
// Linux
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 512, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 32768, PartitionSectors = 1,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 819200, PartitionName = "bootstrap", PartitionType = "Apple_Bootstrap", PartitionStart = 33280, PartitionSectors = 1600,
- PartitionSequence = 1, PartitionStartSector = 65 },
- new Partition{ PartitionDescription = null, PartitionLength = 512, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 852480, PartitionSectors = 1,
- PartitionSequence = 2, PartitionStartSector = 1665 },
- new Partition{ PartitionDescription = null, PartitionLength = 52428800, PartitionName = "Linux", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 852992, PartitionSectors = 102400,
- PartitionSequence = 3, PartitionStartSector = 1666 },
- new Partition{ PartitionDescription = null, PartitionLength = 20971520, PartitionName = "ProDOS", PartitionType = "Apple_PRODOS", PartitionStart = 53281792, PartitionSectors = 40960,
- PartitionSequence = 4, PartitionStartSector = 104066 },
- new Partition{ PartitionDescription = null, PartitionLength = 52428800, PartitionName = "Macintosh", PartitionType = "Apple_HFS", PartitionStart = 74253312, PartitionSectors = 102400,
- PartitionSequence = 5, PartitionStartSector = 145026 },
- new Partition{ PartitionDescription = null, PartitionLength = 7535616, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 126682112, PartitionSectors = 14718,
- PartitionSequence = 6, PartitionStartSector = 247426 },
+ new Partition{ Description = null, Size = 512, Name = "Extra", Type = "Apple_Free", Offset = 32768, Length = 1,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 819200, Name = "bootstrap", Type = "Apple_Bootstrap", Offset = 33280, Length = 1600,
+ Sequence = 1, Start = 65 },
+ new Partition{ Description = null, Size = 512, Name = "Extra", Type = "Apple_Free", Offset = 852480, Length = 1,
+ Sequence = 2, Start = 1665 },
+ new Partition{ Description = null, Size = 52428800, Name = "Linux", Type = "Apple_UNIX_SVR2", Offset = 852992, Length = 102400,
+ Sequence = 3, Start = 1666 },
+ new Partition{ Description = null, Size = 20971520, Name = "ProDOS", Type = "Apple_PRODOS", Offset = 53281792, Length = 40960,
+ Sequence = 4, Start = 104066 },
+ new Partition{ Description = null, Size = 52428800, Name = "Macintosh", Type = "Apple_HFS", Offset = 74253312, Length = 102400,
+ Sequence = 5, Start = 145026 },
+ new Partition{ Description = null, Size = 7535616, Name = "Extra", Type = "Apple_Free", Offset = 126682112, Length = 14718,
+ Sequence = 6, Start = 247426 },
},
// Mac OS 1.1
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5120, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 2048, PartitionSectors = 10,
- PartitionSequence = 0, PartitionStartSector = 4 },
- new Partition{ PartitionDescription = null, PartitionLength = 21403648, PartitionName = "Macintosh", PartitionType = "Apple_HFS", PartitionStart = 8192, PartitionSectors = 41804,
- PartitionSequence = 1, PartitionStartSector = 16 },
+ new Partition{ Description = null, Size = 5120, Name = null, Type = "Apple_Driver", Offset = 2048, Length = 10,
+ Sequence = 0, Start = 4 },
+ new Partition{ Description = null, Size = 21403648, Name = "Macintosh", Type = "Apple_HFS", Offset = 8192, Length = 41804,
+ Sequence = 1, Start = 16 },
},
// Mac OS 2.0
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5120, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 2048, PartitionSectors = 10,
- PartitionSequence = 0, PartitionStartSector = 4 },
- new Partition{ PartitionDescription = null, PartitionLength = 19950080, PartitionName = "Macintosh", PartitionType = "Apple_HFS", PartitionStart = 8192, PartitionSectors = 38965,
- PartitionSequence = 1, PartitionStartSector = 16 },
+ new Partition{ Description = null, Size = 5120, Name = null, Type = "Apple_Driver", Offset = 2048, Length = 10,
+ Sequence = 0, Start = 4 },
+ new Partition{ Description = null, Size = 19950080, Name = "Macintosh", Type = "Apple_HFS", Offset = 8192, Length = 38965,
+ Sequence = 1, Start = 16 },
},
// Mac OS 4.2
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5632, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 2048, PartitionSectors = 11,
- PartitionSequence = 0, PartitionStartSector = 4 },
- new Partition{ PartitionDescription = null, PartitionLength = 19950080, PartitionName = "Macintosh", PartitionType = "Apple_HFS", PartitionStart = 8192, PartitionSectors = 38965,
- PartitionSequence = 1, PartitionStartSector = 16 },
+ new Partition{ Description = null, Size = 5632, Name = null, Type = "Apple_Driver", Offset = 2048, Length = 11,
+ Sequence = 0, Start = 4 },
+ new Partition{ Description = null, Size = 19950080, Name = "Macintosh", Type = "Apple_HFS", Offset = 8192, Length = 38965,
+ Sequence = 1, Start = 16 },
},
// Mac OS 4.3
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5632, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 2048, PartitionSectors = 11,
- PartitionSequence = 0, PartitionStartSector = 4 },
- new Partition{ PartitionDescription = null, PartitionLength = 19950080, PartitionName = "Macintosh", PartitionType = "Apple_HFS", PartitionStart = 8192, PartitionSectors = 38965,
- PartitionSequence = 1, PartitionStartSector = 16 },
+ new Partition{ Description = null, Size = 5632, Name = null, Type = "Apple_Driver", Offset = 2048, Length = 11,
+ Sequence = 0, Start = 4 },
+ new Partition{ Description = null, Size = 19950080, Name = "Macintosh", Type = "Apple_HFS", Offset = 8192, Length = 38965,
+ Sequence = 1, Start = 16 },
},
// Mac OS 6.0.2
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5120, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 10,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Macintosh", PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 32,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 3203072, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 49152, PartitionSectors = 6256,
- PartitionSequence = 2, PartitionStartSector = 96 },
- new Partition{ PartitionDescription = null, PartitionLength = 524288, PartitionName = "Scratch", PartitionType = "Apple_Scratch", PartitionStart = 3252224, PartitionSectors = 1024,
- PartitionSequence = 3, PartitionStartSector = 6352 },
- new Partition{ PartitionDescription = null, PartitionLength = 1048576, PartitionName = "Eschatology 1", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 3776512, PartitionSectors = 2048,
- PartitionSequence = 4, PartitionStartSector = 7376 },
- new Partition{ PartitionDescription = null, PartitionLength = 2191360, PartitionName = "A/UX Root", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 4825088, PartitionSectors = 4280,
- PartitionSequence = 5, PartitionStartSector = 9424 },
- new Partition{ PartitionDescription = null, PartitionLength = 1217024, PartitionName = "Swap", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 7016448, PartitionSectors = 2377,
- PartitionSequence = 6, PartitionStartSector = 13704 },
- new Partition{ PartitionDescription = null, PartitionLength = 1572864, PartitionName = "Eschatology 2", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 8233472, PartitionSectors = 3072,
- PartitionSequence = 7, PartitionStartSector = 16081 },
- new Partition{ PartitionDescription = null, PartitionLength = 1310720, PartitionName = "Root file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 9806336, PartitionSectors = 2560,
- PartitionSequence = 8, PartitionStartSector = 19153 },
- new Partition{ PartitionDescription = null, PartitionLength = 2550272, PartitionName = "Usr file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 11117056, PartitionSectors = 4981,
- PartitionSequence = 9, PartitionStartSector = 21713 },
- new Partition{ PartitionDescription = null, PartitionLength = 2048000, PartitionName = "Random A/UX fs", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 13667328, PartitionSectors = 4000,
- PartitionSequence = 10, PartitionStartSector = 26694 },
- new Partition{ PartitionDescription = null, PartitionLength = 1296384, PartitionName = "Random A/UX fs", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 15715328, PartitionSectors = 2532,
- PartitionSequence = 11, PartitionStartSector = 30694 },
- new Partition{ PartitionDescription = null, PartitionLength = 1364992, PartitionName = "Usr file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 17011712, PartitionSectors = 2666,
- PartitionSequence = 12, PartitionStartSector = 33226 },
- new Partition{ PartitionDescription = null, PartitionLength = 3986432, PartitionName = "Usr file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 18376704, PartitionSectors = 7786,
- PartitionSequence = 13, PartitionStartSector = 35892 },
- new Partition{ PartitionDescription = null, PartitionLength = 5714944, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 22363136, PartitionSectors = 11162,
- PartitionSequence = 14, PartitionStartSector = 43678 },
+ new Partition{ Description = null, Size = 5120, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 10,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 16384, Name = "Macintosh", Type = "Apple_Driver", Offset = 32768, Length = 32,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 3203072, Name = "MacOS", Type = "Apple_HFS", Offset = 49152, Length = 6256,
+ Sequence = 2, Start = 96 },
+ new Partition{ Description = null, Size = 524288, Name = "Scratch", Type = "Apple_Scratch", Offset = 3252224, Length = 1024,
+ Sequence = 3, Start = 6352 },
+ new Partition{ Description = null, Size = 1048576, Name = "Eschatology 1", Type = "Apple_UNIX_SVR2", Offset = 3776512, Length = 2048,
+ Sequence = 4, Start = 7376 },
+ new Partition{ Description = null, Size = 2191360, Name = "A/UX Root", Type = "Apple_UNIX_SVR2", Offset = 4825088, Length = 4280,
+ Sequence = 5, Start = 9424 },
+ new Partition{ Description = null, Size = 1217024, Name = "Swap", Type = "Apple_UNIX_SVR2", Offset = 7016448, Length = 2377,
+ Sequence = 6, Start = 13704 },
+ new Partition{ Description = null, Size = 1572864, Name = "Eschatology 2", Type = "Apple_UNIX_SVR2", Offset = 8233472, Length = 3072,
+ Sequence = 7, Start = 16081 },
+ new Partition{ Description = null, Size = 1310720, Name = "Root file system", Type = "Apple_UNIX_SVR2", Offset = 9806336, Length = 2560,
+ Sequence = 8, Start = 19153 },
+ new Partition{ Description = null, Size = 2550272, Name = "Usr file system", Type = "Apple_UNIX_SVR2", Offset = 11117056, Length = 4981,
+ Sequence = 9, Start = 21713 },
+ new Partition{ Description = null, Size = 2048000, Name = "Random A/UX fs", Type = "Apple_UNIX_SVR2", Offset = 13667328, Length = 4000,
+ Sequence = 10, Start = 26694 },
+ new Partition{ Description = null, Size = 1296384, Name = "Random A/UX fs", Type = "Apple_UNIX_SVR2", Offset = 15715328, Length = 2532,
+ Sequence = 11, Start = 30694 },
+ new Partition{ Description = null, Size = 1364992, Name = "Usr file system", Type = "Apple_UNIX_SVR2", Offset = 17011712, Length = 2666,
+ Sequence = 12, Start = 33226 },
+ new Partition{ Description = null, Size = 3986432, Name = "Usr file system", Type = "Apple_UNIX_SVR2", Offset = 18376704, Length = 7786,
+ Sequence = 13, Start = 35892 },
+ new Partition{ Description = null, Size = 5714944, Name = "Extra", Type = "Apple_Free", Offset = 22363136, Length = 11162,
+ Sequence = 14, Start = 43678 },
},
// Mac OS 6.0.3
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5120, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 10,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Macintosh", PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 32,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 5948928, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 49152, PartitionSectors = 11619,
- PartitionSequence = 2, PartitionStartSector = 96 },
- new Partition{ PartitionDescription = null, PartitionLength = 1029632, PartitionName = "Scratch", PartitionType = "Apple_Scratch", PartitionStart = 5998080, PartitionSectors = 2011,
- PartitionSequence = 3, PartitionStartSector = 11715 },
- new Partition{ PartitionDescription = null, PartitionLength = 2455552, PartitionName = "Eschatology 1", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 7027712, PartitionSectors = 4796,
- PartitionSequence = 4, PartitionStartSector = 13726 },
- new Partition{ PartitionDescription = null, PartitionLength = 3932160, PartitionName = "A/UX Root", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 9483264, PartitionSectors = 7680,
- PartitionSequence = 5, PartitionStartSector = 18522 },
- new Partition{ PartitionDescription = null, PartitionLength = 4194304, PartitionName = "Swap", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 13415424, PartitionSectors = 8192,
- PartitionSequence = 6, PartitionStartSector = 26202 },
- new Partition{ PartitionDescription = null, PartitionLength = 587776, PartitionName = "Eschatology 2", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 17609728, PartitionSectors = 1148,
- PartitionSequence = 7, PartitionStartSector = 34394 },
- new Partition{ PartitionDescription = null, PartitionLength = 6537216, PartitionName = "Root file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 18197504, PartitionSectors = 12768,
- PartitionSequence = 8, PartitionStartSector = 35542 },
- new Partition{ PartitionDescription = null, PartitionLength = 1766400, PartitionName = "Usr file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 24734720, PartitionSectors = 3450,
- PartitionSequence = 9, PartitionStartSector = 48310 },
- new Partition{ PartitionDescription = null, PartitionLength = 1558528, PartitionName = "Random A/UX fs", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 26519552, PartitionSectors = 3044,
- PartitionSequence = 10, PartitionStartSector = 51796 },
- new Partition{ PartitionDescription = null, PartitionLength = 18432, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 26501120, PartitionSectors = 36,
- PartitionSequence = 11, PartitionStartSector = 51760 },
+ new Partition{ Description = null, Size = 5120, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 10,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 16384, Name = "Macintosh", Type = "Apple_Driver", Offset = 32768, Length = 32,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 5948928, Name = "MacOS", Type = "Apple_HFS", Offset = 49152, Length = 11619,
+ Sequence = 2, Start = 96 },
+ new Partition{ Description = null, Size = 1029632, Name = "Scratch", Type = "Apple_Scratch", Offset = 5998080, Length = 2011,
+ Sequence = 3, Start = 11715 },
+ new Partition{ Description = null, Size = 2455552, Name = "Eschatology 1", Type = "Apple_UNIX_SVR2", Offset = 7027712, Length = 4796,
+ Sequence = 4, Start = 13726 },
+ new Partition{ Description = null, Size = 3932160, Name = "A/UX Root", Type = "Apple_UNIX_SVR2", Offset = 9483264, Length = 7680,
+ Sequence = 5, Start = 18522 },
+ new Partition{ Description = null, Size = 4194304, Name = "Swap", Type = "Apple_UNIX_SVR2", Offset = 13415424, Length = 8192,
+ Sequence = 6, Start = 26202 },
+ new Partition{ Description = null, Size = 587776, Name = "Eschatology 2", Type = "Apple_UNIX_SVR2", Offset = 17609728, Length = 1148,
+ Sequence = 7, Start = 34394 },
+ new Partition{ Description = null, Size = 6537216, Name = "Root file system", Type = "Apple_UNIX_SVR2", Offset = 18197504, Length = 12768,
+ Sequence = 8, Start = 35542 },
+ new Partition{ Description = null, Size = 1766400, Name = "Usr file system", Type = "Apple_UNIX_SVR2", Offset = 24734720, Length = 3450,
+ Sequence = 9, Start = 48310 },
+ new Partition{ Description = null, Size = 1558528, Name = "Random A/UX fs", Type = "Apple_UNIX_SVR2", Offset = 26519552, Length = 3044,
+ Sequence = 10, Start = 51796 },
+ new Partition{ Description = null, Size = 18432, Name = "Extra", Type = "Apple_Free", Offset = 26501120, Length = 36,
+ Sequence = 11, Start = 51760 },
},
// Mac OS 6.0.4
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5120, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 10,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Macintosh", PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 32,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 3932160, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 49152, PartitionSectors = 7680,
- PartitionSequence = 2, PartitionStartSector = 96 },
- new Partition{ PartitionDescription = null, PartitionLength = 3197440, PartitionName = "Scratch", PartitionType = "Apple_Scratch", PartitionStart = 3981312, PartitionSectors = 6245,
- PartitionSequence = 3, PartitionStartSector = 7776 },
- new Partition{ PartitionDescription = null, PartitionLength = 3197440, PartitionName = "Eschatology 1", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 7178752, PartitionSectors = 6245,
- PartitionSequence = 4, PartitionStartSector = 14021 },
- new Partition{ PartitionDescription = null, PartitionLength = 2626560, PartitionName = "A/UX Root", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 10376192, PartitionSectors = 5130,
- PartitionSequence = 5, PartitionStartSector = 20266 },
- new Partition{ PartitionDescription = null, PartitionLength = 1370112, PartitionName = "Swap", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 13002752, PartitionSectors = 2676,
- PartitionSequence = 6, PartitionStartSector = 25396 },
- new Partition{ PartitionDescription = null, PartitionLength = 2944512, PartitionName = "Eschatology 2", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 14372864, PartitionSectors = 5751,
- PartitionSequence = 7, PartitionStartSector = 28072 },
- new Partition{ PartitionDescription = null, PartitionLength = 2776576, PartitionName = "Root file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 17317376, PartitionSectors = 5423,
- PartitionSequence = 8, PartitionStartSector = 33823 },
- new Partition{ PartitionDescription = null, PartitionLength = 2892800, PartitionName = "Usr file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 20093952, PartitionSectors = 5650,
- PartitionSequence = 9, PartitionStartSector = 39246 },
- new Partition{ PartitionDescription = null, PartitionLength = 3433472, PartitionName = "Random A/UX fs", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 22986752, PartitionSectors = 6706,
- PartitionSequence = 10, PartitionStartSector = 44896 },
- new Partition{ PartitionDescription = null, PartitionLength = 1657856, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 26420224, PartitionSectors = 3238,
- PartitionSequence = 11, PartitionStartSector = 51602 },
+ new Partition{ Description = null, Size = 5120, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 10,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 16384, Name = "Macintosh", Type = "Apple_Driver", Offset = 32768, Length = 32,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 3932160, Name = "MacOS", Type = "Apple_HFS", Offset = 49152, Length = 7680,
+ Sequence = 2, Start = 96 },
+ new Partition{ Description = null, Size = 3197440, Name = "Scratch", Type = "Apple_Scratch", Offset = 3981312, Length = 6245,
+ Sequence = 3, Start = 7776 },
+ new Partition{ Description = null, Size = 3197440, Name = "Eschatology 1", Type = "Apple_UNIX_SVR2", Offset = 7178752, Length = 6245,
+ Sequence = 4, Start = 14021 },
+ new Partition{ Description = null, Size = 2626560, Name = "A/UX Root", Type = "Apple_UNIX_SVR2", Offset = 10376192, Length = 5130,
+ Sequence = 5, Start = 20266 },
+ new Partition{ Description = null, Size = 1370112, Name = "Swap", Type = "Apple_UNIX_SVR2", Offset = 13002752, Length = 2676,
+ Sequence = 6, Start = 25396 },
+ new Partition{ Description = null, Size = 2944512, Name = "Eschatology 2", Type = "Apple_UNIX_SVR2", Offset = 14372864, Length = 5751,
+ Sequence = 7, Start = 28072 },
+ new Partition{ Description = null, Size = 2776576, Name = "Root file system", Type = "Apple_UNIX_SVR2", Offset = 17317376, Length = 5423,
+ Sequence = 8, Start = 33823 },
+ new Partition{ Description = null, Size = 2892800, Name = "Usr file system", Type = "Apple_UNIX_SVR2", Offset = 20093952, Length = 5650,
+ Sequence = 9, Start = 39246 },
+ new Partition{ Description = null, Size = 3433472, Name = "Random A/UX fs", Type = "Apple_UNIX_SVR2", Offset = 22986752, Length = 6706,
+ Sequence = 10, Start = 44896 },
+ new Partition{ Description = null, Size = 1657856, Name = "Extra", Type = "Apple_Free", Offset = 26420224, Length = 3238,
+ Sequence = 11, Start = 51602 },
},
// Mac OS 6.0.5
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5120, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 10,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Macintosh", PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 32,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 2097152, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 49152, PartitionSectors = 4096,
- PartitionSequence = 2, PartitionStartSector = 96 },
- new Partition{ PartitionDescription = null, PartitionLength = 342528, PartitionName = "Scratch", PartitionType = "Apple_Scratch", PartitionStart = 2146304, PartitionSectors = 669,
- PartitionSequence = 3, PartitionStartSector = 4192 },
- new Partition{ PartitionDescription = null, PartitionLength = 1417216, PartitionName = "Eschatology 1", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 2488832, PartitionSectors = 2768,
- PartitionSequence = 4, PartitionStartSector = 4861 },
- new Partition{ PartitionDescription = null, PartitionLength = 1830912, PartitionName = "A/UX Root", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 3906048, PartitionSectors = 3576,
- PartitionSequence = 5, PartitionStartSector = 7629 },
- new Partition{ PartitionDescription = null, PartitionLength = 1448960, PartitionName = "Swap", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 5736960, PartitionSectors = 2830,
- PartitionSequence = 6, PartitionStartSector = 11205 },
- new Partition{ PartitionDescription = null, PartitionLength = 2687488, PartitionName = "Root file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 7185920, PartitionSectors = 5249,
- PartitionSequence = 7, PartitionStartSector = 14035 },
- new Partition{ PartitionDescription = null, PartitionLength = 2565632, PartitionName = "Usr file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 9873408, PartitionSectors = 5011,
- PartitionSequence = 8, PartitionStartSector = 19284 },
- new Partition{ PartitionDescription = null, PartitionLength = 1954816, PartitionName = "Unreserved 1", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 12439040, PartitionSectors = 3818,
- PartitionSequence = 9, PartitionStartSector = 24295 },
- new Partition{ PartitionDescription = null, PartitionLength = 3543040, PartitionName = "Unreserved 2", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 14393856, PartitionSectors = 6920,
- PartitionSequence = 10, PartitionStartSector = 28113 },
- new Partition{ PartitionDescription = null, PartitionLength = 2565632, PartitionName = "Unreserved 3", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 17936896, PartitionSectors = 5011,
- PartitionSequence = 11, PartitionStartSector = 35033 },
- new Partition{ PartitionDescription = null, PartitionLength = 2932224, PartitionName = "Unreserved 4", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 20502528, PartitionSectors = 5727,
- PartitionSequence = 12, PartitionStartSector = 40044 },
- new Partition{ PartitionDescription = null, PartitionLength = 1221632, PartitionName = "Random A/UX fs", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 23434752, PartitionSectors = 2386,
- PartitionSequence = 13, PartitionStartSector = 45771 },
- new Partition{ PartitionDescription = null, PartitionLength = 3421696, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 24656384, PartitionSectors = 6683,
- PartitionSequence = 14, PartitionStartSector = 48157 },
+ new Partition{ Description = null, Size = 5120, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 10,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 16384, Name = "Macintosh", Type = "Apple_Driver", Offset = 32768, Length = 32,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 2097152, Name = "MacOS", Type = "Apple_HFS", Offset = 49152, Length = 4096,
+ Sequence = 2, Start = 96 },
+ new Partition{ Description = null, Size = 342528, Name = "Scratch", Type = "Apple_Scratch", Offset = 2146304, Length = 669,
+ Sequence = 3, Start = 4192 },
+ new Partition{ Description = null, Size = 1417216, Name = "Eschatology 1", Type = "Apple_UNIX_SVR2", Offset = 2488832, Length = 2768,
+ Sequence = 4, Start = 4861 },
+ new Partition{ Description = null, Size = 1830912, Name = "A/UX Root", Type = "Apple_UNIX_SVR2", Offset = 3906048, Length = 3576,
+ Sequence = 5, Start = 7629 },
+ new Partition{ Description = null, Size = 1448960, Name = "Swap", Type = "Apple_UNIX_SVR2", Offset = 5736960, Length = 2830,
+ Sequence = 6, Start = 11205 },
+ new Partition{ Description = null, Size = 2687488, Name = "Root file system", Type = "Apple_UNIX_SVR2", Offset = 7185920, Length = 5249,
+ Sequence = 7, Start = 14035 },
+ new Partition{ Description = null, Size = 2565632, Name = "Usr file system", Type = "Apple_UNIX_SVR2", Offset = 9873408, Length = 5011,
+ Sequence = 8, Start = 19284 },
+ new Partition{ Description = null, Size = 1954816, Name = "Unreserved 1", Type = "Apple_UNIX_SVR2", Offset = 12439040, Length = 3818,
+ Sequence = 9, Start = 24295 },
+ new Partition{ Description = null, Size = 3543040, Name = "Unreserved 2", Type = "Apple_UNIX_SVR2", Offset = 14393856, Length = 6920,
+ Sequence = 10, Start = 28113 },
+ new Partition{ Description = null, Size = 2565632, Name = "Unreserved 3", Type = "Apple_UNIX_SVR2", Offset = 17936896, Length = 5011,
+ Sequence = 11, Start = 35033 },
+ new Partition{ Description = null, Size = 2932224, Name = "Unreserved 4", Type = "Apple_UNIX_SVR2", Offset = 20502528, Length = 5727,
+ Sequence = 12, Start = 40044 },
+ new Partition{ Description = null, Size = 1221632, Name = "Random A/UX fs", Type = "Apple_UNIX_SVR2", Offset = 23434752, Length = 2386,
+ Sequence = 13, Start = 45771 },
+ new Partition{ Description = null, Size = 3421696, Name = "Extra", Type = "Apple_Free", Offset = 24656384, Length = 6683,
+ Sequence = 14, Start = 48157 },
},
// Mac OS 6.0.7
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5120, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 10,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 14013952, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 49152, PartitionSectors = 27371,
- PartitionSequence = 1, PartitionStartSector = 96 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Macintosh", PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 32,
- PartitionSequence = 2, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 1492992, PartitionName = "Eschatology 1", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 14063104, PartitionSectors = 2916,
- PartitionSequence = 3, PartitionStartSector = 27467 },
- new Partition{ PartitionDescription = null, PartitionLength = 919040, PartitionName = "A/UX Root", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 15556096, PartitionSectors = 1795,
- PartitionSequence = 4, PartitionStartSector = 30383 },
- new Partition{ PartitionDescription = null, PartitionLength = 1302016, PartitionName = "Swap", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 16475136, PartitionSectors = 2543,
- PartitionSequence = 5, PartitionStartSector = 32178 },
- new Partition{ PartitionDescription = null, PartitionLength = 1796608, PartitionName = "Root file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 17777152, PartitionSectors = 3509,
- PartitionSequence = 6, PartitionStartSector = 34721 },
- new Partition{ PartitionDescription = null, PartitionLength = 1943552, PartitionName = "Usr file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 19573760, PartitionSectors = 3796,
- PartitionSequence = 7, PartitionStartSector = 38230 },
- new Partition{ PartitionDescription = null, PartitionLength = 2186752, PartitionName = "Random A/UX fs", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 21517312, PartitionSectors = 4271,
- PartitionSequence = 8, PartitionStartSector = 42026 },
- new Partition{ PartitionDescription = null, PartitionLength = 524288, PartitionName = "Unreserved 1", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 23704064, PartitionSectors = 1024,
- PartitionSequence = 9, PartitionStartSector = 46297 },
- new Partition{ PartitionDescription = null, PartitionLength = 655360, PartitionName = "Unreserved 2", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 24228352, PartitionSectors = 1280,
- PartitionSequence = 10, PartitionStartSector = 47321 },
- new Partition{ PartitionDescription = null, PartitionLength = 798208, PartitionName = "Unreserved 3", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 24883712, PartitionSectors = 1559,
- PartitionSequence = 11, PartitionStartSector = 48601 },
- new Partition{ PartitionDescription = null, PartitionLength = 2252800, PartitionName = "Unreserved 4", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 25825280, PartitionSectors = 4400,
- PartitionSequence = 12, PartitionStartSector = 50440 },
- new Partition{ PartitionDescription = null, PartitionLength = 143360, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 25681920, PartitionSectors = 280,
- PartitionSequence = 13, PartitionStartSector = 50160 },
+ new Partition{ Description = null, Size = 5120, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 10,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 14013952, Name = "MacOS", Type = "Apple_HFS", Offset = 49152, Length = 27371,
+ Sequence = 1, Start = 96 },
+ new Partition{ Description = null, Size = 16384, Name = "Macintosh", Type = "Apple_Driver", Offset = 32768, Length = 32,
+ Sequence = 2, Start = 64 },
+ new Partition{ Description = null, Size = 1492992, Name = "Eschatology 1", Type = "Apple_UNIX_SVR2", Offset = 14063104, Length = 2916,
+ Sequence = 3, Start = 27467 },
+ new Partition{ Description = null, Size = 919040, Name = "A/UX Root", Type = "Apple_UNIX_SVR2", Offset = 15556096, Length = 1795,
+ Sequence = 4, Start = 30383 },
+ new Partition{ Description = null, Size = 1302016, Name = "Swap", Type = "Apple_UNIX_SVR2", Offset = 16475136, Length = 2543,
+ Sequence = 5, Start = 32178 },
+ new Partition{ Description = null, Size = 1796608, Name = "Root file system", Type = "Apple_UNIX_SVR2", Offset = 17777152, Length = 3509,
+ Sequence = 6, Start = 34721 },
+ new Partition{ Description = null, Size = 1943552, Name = "Usr file system", Type = "Apple_UNIX_SVR2", Offset = 19573760, Length = 3796,
+ Sequence = 7, Start = 38230 },
+ new Partition{ Description = null, Size = 2186752, Name = "Random A/UX fs", Type = "Apple_UNIX_SVR2", Offset = 21517312, Length = 4271,
+ Sequence = 8, Start = 42026 },
+ new Partition{ Description = null, Size = 524288, Name = "Unreserved 1", Type = "Apple_UNIX_SVR2", Offset = 23704064, Length = 1024,
+ Sequence = 9, Start = 46297 },
+ new Partition{ Description = null, Size = 655360, Name = "Unreserved 2", Type = "Apple_UNIX_SVR2", Offset = 24228352, Length = 1280,
+ Sequence = 10, Start = 47321 },
+ new Partition{ Description = null, Size = 798208, Name = "Unreserved 3", Type = "Apple_UNIX_SVR2", Offset = 24883712, Length = 1559,
+ Sequence = 11, Start = 48601 },
+ new Partition{ Description = null, Size = 2252800, Name = "Unreserved 4", Type = "Apple_UNIX_SVR2", Offset = 25825280, Length = 4400,
+ Sequence = 12, Start = 50440 },
+ new Partition{ Description = null, Size = 143360, Name = "Extra", Type = "Apple_Free", Offset = 25681920, Length = 280,
+ Sequence = 13, Start = 50160 },
},
// Mac OS 6.0.8
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5120, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 10,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Macintosh", PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 32,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 4575744, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 49152, PartitionSectors = 8937,
- PartitionSequence = 2, PartitionStartSector = 96 },
- new Partition{ PartitionDescription = null, PartitionLength = 1143808, PartitionName = "Scratch", PartitionType = "Apple_Scratch", PartitionStart = 4624896, PartitionSectors = 2234,
- PartitionSequence = 3, PartitionStartSector = 9033 },
- new Partition{ PartitionDescription = null, PartitionLength = 3020800, PartitionName = "Eschatology 1", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 5768704, PartitionSectors = 5900,
- PartitionSequence = 4, PartitionStartSector = 11267 },
- new Partition{ PartitionDescription = null, PartitionLength = 2091520, PartitionName = "A/UX Root", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 25986560, PartitionSectors = 4085,
- PartitionSequence = 5, PartitionStartSector = 50755 },
- new Partition{ PartitionDescription = null, PartitionLength = 3693056, PartitionName = "Swap", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 22293504, PartitionSectors = 7213,
- PartitionSequence = 6, PartitionStartSector = 43542 },
- new Partition{ PartitionDescription = null, PartitionLength = 2308096, PartitionName = "Root file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 19985408, PartitionSectors = 4508,
- PartitionSequence = 7, PartitionStartSector = 39034 },
- new Partition{ PartitionDescription = null, PartitionLength = 2885120, PartitionName = "Usr file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 17100288, PartitionSectors = 5635,
- PartitionSequence = 8, PartitionStartSector = 33399 },
- new Partition{ PartitionDescription = null, PartitionLength = 1615872, PartitionName = "Unreserved 1", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 8789504, PartitionSectors = 3156,
- PartitionSequence = 9, PartitionStartSector = 17167 },
- new Partition{ PartitionDescription = null, PartitionLength = 1615872, PartitionName = "Unreserved 2", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 15484416, PartitionSectors = 3156,
- PartitionSequence = 10, PartitionStartSector = 30243 },
- new Partition{ PartitionDescription = null, PartitionLength = 1384960, PartitionName = "Unreserved 3", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 10405376, PartitionSectors = 2705,
- PartitionSequence = 11, PartitionStartSector = 20323 },
- new Partition{ PartitionDescription = null, PartitionLength = 952832, PartitionName = "Unreserved 4", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 11790336, PartitionSectors = 1861,
- PartitionSequence = 12, PartitionStartSector = 23028 },
- new Partition{ PartitionDescription = null, PartitionLength = 1495040, PartitionName = "Random A/UX fs", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 13989376, PartitionSectors = 2920,
- PartitionSequence = 13, PartitionStartSector = 27323 },
- new Partition{ PartitionDescription = null, PartitionLength = 1246208, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 12743168, PartitionSectors = 2434,
- PartitionSequence = 14, PartitionStartSector = 24889 },
+ new Partition{ Description = null, Size = 5120, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 10,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 16384, Name = "Macintosh", Type = "Apple_Driver", Offset = 32768, Length = 32,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 4575744, Name = "MacOS", Type = "Apple_HFS", Offset = 49152, Length = 8937,
+ Sequence = 2, Start = 96 },
+ new Partition{ Description = null, Size = 1143808, Name = "Scratch", Type = "Apple_Scratch", Offset = 4624896, Length = 2234,
+ Sequence = 3, Start = 9033 },
+ new Partition{ Description = null, Size = 3020800, Name = "Eschatology 1", Type = "Apple_UNIX_SVR2", Offset = 5768704, Length = 5900,
+ Sequence = 4, Start = 11267 },
+ new Partition{ Description = null, Size = 2091520, Name = "A/UX Root", Type = "Apple_UNIX_SVR2", Offset = 25986560, Length = 4085,
+ Sequence = 5, Start = 50755 },
+ new Partition{ Description = null, Size = 3693056, Name = "Swap", Type = "Apple_UNIX_SVR2", Offset = 22293504, Length = 7213,
+ Sequence = 6, Start = 43542 },
+ new Partition{ Description = null, Size = 2308096, Name = "Root file system", Type = "Apple_UNIX_SVR2", Offset = 19985408, Length = 4508,
+ Sequence = 7, Start = 39034 },
+ new Partition{ Description = null, Size = 2885120, Name = "Usr file system", Type = "Apple_UNIX_SVR2", Offset = 17100288, Length = 5635,
+ Sequence = 8, Start = 33399 },
+ new Partition{ Description = null, Size = 1615872, Name = "Unreserved 1", Type = "Apple_UNIX_SVR2", Offset = 8789504, Length = 3156,
+ Sequence = 9, Start = 17167 },
+ new Partition{ Description = null, Size = 1615872, Name = "Unreserved 2", Type = "Apple_UNIX_SVR2", Offset = 15484416, Length = 3156,
+ Sequence = 10, Start = 30243 },
+ new Partition{ Description = null, Size = 1384960, Name = "Unreserved 3", Type = "Apple_UNIX_SVR2", Offset = 10405376, Length = 2705,
+ Sequence = 11, Start = 20323 },
+ new Partition{ Description = null, Size = 952832, Name = "Unreserved 4", Type = "Apple_UNIX_SVR2", Offset = 11790336, Length = 1861,
+ Sequence = 12, Start = 23028 },
+ new Partition{ Description = null, Size = 1495040, Name = "Random A/UX fs", Type = "Apple_UNIX_SVR2", Offset = 13989376, Length = 2920,
+ Sequence = 13, Start = 27323 },
+ new Partition{ Description = null, Size = 1246208, Name = "Extra", Type = "Apple_Free", Offset = 12743168, Length = 2434,
+ Sequence = 14, Start = 24889 },
},
// Mac OS 6.0
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5120, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 10,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Macintosh", PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 32,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 2097152, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 49152, PartitionSectors = 4096,
- PartitionSequence = 2, PartitionStartSector = 96 },
- new Partition{ PartitionDescription = null, PartitionLength = 2097152, PartitionName = "Scratch", PartitionType = "Apple_Scratch", PartitionStart = 2146304, PartitionSectors = 4096,
- PartitionSequence = 3, PartitionStartSector = 4192 },
- new Partition{ PartitionDescription = null, PartitionLength = 2097152, PartitionName = "Eschatology 1", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 4243456, PartitionSectors = 4096,
- PartitionSequence = 4, PartitionStartSector = 8288 },
- new Partition{ PartitionDescription = null, PartitionLength = 2097152, PartitionName = "A/UX Root", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 6340608, PartitionSectors = 4096,
- PartitionSequence = 5, PartitionStartSector = 12384 },
- new Partition{ PartitionDescription = null, PartitionLength = 1048576, PartitionName = "Swap", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 8437760, PartitionSectors = 2048,
- PartitionSequence = 6, PartitionStartSector = 16480 },
- new Partition{ PartitionDescription = null, PartitionLength = 2097152, PartitionName = "Eschatology 2", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 9486336, PartitionSectors = 4096,
- PartitionSequence = 7, PartitionStartSector = 18528 },
- new Partition{ PartitionDescription = null, PartitionLength = 2097152, PartitionName = "Root file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 11583488, PartitionSectors = 4096,
- PartitionSequence = 8, PartitionStartSector = 22624 },
- new Partition{ PartitionDescription = null, PartitionLength = 2310144, PartitionName = "Usr file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 13680640, PartitionSectors = 4512,
- PartitionSequence = 9, PartitionStartSector = 26720 },
- new Partition{ PartitionDescription = null, PartitionLength = 5416960, PartitionName = "Random A/UX fs", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 15990784, PartitionSectors = 10580,
- PartitionSequence = 10, PartitionStartSector = 31232 },
- new Partition{ PartitionDescription = null, PartitionLength = 4096, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 21407744, PartitionSectors = 8,
- PartitionSequence = 11, PartitionStartSector = 41812 },
+ new Partition{ Description = null, Size = 5120, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 10,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 16384, Name = "Macintosh", Type = "Apple_Driver", Offset = 32768, Length = 32,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 2097152, Name = "MacOS", Type = "Apple_HFS", Offset = 49152, Length = 4096,
+ Sequence = 2, Start = 96 },
+ new Partition{ Description = null, Size = 2097152, Name = "Scratch", Type = "Apple_Scratch", Offset = 2146304, Length = 4096,
+ Sequence = 3, Start = 4192 },
+ new Partition{ Description = null, Size = 2097152, Name = "Eschatology 1", Type = "Apple_UNIX_SVR2", Offset = 4243456, Length = 4096,
+ Sequence = 4, Start = 8288 },
+ new Partition{ Description = null, Size = 2097152, Name = "A/UX Root", Type = "Apple_UNIX_SVR2", Offset = 6340608, Length = 4096,
+ Sequence = 5, Start = 12384 },
+ new Partition{ Description = null, Size = 1048576, Name = "Swap", Type = "Apple_UNIX_SVR2", Offset = 8437760, Length = 2048,
+ Sequence = 6, Start = 16480 },
+ new Partition{ Description = null, Size = 2097152, Name = "Eschatology 2", Type = "Apple_UNIX_SVR2", Offset = 9486336, Length = 4096,
+ Sequence = 7, Start = 18528 },
+ new Partition{ Description = null, Size = 2097152, Name = "Root file system", Type = "Apple_UNIX_SVR2", Offset = 11583488, Length = 4096,
+ Sequence = 8, Start = 22624 },
+ new Partition{ Description = null, Size = 2310144, Name = "Usr file system", Type = "Apple_UNIX_SVR2", Offset = 13680640, Length = 4512,
+ Sequence = 9, Start = 26720 },
+ new Partition{ Description = null, Size = 5416960, Name = "Random A/UX fs", Type = "Apple_UNIX_SVR2", Offset = 15990784, Length = 10580,
+ Sequence = 10, Start = 31232 },
+ new Partition{ Description = null, Size = 4096, Name = "Extra", Type = "Apple_Free", Offset = 21407744, Length = 8,
+ Sequence = 11, Start = 41812 },
},
// Mac OS 7.0
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 5120, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 10,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Macintosh", PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 32,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 5262336, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 15845888, PartitionSectors = 10278,
- PartitionSequence = 2, PartitionStartSector = 30949 },
- new Partition{ PartitionDescription = null, PartitionLength = 3073024, PartitionName = "Scratch", PartitionType = "Apple_Scratch", PartitionStart = 49152, PartitionSectors = 6002,
- PartitionSequence = 3, PartitionStartSector = 96 },
- new Partition{ PartitionDescription = null, PartitionLength = 1707520, PartitionName = "Eschatology 1", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 21108224, PartitionSectors = 3335,
- PartitionSequence = 4, PartitionStartSector = 41227 },
- new Partition{ PartitionDescription = null, PartitionLength = 5262336, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 22815744, PartitionSectors = 10278,
- PartitionSequence = 5, PartitionStartSector = 44562 },
- new Partition{ PartitionDescription = null, PartitionLength = 2726400, PartitionName = "Root file system", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 3122176, PartitionSectors = 5325,
- PartitionSequence = 6, PartitionStartSector = 6098 },
- new Partition{ PartitionDescription = null, PartitionLength = 3180544, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 5848576, PartitionSectors = 6212,
- PartitionSequence = 7, PartitionStartSector = 11423 },
- new Partition{ PartitionDescription = null, PartitionLength = 4203520, PartitionName = "Random A/UX fs", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 9029120, PartitionSectors = 8210,
- PartitionSequence = 8, PartitionStartSector = 17635 },
- new Partition{ PartitionDescription = null, PartitionLength = 2613248, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 13232640, PartitionSectors = 5104,
- PartitionSequence = 9, PartitionStartSector = 25845 },
+ new Partition{ Description = null, Size = 5120, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 10,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 16384, Name = "Macintosh", Type = "Apple_Driver", Offset = 32768, Length = 32,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 5262336, Name = "MacOS", Type = "Apple_HFS", Offset = 15845888, Length = 10278,
+ Sequence = 2, Start = 30949 },
+ new Partition{ Description = null, Size = 3073024, Name = "Scratch", Type = "Apple_Scratch", Offset = 49152, Length = 6002,
+ Sequence = 3, Start = 96 },
+ new Partition{ Description = null, Size = 1707520, Name = "Eschatology 1", Type = "Apple_UNIX_SVR2", Offset = 21108224, Length = 3335,
+ Sequence = 4, Start = 41227 },
+ new Partition{ Description = null, Size = 5262336, Name = "Extra", Type = "Apple_Free", Offset = 22815744, Length = 10278,
+ Sequence = 5, Start = 44562 },
+ new Partition{ Description = null, Size = 2726400, Name = "Root file system", Type = "Apple_UNIX_SVR2", Offset = 3122176, Length = 5325,
+ Sequence = 6, Start = 6098 },
+ new Partition{ Description = null, Size = 3180544, Name = "Extra", Type = "Apple_Free", Offset = 5848576, Length = 6212,
+ Sequence = 7, Start = 11423 },
+ new Partition{ Description = null, Size = 4203520, Name = "Random A/UX fs", Type = "Apple_UNIX_SVR2", Offset = 9029120, Length = 8210,
+ Sequence = 8, Start = 17635 },
+ new Partition{ Description = null, Size = 2613248, Name = "Extra", Type = "Apple_Free", Offset = 13232640, Length = 5104,
+ Sequence = 9, Start = 25845 },
},
// Mac OS 7.1.1
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 8704, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 17,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Macintosh", PartitionType = "Apple_Driver43", PartitionStart = 32768, PartitionSectors = 32,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 5148160, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 7294464, PartitionSectors = 10055,
- PartitionSequence = 2, PartitionStartSector = 14247 },
- new Partition{ PartitionDescription = null, PartitionLength = 2097152, PartitionName = "ProDOS", PartitionType = "Apple_PRODOS", PartitionStart = 5197312, PartitionSectors = 4096,
- PartitionSequence = 3, PartitionStartSector = 10151 },
- new Partition{ PartitionDescription = null, PartitionLength = 3996672, PartitionName = "A/UX Root", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 24081408, PartitionSectors = 7806,
- PartitionSequence = 4, PartitionStartSector = 47034 },
- new Partition{ PartitionDescription = null, PartitionLength = 1486848, PartitionName = "Random A/UX fs", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 49152, PartitionSectors = 2904,
- PartitionSequence = 5, PartitionStartSector = 96 },
- new Partition{ PartitionDescription = null, PartitionLength = 4406784, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 12442624, PartitionSectors = 8607,
- PartitionSequence = 6, PartitionStartSector = 24302 },
- new Partition{ PartitionDescription = null, PartitionLength = 2485760, PartitionName = "Random A/UX fs", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 16849408, PartitionSectors = 4855,
- PartitionSequence = 7, PartitionStartSector = 32909 },
- new Partition{ PartitionDescription = null, PartitionLength = 4746240, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 19335168, PartitionSectors = 9270,
- PartitionSequence = 8, PartitionStartSector = 37764 },
- new Partition{ PartitionDescription = null, PartitionLength = 2097152, PartitionName = "ProDOS", PartitionType = "Apple_PRODOS", PartitionStart = 1536000, PartitionSectors = 4096,
- PartitionSequence = 9, PartitionStartSector = 3000 },
- new Partition{ PartitionDescription = null, PartitionLength = 1564160, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 3633152, PartitionSectors = 3055,
- PartitionSequence = 10, PartitionStartSector = 7096 },
+ new Partition{ Description = null, Size = 8704, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 17,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 16384, Name = "Macintosh", Type = "Apple_Driver43", Offset = 32768, Length = 32,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 5148160, Name = "MacOS", Type = "Apple_HFS", Offset = 7294464, Length = 10055,
+ Sequence = 2, Start = 14247 },
+ new Partition{ Description = null, Size = 2097152, Name = "ProDOS", Type = "Apple_PRODOS", Offset = 5197312, Length = 4096,
+ Sequence = 3, Start = 10151 },
+ new Partition{ Description = null, Size = 3996672, Name = "A/UX Root", Type = "Apple_UNIX_SVR2", Offset = 24081408, Length = 7806,
+ Sequence = 4, Start = 47034 },
+ new Partition{ Description = null, Size = 1486848, Name = "Random A/UX fs", Type = "Apple_UNIX_SVR2", Offset = 49152, Length = 2904,
+ Sequence = 5, Start = 96 },
+ new Partition{ Description = null, Size = 4406784, Name = "Extra", Type = "Apple_Free", Offset = 12442624, Length = 8607,
+ Sequence = 6, Start = 24302 },
+ new Partition{ Description = null, Size = 2485760, Name = "Random A/UX fs", Type = "Apple_UNIX_SVR2", Offset = 16849408, Length = 4855,
+ Sequence = 7, Start = 32909 },
+ new Partition{ Description = null, Size = 4746240, Name = "Extra", Type = "Apple_Free", Offset = 19335168, Length = 9270,
+ Sequence = 8, Start = 37764 },
+ new Partition{ Description = null, Size = 2097152, Name = "ProDOS", Type = "Apple_PRODOS", Offset = 1536000, Length = 4096,
+ Sequence = 9, Start = 3000 },
+ new Partition{ Description = null, Size = 1564160, Name = "Extra", Type = "Apple_Free", Offset = 3633152, Length = 3055,
+ Sequence = 10, Start = 7096 },
},
// Mac OS 7.5
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 9216, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 18,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Macintosh", PartitionType = "Apple_Driver43", PartitionStart = 32768, PartitionSectors = 32,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 28028928, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 49152, PartitionSectors = 54744,
- PartitionSequence = 2, PartitionStartSector = 96 },
+ new Partition{ Description = null, Size = 9216, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 18,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 16384, Name = "Macintosh", Type = "Apple_Driver43", Offset = 32768, Length = 32,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 28028928, Name = "MacOS", Type = "Apple_HFS", Offset = 49152, Length = 54744,
+ Sequence = 2, Start = 96 },
},
// GNU Parted
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 47185920, PartitionName = "untitled", PartitionType = "Apple_HFS", PartitionStart = 2097152, PartitionSectors = 92160,
- PartitionSequence = 0, PartitionStartSector = 4096 },
- new Partition{ PartitionDescription = null, PartitionLength = 84934656, PartitionName = "untitled", PartitionType = "Apple_UNIX_SVR2", PartitionStart = 49283072, PartitionSectors = 165888,
- PartitionSequence = 1, PartitionStartSector = 96256 },
- new Partition{ PartitionDescription = null, PartitionLength = 2064384, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 32768, PartitionSectors = 4032,
- PartitionSequence = 2, PartitionStartSector = 64 },
+ new Partition{ Description = null, Size = 47185920, Name = "untitled", Type = "Apple_HFS", Offset = 2097152, Length = 92160,
+ Sequence = 0, Start = 4096 },
+ new Partition{ Description = null, Size = 84934656, Name = "untitled", Type = "Apple_UNIX_SVR2", Offset = 49283072, Length = 165888,
+ Sequence = 1, Start = 96256 },
+ new Partition{ Description = null, Size = 2064384, Name = "Extra", Type = "Apple_Free", Offset = 32768, Length = 4032,
+ Sequence = 2, Start = 64 },
},
// Silverlining 2.2.1
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 3072, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 6,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 25088, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 98304, PartitionSectors = 49,
- PartitionSequence = 1, PartitionStartSector = 192 },
- new Partition{ PartitionDescription = null, PartitionLength = 65536, PartitionName = "Macintosh_SL", PartitionType = "Apple_Driver43", PartitionStart = 32768, PartitionSectors = 128,
- PartitionSequence = 2, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 65536, PartitionName = "Macintosh_SL", PartitionType = "Apple_Driver_ATA", PartitionStart = 98304, PartitionSectors = 128,
- PartitionSequence = 3, PartitionStartSector = 192 },
- new Partition{ PartitionDescription = null, PartitionLength = 25804800, PartitionName = "Untitled #1", PartitionType = "Apple_HFS", PartitionStart = 163840, PartitionSectors = 50400,
- PartitionSequence = 4, PartitionStartSector = 320 },
- new Partition{ PartitionDescription = null, PartitionLength = 237568, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 25968640, PartitionSectors = 464,
- PartitionSequence = 5, PartitionStartSector = 50720 },
+ new Partition{ Description = null, Size = 3072, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 6,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 25088, Name = null, Type = "Apple_Driver", Offset = 98304, Length = 49,
+ Sequence = 1, Start = 192 },
+ new Partition{ Description = null, Size = 65536, Name = "Macintosh_SL", Type = "Apple_Driver43", Offset = 32768, Length = 128,
+ Sequence = 2, Start = 64 },
+ new Partition{ Description = null, Size = 65536, Name = "Macintosh_SL", Type = "Apple_Driver_ATA", Offset = 98304, Length = 128,
+ Sequence = 3, Start = 192 },
+ new Partition{ Description = null, Size = 25804800, Name = "Untitled #1", Type = "Apple_HFS", Offset = 163840, Length = 50400,
+ Sequence = 4, Start = 320 },
+ new Partition{ Description = null, Size = 237568, Name = "Extra", Type = "Apple_Free", Offset = 25968640, Length = 464,
+ Sequence = 5, Start = 50720 },
},
// Hard Disk Speed Tools 3.6
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 13824, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 32768, PartitionSectors = 27,
- PartitionSequence = 0, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 51200, PartitionName = "Macintosh", PartitionType = "Apple_Driver43", PartitionStart = 32768, PartitionSectors = 100,
- PartitionSequence = 1, PartitionStartSector = 64 },
- new Partition{ PartitionDescription = null, PartitionLength = 25165824, PartitionName = "untitled", PartitionType = "Apple_HFS", PartitionStart = 83968, PartitionSectors = 49152,
- PartitionSequence = 2, PartitionStartSector = 164 },
- new Partition{ PartitionDescription = null, PartitionLength = 963584, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 25249792, PartitionSectors = 1882,
- PartitionSequence = 3, PartitionStartSector = 49316 },
+ new Partition{ Description = null, Size = 13824, Name = null, Type = "Apple_Driver", Offset = 32768, Length = 27,
+ Sequence = 0, Start = 64 },
+ new Partition{ Description = null, Size = 51200, Name = "Macintosh", Type = "Apple_Driver43", Offset = 32768, Length = 100,
+ Sequence = 1, Start = 64 },
+ new Partition{ Description = null, Size = 25165824, Name = "untitled", Type = "Apple_HFS", Offset = 83968, Length = 49152,
+ Sequence = 2, Start = 164 },
+ new Partition{ Description = null, Size = 963584, Name = "Extra", Type = "Apple_Free", Offset = 25249792, Length = 1882,
+ Sequence = 3, Start = 49316 },
},
// VCP Formatter 2.1.1
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 12288, PartitionName = null, PartitionType = "Apple_Driver", PartitionStart = 57344, PartitionSectors = 24,
- PartitionSequence = 0, PartitionStartSector = 112 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Macintosh", PartitionType = "Apple_Driver", PartitionStart = 57344, PartitionSectors = 32,
- PartitionSequence = 1, PartitionStartSector = 112 },
- new Partition{ PartitionDescription = null, PartitionLength = 16384, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 73728, PartitionSectors = 32,
- PartitionSequence = 2, PartitionStartSector = 144 },
- new Partition{ PartitionDescription = null, PartitionLength = 27986944, PartitionName = "MacOS", PartitionType = "Apple_HFS", PartitionStart = 90112, PartitionSectors = 54662,
- PartitionSequence = 3, PartitionStartSector = 176 },
+ new Partition{ Description = null, Size = 12288, Name = null, Type = "Apple_Driver", Offset = 57344, Length = 24,
+ Sequence = 0, Start = 112 },
+ new Partition{ Description = null, Size = 16384, Name = "Macintosh", Type = "Apple_Driver", Offset = 57344, Length = 32,
+ Sequence = 1, Start = 112 },
+ new Partition{ Description = null, Size = 16384, Name = "Extra", Type = "Apple_Free", Offset = 73728, Length = 32,
+ Sequence = 2, Start = 144 },
+ new Partition{ Description = null, Size = 27986944, Name = "MacOS", Type = "Apple_HFS", Offset = 90112, Length = 54662,
+ Sequence = 3, Start = 176 },
// TODO: ADFS tries to read past this partition...
- new Partition{ PartitionDescription = null, PartitionLength = 1024, PartitionName = "Extra", PartitionType = "Apple_Free", PartitionStart = 28077056, PartitionSectors = 2,
- PartitionSequence = 4, PartitionStartSector = 54838 },
+ new Partition{ Description = null, Size = 1024, Name = "Extra", Type = "Apple_Free", Offset = 28077056, Length = 2,
+ Sequence = 4, Start = 54838 },
},
};
@@ -488,13 +488,13 @@ namespace DiscImageChef.Tests.Partitions
{
// Too chatty
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionLength, partitions[j].PartitionLength, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionName, partitions[j].PartitionName, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionType, partitions[j].PartitionType, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStart, partitions[j].PartitionStart, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSectors, partitions[j].PartitionSectors, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSequence, partitions[j].PartitionSequence, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStartSector, partitions[j].PartitionStartSector, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
}
}
}
diff --git a/DiscImageChef.Tests/Partitions/Atari.cs b/DiscImageChef.Tests/Partitions/Atari.cs
index 84b7fa84..dbb7af2c 100644
--- a/DiscImageChef.Tests/Partitions/Atari.cs
+++ b/DiscImageChef.Tests/Partitions/Atari.cs
@@ -57,58 +57,58 @@ namespace DiscImageChef.Tests.Partitions
readonly Partition[][] wanted = {
// Linux (AHDI)
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 31457280, PartitionName = null, PartitionType = "GEM", PartitionStart = 512, PartitionSectors = 61440,
- PartitionSequence = 0, PartitionStartSector = 1 },
- new Partition{ PartitionDescription = null, PartitionLength = 41943040, PartitionName = null, PartitionType = "BGM", PartitionStart = 31457792, PartitionSectors = 81920,
- PartitionSequence = 1, PartitionStartSector = 61441 },
- new Partition{ PartitionDescription = null, PartitionLength = 56402432, PartitionName = null, PartitionType = "LNX", PartitionStart = 73400832, PartitionSectors = 110161,
- PartitionSequence = 2, PartitionStartSector = 143361 },
- new Partition{ PartitionDescription = null, PartitionLength = 43212800, PartitionName = null, PartitionType = "MAC", PartitionStart = 129803264, PartitionSectors = 84400,
- PartitionSequence = 3, PartitionStartSector = 253522 },
- new Partition{ PartitionDescription = null, PartitionLength = 57671680, PartitionName = null, PartitionType = "MIX", PartitionStart = 173016064, PartitionSectors = 112640,
- PartitionSequence = 4, PartitionStartSector = 337922 },
- new Partition{ PartitionDescription = null, PartitionLength = 62914560, PartitionName = null, PartitionType = "MNX", PartitionStart = 230687744, PartitionSectors = 122880,
- PartitionSequence = 5, PartitionStartSector = 450562 },
- new Partition{ PartitionDescription = null, PartitionLength = 73400320, PartitionName = null, PartitionType = "RAW", PartitionStart = 293602304, PartitionSectors = 143360,
- PartitionSequence = 6, PartitionStartSector = 573442 },
- new Partition{ PartitionDescription = null, PartitionLength = 78643200, PartitionName = null, PartitionType = "SWP", PartitionStart = 367002624, PartitionSectors = 153600,
- PartitionSequence = 7, PartitionStartSector = 716802 },
- new Partition{ PartitionDescription = null, PartitionLength = 1048576, PartitionName = null, PartitionType = "UNX", PartitionStart = 445645824, PartitionSectors = 2048,
- PartitionSequence = 8, PartitionStartSector = 870402 },
- new Partition{ PartitionDescription = null, PartitionLength = 77593600, PartitionName = null, PartitionType = "LNX", PartitionStart = 446694400, PartitionSectors = 151550,
- PartitionSequence = 9, PartitionStartSector = 872450 },
+ new Partition{ Description = null, Size = 31457280, Name = null, Type = "GEM", Offset = 512, Length = 61440,
+ Sequence = 0, Start = 1 },
+ new Partition{ Description = null, Size = 41943040, Name = null, Type = "BGM", Offset = 31457792, Length = 81920,
+ Sequence = 1, Start = 61441 },
+ new Partition{ Description = null, Size = 56402432, Name = null, Type = "LNX", Offset = 73400832, Length = 110161,
+ Sequence = 2, Start = 143361 },
+ new Partition{ Description = null, Size = 43212800, Name = null, Type = "MAC", Offset = 129803264, Length = 84400,
+ Sequence = 3, Start = 253522 },
+ new Partition{ Description = null, Size = 57671680, Name = null, Type = "MIX", Offset = 173016064, Length = 112640,
+ Sequence = 4, Start = 337922 },
+ new Partition{ Description = null, Size = 62914560, Name = null, Type = "MNX", Offset = 230687744, Length = 122880,
+ Sequence = 5, Start = 450562 },
+ new Partition{ Description = null, Size = 73400320, Name = null, Type = "RAW", Offset = 293602304, Length = 143360,
+ Sequence = 6, Start = 573442 },
+ new Partition{ Description = null, Size = 78643200, Name = null, Type = "SWP", Offset = 367002624, Length = 153600,
+ Sequence = 7, Start = 716802 },
+ new Partition{ Description = null, Size = 1048576, Name = null, Type = "UNX", Offset = 445645824, Length = 2048,
+ Sequence = 8, Start = 870402 },
+ new Partition{ Description = null, Size = 77593600, Name = null, Type = "LNX", Offset = 446694400, Length = 151550,
+ Sequence = 9, Start = 872450 },
},
// Linux (ICD)
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 15728640, PartitionName = null, PartitionType = "GEM", PartitionStart = 512, PartitionSectors = 30720,
- PartitionSequence = 0, PartitionStartSector = 1 },
- new Partition{ PartitionDescription = null, PartitionLength = 20971520, PartitionName = null, PartitionType = "UNX", PartitionStart = 15729152, PartitionSectors = 40960,
- PartitionSequence = 1, PartitionStartSector = 30721 },
- new Partition{ PartitionDescription = null, PartitionLength = 31457280, PartitionName = null, PartitionType = "LNX", PartitionStart = 36700672, PartitionSectors = 61440,
- PartitionSequence = 2, PartitionStartSector = 71681 },
- new Partition{ PartitionDescription = null, PartitionLength = 41943040, PartitionName = null, PartitionType = "BGM", PartitionStart = 68157952, PartitionSectors = 81920,
- PartitionSequence = 3, PartitionStartSector = 133121 },
- new Partition{ PartitionDescription = null, PartitionLength = 52428800, PartitionName = null, PartitionType = "MAC", PartitionStart = 110100992, PartitionSectors = 102400,
- PartitionSequence = 4, PartitionStartSector = 215041 },
- new Partition{ PartitionDescription = null, PartitionLength = 62914560, PartitionName = null, PartitionType = "MIX", PartitionStart = 162529792, PartitionSectors = 122880,
- PartitionSequence = 5, PartitionStartSector = 317441 },
- new Partition{ PartitionDescription = null, PartitionLength = 83886080, PartitionName = null, PartitionType = "SWP", PartitionStart = 225444352, PartitionSectors = 163840,
- PartitionSequence = 6, PartitionStartSector = 440321 },
- new Partition{ PartitionDescription = null, PartitionLength = 103809024, PartitionName = null, PartitionType = "MNX", PartitionStart = 309330432, PartitionSectors = 202752,
- PartitionSequence = 7, PartitionStartSector = 604161 },
- new Partition{ PartitionDescription = null, PartitionLength = 104857600, PartitionName = null, PartitionType = "LNX", PartitionStart = 413139456, PartitionSectors = 204800,
- PartitionSequence = 8, PartitionStartSector = 806913 },
+ new Partition{ Description = null, Size = 15728640, Name = null, Type = "GEM", Offset = 512, Length = 30720,
+ Sequence = 0, Start = 1 },
+ new Partition{ Description = null, Size = 20971520, Name = null, Type = "UNX", Offset = 15729152, Length = 40960,
+ Sequence = 1, Start = 30721 },
+ new Partition{ Description = null, Size = 31457280, Name = null, Type = "LNX", Offset = 36700672, Length = 61440,
+ Sequence = 2, Start = 71681 },
+ new Partition{ Description = null, Size = 41943040, Name = null, Type = "BGM", Offset = 68157952, Length = 81920,
+ Sequence = 3, Start = 133121 },
+ new Partition{ Description = null, Size = 52428800, Name = null, Type = "MAC", Offset = 110100992, Length = 102400,
+ Sequence = 4, Start = 215041 },
+ new Partition{ Description = null, Size = 62914560, Name = null, Type = "MIX", Offset = 162529792, Length = 122880,
+ Sequence = 5, Start = 317441 },
+ new Partition{ Description = null, Size = 83886080, Name = null, Type = "SWP", Offset = 225444352, Length = 163840,
+ Sequence = 6, Start = 440321 },
+ new Partition{ Description = null, Size = 103809024, Name = null, Type = "MNX", Offset = 309330432, Length = 202752,
+ Sequence = 7, Start = 604161 },
+ new Partition{ Description = null, Size = 104857600, Name = null, Type = "LNX", Offset = 413139456, Length = 204800,
+ Sequence = 8, Start = 806913 },
},
// TOS 1.04
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 7340032, PartitionName = null, PartitionType = "GEM", PartitionStart = 1024, PartitionSectors = 14336,
- PartitionSequence = 0, PartitionStartSector = 2 },
- new Partition{ PartitionDescription = null, PartitionLength = 7340032, PartitionName = null, PartitionType = "GEM", PartitionStart = 7341056, PartitionSectors = 14336,
- PartitionSequence = 1, PartitionStartSector = 14338 },
- new Partition{ PartitionDescription = null, PartitionLength = 7340032, PartitionName = null, PartitionType = "GEM", PartitionStart = 14681088, PartitionSectors = 14336,
- PartitionSequence = 2, PartitionStartSector = 28674 },
- new Partition{ PartitionDescription = null, PartitionLength = 7339008, PartitionName = null, PartitionType = "GEM", PartitionStart = 22021120, PartitionSectors = 14334,
- PartitionSequence = 3, PartitionStartSector = 43010 },
+ new Partition{ Description = null, Size = 7340032, Name = null, Type = "GEM", Offset = 1024, Length = 14336,
+ Sequence = 0, Start = 2 },
+ new Partition{ Description = null, Size = 7340032, Name = null, Type = "GEM", Offset = 7341056, Length = 14336,
+ Sequence = 1, Start = 14338 },
+ new Partition{ Description = null, Size = 7340032, Name = null, Type = "GEM", Offset = 14681088, Length = 14336,
+ Sequence = 2, Start = 28674 },
+ new Partition{ Description = null, Size = 7339008, Name = null, Type = "GEM", Offset = 22021120, Length = 14334,
+ Sequence = 3, Start = 43010 },
},
};
@@ -129,13 +129,13 @@ namespace DiscImageChef.Tests.Partitions
{
// Too chatty
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionLength, partitions[j].PartitionLength, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionName, partitions[j].PartitionName, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionType, partitions[j].PartitionType, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStart, partitions[j].PartitionStart, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSectors, partitions[j].PartitionSectors, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSequence, partitions[j].PartitionSequence, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStartSector, partitions[j].PartitionStartSector, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
}
}
}
diff --git a/DiscImageChef.Tests/Partitions/BSD.cs b/DiscImageChef.Tests/Partitions/BSD.cs
index 7f05ca49..494841b9 100644
--- a/DiscImageChef.Tests/Partitions/BSD.cs
+++ b/DiscImageChef.Tests/Partitions/BSD.cs
@@ -56,12 +56,12 @@ namespace DiscImageChef.Tests.Partitions
readonly Partition[][] wanted = {
// Parted
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 38797312, PartitionName = null, PartitionType = "???", PartitionStart = 1048576, PartitionSectors = 75776,
- PartitionSequence = 0, PartitionStartSector = 2048 },
- new Partition{ PartitionDescription = null, PartitionLength = 19922944, PartitionName = null, PartitionType = "???", PartitionStart = 40894464, PartitionSectors = 38912,
- PartitionSequence = 1, PartitionStartSector = 79872 },
- new Partition{ PartitionDescription = null, PartitionLength = 48234496, PartitionName = null, PartitionType = "???", PartitionStart = 61865984, PartitionSectors = 94208,
- PartitionSequence = 2, PartitionStartSector = 120832 },
+ new Partition{ Description = null, Size = 38797312, Name = null, Type = "???", Offset = 1048576, Length = 75776,
+ Sequence = 0, Start = 2048 },
+ new Partition{ Description = null, Size = 19922944, Name = null, Type = "???", Offset = 40894464, Length = 38912,
+ Sequence = 1, Start = 79872 },
+ new Partition{ Description = null, Size = 48234496, Name = null, Type = "???", Offset = 61865984, Length = 94208,
+ Sequence = 2, Start = 120832 },
},
};
diff --git a/DiscImageChef.Tests/Partitions/GPT.cs b/DiscImageChef.Tests/Partitions/GPT.cs
index e2c1dd24..3e65b4ae 100644
--- a/DiscImageChef.Tests/Partitions/GPT.cs
+++ b/DiscImageChef.Tests/Partitions/GPT.cs
@@ -57,27 +57,27 @@ namespace DiscImageChef.Tests.Partitions
readonly Partition[][] wanted = {
// Linux
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 10485760, PartitionName = "EFI System", PartitionType = "EFI System", PartitionStart = 1048576, PartitionSectors = 20480,
- PartitionSequence = 0, PartitionStartSector = 2048 },
- new Partition{ PartitionDescription = null, PartitionLength = 15728640, PartitionName = "Microsoft basic data", PartitionType = "Microsoft Basic data", PartitionStart = 11534336, PartitionSectors = 30720,
- PartitionSequence = 1, PartitionStartSector = 22528 },
- new Partition{ PartitionDescription = null, PartitionLength = 20971520, PartitionName = "Apple label", PartitionType = "Apple Label", PartitionStart = 27262976, PartitionSectors = 40960,
- PartitionSequence = 2, PartitionStartSector = 53248 },
- new Partition{ PartitionDescription = null, PartitionLength = 26214400, PartitionName = "Solaris /usr & Mac ZFS", PartitionType = "Solaris /usr or Apple ZFS", PartitionStart = 48234496, PartitionSectors = 51200,
- PartitionSequence = 3, PartitionStartSector = 94208 },
- new Partition{ PartitionDescription = null, PartitionLength = 31457280, PartitionName = "FreeBSD ZFS", PartitionType = "FreeBSD ZFS", PartitionStart = 74448896, PartitionSectors = 61440,
- PartitionSequence = 4, PartitionStartSector = 145408 },
- new Partition{ PartitionDescription = null, PartitionLength = 28294656, PartitionName = "HP-UX data", PartitionType = "HP-UX Data", PartitionStart = 105906176, PartitionSectors = 55263,
- PartitionSequence = 5, PartitionStartSector = 206848 },
+ new Partition{ Description = null, Size = 10485760, Name = "EFI System", Type = "EFI System", Offset = 1048576, Length = 20480,
+ Sequence = 0, Start = 2048 },
+ new Partition{ Description = null, Size = 15728640, Name = "Microsoft basic data", Type = "Microsoft Basic data", Offset = 11534336, Length = 30720,
+ Sequence = 1, Start = 22528 },
+ new Partition{ Description = null, Size = 20971520, Name = "Apple label", Type = "Apple Label", Offset = 27262976, Length = 40960,
+ Sequence = 2, Start = 53248 },
+ new Partition{ Description = null, Size = 26214400, Name = "Solaris /usr & Mac ZFS", Type = "Solaris /usr or Apple ZFS", Offset = 48234496, Length = 51200,
+ Sequence = 3, Start = 94208 },
+ new Partition{ Description = null, Size = 31457280, Name = "FreeBSD ZFS", Type = "FreeBSD ZFS", Offset = 74448896, Length = 61440,
+ Sequence = 4, Start = 145408 },
+ new Partition{ Description = null, Size = 28294656, Name = "HP-UX data", Type = "HP-UX Data", Offset = 105906176, Length = 55263,
+ Sequence = 5, Start = 206848 },
},
// Parted
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 42991616, PartitionName = "", PartitionType = "Apple HFS", PartitionStart = 1048576, PartitionSectors = 83968,
- PartitionSequence = 0, PartitionStartSector = 2048 },
- new Partition{ PartitionDescription = null, PartitionLength = 52428800, PartitionName = "", PartitionType = "Linux filesystem", PartitionStart = 44040192, PartitionSectors = 102400,
- PartitionSequence = 1, PartitionStartSector = 86016 },
- new Partition{ PartitionDescription = null, PartitionLength = 36700160, PartitionName = "", PartitionType = "Microsoft Basic data", PartitionStart = 96468992, PartitionSectors = 71680,
- PartitionSequence = 2, PartitionStartSector = 188416 },
+ new Partition{ Description = null, Size = 42991616, Name = "", Type = "Apple HFS", Offset = 1048576, Length = 83968,
+ Sequence = 0, Start = 2048 },
+ new Partition{ Description = null, Size = 52428800, Name = "", Type = "Linux filesystem", Offset = 44040192, Length = 102400,
+ Sequence = 1, Start = 86016 },
+ new Partition{ Description = null, Size = 36700160, Name = "", Type = "Microsoft Basic data", Offset = 96468992, Length = 71680,
+ Sequence = 2, Start = 188416 },
},
};
@@ -98,13 +98,13 @@ namespace DiscImageChef.Tests.Partitions
{
// Too chatty
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionLength, partitions[j].PartitionLength, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionName, partitions[j].PartitionName, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionType, partitions[j].PartitionType, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStart, partitions[j].PartitionStart, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSectors, partitions[j].PartitionSectors, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSequence, partitions[j].PartitionSequence, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStartSector, partitions[j].PartitionStartSector, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
}
}
}
diff --git a/DiscImageChef.Tests/Partitions/MBR.cs b/DiscImageChef.Tests/Partitions/MBR.cs
index 260b5aa4..5fcde528 100644
--- a/DiscImageChef.Tests/Partitions/MBR.cs
+++ b/DiscImageChef.Tests/Partitions/MBR.cs
@@ -65,501 +65,501 @@ namespace DiscImageChef.Tests.Partitions
readonly Partition[][] wanted = {
// Concurrent DOS 6.0
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 100800,
- PartitionSequence = 0, PartitionStartSector = 1008 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 99792,
- PartitionSequence = 1, PartitionStartSector = 102816 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 100800,
- PartitionSequence = 2, PartitionStartSector = 202608 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 303408,
- PartitionSequence = 2, PartitionStartSector = 352800 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 100800,
+ Sequence = 0, Start = 1008 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 99792,
+ Sequence = 1, Start = 102816 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 100800,
+ Sequence = 2, Start = 202608 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 303408,
+ Sequence = 2, Start = 352800 },
},
// Darwin 1.4.1
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x07", PartitionSectors = 409248,
- PartitionSequence = 0, PartitionStartSector = 409248 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xA8", PartitionSectors = 204624,
- PartitionSequence = 1, PartitionStartSector = 818496 },
+ new Partition{ Description = null, Name = null, Type = "0x07", Length = 409248,
+ Sequence = 0, Start = 409248 },
+ new Partition{ Description = null, Name = null, Type = "0xA8", Length = 204624,
+ Sequence = 1, Start = 818496 },
},
// Darwin 6.0.2
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xA8", PartitionSectors = 204561,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xAB", PartitionSectors = 81648,
- PartitionSequence = 1, PartitionStartSector = 204624 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 245952,
- PartitionSequence = 2, PartitionStartSector = 286272 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 488880,
- PartitionSequence = 2, PartitionStartSector = 532224 },
+ new Partition{ Description = null, Name = null, Type = "0xA8", Length = 204561,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0xAB", Length = 81648,
+ Sequence = 1, Start = 204624 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 245952,
+ Sequence = 2, Start = 286272 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 488880,
+ Sequence = 2, Start = 532224 },
},
// Darwin 8.0.1
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 150000,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xAF", PartitionSectors = 176000,
- PartitionSequence = 1, PartitionStartSector = 150063 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xA8", PartitionSectors = 350000,
- PartitionSequence = 2, PartitionStartSector = 326063 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x0C", PartitionSectors = 347937,
- PartitionSequence = 2, PartitionStartSector = 676063 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 150000,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0xAF", Length = 176000,
+ Sequence = 1, Start = 150063 },
+ new Partition{ Description = null, Name = null, Type = "0xA8", Length = 350000,
+ Sequence = 2, Start = 326063 },
+ new Partition{ Description = null, Name = null, Type = "0x0C", Length = 347937,
+ Sequence = 2, Start = 676063 },
},
// DR-DOS 3.40
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 100800,
- PartitionSequence = 0, PartitionStartSector = 1008 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 402129,
- PartitionSequence = 1, PartitionStartSector = 101871 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 152145,
- PartitionSequence = 2, PartitionStartSector = 504063 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 365841,
- PartitionSequence = 2, PartitionStartSector = 656271 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 100800,
+ Sequence = 0, Start = 1008 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 402129,
+ Sequence = 1, Start = 101871 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 152145,
+ Sequence = 2, Start = 504063 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 365841,
+ Sequence = 2, Start = 656271 },
},
// DR-DOS 3.41
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 126945,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 124929,
- PartitionSequence = 1, PartitionStartSector = 127071 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 101745,
- PartitionSequence = 2, PartitionStartSector = 252063 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 668241,
- PartitionSequence = 2, PartitionStartSector = 353871 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 126945,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 124929,
+ Sequence = 1, Start = 127071 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 101745,
+ Sequence = 2, Start = 252063 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 668241,
+ Sequence = 2, Start = 353871 },
},
// DR-DOS 5.00
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 128016,
- PartitionSequence = 0, PartitionStartSector = 124992 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 99729,
- PartitionSequence = 1, PartitionStartSector = 253071 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 100737,
- PartitionSequence = 2, PartitionStartSector = 352863 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 313425,
- PartitionSequence = 2, PartitionStartSector = 453663 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 254961,
- PartitionSequence = 2, PartitionStartSector = 767151 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 128016,
+ Sequence = 0, Start = 124992 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 99729,
+ Sequence = 1, Start = 253071 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 100737,
+ Sequence = 2, Start = 352863 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 313425,
+ Sequence = 2, Start = 453663 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 254961,
+ Sequence = 2, Start = 767151 },
},
// DR-DOS 6.00
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 101745,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 18081,
- PartitionSequence = 1, PartitionStartSector = 102879 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 130977,
- PartitionSequence = 2, PartitionStartSector = 121023 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 202545,
- PartitionSequence = 2, PartitionStartSector = 252063 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 567441,
- PartitionSequence = 2, PartitionStartSector = 454671 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 101745,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 18081,
+ Sequence = 1, Start = 102879 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 130977,
+ Sequence = 2, Start = 121023 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 202545,
+ Sequence = 2, Start = 252063 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 567441,
+ Sequence = 2, Start = 454671 },
},
// DR-DOS 7.02
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 102753,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 307377,
- PartitionSequence = 1, PartitionStartSector = 102879 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 384993,
- PartitionSequence = 2, PartitionStartSector = 410319 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 17073,
- PartitionSequence = 2, PartitionStartSector = 795375 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 209601,
- PartitionSequence = 2, PartitionStartSector = 812511 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 102753,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 307377,
+ Sequence = 1, Start = 102879 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 384993,
+ Sequence = 2, Start = 410319 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 17073,
+ Sequence = 2, Start = 795375 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 209601,
+ Sequence = 2, Start = 812511 },
},
// DR-DOS 7.03
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 202545,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 141057,
- PartitionSequence = 1, PartitionStartSector = 202671 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 152145,
- PartitionSequence = 2, PartitionStartSector = 352863 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 364833,
- PartitionSequence = 2, PartitionStartSector = 505071 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 152145,
- PartitionSequence = 2, PartitionStartSector = 869967 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 202545,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 141057,
+ Sequence = 1, Start = 202671 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 152145,
+ Sequence = 2, Start = 352863 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 364833,
+ Sequence = 2, Start = 505071 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 152145,
+ Sequence = 2, Start = 869967 },
},
// DR-DOS 8.0
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 205569,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 138033,
- PartitionSequence = 1, PartitionStartSector = 205695 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 303345,
- PartitionSequence = 2, PartitionStartSector = 352863 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 249921,
- PartitionSequence = 2, PartitionStartSector = 656271 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 115857,
- PartitionSequence = 2, PartitionStartSector = 906255 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 205569,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 138033,
+ Sequence = 1, Start = 205695 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 303345,
+ Sequence = 2, Start = 352863 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 249921,
+ Sequence = 2, Start = 656271 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 115857,
+ Sequence = 2, Start = 906255 },
},
// Linux
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 20480,
- PartitionSequence = 0, PartitionStartSector = 2048 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x24", PartitionSectors = 40960,
- PartitionSequence = 1, PartitionStartSector = 22528 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xA7", PartitionSectors = 61440,
- PartitionSequence = 2, PartitionStartSector = 65536 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x42", PartitionSectors = 81920,
- PartitionSequence = 2, PartitionStartSector = 129024 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x83", PartitionSectors = 49152,
- PartitionSequence = 2, PartitionStartSector = 212992 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 20480,
+ Sequence = 0, Start = 2048 },
+ new Partition{ Description = null, Name = null, Type = "0x24", Length = 40960,
+ Sequence = 1, Start = 22528 },
+ new Partition{ Description = null, Name = null, Type = "0xA7", Length = 61440,
+ Sequence = 2, Start = 65536 },
+ new Partition{ Description = null, Name = null, Type = "0x42", Length = 81920,
+ Sequence = 2, Start = 129024 },
+ new Partition{ Description = null, Name = null, Type = "0x83", Length = 49152,
+ Sequence = 2, Start = 212992 },
},
// Mac OS X 10.3
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xA8", PartitionSectors = 204800,
- PartitionSequence = 0, PartitionStartSector = 8 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xAF", PartitionSectors = 102400,
- PartitionSequence = 1, PartitionStartSector = 204816 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x0B", PartitionSectors = 102400,
- PartitionSequence = 2, PartitionStartSector = 307224 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xAF", PartitionSectors = 204800,
- PartitionSequence = 0, PartitionStartSector = 409632 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xAF", PartitionSectors = 204800,
- PartitionSequence = 1, PartitionStartSector = 614440 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xAF", PartitionSectors = 204752,
- PartitionSequence = 2, PartitionStartSector = 819248 },
+ new Partition{ Description = null, Name = null, Type = "0xA8", Length = 204800,
+ Sequence = 0, Start = 8 },
+ new Partition{ Description = null, Name = null, Type = "0xAF", Length = 102400,
+ Sequence = 1, Start = 204816 },
+ new Partition{ Description = null, Name = null, Type = "0x0B", Length = 102400,
+ Sequence = 2, Start = 307224 },
+ new Partition{ Description = null, Name = null, Type = "0xAF", Length = 204800,
+ Sequence = 0, Start = 409632 },
+ new Partition{ Description = null, Name = null, Type = "0xAF", Length = 204800,
+ Sequence = 1, Start = 614440 },
+ new Partition{ Description = null, Name = null, Type = "0xAF", Length = 204752,
+ Sequence = 2, Start = 819248 },
},
// Mac OS X 10.4
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xAF", PartitionSectors = 102400,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xAF", PartitionSectors = 204800,
- PartitionSequence = 1, PartitionStartSector = 102501 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x0B", PartitionSectors = 204800,
- PartitionSequence = 2, PartitionStartSector = 307314 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xA8", PartitionSectors = 204800,
- PartitionSequence = 0, PartitionStartSector = 512127 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 102400,
- PartitionSequence = 1, PartitionStartSector = 716940 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0xAF", PartitionSectors = 204624,
- PartitionSequence = 2, PartitionStartSector = 819378 },
+ new Partition{ Description = null, Name = null, Type = "0xAF", Length = 102400,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0xAF", Length = 204800,
+ Sequence = 1, Start = 102501 },
+ new Partition{ Description = null, Name = null, Type = "0x0B", Length = 204800,
+ Sequence = 2, Start = 307314 },
+ new Partition{ Description = null, Name = null, Type = "0xA8", Length = 204800,
+ Sequence = 0, Start = 512127 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 102400,
+ Sequence = 1, Start = 716940 },
+ new Partition{ Description = null, Name = null, Type = "0xAF", Length = 204624,
+ Sequence = 2, Start = 819378 },
},
// MS-DOS 3.30A
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 1, PartitionStartSector = 65583 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 131103 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 196623 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 262143 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 327663 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 393183 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 458703 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 524223 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 589743 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 655263 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 720783 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 786303 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 851823 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 917343 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 39249,
- PartitionSequence = 2, PartitionStartSector = 982863 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 1, Start = 65583 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 131103 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 196623 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 262143 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 327663 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 393183 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 458703 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 524223 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 589743 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 655263 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 720783 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 786303 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 851823 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 917343 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 39249,
+ Sequence = 2, Start = 982863 },
},
// MS-DOS 5.00
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 102753,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 31185,
- PartitionSequence = 1, PartitionStartSector = 102879 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 41265,
- PartitionSequence = 2, PartitionStartSector = 134127 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 51345,
- PartitionSequence = 2, PartitionStartSector = 175455 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 61425,
- PartitionSequence = 2, PartitionStartSector = 226863 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 72513,
- PartitionSequence = 2, PartitionStartSector = 288351 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 82593,
- PartitionSequence = 2, PartitionStartSector = 360927 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 92673,
- PartitionSequence = 2, PartitionStartSector = 443583 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 102753,
- PartitionSequence = 2, PartitionStartSector = 536319 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 112833,
- PartitionSequence = 2, PartitionStartSector = 639135 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 122913,
- PartitionSequence = 2, PartitionStartSector = 752031 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 134001,
- PartitionSequence = 2, PartitionStartSector = 875007 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 13041,
- PartitionSequence = 2, PartitionStartSector = 1009071 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 102753,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 31185,
+ Sequence = 1, Start = 102879 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 41265,
+ Sequence = 2, Start = 134127 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 51345,
+ Sequence = 2, Start = 175455 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 61425,
+ Sequence = 2, Start = 226863 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 72513,
+ Sequence = 2, Start = 288351 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 82593,
+ Sequence = 2, Start = 360927 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 92673,
+ Sequence = 2, Start = 443583 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 102753,
+ Sequence = 2, Start = 536319 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 112833,
+ Sequence = 2, Start = 639135 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 122913,
+ Sequence = 2, Start = 752031 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 134001,
+ Sequence = 2, Start = 875007 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 13041,
+ Sequence = 2, Start = 1009071 },
},
// MS-DOS 6.00
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 51345,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 72513,
- PartitionSequence = 1, PartitionStartSector = 51471 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 92673,
- PartitionSequence = 2, PartitionStartSector = 124047 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 112833,
- PartitionSequence = 2, PartitionStartSector = 216783 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 134001,
- PartitionSequence = 2, PartitionStartSector = 329679 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 154161,
- PartitionSequence = 2, PartitionStartSector = 463743 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 178353,
- PartitionSequence = 2, PartitionStartSector = 617967 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 184401,
- PartitionSequence = 2, PartitionStartSector = 796383 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 41265,
- PartitionSequence = 2, PartitionStartSector = 980847 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 51345,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 72513,
+ Sequence = 1, Start = 51471 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 92673,
+ Sequence = 2, Start = 124047 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 112833,
+ Sequence = 2, Start = 216783 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 134001,
+ Sequence = 2, Start = 329679 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 154161,
+ Sequence = 2, Start = 463743 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 178353,
+ Sequence = 2, Start = 617967 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 184401,
+ Sequence = 2, Start = 796383 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 41265,
+ Sequence = 2, Start = 980847 },
},
// MS-DOS 6.20
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 205569,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 225729,
- PartitionSequence = 1, PartitionStartSector = 205695 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 245889,
- PartitionSequence = 2, PartitionStartSector = 431487 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 267057,
- PartitionSequence = 2, PartitionStartSector = 677439 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 61425,
- PartitionSequence = 2, PartitionStartSector = 944559 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 16065,
- PartitionSequence = 2, PartitionStartSector = 1006047 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 205569,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 225729,
+ Sequence = 1, Start = 205695 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 245889,
+ Sequence = 2, Start = 431487 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 267057,
+ Sequence = 2, Start = 677439 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 61425,
+ Sequence = 2, Start = 944559 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 16065,
+ Sequence = 2, Start = 1006047 },
},
// MS-DOS 6.21
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 205569,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 225729,
- PartitionSequence = 1, PartitionStartSector = 205695 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 245889,
- PartitionSequence = 2, PartitionStartSector = 431487 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 267057,
- PartitionSequence = 2, PartitionStartSector = 677439 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 51345,
- PartitionSequence = 2, PartitionStartSector = 944559 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 6993,
- PartitionSequence = 2, PartitionStartSector = 995967 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 19089,
- PartitionSequence = 2, PartitionStartSector = 1003023 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 205569,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 225729,
+ Sequence = 1, Start = 205695 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 245889,
+ Sequence = 2, Start = 431487 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 267057,
+ Sequence = 2, Start = 677439 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 51345,
+ Sequence = 2, Start = 944559 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 6993,
+ Sequence = 2, Start = 995967 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 19089,
+ Sequence = 2, Start = 1003023 },
},
// MS-DOS 6.22
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 245889,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 205569,
- PartitionSequence = 1, PartitionStartSector = 246015 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 307377,
- PartitionSequence = 2, PartitionStartSector = 451647 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 225729,
- PartitionSequence = 2, PartitionStartSector = 759087 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 37233,
- PartitionSequence = 2, PartitionStartSector = 984879 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 245889,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 205569,
+ Sequence = 1, Start = 246015 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 307377,
+ Sequence = 2, Start = 451647 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 225729,
+ Sequence = 2, Start = 759087 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 37233,
+ Sequence = 2, Start = 984879 },
},
// Multiuser DOS 7.22 release 04
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 152145,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 99729,
- PartitionSequence = 1, PartitionStartSector = 152271 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 202545,
- PartitionSequence = 2, PartitionStartSector = 252063 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 1953,
- PartitionSequence = 2, PartitionStartSector = 454671 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 565425,
- PartitionSequence = 2, PartitionStartSector = 456687 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 152145,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 99729,
+ Sequence = 1, Start = 152271 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 202545,
+ Sequence = 2, Start = 252063 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 1953,
+ Sequence = 2, Start = 454671 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 565425,
+ Sequence = 2, Start = 456687 },
},
// Novell DOS 7.0
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 252945,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 4977,
- PartitionSequence = 1, PartitionStartSector = 253071 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 202545,
- PartitionSequence = 2, PartitionStartSector = 352863 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 348705,
- PartitionSequence = 2, PartitionStartSector = 555471 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 117873,
- PartitionSequence = 2, PartitionStartSector = 904239 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 252945,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 4977,
+ Sequence = 1, Start = 253071 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 202545,
+ Sequence = 2, Start = 352863 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 348705,
+ Sequence = 2, Start = 555471 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 117873,
+ Sequence = 2, Start = 904239 },
},
// OpenDOS 7.01
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 307377,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 4977,
- PartitionSequence = 1, PartitionStartSector = 307503 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 40257,
- PartitionSequence = 2, PartitionStartSector = 312543 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 202545,
- PartitionSequence = 2, PartitionStartSector = 352863 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 466641,
- PartitionSequence = 2, PartitionStartSector = 555471 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 307377,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 4977,
+ Sequence = 1, Start = 307503 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 40257,
+ Sequence = 2, Start = 312543 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 202545,
+ Sequence = 2, Start = 352863 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 466641,
+ Sequence = 2, Start = 555471 },
},
// Parted
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x83", PartitionSectors = 67584,
- PartitionSequence = 0, PartitionStartSector = 4096 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x07", PartitionSectors = 59392,
- PartitionSequence = 1, PartitionStartSector = 73728 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 129024,
- PartitionSequence = 2, PartitionStartSector = 133120 },
+ new Partition{ Description = null, Name = null, Type = "0x83", Length = 67584,
+ Sequence = 0, Start = 4096 },
+ new Partition{ Description = null, Name = null, Type = "0x07", Length = 59392,
+ Sequence = 1, Start = 73728 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 129024,
+ Sequence = 2, Start = 133120 },
},
// PC-DOS 2000
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 205569,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 225729,
- PartitionSequence = 1, PartitionStartSector = 205695 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 245889,
- PartitionSequence = 2, PartitionStartSector = 431487 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 287217,
- PartitionSequence = 2, PartitionStartSector = 677439 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 57393,
- PartitionSequence = 2, PartitionStartSector = 964719 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 205569,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 225729,
+ Sequence = 1, Start = 205695 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 245889,
+ Sequence = 2, Start = 431487 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 287217,
+ Sequence = 2, Start = 677439 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 57393,
+ Sequence = 2, Start = 964719 },
},
// PC-DOS 2.00
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 1022111,
- PartitionSequence = 0, PartitionStartSector = 1 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 1022111,
+ Sequence = 0, Start = 1 },
},
// PC-DOS 2.10
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 1022111,
- PartitionSequence = 0, PartitionStartSector = 1 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 1022111,
+ Sequence = 0, Start = 1 },
},
// PC-DOS 3.00
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 66465,
- PartitionSequence = 0, PartitionStartSector = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 66465,
+ Sequence = 0, Start = 63 },
},
// PC-DOS 3.10
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 66465,
- PartitionSequence = 0, PartitionStartSector = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 66465,
+ Sequence = 0, Start = 63 },
},
// PC-DOS 3.30
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 1, PartitionStartSector = 65583 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 131103 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 196623 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 262143 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 327663 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 393183 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 458703 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 524223 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 589743 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 655263 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 720783 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 786303 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 851823 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 65457,
- PartitionSequence = 2, PartitionStartSector = 917343 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x04", PartitionSectors = 39249,
- PartitionSequence = 2, PartitionStartSector = 982863 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 1, Start = 65583 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 131103 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 196623 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 262143 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 327663 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 393183 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 458703 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 524223 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 589743 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 655263 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 720783 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 786303 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 851823 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 65457,
+ Sequence = 2, Start = 917343 },
+ new Partition{ Description = null, Name = null, Type = "0x04", Length = 39249,
+ Sequence = 2, Start = 982863 },
},
// PC-DOS 4.00
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 205569,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 25137,
- PartitionSequence = 1, PartitionStartSector = 205695 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 245889,
- PartitionSequence = 2, PartitionStartSector = 230895 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 307377,
- PartitionSequence = 2, PartitionStartSector = 476847 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 237825,
- PartitionSequence = 2, PartitionStartSector = 784287 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 205569,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 25137,
+ Sequence = 1, Start = 205695 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 245889,
+ Sequence = 2, Start = 230895 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 307377,
+ Sequence = 2, Start = 476847 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 237825,
+ Sequence = 2, Start = 784287 },
},
// PC-DOS 5.00
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 205569,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 25137,
- PartitionSequence = 1, PartitionStartSector = 205695 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 245889,
- PartitionSequence = 2, PartitionStartSector = 230895 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 287217,
- PartitionSequence = 2, PartitionStartSector = 476847 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 257985,
- PartitionSequence = 2, PartitionStartSector = 764127 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 205569,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 25137,
+ Sequence = 1, Start = 205695 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 245889,
+ Sequence = 2, Start = 230895 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 287217,
+ Sequence = 2, Start = 476847 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 257985,
+ Sequence = 2, Start = 764127 },
},
// PC-DOS 6.10
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 205569,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 25137,
- PartitionSequence = 1, PartitionStartSector = 205695 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 225729,
- PartitionSequence = 2, PartitionStartSector = 230895 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 245889,
- PartitionSequence = 2, PartitionStartSector = 456687 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 319473,
- PartitionSequence = 2, PartitionStartSector = 702639 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 205569,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 25137,
+ Sequence = 1, Start = 205695 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 225729,
+ Sequence = 2, Start = 230895 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 245889,
+ Sequence = 2, Start = 456687 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 319473,
+ Sequence = 2, Start = 702639 },
},
// Windows 95
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 205569,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 245889,
- PartitionSequence = 1, PartitionStartSector = 205695 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 267057,
- PartitionSequence = 2, PartitionStartSector = 451647 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 287217,
- PartitionSequence = 2, PartitionStartSector = 718767 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 17073,
- PartitionSequence = 2, PartitionStartSector = 1006047 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 205569,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 245889,
+ Sequence = 1, Start = 205695 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 267057,
+ Sequence = 2, Start = 451647 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 287217,
+ Sequence = 2, Start = 718767 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 17073,
+ Sequence = 2, Start = 1006047 },
},
// Windows 95 OSR 2.5
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 307377,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 245889,
- PartitionSequence = 1, PartitionStartSector = 307503 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 328545,
- PartitionSequence = 2, PartitionStartSector = 553455 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 102753,
- PartitionSequence = 2, PartitionStartSector = 882063 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 21105,
- PartitionSequence = 2, PartitionStartSector = 984879 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 17073,
- PartitionSequence = 2, PartitionStartSector = 1006047 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 307377,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 245889,
+ Sequence = 1, Start = 307503 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 328545,
+ Sequence = 2, Start = 553455 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 102753,
+ Sequence = 2, Start = 882063 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 21105,
+ Sequence = 2, Start = 984879 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 17073,
+ Sequence = 2, Start = 1006047 },
},
// Windows NT 3.10
new []{
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x07", PartitionSectors = 204561,
- PartitionSequence = 0, PartitionStartSector = 63 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x07", PartitionSectors = 60480,
- PartitionSequence = 1, PartitionStartSector = 962640 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x07", PartitionSectors = 307377,
- PartitionSequence = 2, PartitionStartSector = 204687 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 224721,
- PartitionSequence = 2, PartitionStartSector = 512127 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x06", PartitionSectors = 214641,
- PartitionSequence = 2, PartitionStartSector = 736911 },
- new Partition{ PartitionDescription = null, PartitionName = null, PartitionType = "0x01", PartitionSectors = 10017,
- PartitionSequence = 2, PartitionStartSector = 951615 },
+ new Partition{ Description = null, Name = null, Type = "0x07", Length = 204561,
+ Sequence = 0, Start = 63 },
+ new Partition{ Description = null, Name = null, Type = "0x07", Length = 60480,
+ Sequence = 1, Start = 962640 },
+ new Partition{ Description = null, Name = null, Type = "0x07", Length = 307377,
+ Sequence = 2, Start = 204687 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 224721,
+ Sequence = 2, Start = 512127 },
+ new Partition{ Description = null, Name = null, Type = "0x06", Length = 214641,
+ Sequence = 2, Start = 736911 },
+ new Partition{ Description = null, Name = null, Type = "0x01", Length = 10017,
+ Sequence = 2, Start = 951615 },
},
};
@@ -580,13 +580,13 @@ namespace DiscImageChef.Tests.Partitions
{
// Too chatty
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSectors * 512, partitions[j].PartitionLength, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionName, partitions[j].PartitionName, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionType, partitions[j].PartitionType, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStartSector * 512, partitions[j].PartitionStart, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSectors, partitions[j].PartitionSectors, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSequence, partitions[j].PartitionSequence, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStartSector, partitions[j].PartitionStartSector, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Length * 512, partitions[j].Size, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Start * 512, partitions[j].Offset, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
}
}
}
diff --git a/DiscImageChef.Tests/Partitions/MINIX.cs b/DiscImageChef.Tests/Partitions/MINIX.cs
index 260927c9..cadf47f0 100644
--- a/DiscImageChef.Tests/Partitions/MINIX.cs
+++ b/DiscImageChef.Tests/Partitions/MINIX.cs
@@ -56,14 +56,14 @@ namespace DiscImageChef.Tests.Partitions
readonly Partition[][] wanted = {
// Parted
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 268369408, PartitionName = null, PartitionType = "MINIX", PartitionStart = 2064896, PartitionSectors = 524159,
- PartitionSequence = 0, PartitionStartSector = 4033 },
- new Partition{ PartitionDescription = null, PartitionLength = 270434304, PartitionName = null, PartitionType = "MINIX", PartitionStart = 270434304, PartitionSectors = 528192,
- PartitionSequence = 1, PartitionStartSector = 528192 },
- new Partition{ PartitionDescription = null, PartitionLength = 270434304, PartitionName = null, PartitionType = "MINIX", PartitionStart = 540868608, PartitionSectors = 528192,
- PartitionSequence = 2, PartitionStartSector = 1056384 },
- new Partition{ PartitionDescription = null, PartitionLength = 262176768, PartitionName = null, PartitionType = "MINIX", PartitionStart = 811302912, PartitionSectors = 512064,
- PartitionSequence = 2, PartitionStartSector = 1584576 },
+ new Partition{ Description = null, Size = 268369408, Name = null, Type = "MINIX", Offset = 2064896, Length = 524159,
+ Sequence = 0, Start = 4033 },
+ new Partition{ Description = null, Size = 270434304, Name = null, Type = "MINIX", Offset = 270434304, Length = 528192,
+ Sequence = 1, Start = 528192 },
+ new Partition{ Description = null, Size = 270434304, Name = null, Type = "MINIX", Offset = 540868608, Length = 528192,
+ Sequence = 2, Start = 1056384 },
+ new Partition{ Description = null, Size = 262176768, Name = null, Type = "MINIX", Offset = 811302912, Length = 512064,
+ Sequence = 2, Start = 1584576 },
},
};
diff --git a/DiscImageChef.Tests/Partitions/PC98.cs b/DiscImageChef.Tests/Partitions/PC98.cs
index dd0666d8..9cf959aa 100644
--- a/DiscImageChef.Tests/Partitions/PC98.cs
+++ b/DiscImageChef.Tests/Partitions/PC98.cs
@@ -57,12 +57,12 @@ namespace DiscImageChef.Tests.Partitions
readonly Partition[][] wanted = {
// Parted
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 38797312, PartitionName = null, PartitionType = "???", PartitionStart = 1048576, PartitionSectors = 75776,
- PartitionSequence = 0, PartitionStartSector = 2048 },
- new Partition{ PartitionDescription = null, PartitionLength = 19922944, PartitionName = null, PartitionType = "???", PartitionStart = 40894464, PartitionSectors = 38912,
- PartitionSequence = 1, PartitionStartSector = 79872 },
- new Partition{ PartitionDescription = null, PartitionLength = 48234496, PartitionName = null, PartitionType = "???", PartitionStart = 61865984, PartitionSectors = 94208,
- PartitionSequence = 2, PartitionStartSector = 120832 },
+ new Partition{ Description = null, Size = 38797312, Name = null, Type = "???", Offset = 1048576, Length = 75776,
+ Sequence = 0, Start = 2048 },
+ new Partition{ Description = null, Size = 19922944, Name = null, Type = "???", Offset = 40894464, Length = 38912,
+ Sequence = 1, Start = 79872 },
+ new Partition{ Description = null, Size = 48234496, Name = null, Type = "???", Offset = 61865984, Length = 94208,
+ Sequence = 2, Start = 120832 },
},
};
@@ -83,13 +83,13 @@ namespace DiscImageChef.Tests.Partitions
{
// Too chatty
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionLength, partitions[j].PartitionLength, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionName, partitions[j].PartitionName, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionType, partitions[j].PartitionType, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStart, partitions[j].PartitionStart, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSectors, partitions[j].PartitionSectors, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSequence, partitions[j].PartitionSequence, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStartSector, partitions[j].PartitionStartSector, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
}
}
}
diff --git a/DiscImageChef.Tests/Partitions/RDB.cs b/DiscImageChef.Tests/Partitions/RDB.cs
index b4708db2..6c06ee6e 100644
--- a/DiscImageChef.Tests/Partitions/RDB.cs
+++ b/DiscImageChef.Tests/Partitions/RDB.cs
@@ -57,42 +57,42 @@ namespace DiscImageChef.Tests.Partitions
readonly Partition[][] wanted = {
// AmigaOS 3.9
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 87392256, PartitionName = "UDH0", PartitionType = "\"DOS\\0\"", PartitionStart = 2080768, PartitionSectors = 170688,
- PartitionSequence = 0, PartitionStartSector = 4064 },
- new Partition{ PartitionDescription = null, PartitionLength = 87392256, PartitionName = "UDH1", PartitionType = "\"DOS\\2\"", PartitionStart = 89473024, PartitionSectors = 170688,
- PartitionSequence = 1, PartitionStartSector = 174752 },
- new Partition{ PartitionDescription = null, PartitionLength = 87392256, PartitionName = "UDH2", PartitionType = "\"DOS\\1\"", PartitionStart = 176865280, PartitionSectors = 170688,
- PartitionSequence = 2, PartitionStartSector = 345440 },
- new Partition{ PartitionDescription = null, PartitionLength = 87392256, PartitionName = "UDH3", PartitionType = "\"DOS\\3\"", PartitionStart = 264257536, PartitionSectors = 170688,
- PartitionSequence = 3, PartitionStartSector = 516128 },
- new Partition{ PartitionDescription = null, PartitionLength = 87392256, PartitionName = "UDH4", PartitionType = "\"RES\\86\"", PartitionStart = 351649792, PartitionSectors = 170688,
- PartitionSequence = 4, PartitionStartSector = 686816 },
- new Partition{ PartitionDescription = null, PartitionLength = 85311488, PartitionName = "UDH5", PartitionType = "\"RES\\86\"", PartitionStart = 439042048, PartitionSectors = 166624,
- PartitionSequence = 5, PartitionStartSector = 857504 },
+ new Partition{ Description = null, Size = 87392256, Name = "UDH0", Type = "\"DOS\\0\"", Offset = 2080768, Length = 170688,
+ Sequence = 0, Start = 4064 },
+ new Partition{ Description = null, Size = 87392256, Name = "UDH1", Type = "\"DOS\\2\"", Offset = 89473024, Length = 170688,
+ Sequence = 1, Start = 174752 },
+ new Partition{ Description = null, Size = 87392256, Name = "UDH2", Type = "\"DOS\\1\"", Offset = 176865280, Length = 170688,
+ Sequence = 2, Start = 345440 },
+ new Partition{ Description = null, Size = 87392256, Name = "UDH3", Type = "\"DOS\\3\"", Offset = 264257536, Length = 170688,
+ Sequence = 3, Start = 516128 },
+ new Partition{ Description = null, Size = 87392256, Name = "UDH4", Type = "\"RES\\86\"", Offset = 351649792, Length = 170688,
+ Sequence = 4, Start = 686816 },
+ new Partition{ Description = null, Size = 85311488, Name = "UDH5", Type = "\"RES\\86\"", Offset = 439042048, Length = 166624,
+ Sequence = 5, Start = 857504 },
},
// AmigaOS 4.0
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 91455488, PartitionName = "DH1", PartitionType = "\"DOS\\1\"", PartitionStart = 1048576, PartitionSectors = 178624,
- PartitionSequence = 0, PartitionStartSector = 2048 },
- new Partition{ PartitionDescription = null, PartitionLength = 76546048, PartitionName = "DH2", PartitionType = "\"DOS\\3\"", PartitionStart = 92504064, PartitionSectors = 149504,
- PartitionSequence = 1, PartitionStartSector = 180672 },
- new Partition{ PartitionDescription = null, PartitionLength = 78741504, PartitionName = "DH3", PartitionType = "\"DOS\\3\"", PartitionStart = 169050112, PartitionSectors = 153792,
- PartitionSequence = 2, PartitionStartSector = 330176 },
- new Partition{ PartitionDescription = null, PartitionLength = 78020608, PartitionName = "DH4", PartitionType = "\"DOS\\7\"", PartitionStart = 247791616, PartitionSectors = 152384,
- PartitionSequence = 3, PartitionStartSector = 483968 },
- new Partition{ PartitionDescription = null, PartitionLength = 85000192, PartitionName = "DH5", PartitionType = "\"SFS\\0\"", PartitionStart = 325812224, PartitionSectors = 166016,
- PartitionSequence = 4, PartitionStartSector = 636352 },
- new Partition{ PartitionDescription = null, PartitionLength = 113541120, PartitionName = "DH6", PartitionType = "\"SFS\\2\"", PartitionStart = 410812416, PartitionSectors = 221760,
- PartitionSequence = 5, PartitionStartSector = 802368 },
+ new Partition{ Description = null, Size = 91455488, Name = "DH1", Type = "\"DOS\\1\"", Offset = 1048576, Length = 178624,
+ Sequence = 0, Start = 2048 },
+ new Partition{ Description = null, Size = 76546048, Name = "DH2", Type = "\"DOS\\3\"", Offset = 92504064, Length = 149504,
+ Sequence = 1, Start = 180672 },
+ new Partition{ Description = null, Size = 78741504, Name = "DH3", Type = "\"DOS\\3\"", Offset = 169050112, Length = 153792,
+ Sequence = 2, Start = 330176 },
+ new Partition{ Description = null, Size = 78020608, Name = "DH4", Type = "\"DOS\\7\"", Offset = 247791616, Length = 152384,
+ Sequence = 3, Start = 483968 },
+ new Partition{ Description = null, Size = 85000192, Name = "DH5", Type = "\"SFS\\0\"", Offset = 325812224, Length = 166016,
+ Sequence = 4, Start = 636352 },
+ new Partition{ Description = null, Size = 113541120, Name = "DH6", Type = "\"SFS\\2\"", Offset = 410812416, Length = 221760,
+ Sequence = 5, Start = 802368 },
},
// Parted
new []{
- new Partition{ PartitionDescription = null, PartitionLength = 8225280, PartitionName = "primary", PartitionType = "\"\0\0\0\\0\"", PartitionStart = 8225280, PartitionSectors = 16065,
- PartitionSequence = 0, PartitionStartSector = 16065 },
- new Partition{ PartitionDescription = null, PartitionLength = 24675840, PartitionName = "name", PartitionType = "\"FAT\\1\"", PartitionStart = 16450560, PartitionSectors = 48195,
- PartitionSequence = 1, PartitionStartSector = 32130 },
- new Partition{ PartitionDescription = null, PartitionLength = 90478080, PartitionName = "partition", PartitionType = "\"\0\0\0\\0\"", PartitionStart = 41126400, PartitionSectors = 176715,
- PartitionSequence = 2, PartitionStartSector = 80325 },
+ new Partition{ Description = null, Size = 8225280, Name = "primary", Type = "\"\0\0\0\\0\"", Offset = 8225280, Length = 16065,
+ Sequence = 0, Start = 16065 },
+ new Partition{ Description = null, Size = 24675840, Name = "name", Type = "\"FAT\\1\"", Offset = 16450560, Length = 48195,
+ Sequence = 1, Start = 32130 },
+ new Partition{ Description = null, Size = 90478080, Name = "partition", Type = "\"\0\0\0\\0\"", Offset = 41126400, Length = 176715,
+ Sequence = 2, Start = 80325 },
},
};
@@ -113,13 +113,13 @@ namespace DiscImageChef.Tests.Partitions
{
// Too chatty
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionLength, partitions[j].PartitionLength, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionName, partitions[j].PartitionName, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionType, partitions[j].PartitionType, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStart, partitions[j].PartitionStart, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSectors, partitions[j].PartitionSectors, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionSequence, partitions[j].PartitionSequence, testfiles[i]);
- Assert.AreEqual(wanted[i][j].PartitionStartSector, partitions[j].PartitionStartSector, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+ Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
}
}
}
diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog
index 7c73d2e3..ce4a11f7 100644
--- a/DiscImageChef/ChangeLog
+++ b/DiscImageChef/ChangeLog
@@ -1,3 +1,8 @@
+* Commands/Ls.cs:
+* Commands/Analyze.cs:
+* Commands/ExtractFiles.cs:
+ Refactor: Simplify field names.
+
* Commands/Ls.cs:
* Commands/Analyze.cs:
* Commands/ExtractFiles.cs:
diff --git a/DiscImageChef/Commands/Analyze.cs b/DiscImageChef/Commands/Analyze.cs
index 4c8db0e1..51f6cdb1 100644
--- a/DiscImageChef/Commands/Analyze.cs
+++ b/DiscImageChef/Commands/Analyze.cs
@@ -152,13 +152,13 @@ namespace DiscImageChef.Commands
for(int i = 0; i < partitions.Count; i++)
{
DicConsole.WriteLine();
- DicConsole.WriteLine("Partition {0}:", partitions[i].PartitionSequence);
- DicConsole.WriteLine("Partition name: {0}", partitions[i].PartitionName);
- DicConsole.WriteLine("Partition type: {0}", partitions[i].PartitionType);
- DicConsole.WriteLine("Partition start: sector {0}, byte {1}", partitions[i].PartitionStartSector, partitions[i].PartitionStart);
- DicConsole.WriteLine("Partition length: {0} sectors, {1} bytes", partitions[i].PartitionSectors, partitions[i].PartitionLength);
+ DicConsole.WriteLine("Partition {0}:", partitions[i].Sequence);
+ DicConsole.WriteLine("Partition name: {0}", partitions[i].Name);
+ DicConsole.WriteLine("Partition type: {0}", partitions[i].Type);
+ DicConsole.WriteLine("Partition start: sector {0}, byte {1}", partitions[i].Start, partitions[i].Offset);
+ DicConsole.WriteLine("Partition length: {0} sectors, {1} bytes", partitions[i].Length, partitions[i].Size);
DicConsole.WriteLine("Partition description:");
- DicConsole.WriteLine(partitions[i].PartitionDescription);
+ DicConsole.WriteLine(partitions[i].Description);
if(options.SearchForFilesystems)
{
@@ -199,9 +199,9 @@ namespace DiscImageChef.Commands
{
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = _imageFormat.GetSectors(),
- PartitionLength = _imageFormat.GetSectors() * _imageFormat.GetSectorSize()
+ Name = "Whole device",
+ Length = _imageFormat.GetSectors(),
+ Size = _imageFormat.GetSectors() * _imageFormat.GetSectorSize()
};
Core.Filesystems.Identify(_imageFormat, out id_plugins, wholePart);
diff --git a/DiscImageChef/Commands/ExtractFiles.cs b/DiscImageChef/Commands/ExtractFiles.cs
index 4a61ce4a..747a825d 100644
--- a/DiscImageChef/Commands/ExtractFiles.cs
+++ b/DiscImageChef/Commands/ExtractFiles.cs
@@ -151,7 +151,7 @@ namespace DiscImageChef.Commands
for(int i = 0; i < partitions.Count; i++)
{
DicConsole.WriteLine();
- DicConsole.WriteLine("Partition {0}:", partitions[i].PartitionSequence);
+ DicConsole.WriteLine("Partition {0}:", partitions[i].Sequence);
DicConsole.WriteLine("Identifying filesystem on partition");
@@ -167,7 +167,7 @@ namespace DiscImageChef.Commands
if(plugins.PluginsList.TryGetValue(plugin_name, out _plugin))
{
DicConsole.WriteLine(string.Format("As identified by {0}.", _plugin.Name));
- Filesystem fs = (Filesystem)_plugin.GetType().GetConstructor(new Type[] { typeof(ImagePlugin), typeof(ulong), typeof(ulong), typeof(System.Text.Encoding) }).Invoke(new object[] { _imageFormat, partitions[i].PartitionStartSector, partitions[i].PartitionStartSector + partitions[i].PartitionSectors, null });
+ Filesystem fs = (Filesystem)_plugin.GetType().GetConstructor(new Type[] { typeof(ImagePlugin), typeof(ulong), typeof(ulong), typeof(System.Text.Encoding) }).Invoke(new object[] { _imageFormat, partitions[i].Start, partitions[i].Start + partitions[i].Length, null });
error = fs.Mount(options.Debug);
if(error == Errno.NoError)
@@ -193,7 +193,7 @@ namespace DiscImageChef.Commands
{
plugins.PluginsList.TryGetValue(id_plugins[0], out _plugin);
DicConsole.WriteLine(string.Format("Identified by {0}.", _plugin.Name));
- Filesystem fs = (Filesystem)_plugin.GetType().GetConstructor(new Type[] { typeof(ImagePlugin), typeof(ulong), typeof(ulong), typeof(System.Text.Encoding) }).Invoke(new object[] { _imageFormat, partitions[i].PartitionStartSector, partitions[i].PartitionStartSector + partitions[i].PartitionSectors, null });
+ Filesystem fs = (Filesystem)_plugin.GetType().GetConstructor(new Type[] { typeof(ImagePlugin), typeof(ulong), typeof(ulong), typeof(System.Text.Encoding) }).Invoke(new object[] { _imageFormat, partitions[i].Start, partitions[i].Start + partitions[i].Length, null });
error = fs.Mount(options.Debug);
if(error == Errno.NoError)
{
@@ -217,9 +217,9 @@ namespace DiscImageChef.Commands
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = _imageFormat.GetSectors(),
- PartitionLength = _imageFormat.GetSectors() * _imageFormat.GetSectorSize()
+ Name = "Whole device",
+ Length = _imageFormat.GetSectors(),
+ Size = _imageFormat.GetSectors() * _imageFormat.GetSectorSize()
};
Core.Filesystems.Identify(_imageFormat, out id_plugins, wholePart);
diff --git a/DiscImageChef/Commands/Ls.cs b/DiscImageChef/Commands/Ls.cs
index 4caf9653..99f652c9 100644
--- a/DiscImageChef/Commands/Ls.cs
+++ b/DiscImageChef/Commands/Ls.cs
@@ -140,7 +140,7 @@ namespace DiscImageChef.Commands
for(int i = 0; i < partitions.Count; i++)
{
DicConsole.WriteLine();
- DicConsole.WriteLine("Partition {0}:", partitions[i].PartitionSequence);
+ DicConsole.WriteLine("Partition {0}:", partitions[i].Sequence);
DicConsole.WriteLine("Identifying filesystem on partition");
@@ -156,7 +156,7 @@ namespace DiscImageChef.Commands
if(plugins.PluginsList.TryGetValue(plugin_name, out _plugin))
{
DicConsole.WriteLine(string.Format("As identified by {0}.", _plugin.Name));
- Filesystem fs = (Filesystem)_plugin.GetType().GetConstructor(new Type[] { typeof(ImagePlugin), typeof(ulong), typeof(ulong), typeof(System.Text.Encoding) }).Invoke(new object[] { _imageFormat, partitions[i].PartitionStartSector, partitions[i].PartitionStartSector + partitions[i].PartitionSectors, null });
+ Filesystem fs = (Filesystem)_plugin.GetType().GetConstructor(new Type[] { typeof(ImagePlugin), typeof(ulong), typeof(ulong), typeof(System.Text.Encoding) }).Invoke(new object[] { _imageFormat, partitions[i].Start, partitions[i].Start + partitions[i].Length, null });
error = fs.Mount(options.Debug);
if(error == Errno.NoError)
@@ -182,7 +182,7 @@ namespace DiscImageChef.Commands
{
plugins.PluginsList.TryGetValue(id_plugins[0], out _plugin);
DicConsole.WriteLine(string.Format("Identified by {0}.", _plugin.Name));
- Filesystem fs = (Filesystem)_plugin.GetType().GetConstructor(new Type[] { typeof(ImagePlugin), typeof(ulong), typeof(ulong), typeof(System.Text.Encoding) }).Invoke(new object[] { _imageFormat, partitions[i].PartitionStartSector, partitions[i].PartitionStartSector + partitions[i].PartitionSectors, null });
+ Filesystem fs = (Filesystem)_plugin.GetType().GetConstructor(new Type[] { typeof(ImagePlugin), typeof(ulong), typeof(ulong), typeof(System.Text.Encoding) }).Invoke(new object[] { _imageFormat, partitions[i].Start, partitions[i].Start + partitions[i].Length, null });
error = fs.Mount(options.Debug);
if(error == Errno.NoError)
{
@@ -206,9 +206,9 @@ namespace DiscImageChef.Commands
Partition wholePart = new Partition
{
- PartitionName = "Whole device",
- PartitionSectors = _imageFormat.GetSectors(),
- PartitionLength = _imageFormat.GetSectors() * _imageFormat.GetSectorSize()
+ Name = "Whole device",
+ Length = _imageFormat.GetSectors(),
+ Size = _imageFormat.GetSectors() * _imageFormat.GetSectorSize()
};
Core.Filesystems.Identify(_imageFormat, out id_plugins, wholePart);