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

Redo Reformat and cleanup.

Browse Source 
Rider EAP was having a bug interpreting .editorconfig that didn't generate the code style as we wanted.
This is now done with Rider-stable.
This commit is contained in:
Natalia Portillo
2023-10-04 17:34:40 +01:00
parent bc8bf7a2dc
commit 7363a5d9c5
453 changed files with 7241 additions and 7126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Aaru.Images/Apple2MG/Constants.cs
View File

@@ -58,9 +58,15 @@ public sealed partial class Apple2Mg
/// <summary>Disk image created by Aaru, "aaru"</summary>
const uint CREATOR_AARU = 0x75726161;
const uint LOCKED_DISK = 0x80000000;
const uint VALID_VOLUME_NUMBER = 0x00000100;
const uint VOLUME_NUMBER_MASK = 0x000000FF;
readonly int[] _deinterleave = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
readonly int[] _interleave = { 0, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 15 };
const uint LOCKED_DISK = 0x80000000;
const uint VALID_VOLUME_NUMBER = 0x00000100;
const uint VOLUME_NUMBER_MASK = 0x000000FF;
readonly int[] _deinterleave =
{
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
};
readonly int[] _interleave =
{
0, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 15
};
}

5
Aaru.Images/Apple2MG/Properties.cs
View File

@@ -85,7 +85,10 @@ public sealed partial class Apple2Mg
Array.Empty<(string name, Type type, string description, object @default)>();
/// <inheritdoc />
public IEnumerable<string> KnownExtensions => new[] { ".2mg" };
public IEnumerable<string> KnownExtensions => new[]
{
".2mg"
};
/// <inheritdoc />
public bool IsWriting { get; private set; }

28
Aaru.Images/Apple2MG/Read.cs
View File

@@ -99,8 +99,7 @@ public sealed partial class Apple2Mg
AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.reserved3 = 0x{0:X8}", _imageHeader.Reserved3);
AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.reserved4 = 0x{0:X8}", _imageHeader.Reserved4);
if(_imageHeader is { DataSize: 0, Blocks: 0 } &&
_imageHeader.ImageFormat != SectorOrder.ProDos)
if(_imageHeader is { DataSize: 0, Blocks: 0 } && _imageHeader.ImageFormat != SectorOrder.ProDos)
return ErrorNumber.InvalidArgument;
byte[] tmp;
@@ -131,23 +130,24 @@ public sealed partial class Apple2Mg
tmp = new byte[_imageHeader.DataSize];
stream.EnsureRead(tmp, 0, tmp.Length);
bool isDos = tmp[0x11001] == 17 && tmp[0x11002] < 16 && tmp[0x11027] <= 122 && tmp[0x11034] == 35 &&
tmp[0x11035] == 16 && tmp[0x11036] == 0 && tmp[0x11037] == 1;
bool isDos = tmp[0x11001] == 17 &&
tmp[0x11002] < 16 &&
tmp[0x11027] <= 122 &&
tmp[0x11034] == 35 &&
tmp[0x11035] == 16 &&
tmp[0x11036] == 0 &&
tmp[0x11037] == 1;
_decodedImage = new byte[_imageHeader.DataSize];
offsets = _imageHeader.ImageFormat == SectorOrder.Dos
? isDos ? _deinterleave : _interleave
: isDos
? _interleave
: _deinterleave;
offsets = _imageHeader.ImageFormat == SectorOrder.Dos ? isDos ? _deinterleave : _interleave :
isDos ? _interleave : _deinterleave;
for(var t = 0; t < 35; t++)
{
for(var s = 0; s < 16; s++)
{
Array.Copy(tmp, t * 16 * 256 + s * 256, _decodedImage, t * 16 * 256 + offsets[s] * 256,
256);
Array.Copy(tmp, t * 16 * 256 + s * 256, _decodedImage, t * 16 * 256 + offsets[s] * 256, 256);
}
}
@@ -166,8 +166,7 @@ public sealed partial class Apple2Mg
{
for(var s = 0; s < 16; s++)
{
Array.Copy(tmp, t * 16 * 256 + s * 256, _decodedImage, t * 16 * 256 + offsets[s] * 256,
256);
Array.Copy(tmp, t * 16 * 256 + s * 256, _decodedImage, t * 16 * 256 + offsets[s] * 256, 256);
}
}
@@ -202,8 +201,7 @@ public sealed partial class Apple2Mg
_imageInfo.Version = _imageHeader.Version.ToString();
if(_imageHeader.CommentOffset != 0 &&
_imageHeader.CommentSize != 0)
if(_imageHeader.CommentOffset != 0 && _imageHeader.CommentSize != 0)
{
stream.Seek(_imageHeader.CommentOffset, SeekOrigin.Begin);

12
Aaru.Images/Apple2MG/Write.cs
View File

@@ -52,8 +52,7 @@ public sealed partial class Apple2Mg
{
if(sectorSize != 512)
{
if(sectorSize != 256 ||
mediaType != MediaType.Apple32SS && mediaType != MediaType.Apple33SS)
if(sectorSize != 256 || mediaType != MediaType.Apple32SS && mediaType != MediaType.Apple33SS)
{
ErrorMessage = Localization.Unsupported_sector_size;
@@ -201,8 +200,13 @@ public sealed partial class Apple2Mg
var tmp = new byte[256];
_writingStream.EnsureRead(tmp, 0, tmp.Length);
bool isDos = tmp[0x01] == 17 && tmp[0x02] < 16 && tmp[0x27] <= 122 && tmp[0x34] == 35 && tmp[0x35] == 16 &&
tmp[0x36] == 0 && tmp[0x37] == 1;
bool isDos = tmp[0x01] == 17 &&
tmp[0x02] < 16 &&
tmp[0x27] <= 122 &&
tmp[0x34] == 35 &&
tmp[0x35] == 16 &&
tmp[0x36] == 0 &&
tmp[0x37] == 1;
_imageHeader = new Header
{