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: Reformat code.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-19 20:33:03 +00:00
parent 77edc7c91c
commit e6f6ace80b
704 changed files with 82627 additions and 83641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
DiscImageChef.Decoders/Floppy/Amiga.cs
View File

@@ -44,13 +44,11 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Set to 0x00
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)] public byte[] zero;
/// <summary>
/// Set to 0xA1
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
public byte[] sync;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)] public byte[] sync;
/// <summary>
/// Set to 0xFF
/// </summary>
@@ -70,8 +68,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// OS dependent tag
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
public byte[] label;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)] public byte[] label;
/// <summary>
/// Checksum from <see cref="amiga"/> to <see cref="label"/>
/// </summary>
@@ -80,9 +77,7 @@ namespace DiscImageChef.Decoders.Floppy
/// Checksum from <see cref="data"/>
/// </summary>
public uint dataChecksum;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
public byte[] data;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)] public byte[] data;
}
}
}
}

133
DiscImageChef.Decoders/Floppy/Apple2.cs
View File

@@ -86,41 +86,35 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Always 0xD5, 0xAA, 0x96
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] prologue;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] prologue;
/// <summary>
/// Volume number encoded as:
/// volume[0] = (decodedVolume >> 1) | 0xAA
/// volume[1] = decodedVolume | 0xAA
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
public byte[] volume;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)] public byte[] volume;
/// <summary>
/// Track number encoded as:
/// track[0] = (decodedTrack >> 1) | 0xAA
/// track[1] = decodedTrack | 0xAA
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
public byte[] track;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)] public byte[] track;
/// <summary>
/// Sector number encoded as:
/// sector[0] = (decodedSector >> 1) | 0xAA
/// sector[1] = decodedSector | 0xAA
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
public byte[] sector;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)] public byte[] sector;
/// <summary>
/// decodedChecksum = decodedVolume ^ decodedTrack ^ decodedSector
/// checksum[0] = (decodedChecksum >> 1) | 0xAA
/// checksum[1] = decodedChecksum | 0xAA
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
public byte[] checksum;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)] public byte[] checksum;
/// <summary>
/// Always 0xDE, 0xAA, 0xEB
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] epilogue;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] epilogue;
}
/// <summary>
@@ -131,8 +125,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Always 0xD5, 0xAA, 0xAD
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] prologue;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] prologue;
/// <summary>
/// Encoded data bytes.
/// 410 bytes for 5to3 (aka DOS 3.2) format
@@ -143,8 +136,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Always 0xDE, 0xAA, 0xEB
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] epilogue;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] epilogue;
}
static readonly byte[] ReadTable5and3 =
@@ -225,8 +217,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <param name="data">5and3 encoded data.</param>
public static byte[] Decode5and3(byte[] data)
{
if(data == null || data.Length != 410)
return null;
if(data == null || data.Length != 410) return null;
byte[] buffer = new byte[data.Length];
byte carry = 0;
@@ -250,6 +241,7 @@ namespace DiscImageChef.Decoders.Floppy
output[253 - 5 * i] = (byte)(((buffer[i + 51 * 6 + 1] << 3) | b4) & 0xFF);
output[254 - 5 * i] = (byte)(((buffer[i + 51 * 7 + 1] << 3) | b5) & 0xFF);
}
output[255] = (byte)(((buffer[409] << 3) | (buffer[0] & 0x7)) & 0xFF);
return output;
@@ -261,8 +253,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <param name="data">6and2 encoded data.</param>
public static byte[] Decode6and2(byte[] data)
{
if(data == null || data.Length != 342)
return null;
if(data == null || data.Length != 342) return null;
byte[] buffer = new byte[data.Length];
byte carry = 0;
@@ -299,15 +290,12 @@ namespace DiscImageChef.Decoders.Floppy
public static byte[] DecodeSector(RawSector sector)
{
if(sector.addressField.prologue[0] == 0xD5 &&
sector.addressField.prologue[1] == 0xAA)
if(sector.addressField.prologue[0] == 0xD5 && sector.addressField.prologue[1] == 0xAA)
{
// Pre DOS 3.3
if(sector.addressField.prologue[2] == 0xB5)
return Decode5and3(sector.dataField.data);
if(sector.addressField.prologue[2] == 0xB5) return Decode5and3(sector.dataField.data);
// DOS 3.3
if(sector.addressField.prologue[2] == 0x96)
return Decode6and2(sector.dataField.data);
if(sector.addressField.prologue[2] == 0x96) return Decode6and2(sector.dataField.data);
// Unknown
return null;
}
@@ -327,8 +315,7 @@ namespace DiscImageChef.Decoders.Floppy
endOffset = offset;
// Not an Apple ][ GCR sector
if(data == null || data.Length < 363)
return null;
if(data == null || data.Length < 363) return null;
RawSector sector;
int position = offset;
@@ -346,8 +333,7 @@ namespace DiscImageChef.Decoders.Floppy
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Prologue found at {0}", position);
// Epilogue not in correct position
if(data[position + 11] != 0xDE || data[position + 12] != 0xAA)
return null;
if(data[position + 11] != 0xDE || data[position + 12] != 0xAA) return null;
sector = new RawSector();
sector.addressField = new RawAddressField();
@@ -372,11 +358,21 @@ namespace DiscImageChef.Decoders.Floppy
sector.addressField.epilogue[1] = data[position + 12];
sector.addressField.epilogue[2] = data[position + 13];
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Volume {0}", (((sector.addressField.volume[0] & 0x55) << 1) | (sector.addressField.volume[1] & 0x55)) & 0xFF);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Track {0}", (((sector.addressField.track[0] & 0x55) << 1) | (sector.addressField.track[1] & 0x55)) & 0xFF);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Sector {0}", (((sector.addressField.sector[0] & 0x55) << 1) | (sector.addressField.sector[1] & 0x55)) & 0xFF);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Checksum {0}", (((sector.addressField.checksum[0] & 0x55) << 1) | (sector.addressField.checksum[1] & 0x55)) & 0xFF);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Epilogue {0:X2}{1:X2}{2:X2}", sector.addressField.epilogue[0], sector.addressField.epilogue[1], sector.addressField.epilogue[2]);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Volume {0}",
(((sector.addressField.volume[0] & 0x55) << 1) |
(sector.addressField.volume[1] & 0x55)) & 0xFF);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Track {0}",
(((sector.addressField.track[0] & 0x55) << 1) |
(sector.addressField.track[1] & 0x55)) & 0xFF);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Sector {0}",
(((sector.addressField.sector[0] & 0x55) << 1) |
(sector.addressField.sector[1] & 0x55)) & 0xFF);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Checksum {0}",
(((sector.addressField.checksum[0] & 0x55) << 1) |
(sector.addressField.checksum[1] & 0x55)) & 0xFF);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Epilogue {0:X2}{1:X2}{2:X2}",
sector.addressField.epilogue[0], sector.addressField.epilogue[1],
sector.addressField.epilogue[2]);
position += 14;
syncCount = 0;
@@ -392,17 +388,16 @@ namespace DiscImageChef.Decoders.Floppy
}
// Lost sync
if(!onSync)
return null;
if(!onSync) return null;
// Prologue not found
if(data[position] != 0xD5 || data[position + 1] != 0xAA)
return null;
if(data[position] != 0xD5 || data[position + 1] != 0xAA) return null;
sector.innerGap = gaps.ToArray();
sector.dataField = new RawDataField();
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Inner gap has {0} bytes", sector.innerGap.Length);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Inner gap has {0} bytes",
sector.innerGap.Length);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Prologue found at {0}", position);
sector.dataField.prologue = new byte[3];
sector.dataField.prologue[0] = data[position];
@@ -418,12 +413,12 @@ namespace DiscImageChef.Decoders.Floppy
position++;
// No space left for epilogue
if(position + 4 > data.Length)
return null;
if(position + 4 > data.Length) return null;
}
sector.dataField.data = gaps.ToArray();
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Data has {0} bytes", sector.dataField.data.Length);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Data has {0} bytes",
sector.dataField.data.Length);
sector.dataField.checksum = data[position];
sector.dataField.epilogue = new byte[3];
sector.dataField.epilogue[0] = data[position + 1];
@@ -454,25 +449,19 @@ namespace DiscImageChef.Decoders.Floppy
return sector;
}
if(data[position] == 0xFF)
position++;
if(data[position] == 0xFF) position++;
// Found data that is not sync or a prologue
else
return null;
else return null;
}
}
catch(IndexOutOfRangeException)
{
return null;
}
catch(IndexOutOfRangeException) { return null; }
return null;
}
public static byte[] MarshalAddressField(RawAddressField addressField)
{
if(addressField == null)
return null;
if(addressField == null) return null;
MemoryStream raw = new MemoryStream();
raw.Write(addressField.prologue, 0, addressField.prologue.Length);
@@ -487,8 +476,7 @@ namespace DiscImageChef.Decoders.Floppy
public static byte[] MarshalSector(RawSector sector)
{
if(sector == null)
return null;
if(sector == null) return null;
MemoryStream raw = new MemoryStream();
raw.Write(sector.addressField.prologue, 0, sector.addressField.prologue.Length);
@@ -532,18 +520,15 @@ namespace DiscImageChef.Decoders.Floppy
onSync = count >= 5;
}
if(position >= data.Length)
return null;
if(position >= data.Length) return null;
if(!onSync)
return null;
if(!onSync) return null;
while(position < data.Length)
{
int oldPosition = position;
RawSector sector = MarshalSector(data, out position, position);
if(sector == null)
break;
if(sector == null) break;
if(firstSector)
{
@@ -552,19 +537,21 @@ namespace DiscImageChef.Decoders.Floppy
firstSector = false;
}
if(sector.addressField.track[0] != trackNumber[0] ||
sector.addressField.track[1] != trackNumber[1])
if(sector.addressField.track[0] != trackNumber[0] || sector.addressField.track[1] != trackNumber[1])
{
position = oldPosition;
break;
}
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Adding sector {0} of track {1}", (((sector.addressField.sector[0] & 0x55) << 1) | (sector.addressField.sector[1] & 0x55)) & 0xFF, (((sector.addressField.track[0] & 0x55) << 1) | (sector.addressField.track[1] & 0x55)) & 0xFF);
DicConsole.DebugWriteLine("Apple ][ GCR Decoder", "Adding sector {0} of track {1}",
(((sector.addressField.sector[0] & 0x55) << 1) |
(sector.addressField.sector[1] & 0x55)) & 0xFF,
(((sector.addressField.track[0] & 0x55) << 1) |
(sector.addressField.track[1] & 0x55)) & 0xFF);
sectors.Add(sector);
}
if(sectors.Count == 0)
return null;
if(sectors.Count == 0) return null;
RawTrack track = new RawTrack();
track.gap = gaps.ToArray();
@@ -575,8 +562,7 @@ namespace DiscImageChef.Decoders.Floppy
public static byte[] MarshalTrack(RawTrack track)
{
if(track == null)
return null;
if(track == null) return null;
MemoryStream raw = new MemoryStream();
raw.Write(track.gap, 0, track.gap.Length);
@@ -585,6 +571,7 @@ namespace DiscImageChef.Decoders.Floppy
byte[] rawSector = MarshalSector(sector);
raw.Write(rawSector, 0, rawSector.Length);
}
return raw.ToArray();
}
@@ -607,8 +594,7 @@ namespace DiscImageChef.Decoders.Floppy
track = MarshalTrack(data, out position, position);
}
if(tracks.Count == 0)
return null;
if(tracks.Count == 0) return null;
endOffset = position;
return tracks;
@@ -621,8 +607,7 @@ namespace DiscImageChef.Decoders.Floppy
public static byte[] MarshalDisk(RawTrack[] disk)
{
if(disk == null)
return null;
if(disk == null) return null;
MemoryStream raw = new MemoryStream();
foreach(RawTrack track in disk)
@@ -630,6 +615,7 @@ namespace DiscImageChef.Decoders.Floppy
byte[] rawTrack = MarshalTrack(track);
raw.Write(rawTrack, 0, rawTrack.Length);
}
return raw.ToArray();
}
@@ -641,5 +627,4 @@ namespace DiscImageChef.Decoders.Floppy
return sector != null && position != 0;
}
}
}
}

