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

Rename fields, methods and structs to more adequate names.

Browse Source
This commit is contained in:
Natalia Portillo
2015-10-19 02:13:54 +01:00
parent aab90287f9
commit 38a48777e7
10 changed files with 262 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DiscImageChef.Decoders/ChangeLog
View File

@@ -1,3 +1,16 @@
2015-10-19 Natalia Portillo <claunia@claunia.com>
* Floppy/ISO.cs:
* Floppy/Amiga.cs:
* Floppy/Enums.cs:
* Floppy/Apple2.cs:
* Floppy/System34.cs:
* Floppy/Commodore.cs:
* Floppy/AppleSony.cs:
* Floppy/System3740.cs:
* Floppy/Perpendicular.cs:
Rename fields, methods and structs to more adequate names.
2015-10-19 Natalia Portillo <claunia@claunia.com>
* Floppy/ISO.cs:

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

@@ -36,6 +36,7 @@
// ****************************************************************************/
// //$Id$
using System;
using System.Runtime.InteropServices;
namespace DiscImageChef.Decoders.Floppy
{
@@ -44,7 +45,7 @@ namespace DiscImageChef.Decoders.Floppy
/// </summary>
public static class Amiga
{
public struct CommodoreAmigaSector
public struct Sector
{
/// <summary>
/// Set to 0x00

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

@@ -36,6 +36,7 @@
// ****************************************************************************/
// //$Id$
using System;
using System.Runtime.InteropServices;
namespace DiscImageChef.Decoders.Floppy
{
@@ -47,24 +48,24 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// GCR-encoded Apple ][ GCR floppy track
/// </summary>
public struct AppleOldGCRRawSectorRawTrack
public struct RawTrack
{
/// <summary>
/// Track preamble, set to self-sync 0xFF, between 40 and 95 bytes
/// </summary>
public byte[] gap;
public AppleOldGCRRawSector[] sectors;
public RawSector[] sectors;
}
/// <summary>
/// GCR-encoded Apple ][ GCR floppy sector
/// </summary>
public struct AppleOldGCRRawSector
public struct RawSector
{
/// <summary>
/// Address field
/// </summary>
public AppleOldGCRRawAddressField addressField;
public RawDataField addressField;
/// <summary>
/// Track preamble, set to self-sync 0xFF, between 5 and 10 bytes
/// </summary>
@@ -72,7 +73,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Data field
/// </summary>
public AppleOldGCRRawDataField dataField;
public RawDataField dataField;
/// <summary>
/// Track preamble, set to self-sync 0xFF, between 14 and 24 bytes
/// </summary>
@@ -82,7 +83,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// GCR-encoded Apple ][ GCR floppy sector address field
/// </summary>
public struct AppleOldGCRRawAddressField
public struct RawAddressField
{
/// <summary>
/// Always 0xD5, 0xAA, 0x96
@@ -127,7 +128,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// GCR-encoded Apple ][ GCR floppy sector data field
/// </summary>
public struct AppleOldGCRRawDataField
public struct RawDataField
{
/// <summary>
/// Always 0xD5, 0xAA, 0xAD

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

@@ -36,6 +36,7 @@
// ****************************************************************************/
// //$Id$
using System;
using System.Runtime.InteropServices;
namespace DiscImageChef.Decoders.Floppy
{
@@ -50,24 +51,24 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// GCR-encoded Apple Sony GCR floppy track
/// </summary>
public struct AppleSonyGCRRawSectorRawTrack
public struct RawTrack
{
/// <summary>
/// Track preamble, set to self-sync 0xFF, 36 bytes
/// </summary>
public byte[] gap;
public AppleSonyGCRRawSector[] sectors;
public RawSector[] sectors;
}
/// <summary>
/// GCR-encoded Apple Sony GCR floppy sector
/// </summary>
public struct AppleSonyGCRRawSector
public struct RawSector
{
/// <summary>
/// Address field
/// </summary>
public AppleSonyGCRRawAddressField addressField;
public RawAddressField addressField;
/// <summary>
/// Track preamble, set to self-sync 0xFF, 6 bytes
/// </summary>
@@ -75,7 +76,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Data field
/// </summary>
public AppleSonyGCRRawDataField dataField;
public RawDataField dataField;
/// <summary>
/// Track preamble, set to self-sync 0xFF, unknown size
/// </summary>
@@ -85,7 +86,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// GCR-encoded Apple Sony GCR floppy sector address field
/// </summary>
public struct AppleSonyGCRRawAddressField
public struct RawAddressField
{
/// <summary>
/// Always 0xD5, 0xAA, 0x96
@@ -122,7 +123,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// GCR-encoded Apple ][ GCR floppy sector data field
/// </summary>
public struct AppleSonyGCRRawDataField
public struct RawDataField
{
/// <summary>
/// Always 0xD5, 0xAA, 0xAD
@@ -130,7 +131,7 @@ namespace DiscImageChef.Decoders.Floppy
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] prologue;
/// <summary>
/// Spare, usually <see cref="AppleSonyGCRRawAddressField.sector"/>
/// Spare, usually <see cref="RawAddressField.sector"/>
/// </summary>
public byte spare;
/// <summary>

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

@@ -36,6 +36,7 @@
// ****************************************************************************/
// //$Id$
using System;
using System.Runtime.InteropServices;
namespace DiscImageChef.Decoders.Floppy
{
@@ -47,7 +48,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Decoded Commodore GCR sector header
/// </summary>
public struct CommodoreSectorHeader
public struct SectorHeader
{
/// <summary>
/// Always 0x08
@@ -78,7 +79,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Decoded Commodore GCR sector data
/// </summary>
public struct CommodoreSectorData
public struct SectorData
{
/// <summary>
/// Always 0x07

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

@@ -39,8 +39,6 @@ using System;
namespace DiscImageChef.Decoders.Floppy
{
#region Public enumerations
/// <summary>
/// In-sector code for sector size
/// </summary>
@@ -107,7 +105,5 @@ namespace DiscImageChef.Decoders.Floppy
/// </summary>
MacDoubleSide = 0xD9
}
#endregion Public enumerations
}

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

@@ -37,6 +37,7 @@
// ****************************************************************************/
// //$Id$
using System;
using System.Runtime.InteropServices;
namespace DiscImageChef.Decoders.Floppy
{
@@ -58,7 +59,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// ISO floppy track, also used by Atari ST and others
/// </summary>
public struct ISOFloppyTrack
public struct Track
{
/// <summary>
/// Start of track, 32 bytes set to 0x4E
@@ -68,12 +69,106 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Track sectors
/// </summary>
public IBMMFMSector[] sectors;
public Sector[] sectors;
/// <summary>
/// Undefined size
/// </summary>
public byte[] gap;
}
/// <summary>
/// Raw demodulated format for IBM System 34 floppies
/// </summary>
public struct Sector
{
/// <summary>
/// Sector address mark
/// </summary>
public AddressMark addressMark;
/// <summary>
/// 22 bytes set to 0x4E, set to 0x22 on Commodore 1581
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)]
public byte[] innerGap;
/// <summary>
/// Sector data block
/// </summary>
public DataBlock dataBlock;
/// <summary>
/// Variable bytes set to 0x4E, ECMA defines 54
/// </summary>
public byte[] outerGap;
}
/// <summary>
/// Sector address mark for IBM System 34 floppies, contains sync word
/// </summary>
public struct AddressMark
{
/// <summary>
/// 12 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
/// <summary>
/// 3 bytes set to 0xA1
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] aone;
/// <summary>
/// Set to <see cref="IBMIdType.AddressMark"/>
/// </summary>
public IBMIdType type;
/// <summary>
/// Track number
/// </summary>
public byte track;
/// <summary>
/// Side number
/// </summary>
public byte side;
/// <summary>
/// Sector number
/// </summary>
public byte sector;
/// <summary>
/// <see cref="IBMSectorSizeCode"/>
/// </summary>
public IBMSectorSizeCode sectorSize;
/// <summary>
/// CRC16 from <see cref="AddressMark.aone"/> to end of <see cref="sectorSize"/>
/// </summary>
public UInt16 crc;
}
/// <summary>
/// Sector data block for IBM System 34 floppies
/// </summary>
public struct DataBlock
{
/// <summary>
/// 12 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
/// <summary>
/// 3 bytes set to 0xA1
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] aone;
/// <summary>
/// Set to <see cref="IBMIdType.DataMark"/> or to <see cref="IBMIdType.DeletedDataMark"/>
/// </summary>
public IBMIdType type;
/// <summary>
/// User data
/// </summary>
public byte[] data;
/// <summary>
/// CRC16 from <see cref="aone"/> to end of <see cref="data"/>
/// </summary>
public UInt16 crc;
}
}
}

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

@@ -36,6 +36,7 @@
// ****************************************************************************/
// //$Id$
using System;
using System.Runtime.InteropServices;
namespace DiscImageChef.Decoders.Floppy
{
@@ -57,16 +58,16 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Perpendicular floppy track
/// </summary>
public struct PerpendicularFloppyTrack
public struct Track
{
/// <summary>
/// Start of track
/// </summary>
public IBMMFMTrackPreamble trackStart;
public TrackPreamble trackStart;
/// <summary>
/// Track sectors
/// </summary>
public PerpendicularFloppySector[] sectors;
public Sector[] sectors;
/// <summary>
/// Undefined size
/// </summary>
@@ -76,12 +77,12 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Raw demodulated format for perpendicular floppies
/// </summary>
public struct PerpendicularFloppySector
public struct Sector
{
/// <summary>
/// Sector address mark
/// </summary>
public IBMMFMSectorAddressMark addressMark;
public AddressMark addressMark;
/// <summary>
/// 41 bytes set to 0x4E
/// </summary>
@@ -90,12 +91,114 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Sector data block
/// </summary>
public IBMMFMSectorDataBlock dataBlock;
public DataBlock dataBlock;
/// <summary>
/// Variable-sized inter-sector gap, ECMA defines 83 bytes
/// </summary>
public byte[] outerGap;
}
/// <summary>
/// Start of IBM PC MFM floppy track
/// Used by IBM PC, Apple Macintosh (high-density only), and a lot others
/// </summary>
public struct TrackPreamble
{
/// <summary>
/// Gap from index pulse, 80 bytes set to 0x4E
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 80)]
public byte[] gap;
/// <summary>
/// 12 bytes set to 0x00
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
/// <summary>
/// 3 bytes set to 0xC2
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] ctwo;
/// <summary>
/// Set to <see cref="IBMIdType.IndexMark"/>
/// </summary>
public IBMIdType type;
/// <summary>
/// Gap until first sector, 50 bytes to 0x4E
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 50)]
public byte[] gap1;
}
/// <summary>
/// Sector address mark for IBM System 34 floppies, contains sync word
/// </summary>
public struct AddressMark
{
/// <summary>
/// 12 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
/// <summary>
/// 3 bytes set to 0xA1
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] aone;
/// <summary>
/// Set to <see cref="IBMIdType.AddressMark"/>
/// </summary>
public IBMIdType type;
/// <summary>
/// Track number
/// </summary>
public byte track;
/// <summary>
/// Side number
/// </summary>
public byte side;
/// <summary>
/// Sector number
/// </summary>
public byte sector;
/// <summary>
/// <see cref="IBMSectorSizeCode"/>
/// </summary>
public IBMSectorSizeCode sectorSize;
/// <summary>
/// CRC16 from <see cref="AddressMark.aone"/> to end of <see cref="sectorSize"/>
/// </summary>
public UInt16 crc;
}
/// <summary>
/// Sector data block for IBM System 34 floppies
/// </summary>
public struct DataBlock
{
/// <summary>
/// 12 bytes set to 0
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
public byte[] zero;
/// <summary>
/// 3 bytes set to 0xA1
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public byte[] aone;
/// <summary>
/// Set to <see cref="IBMIdType.DataMark"/> or to <see cref="IBMIdType.DeletedDataMark"/>
/// </summary>
public IBMIdType type;
/// <summary>
/// User data
/// </summary>
public byte[] data;
/// <summary>
/// CRC16 from <see cref="aone"/> to end of <see cref="data"/>
/// </summary>
public UInt16 crc;
}
}
}

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

@@ -36,6 +36,7 @@
// ****************************************************************************/
// //$Id$
using System;
using System.Runtime.InteropServices;
namespace DiscImageChef.Decoders.Floppy
{
@@ -58,16 +59,16 @@ namespace DiscImageChef.Decoders.Floppy
/// Track format for IBM System 34 floppy
/// Used by IBM PC, Apple Macintosh (high-density only), and a lot others
/// </summary>
public struct IBMMFMTrack
public struct Track
{
/// <summary>
/// Start of track
/// </summary>
public IBMMFMTrackPreamble trackStart;
public TrackPreamble trackStart;
/// <summary>
/// Track sectors
/// </summary>
public IBMMFMSector[] sectors;
public Sector[] sectors;
/// <summary>
/// Undefined size
/// </summary>
@@ -78,7 +79,7 @@ namespace DiscImageChef.Decoders.Floppy
/// Start of IBM PC MFM floppy track
/// Used by IBM PC, Apple Macintosh (high-density only), and a lot others
/// </summary>
public struct IBMMFMTrackPreamble
public struct TrackPreamble
{
/// <summary>
/// Gap from index pulse, 80 bytes set to 0x4E
@@ -109,12 +110,12 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Raw demodulated format for IBM System 34 floppies
/// </summary>
public struct IBMMFMSector
public struct Sector
{
/// <summary>
/// Sector address mark
/// </summary>
public IBMMFMSectorAddressMark addressMark;
public AddressMark addressMark;
/// <summary>
/// 22 bytes set to 0x4E, set to 0x22 on Commodore 1581
/// </summary>
@@ -123,7 +124,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Sector data block
/// </summary>
public IBMMFMSectorAddressMark dataBlock;
public DataBlock dataBlock;
/// <summary>
/// Variable bytes set to 0x4E, ECMA defines 54
/// </summary>
@@ -133,7 +134,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Sector address mark for IBM System 34 floppies, contains sync word
/// </summary>
public struct IBMMFMSectorAddressMark
public struct AddressMark
{
/// <summary>
/// 12 bytes set to 0
@@ -166,7 +167,7 @@ namespace DiscImageChef.Decoders.Floppy
/// </summary>
public IBMSectorSizeCode sectorSize;
/// <summary>
/// CRC16 from <see cref="IBMMFMSectorAddressMark.aone"/> to end of <see cref="sectorSize"/>
/// CRC16 from <see cref="AddressMark.aone"/> to end of <see cref="sectorSize"/>
/// </summary>
public UInt16 crc;
}
@@ -174,7 +175,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Sector data block for IBM System 34 floppies
/// </summary>
public struct IBMMFMSectorDataBlock
public struct DataBlock
{
/// <summary>
/// 12 bytes set to 0

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

@@ -36,6 +36,7 @@
// ****************************************************************************/
// //$Id$
using System;
using System.Runtime.InteropServices;
namespace DiscImageChef.Decoders.Floppy
{
@@ -57,16 +58,16 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Track format for IBM System 3740 floppy
/// </summary>
public struct IBMFMTrack
public struct Track
{
/// <summary>
/// Start of track
/// </summary>
public IBMFMTrackPreamble trackStart;
public TrackPreamble trackStart;
/// <summary>
/// Track sectors
/// </summary>
public IBMFMSector[] sectors;
public Sector[] sectors;
/// <summary>
/// Undefined size
/// </summary>
@@ -76,7 +77,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Start of IBM PC FM floppy track
/// </summary>
public struct IBMFMTrackPreamble
public struct TrackPreamble
{
/// <summary>
/// Gap from index pulse, 80 bytes set to 0xFF
@@ -102,12 +103,12 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Raw demodulated format for IBM System 3740 floppies
/// </summary>
public struct IBMFMSector
public struct Sector
{
/// <summary>
/// Sector address mark
/// </summary>
public IBMFMSectorAddressMark addressMark;
public AddressMark addressMark;
/// <summary>
/// 11 bytes set to 0xFF
/// </summary>
@@ -116,7 +117,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Sector data block
/// </summary>
public IBMFMSectorAddressMark dataBlock;
public DataBlock dataBlock;
/// <summary>
/// Variable bytes set to 0xFF
/// </summary>
@@ -126,7 +127,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Sector address mark for IBM System 3740 floppies, contains sync word
/// </summary>
public struct IBMFMSectorAddressMark
public struct AddressMark
{
/// <summary>
/// 6 bytes set to 0
@@ -162,7 +163,7 @@ namespace DiscImageChef.Decoders.Floppy
/// <summary>
/// Sector data block for IBM System 3740 floppies
/// </summary>
public struct IBMFMSectorDataBlock
public struct DataBlock
{
/// <summary>
/// 12 bytes set to 0