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

General cleanup and refactor.

Browse Source
This commit is contained in:
Natalia Portillo
2022-03-07 07:36:44 +00:00
parent bc6e432565
commit 762e3eb6d2
1321 changed files with 44657 additions and 45479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Aaru.Images/UkvFdi/Enums.cs
View File

@@ -30,11 +30,11 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System;
using System.Diagnostics.CodeAnalysis;
namespace Aaru.DiscImages;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class UkvFdi
{
@@ -47,8 +47,12 @@ public sealed partial class UkvFdi
[Flags]
enum SectorFlags : byte
{
CrcOk128 = 0x01, CrcOk256 = 0x02, CrcOk512 = 0x04,
CrcOk1024 = 0x08, CrcOk2048 = 0x10, CrcOk4096 = 0x20,
CrcOk128 = 0x01,
CrcOk256 = 0x02,
CrcOk512 = 0x04,
CrcOk1024 = 0x08,
CrcOk2048 = 0x10,
CrcOk4096 = 0x20,
Deleted = 0x80
}
}

6
Aaru.Images/UkvFdi/Helpers.cs
View File

@@ -36,9 +36,9 @@ public sealed partial class UkvFdi
{
(ushort cylinder, byte head, byte sector) LbaToChs(ulong lba)
{
ushort cylinder = (ushort)(lba / (_imageInfo.Heads * _imageInfo.SectorsPerTrack));
byte head = (byte)(lba / _imageInfo.SectorsPerTrack % _imageInfo.Heads);
byte sector = (byte)((lba % _imageInfo.SectorsPerTrack) + 1);
var cylinder = (ushort)(lba / (_imageInfo.Heads * _imageInfo.SectorsPerTrack));
var head = (byte)(lba / _imageInfo.SectorsPerTrack % _imageInfo.Heads);
var sector = (byte)(lba % _imageInfo.SectorsPerTrack + 1);
return (cylinder, head, sector);
}

6
Aaru.Images/UkvFdi/Identify.cs
View File

@@ -30,13 +30,13 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System.IO;
using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
namespace Aaru.DiscImages;
public sealed partial class UkvFdi
{
/// <inheritdoc />
@@ -48,7 +48,7 @@ public sealed partial class UkvFdi
if(stream.Length < Marshal.SizeOf<Header>())
return false;
byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
var hdrB = new byte[Marshal.SizeOf<Header>()];
stream.Read(hdrB, 0, hdrB.Length);
Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);

6
Aaru.Images/UkvFdi/Properties.cs
View File

@@ -30,19 +30,19 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System;
using System.Collections.Generic;
using Aaru.CommonTypes.Structs;
using Schemas;
namespace Aaru.DiscImages;
public sealed partial class UkvFdi
{
/// <inheritdoc />
public string Name => "Spectrum Floppy Disk Image";
/// <inheritdoc />
public Guid Id => new Guid("DADFC9B2-67C1-42A3-B124-825528163FC0");
public Guid Id => new("DADFC9B2-67C1-42A3-B124-825528163FC0");
/// <inheritdoc />
public string Format => "Spectrum floppy disk image";
/// <inheritdoc />

36
Aaru.Images/UkvFdi/Read.cs
View File

@@ -30,6 +30,8 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System;
using System.IO;
using Aaru.CommonTypes;
@@ -38,8 +40,6 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
namespace Aaru.DiscImages;
public sealed partial class UkvFdi
{
/// <inheritdoc />
@@ -51,7 +51,7 @@ public sealed partial class UkvFdi
if(stream.Length < Marshal.SizeOf<Header>())
return ErrorNumber.InvalidArgument;
byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
var hdrB = new byte[Marshal.SizeOf<Header>()];
stream.Read(hdrB, 0, hdrB.Length);
Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
@@ -64,7 +64,7 @@ public sealed partial class UkvFdi
AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.heads = {0}", hdr.heads);
stream.Seek(hdr.descOff, SeekOrigin.Begin);
byte[] description = new byte[hdr.dataOff - hdr.descOff];
var description = new byte[hdr.dataOff - hdr.descOff];
stream.Read(description, 0, description.Length);
_imageInfo.Comments = StringHandlers.CToString(description);
@@ -72,8 +72,8 @@ public sealed partial class UkvFdi
stream.Seek(0xE + hdr.addInfoLen, SeekOrigin.Begin);
long spt = long.MaxValue;
uint[][][] sectorsOff = new uint[hdr.cylinders][][];
long spt = long.MaxValue;
var sectorsOff = new uint[hdr.cylinders][][];
_sectorsData = new byte[hdr.cylinders][][][];
_imageInfo.Cylinders = hdr.cylinders;
@@ -87,11 +87,11 @@ public sealed partial class UkvFdi
for(ushort head = 0; head < hdr.heads; head++)
{
byte[] sctB = new byte[4];
var sctB = new byte[4];
stream.Read(sctB, 0, 4);
stream.Seek(2, SeekOrigin.Current);
byte sectors = (byte)stream.ReadByte();
uint trkOff = BitConverter.ToUInt32(sctB, 0);
var sectors = (byte)stream.ReadByte();
var trkOff = BitConverter.ToUInt32(sctB, 0);
AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.c = {0}", cyl);
AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.h = {0}", head);
@@ -107,14 +107,14 @@ public sealed partial class UkvFdi
for(ushort sec = 0; sec < sectors; sec++)
{
byte c = (byte)stream.ReadByte();
byte h = (byte)stream.ReadByte();
byte r = (byte)stream.ReadByte();
byte n = (byte)stream.ReadByte();
var f = (SectorFlags)stream.ReadByte();
byte[] offB = new byte[2];
var c = (byte)stream.ReadByte();
var h = (byte)stream.ReadByte();
var r = (byte)stream.ReadByte();
var n = (byte)stream.ReadByte();
var f = (SectorFlags)stream.ReadByte();
var offB = new byte[2];
stream.Read(offB, 0, 2);
ushort secOff = BitConverter.ToUInt16(offB, 0);
var secOff = BitConverter.ToUInt16(offB, 0);
AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.c = {0}", c);
AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.h = {0}", h);
@@ -138,7 +138,7 @@ public sealed partial class UkvFdi
// Read sectors
for(ushort cyl = 0; cyl < hdr.cylinders; cyl++)
{
bool emptyCyl = false;
var emptyCyl = false;
for(ushort head = 0; head < hdr.heads; head++)
{
@@ -163,7 +163,7 @@ public sealed partial class UkvFdi
{
_sectorsData[cyl][head] = new byte[spt][];
for(int i = 0; i < spt; i++)
for(var i = 0; i < spt; i++)
_sectorsData[cyl][head][i] = new byte[_imageInfo.SectorSize];
}
}

4
Aaru.Images/UkvFdi/Structs.cs
View File

@@ -30,10 +30,10 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
using System.Runtime.InteropServices;
namespace Aaru.DiscImages;
using System.Runtime.InteropServices;
public sealed partial class UkvFdi
{
[StructLayout(LayoutKind.Sequential, Pack = 1)]

4
Aaru.Images/UkvFdi/UkvFdi.cs
View File

@@ -30,13 +30,13 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System.Collections.Generic;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
namespace Aaru.DiscImages;
/// <inheritdoc />
/// <summary>Implements reading UKV FDI disk images</summary>
public sealed partial class UkvFdi : IMediaImage

4
Aaru.Images/UkvFdi/Unsupported.cs
View File

@@ -30,10 +30,10 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
using Aaru.CommonTypes.Enums;
namespace Aaru.DiscImages;
using Aaru.CommonTypes.Enums;
public sealed partial class UkvFdi
{
/// <inheritdoc />