88
DiscImageChef.Decoders/Floppy/AppleSony.cs
View File

@@ -88,8 +88,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Always 0xD5, 0xAA, 0x96
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] prologue;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] prologue;
/// <summary>
/// Encoded (decodedTrack &amp; 0x3F)
/// </summary>
@@ -113,8 +112,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Always 0xDE, 0xAA
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
public byte[] epilogue;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)] public byte[] epilogue;
}
/// <summary>
@@ -125,8 +123,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Always 0xD5, 0xAA, 0xAD
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] prologue;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] prologue;
/// <summary>
/// Spare, usually <see cref="RawAddressField.sector"/>
/// </summary>
@@ -134,24 +131,20 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Encoded data bytes.
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 698)]
public byte[] data;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 698)] public byte[] data;
/// <summary>
/// Checksum
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
public byte[] checksum;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)] public byte[] checksum;
/// <summary>
/// Always 0xDE, 0xAA
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
public byte[] epilogue;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)] public byte[] epilogue;
}
public static byte[] DecodeSector(RawSector sector)
{
if(sector.addressField.prologue[0] == 0xD5 &&
sector.addressField.prologue[1] == 0xAA &&
if(sector.addressField.prologue[0] == 0xD5 && sector.addressField.prologue[1] == 0xAA &&
sector.addressField.prologue[2] == 0x96)
{
uint ck1, ck2, ck3;
@@ -185,8 +178,7 @@ namespace DiscImageChef.Decoders.Floppy
while(true)
{
ck1 = (ck1 & 0xFF) << 1;
if((ck1 & 0x0100) > 0)
ck1++;
if((ck1 & 0x0100) > 0) ck1++;
carry = (byte)((bf1[j] ^ ck1) & 0xFF);
ck3 += carry;
@@ -199,18 +191,18 @@ namespace DiscImageChef.Decoders.Floppy
carry = (byte)((bf2[j] ^ ck3) & 0xFF);
ck2 += carry;
if (ck3 > 0xFF)
if(ck3 > 0xFF)
{
ck2++;
ck3 &= 0xFF;
}
ms.WriteByte(carry);
if (ms.Length == 524) break;
if(ms.Length == 524) break;
carry = (byte)((bf3[j] ^ ck2) & 0xFF);
ck1 += carry;
if (ck2 > 0xFF)
if(ck2 > 0xFF)
{
ck1++;
ck2 &= 0xFF;
@@ -237,8 +229,7 @@ namespace DiscImageChef.Decoders.Floppy
endOffset = offset;
// Not an Apple ][ GCR sector
if(data == null || data.Length < 363)
return null;
if(data == null || data.Length < 363) return null;
RawSector sector;
int position = offset;
@@ -254,8 +245,7 @@ namespace DiscImageChef.Decoders.Floppy
if(data[position] == 0xD5 && data[position + 1] == 0xAA && data[position + 2] == 0x96)
{
// Epilogue not in correct position
if(data[position + 8] != 0xDE || data[position + 9] != 0xAA)
return null;
if(data[position + 8] != 0xDE || data[position + 9] != 0xAA) return null;
sector = new RawSector();
sector.addressField = new RawAddressField();
@@ -286,8 +276,7 @@ namespace DiscImageChef.Decoders.Floppy
}
// Lost sync
if(!onSync)
return null;
if(!onSync) return null;
// Prologue not found
if(data[position] != 0xDE || data[position + 1] != 0xAA || data[position + 2] != 0xAD)
@@ -310,8 +299,7 @@ namespace DiscImageChef.Decoders.Floppy
position++;
// No space left for epilogue
if(position + 7 > data.Length)
return null;
if(position + 7 > data.Length) return null;
}
sector.dataField.data = gaps.ToArray();
@@ -346,25 +334,19 @@ namespace DiscImageChef.Decoders.Floppy
return sector;
}
if(data[position] == 0xFF)
position++;
if(data[position] == 0xFF) position++;
// Found data that is not sync or a prologue
else
return null;
else return null;
}
}
catch(IndexOutOfRangeException)
{
return null;
}
catch(IndexOutOfRangeException) { return null; }
return null;
}
public static byte[] MarshalAddressField(RawAddressField addressField)
{
if(addressField == null)
return null;
if(addressField == null) return null;
MemoryStream raw = new MemoryStream();
raw.Write(addressField.prologue, 0, addressField.prologue.Length);
@@ -379,8 +361,7 @@ namespace DiscImageChef.Decoders.Floppy
public static byte[] MarshalSector(RawSector sector)
{
if(sector == null)
return null;
if(sector == null) return null;
MemoryStream raw = new MemoryStream();
raw.Write(sector.addressField.prologue, 0, sector.addressField.prologue.Length);
@@ -426,18 +407,15 @@ namespace DiscImageChef.Decoders.Floppy
onSync = count >= 5;
}
if(position >= data.Length)
return null;
if(position >= data.Length) return null;
if(!onSync)
return null;
if(!onSync) return null;
while(position < data.Length)
{
int oldPosition = position;
RawSector sector = MarshalSector(data, out position, position);
if(sector == null)
break;
if(sector == null) break;
if(firstSector)
{
@@ -446,8 +424,7 @@ namespace DiscImageChef.Decoders.Floppy
firstSector = false;
}
if(sector.addressField.track != trackNumber ||
sector.addressField.side != sideNumber)
if(sector.addressField.track != trackNumber || sector.addressField.side != sideNumber)
{
position = oldPosition;
break;
@@ -456,8 +433,7 @@ namespace DiscImageChef.Decoders.Floppy
sectors.Add(sector);
}
if(sectors.Count == 0)
return null;
if(sectors.Count == 0) return null;
RawTrack track = new RawTrack();
track.gap = gaps.ToArray();
@@ -468,8 +444,7 @@ namespace DiscImageChef.Decoders.Floppy
public static byte[] MarshalTrack(RawTrack track)
{
if(track == null)
return null;
if(track == null) return null;
MemoryStream raw = new MemoryStream();
raw.Write(track.gap, 0, track.gap.Length);
@@ -478,6 +453,7 @@ namespace DiscImageChef.Decoders.Floppy
byte[] rawSector = MarshalSector(sector);
raw.Write(rawSector, 0, rawSector.Length);
}
return raw.ToArray();
}
@@ -500,8 +476,7 @@ namespace DiscImageChef.Decoders.Floppy
track = MarshalTrack(data, out position, position);
}
if(tracks.Count == 0)
return null;
if(tracks.Count == 0) return null;
endOffset = position;
return tracks;
@@ -514,8 +489,7 @@ namespace DiscImageChef.Decoders.Floppy
public static byte[] MarshalDisk(RawTrack[] disk)
{
if(disk == null)
return null;
if(disk == null) return null;
MemoryStream raw = new MemoryStream();
foreach(RawTrack track in disk)
@@ -523,6 +497,7 @@ namespace DiscImageChef.Decoders.Floppy
byte[] rawTrack = MarshalTrack(track);
raw.Write(rawTrack, 0, rawTrack.Length);
}
return raw.ToArray();
}
@@ -534,5 +509,4 @@ namespace DiscImageChef.Decoders.Floppy
return sector != null && position != 0;
}
}
}
}

