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

Use object initializer.

Browse Source
This commit is contained in:
Natalia Portillo
2022-11-14 01:23:52 +00:00
parent c4a95c40ca
commit 2b40eab0d2
9 changed files with 85 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Decoders

Submodule Aaru.Decoders updated: 83612d6084...f9e9b07584

10
Aaru.Devices/Device/AtaCommands/Ata48.cs
View File

@@ -133,11 +133,10 @@ public partial class Device
Command = (byte)AtaCommands.ReadLogExt, Command = (byte)AtaCommands.ReadLogExt,
SectorCount = count, SectorCount = count,
LbaMidCurrent = (byte)(pageNumber & 0xFF), 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, LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn, AtaTransferRegister.SectorCount,
ref buffer, timeout, true, out duration, out bool sense); ref buffer, timeout, true, out duration, out bool sense);
@@ -167,11 +166,10 @@ public partial class Device
Command = (byte)AtaCommands.ReadLogDmaExt, Command = (byte)AtaCommands.ReadLogDmaExt,
SectorCount = count, SectorCount = count,
LbaMidCurrent = (byte)(pageNumber & 0xFF), 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, LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
ref buffer, timeout, true, out duration, out bool sense); ref buffer, timeout, true, out duration, out bool sense);

10
Aaru.Devices/Windows/Device.cs
View File

@@ -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 // Windows is answering SCSI INQUIRY for all device types so it needs to be detected first
var query = new StoragePropertyQuery(); var query = new StoragePropertyQuery
query.PropertyId = StoragePropertyId.Device; {
query.QueryType = StorageQueryType.Standard; PropertyId = StoragePropertyId.Device,
query.AdditionalParameters = new byte[1]; QueryType = StorageQueryType.Standard,
AdditionalParameters = new byte[1]
};
IntPtr descriptorPtr = Marshal.AllocHGlobal(1000); IntPtr descriptorPtr = Marshal.AllocHGlobal(1000);
var descriptorB = new byte[1000]; var descriptorB = new byte[1000];

8
Aaru.Devices/Windows/Usb.cs
View File

