aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Final cleanup of DiscImageChef.Partitions.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-24 03:11:33 +00:00
parent 9dda52522c
commit 3f628cd3c9
19 changed files with 1638 additions and 1620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DiscImageChef.Partitions/PC98.cs
View File

@@ -92,8 +92,9 @@ namespace DiscImageChef.Partitions
Partition part = new Partition
{
Start = CHS.ToLBA(entry.dp_scyl, entry.dp_shd, (uint)(entry.dp_ssect + 1),
imagePlugin.ImageInfo.Heads, imagePlugin.ImageInfo.SectorsPerTrack),
Start =
CHS.ToLBA(entry.dp_scyl, entry.dp_shd, (uint)(entry.dp_ssect + 1), imagePlugin.ImageInfo.Heads,
imagePlugin.ImageInfo.SectorsPerTrack),
Type = DecodePC98Sid(entry.dp_sid),
Name = StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)).Trim(),
Sequence = counter,
@@ -101,8 +102,8 @@ namespace DiscImageChef.Partitions
};
part.Offset = part.Start * imagePlugin.GetSectorSize();
part.Length = CHS.ToLBA(entry.dp_ecyl, entry.dp_ehd, (uint)(entry.dp_esect + 1),
imagePlugin.ImageInfo.Heads,
imagePlugin.ImageInfo.SectorsPerTrack) - part.Start;
imagePlugin.ImageInfo.Heads, imagePlugin.ImageInfo.SectorsPerTrack) -
part.Start;
part.Size = part.Length * imagePlugin.GetSectorSize();
DicConsole.DebugWriteLine("PC98 plugin", "part.Start = {0}", part.Start);
@@ -113,9 +114,8 @@ namespace DiscImageChef.Partitions
DicConsole.DebugWriteLine("PC98 plugin", "part.Length = {0}", part.Length);
DicConsole.DebugWriteLine("PC98 plugin", "part.Size = {0}", part.Size);
if(((entry.dp_mid & 0x20) != 0x20 && (entry.dp_mid & 0x44) != 0x44) ||
part.Start >= imagePlugin.ImageInfo.Sectors ||
part.End > imagePlugin.ImageInfo.Sectors) continue;
if((entry.dp_mid & 0x20) != 0x20 && (entry.dp_mid & 0x44) != 0x44 ||
part.Start >= imagePlugin.ImageInfo.Sectors || part.End > imagePlugin.ImageInfo.Sectors) continue;
partitions.Add(part);
counter++;
@@ -154,11 +154,11 @@ namespace DiscImageChef.Partitions
struct PC98Partition
{
/// <summary>
/// Some ID, if 0x80 bit is set, it is bootable
/// Some ID, if 0x80 bit is set, it is bootable
/// </summary>
public byte dp_mid;
/// <summary>
/// Some ID, if 0x80 bit is set, it is active
/// Some ID, if 0x80 bit is set, it is active
/// </summary>
public byte dp_sid;
public byte dp_dum1;