6
DiscImageChef.Decoders/Floppy/Commodore.cs
View File

@@ -82,8 +82,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// User data
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)]
public byte data;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)] public byte data;
/// <summary>
/// XOR of <see cref="data"/>
/// </summary>
@@ -94,5 +93,4 @@ namespace DiscImageChef.Decoders.Floppy
public ushort fill;
}
}
}
}

3
DiscImageChef.Decoders/Floppy/Enums.cs
View File

@@ -98,5 +98,4 @@ namespace DiscImageChef.Decoders.Floppy
/// </summary>
MacDoubleSide = 0xD9
}
}
}

21
DiscImageChef.Decoders/Floppy/ISO.cs
View File

@@ -57,8 +57,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Start of track, 32 bytes set to 0x4E
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
public byte[] innerGap;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)] public byte[] innerGap;
/// <summary>
/// Track sectors
/// </summary>
@@ -81,8 +80,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 22 bytes set to 0x4E, set to 0x22 on Commodore 1581
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)]
public byte[] innerGap;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)] public byte[] innerGap;
/// <summary>
/// Sector data block
/// </summary>
@@ -101,13 +99,11 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 12 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)] public byte[] zero;
/// <summary>
/// 3 bytes set to 0xA1
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] aone;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] aone;
/// <summary>
/// Set to <see cref="IBMIdType.AddressMark"/>
/// </summary>
@@ -142,13 +138,11 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 12 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)] public byte[] zero;
/// <summary>
/// 3 bytes set to 0xA1
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] aone;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] aone;
/// <summary>
/// Set to <see cref="IBMIdType.DataMark"/> or to <see cref="IBMIdType.DeletedDataMark"/>
/// </summary>
@@ -163,5 +157,4 @@ namespace DiscImageChef.Decoders.Floppy
public ushort crc;
}
}
}
}