@@ -705,9 +705,11 @@ static partial class Usb
if(!_portIsHub) if(!_portIsHub)
return null; return null;
var hub = new UsbHub(); var hub = new UsbHub
hub._hubIsRootHub = false; {
hub._hubDeviceDesc = "External Hub"; _hubIsRootHub = false,
_hubDeviceDesc = "External Hub"
};
// Open a handle to the Host Controller // Open a handle to the Host Controller
IntPtr h = CreateFile(_portHubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0, IntPtr h = CreateFile(_portHubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,

70
Aaru.Filesystems/ISO9660/Dir.cs
View File

@@ -203,11 +203,10 @@ public sealed partial class ISO9660
Filename = Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len), Filename = Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len),
VolumeSequenceNumber = record.volume_sequence_number, VolumeSequenceNumber = record.volume_sequence_number,
Timestamp = DecodeHighSierraDateTime(record.date), 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) if(record.size != 0)
entry.Extents.Add((record.start_lbn, record.size)); entry.Extents.Add((record.start_lbn, record.size));
@@ -286,11 +285,10 @@ public sealed partial class ISO9660
VolumeSequenceNumber = record.volume_sequence_number, VolumeSequenceNumber = record.volume_sequence_number,
Filename = Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len), Filename = Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len),
Timestamp = DecodeHighSierraDateTime(record.date), 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) if(record.size != 0)
entry.Extents.Add((record.extent, record.size)); entry.Extents.Add((record.extent, record.size));
@@ -363,11 +361,10 @@ public sealed partial class ISO9660
Interleave = record.interleave, Interleave = record.interleave,
VolumeSequenceNumber = record.volume_sequence_number, VolumeSequenceNumber = record.volume_sequence_number,
Timestamp = DecodeIsoDateTime(record.date), 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) if(record.size != 0)
entry.Extents.Add((record.extent, record.size)); entry.Extents.Add((record.extent, record.size));
@@ -581,10 +578,13 @@ public sealed partial class ISO9660
hasResourceFork = true; hasResourceFork = true;
fInfo = new AppleCommon.FInfo(); fInfo = new AppleCommon.FInfo
fInfo.fdCreator = appleHfsSystemUse.creator; {
fInfo.fdFlags = appleHfsSystemUse.finder_flags; fdCreator = appleHfsSystemUse.creator,
fInfo.fdType = appleHfsSystemUse.type; fdFlags = appleHfsSystemUse.finder_flags,
fdType = appleHfsSystemUse.type
};
entry.FinderInfo = fInfo; entry.FinderInfo = fInfo;
break; break;
@@ -617,9 +617,12 @@ public sealed partial class ISO9660
hasResourceFork = true; hasResourceFork = true;
fInfo = new AppleCommon.FInfo(); fInfo = new AppleCommon.FInfo
fInfo.fdCreator = appleHfsTypeCreatorSystemUse.creator; {
fInfo.fdType = appleHfsTypeCreatorSystemUse.type; fdCreator = appleHfsTypeCreatorSystemUse.creator,
fdType = appleHfsTypeCreatorSystemUse.type
};
entry.FinderInfo = fInfo; entry.FinderInfo = fInfo;
systemAreaOff += Marshal.SizeOf<AppleHFSTypeCreatorSystemUse>(); systemAreaOff += Marshal.SizeOf<AppleHFSTypeCreatorSystemUse>();
@@ -633,9 +636,12 @@ public sealed partial class ISO9660
hasResourceFork = true; hasResourceFork = true;
fInfo = new AppleCommon.FInfo(); fInfo = new AppleCommon.FInfo
fInfo.fdCreator = appleHfsIconSystemUse.creator; {
fInfo.fdType = appleHfsIconSystemUse.type; fdCreator = appleHfsIconSystemUse.creator,
fdType = appleHfsIconSystemUse.type
};
entry.FinderInfo = fInfo; entry.FinderInfo = fInfo;
entry.AppleIcon = appleHfsIconSystemUse.icon; entry.AppleIcon = appleHfsIconSystemUse.icon;
@@ -649,10 +655,13 @@ public sealed partial class ISO9660
hasResourceFork = true; hasResourceFork = true;
fInfo = new AppleCommon.FInfo(); fInfo = new AppleCommon.FInfo
fInfo.fdCreator = appleHfsSystemUse.creator; {
fInfo.fdFlags = (AppleCommon.FinderFlags)appleHfsSystemUse.finder_flags; fdCreator = appleHfsSystemUse.creator,
fInfo.fdType = appleHfsSystemUse.type; fdFlags = (AppleCommon.FinderFlags)appleHfsSystemUse.finder_flags,
fdType = appleHfsSystemUse.type
};
entry.FinderInfo = fInfo; entry.FinderInfo = fInfo;
systemAreaOff += Marshal.SizeOf<AppleHFSOldSystemUse>(); systemAreaOff += Marshal.SizeOf<AppleHFSOldSystemUse>();
@@ -1096,11 +1105,10 @@ public sealed partial class ISO9660
Filename = tEntry.Name, Filename = tEntry.Name,
VolumeSequenceNumber = record.volume_sequence_number, VolumeSequenceNumber = record.volume_sequence_number,
Timestamp = DecodeHighSierraDateTime(record.date), 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) if(record.size != 0)
entry.Extents.Add((record.start_lbn, record.size)); entry.Extents.Add((record.start_lbn, record.size));
@@ -1152,11 +1160,10 @@ public sealed partial class ISO9660
Interleave = record.interleave, Interleave = record.interleave,
VolumeSequenceNumber = record.volume_sequence_number, VolumeSequenceNumber = record.volume_sequence_number,
Timestamp = DecodeIsoDateTime(record.date), 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) if(record.size != 0)
entry.Extents.Add((record.extent, record.size)); entry.Extents.Add((record.extent, record.size));
@@ -1201,11 +1208,10 @@ public sealed partial class ISO9660
Interleave = record.interleave, Interleave = record.interleave,
VolumeSequenceNumber = record.volume_sequence_number, VolumeSequenceNumber = record.volume_sequence_number,
Timestamp = DecodeHighSierraDateTime(record.date), 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) if(record.size != 0)
entry.Extents.Add((record.extent, record.size)); entry.Extents.Add((record.extent, record.size));

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

