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

Handle empty cylinders in the middle of a disk for Speccy's FDI.

Browse Source
This commit is contained in:
Natalia Portillo
2017-09-16 21:30:13 +01:00
parent efdd7d9be6
commit 0cede92f62
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
DiscImageChef.DiscImages/UkvFdi.cs
View File

@@ -179,8 +179,6 @@ namespace DiscImageChef.ImagePlugins
sectorsOff[cyl] = new uint[hdr.heads][]; sectorsOff[cyl] = new uint[hdr.heads][];
sectorsData[cyl] = new byte[hdr.heads][][]; sectorsData[cyl] = new byte[hdr.heads][][];
bool emptyCyl = false;
for(ushort head = 0; head < hdr.heads; head++) for(ushort head = 0; head < hdr.heads; head++)
{ {
byte[] sct_b = new byte[4]; byte[] sct_b = new byte[4];
@@ -200,8 +198,6 @@ namespace DiscImageChef.ImagePlugins
if(sectors < spt && sectors > 0) if(sectors < spt && sectors > 0)
spt = sectors; spt = sectors;
emptyCyl |= sectors == 0;
for(ushort sec = 0; sec < sectors; sec++) for(ushort sec = 0; sec < sectors; sec++)
{ {
byte c = (byte)stream.ReadByte(); byte c = (byte)stream.ReadByte();
@@ -228,15 +224,13 @@ namespace DiscImageChef.ImagePlugins
ImageInfo.sectorSize = (uint)(128 << n); ImageInfo.sectorSize = (uint)(128 << n);
} }
} }
// TODO: What happens if there is an empty cylinder in the middle?
if(emptyCyl)
ImageInfo.cylinders--;
} }
// Read sectors // Read sectors
for(ushort cyl = 0; cyl < hdr.cylinders; cyl++) for(ushort cyl = 0; cyl < hdr.cylinders; cyl++)
{ {
bool emptyCyl = false;
for(ushort head = 0; head < hdr.heads; head++) for(ushort head = 0; head < hdr.heads; head++)
{ {
for(ushort sec = 0; sec < sectorsOff[cyl][head].Length; sec++) for(ushort sec = 0; sec < sectorsOff[cyl][head].Length; sec++)
@@ -244,7 +238,28 @@ namespace DiscImageChef.ImagePlugins
stream.Seek(sectorsOff[cyl][head][sec], SeekOrigin.Begin); stream.Seek(sectorsOff[cyl][head][sec], SeekOrigin.Begin);
stream.Read(sectorsData[cyl][head][sec], 0, sectorsData[cyl][head][sec].Length); stream.Read(sectorsData[cyl][head][sec], 0, sectorsData[cyl][head][sec].Length);
} }
// For empty cylinders
if(sectorsOff[cyl][head].Length == 0)
{
// Last cylinder
if(cyl + 1 == hdr.cylinders ||
// Next cylinder is also empty
sectorsOff[cyl + 1][head].Length == 0
)
emptyCyl = true;
// Create empty sectors
else
{
sectorsData[cyl][head] = new byte[spt][];
for(int i = 0; i < spt; i++)
sectorsData[cyl][head][i] = new byte[ImageInfo.sectorSize];
}
}
} }
if(emptyCyl)
ImageInfo.cylinders--;
} }
// TODO: What about double sided, half track pitch compact floppies? // TODO: What about double sided, half track pitch compact floppies?