30
DiscImageChef.Decoders/Floppy/Perpendicular.cs
View File

@@ -80,8 +80,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 41 bytes set to 0x4E
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 41)]
public byte[] innerGap;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 41)] public byte[] innerGap;
/// <summary>
/// Sector data block
/// </summary>
@@ -101,18 +100,15 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Gap from index pulse, 80 bytes set to 0x4E
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 80)]
public byte[] gap;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 80)] public byte[] gap;
/// <summary>
/// 12 bytes set to 0x00
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)] public byte[] zero;
/// <summary>
/// 3 bytes set to 0xC2
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] ctwo;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] ctwo;
/// <summary>
/// Set to <see cref="IBMIdType.IndexMark"/>
/// </summary>
@@ -120,8 +116,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Gap until first sector, 50 bytes to 0x4E
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 50)]
public byte[] gap1;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 50)] public byte[] gap1;
}
/// <summary>
@@ -132,13 +127,11 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 12 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)] public byte[] zero;
/// <summary>
/// 3 bytes set to 0xA1
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] aone;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] aone;
/// <summary>
/// Set to <see cref="IBMIdType.AddressMark"/>
/// </summary>
@@ -173,13 +166,11 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 12 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)] public byte[] zero;
/// <summary>
/// 3 bytes set to 0xA1
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] aone;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] aone;
/// <summary>
/// Set to <see cref="IBMIdType.DataMark"/> or to <see cref="IBMIdType.DeletedDataMark"/>
/// </summary>
@@ -194,5 +185,4 @@ namespace DiscImageChef.Decoders.Floppy
public ushort crc;
}
}
}
}

