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

Fix inconsistent naming.

Browse Source
This commit is contained in:
Natalia Portillo
2022-11-13 20:38:15 +00:00
parent 6911b6e175
commit c68760ec49
8 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.CommonTypes

Submodule Aaru.CommonTypes updated: ee657ecfa5...6d8fcb4d8b

2
Aaru.Decoders

Submodule Aaru.Decoders updated: c1f24c46a9...e727683929

6
Aaru.Devices/Device/MmcCommands/MMC.cs
View File

@@ -163,11 +163,11 @@ public partial class Device
if(transferLength <= 1) if(transferLength <= 1)
return ReadSingleBlock(out buffer, out response, lba, blockSize, byteAddressed, timeout, out duration); return ReadSingleBlock(out buffer, out response, lba, blockSize, byteAddressed, timeout, out duration);
if(!_readMultipleBlockCannotSetBlockCount) if(!ReadMultipleBlockCannotSetBlockCount)
sense = ReadMultipleBlock(out buffer, out response, lba, blockSize, transferLength, byteAddressed, timeout, sense = ReadMultipleBlock(out buffer, out response, lba, blockSize, transferLength, byteAddressed, timeout,
out duration); out duration);
if(_readMultipleBlockCannotSetBlockCount) if(ReadMultipleBlockCannotSetBlockCount)
return ReadMultipleUsingSingle(out buffer, out response, lba, blockSize, transferLength, byteAddressed, return ReadMultipleUsingSingle(out buffer, out response, lba, blockSize, transferLength, byteAddressed,
timeout, out duration); timeout, out duration);
@@ -206,7 +206,7 @@ public partial class Device
return sense; return sense;
} }
protected static bool _readMultipleBlockCannotSetBlockCount; protected static bool ReadMultipleBlockCannotSetBlockCount;
/// <summary>Reads multiple blocks from a SecureDigital or MultiMediaCard device</summary> /// <summary>Reads multiple blocks from a SecureDigital or MultiMediaCard device</summary>
/// <param name="buffer">Data buffer</param> /// <param name="buffer">Data buffer</param>

2
Aaru.Devices/Linux/Device.cs
View File

@@ -96,7 +96,7 @@ partial class Device : Devices.Device
// Seems ioctl(2) does not allow the atomicity needed // Seems ioctl(2) does not allow the atomicity needed
if(dev.PlatformId == PlatformID.Linux) if(dev.PlatformId == PlatformID.Linux)
_readMultipleBlockCannotSetBlockCount = true; ReadMultipleBlockCannotSetBlockCount = true;
dev.Type = DeviceType.Unknown; dev.Type = DeviceType.Unknown;
dev.ScsiType = PeripheralDeviceTypes.UnknownDevice; dev.ScsiType = PeripheralDeviceTypes.UnknownDevice;

2
Aaru.Devices/Remote/Device.cs
View File

@@ -127,7 +127,7 @@ public sealed partial class Device : Devices.Device
} }
if(dev._remote.ServerOperatingSystem == "Linux") if(dev._remote.ServerOperatingSystem == "Linux")
_readMultipleBlockCannotSetBlockCount = true; ReadMultipleBlockCannotSetBlockCount = true;
dev.Type = DeviceType.Unknown; dev.Type = DeviceType.Unknown;
dev.ScsiType = PeripheralDeviceTypes.UnknownDevice; dev.ScsiType = PeripheralDeviceTypes.UnknownDevice;

2
Aaru.Filesystems/ISO9660/Structs/Internal.cs
View File

@@ -89,6 +89,8 @@ public sealed partial class ISO9660
public string SymbolicLink; public string SymbolicLink;
public DateTime? Timestamp; public DateTime? Timestamp;
public ushort VolumeSequenceNumber; public ushort VolumeSequenceNumber;
// ReSharper disable once InconsistentNaming
public CdromXa? XA; public CdromXa? XA;
public byte XattrLength; public byte XattrLength;

6
Aaru.Images/ByteAddressable/SegaMegaDrive.cs
View File

@@ -526,11 +526,11 @@ public class SegaMegaDrive : IByteAddressableImage
SegaHeader header = SegaHeader header =
Marshal.ByteArrayToStructureBigEndian<SegaHeader>(_data, 0x100, Marshal.SizeOf<SegaHeader>()); Marshal.ByteArrayToStructureBigEndian<SegaHeader>(_data, 0x100, Marshal.SizeOf<SegaHeader>());
bool extraRAM = header.ExtraRamPresent[0] == 0x52 && header.ExtraRamPresent[1] == 0x41; bool extraRam = header.ExtraRamPresent[0] == 0x52 && header.ExtraRamPresent[1] == 0x41;
mappings = new LinearMemoryMap mappings = new LinearMemoryMap
{ {
Devices = extraRAM ? new LinearMemoryDevice[2] : new LinearMemoryDevice[1] Devices = extraRam ? new LinearMemoryDevice[2] : new LinearMemoryDevice[1]
}; };
mappings.Devices[0].Type = LinearMemoryType.ROM; mappings.Devices[0].Type = LinearMemoryType.ROM;
@@ -547,7 +547,7 @@ public class SegaMegaDrive : IByteAddressableImage
Length = header.RomEnd - header.RomStart + 1 Length = header.RomEnd - header.RomStart + 1
}; };
if(!extraRAM) if(!extraRam)
return ErrorNumber.NoError; return ErrorNumber.NoError;
mappings.Devices[1].PhysicalAddress = new LinearMemoryAddressing mappings.Devices[1].PhysicalAddress = new LinearMemoryAddressing

2
Aaru.Images/SuperCardPro/Enums.cs
View File

@@ -33,9 +33,11 @@
namespace Aaru.DiscImages; namespace Aaru.DiscImages;
using System; using System;
using System.Diagnostics.CodeAnalysis;
public sealed partial class SuperCardPro public sealed partial class SuperCardPro
{ {
[SuppressMessage("ReSharper", "InconsistentNaming")]
public enum ScpDiskType : byte public enum ScpDiskType : byte
{ {
Commodore64 = 0x00, Commodore64 = 0x00,