@@ -379,8 +379,10 @@ public class SuperNintendo : IByteAddressableImage
if(hasFlash) if(hasFlash)
devices++; devices++;
mappings = new LinearMemoryMap(); mappings = new LinearMemoryMap
mappings.Devices = new LinearMemoryDevice[devices]; {
Devices = new LinearMemoryDevice[devices]
};
mappings.Devices[0] = new LinearMemoryDevice mappings.Devices[0] = new LinearMemoryDevice
{ {

34
Aaru.Images/Nero/Read.cs
View File

@@ -1238,22 +1238,24 @@ public sealed partial class Nero
return ErrorNumber.InvalidArgument; return ErrorNumber.InvalidArgument;
} }
var track = new Track(); var track = new Track
{
// Common track data // Common track data
track.Description = StringHandlers.CToString(_neroTracks[1].Isrc); Description = StringHandlers.CToString(_neroTracks[1].Isrc),
EndSector = (_imageNewFormat ? footerV2.FirstChunkOffset : footerV1.FirstChunkOffset) /
track.EndSector = (_imageNewFormat ? footerV2.FirstChunkOffset : footerV1.FirstChunkOffset) / _neroTracks[1].SectorSize - 150,
_neroTracks[1].SectorSize - 150; Sequence = _neroTracks[1].Sequence,
Session = currentSession,
track.Sequence = _neroTracks[1].Sequence; Type = NeroTrackModeToTrackType((DaoMode)_neroTracks[1].Mode),
track.Session = currentSession; File = imageFilter.Filename,
track.Type = NeroTrackModeToTrackType((DaoMode)_neroTracks[1].Mode); Filter = imageFilter,
track.File = imageFilter.Filename; FileType = "BINARY",
track.Filter = imageFilter; SubchannelType = TrackSubchannelType.None,
track.FileType = "BINARY"; Indexes =
track.SubchannelType = TrackSubchannelType.None; {
track.Indexes[1] = 0; [1] = 0
}
};
var rawMode1 = false; var rawMode1 = false;
var rawMode2 = false; var rawMode2 = false;

6
Aaru.Partitions/Atari.cs
View File

@@ -260,8 +260,10 @@ public sealed class AtariPartitions : IPartition
if(errno != ErrorNumber.NoError) if(errno != ErrorNumber.NoError)
break; break;
var extendedTable = new AtariTable(); var extendedTable = new AtariTable
extendedTable.Entries = new AtariEntry[4]; {
Entries = new AtariEntry[4]
};
for(var j = 0; j < 4; j++) for(var j = 0; j < 4; j++)
{ {

7
Aaru/Commands/Filesystem/Info.cs
View File

@@ -255,8 +255,11 @@ sealed class FilesystemInfoCommand : Command
for(var i = 0; i < partitionsList.Count; i++) for(var i = 0; i < partitionsList.Count; i++)
{ {
Table table = new(); Table table = new()
table.Title = new TableTitle($"Partition {partitionsList[i].Sequence}:"); {
Title = new TableTitle($"Partition {partitionsList[i].Sequence}:")
};
table.AddColumn(""); table.AddColumn("");
table.AddColumn(""); table.AddColumn("");
table.HideHeaders(); table.HideHeaders();