30
DiscImageChef.Decoders/Floppy/System34.cs
View File

@@ -78,18 +78,15 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Gap from index pulse, 80 bytes set to 0x4E
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 80)]
public byte[] gap;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 80)] public byte[] gap;
/// <summary>
/// 12 bytes set to 0x00
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)] public byte[] zero;
/// <summary>
/// 3 bytes set to 0xC2
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] ctwo;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] ctwo;
/// <summary>
/// Set to <see cref="IBMIdType.IndexMark"/>
/// </summary>
@@ -97,8 +94,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Gap until first sector, 50 bytes to 0x4E
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 50)]
public byte[] gap1;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 50)] public byte[] gap1;
}
/// <summary>
@@ -113,8 +109,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 22 bytes set to 0x4E, set to 0x22 on Commodore 1581
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)]
public byte[] innerGap;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)] public byte[] innerGap;
/// <summary>
/// Sector data block
/// </summary>
@@ -133,13 +128,11 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 12 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)] public byte[] zero;
/// <summary>
/// 3 bytes set to 0xA1
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] aone;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] aone;
/// <summary>
/// Set to <see cref="IBMIdType.AddressMark"/>
/// </summary>
@@ -174,13 +167,11 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 12 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)] public byte[] zero;
/// <summary>
/// 3 bytes set to 0xA1
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] aone;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] aone;
/// <summary>
/// Set to <see cref="IBMIdType.DataMark"/> or to <see cref="IBMIdType.DeletedDataMark"/>
/// </summary>
@@ -195,5 +186,4 @@ namespace DiscImageChef.Decoders.Floppy
public ushort crc;
}
}
}
}

