diff --git a/Aaru.Decoders b/Aaru.Decoders index 83612d608..f9e9b0758 160000 --- a/Aaru.Decoders +++ b/Aaru.Decoders @@ -1 +1 @@ -Subproject commit 83612d6084e3b207d4789e98a8940673975e796e +Subproject commit f9e9b075849906a893de77403968a18002886657 diff --git a/Aaru.Devices/Device/AtaCommands/Ata48.cs b/Aaru.Devices/Device/AtaCommands/Ata48.cs index 5a9ee5c99..e8d045dc4 100644 --- a/Aaru.Devices/Device/AtaCommands/Ata48.cs +++ b/Aaru.Devices/Device/AtaCommands/Ata48.cs @@ -133,11 +133,10 @@ public partial class Device Command = (byte)AtaCommands.ReadLogExt, SectorCount = count, LbaMidCurrent = (byte)(pageNumber & 0xFF), - LbaMidPrevious = (byte)((pageNumber & 0xFF00) / 0x100) + LbaMidPrevious = (byte)((pageNumber & 0xFF00) / 0x100), + LbaLowCurrent = logAddress }; - registers.LbaLowCurrent = logAddress; - LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn, AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration, out bool sense); @@ -167,11 +166,10 @@ public partial class Device Command = (byte)AtaCommands.ReadLogDmaExt, SectorCount = count, LbaMidCurrent = (byte)(pageNumber & 0xFF), - LbaMidPrevious = (byte)((pageNumber & 0xFF00) / 0x100) + LbaMidPrevious = (byte)((pageNumber & 0xFF00) / 0x100), + LbaLowCurrent = logAddress }; - registers.LbaLowCurrent = logAddress; - LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration, out bool sense); diff --git a/Aaru.Devices/Windows/Device.cs b/Aaru.Devices/Windows/Device.cs index d611c4ede..e6d2d366d 100644 --- a/Aaru.Devices/Windows/Device.cs +++ b/Aaru.Devices/Windows/Device.cs @@ -90,10 +90,12 @@ partial class Device : Devices.Device } // Windows is answering SCSI INQUIRY for all device types so it needs to be detected first - var query = new StoragePropertyQuery(); - query.PropertyId = StoragePropertyId.Device; - query.QueryType = StorageQueryType.Standard; - query.AdditionalParameters = new byte[1]; + var query = new StoragePropertyQuery + { + PropertyId = StoragePropertyId.Device, + QueryType = StorageQueryType.Standard, + AdditionalParameters = new byte[1] + }; IntPtr descriptorPtr = Marshal.AllocHGlobal(1000); var descriptorB = new byte[1000]; diff --git a/Aaru.Devices/Windows/Usb.cs b/Aaru.Devices/Windows/Usb.cs index a6e82d878..708416778 100644 --- a/Aaru.Devices/Windows/Usb.cs +++ b/Aaru.Devices/Windows/Usb.cs @@ -705,9 +705,11 @@ static partial class Usb if(!_portIsHub) return null; - var hub = new UsbHub(); - hub._hubIsRootHub = false; - hub._hubDeviceDesc = "External Hub"; + var hub = new UsbHub + { + _hubIsRootHub = false, + _hubDeviceDesc = "External Hub" + }; // Open a handle to the Host Controller IntPtr h = CreateFile(_portHubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0, diff --git a/Aaru.Filesystems/ISO9660/Dir.cs b/Aaru.Filesystems/ISO9660/Dir.cs index 41feffe3d..e37faa2e6 100644 --- a/Aaru.Filesystems/ISO9660/Dir.cs +++ b/Aaru.Filesystems/ISO9660/Dir.cs @@ -203,11 +203,10 @@ public sealed partial class ISO9660 Filename = Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len), VolumeSequenceNumber = record.volume_sequence_number, Timestamp = DecodeHighSierraDateTime(record.date), - XattrLength = record.xattr_len + XattrLength = record.xattr_len, + Extents = new List<(uint extent, uint size)>() }; - entry.Extents = new List<(uint extent, uint size)>(); - if(record.size != 0) entry.Extents.Add((record.start_lbn, record.size)); @@ -286,11 +285,10 @@ public sealed partial class ISO9660 VolumeSequenceNumber = record.volume_sequence_number, Filename = Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len), Timestamp = DecodeHighSierraDateTime(record.date), - XattrLength = record.xattr_len + XattrLength = record.xattr_len, + Extents = new List<(uint extent, uint size)>() }; - entry.Extents = new List<(uint extent, uint size)>(); - if(record.size != 0) entry.Extents.Add((record.extent, record.size)); @@ -363,11 +361,10 @@ public sealed partial class ISO9660 Interleave = record.interleave, VolumeSequenceNumber = record.volume_sequence_number, Timestamp = DecodeIsoDateTime(record.date), - XattrLength = record.xattr_len + XattrLength = record.xattr_len, + Extents = new List<(uint extent, uint size)>() }; - entry.Extents = new List<(uint extent, uint size)>(); - if(record.size != 0) entry.Extents.Add((record.extent, record.size)); @@ -581,10 +578,13 @@ public sealed partial class ISO9660 hasResourceFork = true; - fInfo = new AppleCommon.FInfo(); - fInfo.fdCreator = appleHfsSystemUse.creator; - fInfo.fdFlags = appleHfsSystemUse.finder_flags; - fInfo.fdType = appleHfsSystemUse.type; + fInfo = new AppleCommon.FInfo + { + fdCreator = appleHfsSystemUse.creator, + fdFlags = appleHfsSystemUse.finder_flags, + fdType = appleHfsSystemUse.type + }; + entry.FinderInfo = fInfo; break; @@ -617,9 +617,12 @@ public sealed partial class ISO9660 hasResourceFork = true; - fInfo = new AppleCommon.FInfo(); - fInfo.fdCreator = appleHfsTypeCreatorSystemUse.creator; - fInfo.fdType = appleHfsTypeCreatorSystemUse.type; + fInfo = new AppleCommon.FInfo + { + fdCreator = appleHfsTypeCreatorSystemUse.creator, + fdType = appleHfsTypeCreatorSystemUse.type + }; + entry.FinderInfo = fInfo; systemAreaOff += Marshal.SizeOf(); @@ -633,9 +636,12 @@ public sealed partial class ISO9660 hasResourceFork = true; - fInfo = new AppleCommon.FInfo(); - fInfo.fdCreator = appleHfsIconSystemUse.creator; - fInfo.fdType = appleHfsIconSystemUse.type; + fInfo = new AppleCommon.FInfo + { + fdCreator = appleHfsIconSystemUse.creator, + fdType = appleHfsIconSystemUse.type + }; + entry.FinderInfo = fInfo; entry.AppleIcon = appleHfsIconSystemUse.icon; @@ -649,10 +655,13 @@ public sealed partial class ISO9660 hasResourceFork = true; - fInfo = new AppleCommon.FInfo(); - fInfo.fdCreator = appleHfsSystemUse.creator; - fInfo.fdFlags = (AppleCommon.FinderFlags)appleHfsSystemUse.finder_flags; - fInfo.fdType = appleHfsSystemUse.type; + fInfo = new AppleCommon.FInfo + { + fdCreator = appleHfsSystemUse.creator, + fdFlags = (AppleCommon.FinderFlags)appleHfsSystemUse.finder_flags, + fdType = appleHfsSystemUse.type + }; + entry.FinderInfo = fInfo; systemAreaOff += Marshal.SizeOf(); @@ -1096,11 +1105,10 @@ public sealed partial class ISO9660 Filename = tEntry.Name, VolumeSequenceNumber = record.volume_sequence_number, Timestamp = DecodeHighSierraDateTime(record.date), - XattrLength = tEntry.XattrLength + XattrLength = tEntry.XattrLength, + Extents = new List<(uint extent, uint size)>() }; - entry.Extents = new List<(uint extent, uint size)>(); - if(record.size != 0) entry.Extents.Add((record.start_lbn, record.size)); @@ -1152,11 +1160,10 @@ public sealed partial class ISO9660 Interleave = record.interleave, VolumeSequenceNumber = record.volume_sequence_number, Timestamp = DecodeIsoDateTime(record.date), - XattrLength = tEntry.XattrLength + XattrLength = tEntry.XattrLength, + Extents = new List<(uint extent, uint size)>() }; - entry.Extents = new List<(uint extent, uint size)>(); - if(record.size != 0) entry.Extents.Add((record.extent, record.size)); @@ -1201,11 +1208,10 @@ public sealed partial class ISO9660 Interleave = record.interleave, VolumeSequenceNumber = record.volume_sequence_number, Timestamp = DecodeHighSierraDateTime(record.date), - XattrLength = tEntry.XattrLength + XattrLength = tEntry.XattrLength, + Extents = new List<(uint extent, uint size)>() }; - entry.Extents = new List<(uint extent, uint size)>(); - if(record.size != 0) entry.Extents.Add((record.extent, record.size)); diff --git a/Aaru.Images/ByteAddressable/SuperNintendo.cs b/Aaru.Images/ByteAddressable/SuperNintendo.cs index bd4067c6e..c84415242 100644 --- a/Aaru.Images/ByteAddressable/SuperNintendo.cs +++ b/Aaru.Images/ByteAddressable/SuperNintendo.cs @@ -379,8 +379,10 @@ public class SuperNintendo : IByteAddressableImage if(hasFlash) devices++; - mappings = new LinearMemoryMap(); - mappings.Devices = new LinearMemoryDevice[devices]; + mappings = new LinearMemoryMap + { + Devices = new LinearMemoryDevice[devices] + }; mappings.Devices[0] = new LinearMemoryDevice { diff --git a/Aaru.Images/Nero/Read.cs b/Aaru.Images/Nero/Read.cs index dda837ac3..42d1b5a1d 100644 --- a/Aaru.Images/Nero/Read.cs +++ b/Aaru.Images/Nero/Read.cs @@ -1238,22 +1238,24 @@ public sealed partial class Nero return ErrorNumber.InvalidArgument; } - var track = new Track(); - - // Common track data - track.Description = StringHandlers.CToString(_neroTracks[1].Isrc); - - track.EndSector = (_imageNewFormat ? footerV2.FirstChunkOffset : footerV1.FirstChunkOffset) / - _neroTracks[1].SectorSize - 150; - - track.Sequence = _neroTracks[1].Sequence; - track.Session = currentSession; - track.Type = NeroTrackModeToTrackType((DaoMode)_neroTracks[1].Mode); - track.File = imageFilter.Filename; - track.Filter = imageFilter; - track.FileType = "BINARY"; - track.SubchannelType = TrackSubchannelType.None; - track.Indexes[1] = 0; + var track = new Track + { + // Common track data + Description = StringHandlers.CToString(_neroTracks[1].Isrc), + EndSector = (_imageNewFormat ? footerV2.FirstChunkOffset : footerV1.FirstChunkOffset) / + _neroTracks[1].SectorSize - 150, + Sequence = _neroTracks[1].Sequence, + Session = currentSession, + Type = NeroTrackModeToTrackType((DaoMode)_neroTracks[1].Mode), + File = imageFilter.Filename, + Filter = imageFilter, + FileType = "BINARY", + SubchannelType = TrackSubchannelType.None, + Indexes = + { + [1] = 0 + } + }; var rawMode1 = false; var rawMode2 = false; diff --git a/Aaru.Partitions/Atari.cs b/Aaru.Partitions/Atari.cs index d41efa44c..6c3eae0fd 100644 --- a/Aaru.Partitions/Atari.cs +++ b/Aaru.Partitions/Atari.cs @@ -260,8 +260,10 @@ public sealed class AtariPartitions : IPartition if(errno != ErrorNumber.NoError) break; - var extendedTable = new AtariTable(); - extendedTable.Entries = new AtariEntry[4]; + var extendedTable = new AtariTable + { + Entries = new AtariEntry[4] + }; for(var j = 0; j < 4; j++) { diff --git a/Aaru/Commands/Filesystem/Info.cs b/Aaru/Commands/Filesystem/Info.cs index 9c1c7d27f..4e2572d80 100644 --- a/Aaru/Commands/Filesystem/Info.cs +++ b/Aaru/Commands/Filesystem/Info.cs @@ -255,8 +255,11 @@ sealed class FilesystemInfoCommand : Command for(var i = 0; i < partitionsList.Count; i++) { - Table table = new(); - table.Title = new TableTitle($"Partition {partitionsList[i].Sequence}:"); + Table table = new() + { + Title = new TableTitle($"Partition {partitionsList[i].Sequence}:") + }; + table.AddColumn(""); table.AddColumn(""); table.HideHeaders();