21
DiscImageChef.Decoders/Floppy/System3740.cs
View File

@@ -76,13 +76,11 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Gap from index pulse, 80 bytes set to 0xFF
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 40)]
public byte[] gap;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 40)] public byte[] gap;
/// <summary>
/// 6 bytes set to 0x00
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)] public byte[] zero;
/// <summary>
/// Set to <see cref="IBMIdType.IndexMark"/>
/// </summary>
@@ -90,8 +88,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Gap until first sector, 26 bytes to 0xFF
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 26)]
public byte[] gap1;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 26)] public byte[] gap1;
}
/// <summary>
@@ -106,8 +103,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 11 bytes set to 0xFF
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
public byte[] innerGap;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)] public byte[] innerGap;
/// <summary>
/// Sector data block
/// </summary>
@@ -126,8 +122,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 6 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)] public byte[] zero;
/// <summary>
/// Set to <see cref="IBMIdType.AddressMark"/>
/// </summary>
@@ -162,8 +157,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// 12 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)] public byte[] zero;
/// <summary>
/// Set to <see cref="IBMIdType.DataMark"/> or to <see cref="IBMIdType.DeletedDataMark"/>
/// </summary>
@@ -178,5 +172,4 @@ namespace DiscImageChef.Decoders.Floppy
public ushort crc;
}
}
}
}