aaru-dps/Aaru-aaru-dps
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-05-21 12:07:58 +00:00
Code Issues 657 Packages Projects Releases 19 Wiki Activity

[Refactor] Inline out variable declaration.

Browse Source
This commit is contained in:
Natalia Portillo
2025-11-24 19:09:00 +00:00
parent 64db005bdc
commit dea49e235d
5 changed files with 82 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Aaru.Core/Devices/Report/MMC.cs
View File

@@ -2650,9 +2650,17 @@ public sealed partial class DeviceReport
Spectre.ProgressSingleSpinner(ctx =>
{
ReadOnlySpan<byte> localSense;
ctx.AddTask(Localization.Core.Trying_SCSI_READ_LONG_10).IsIndeterminate();
sense = _dev.ReadLong10(out buffer, out localSense, false, false, 16, 0xFFFF, _dev.Timeout, out _);
sense = _dev.ReadLong10(out buffer,
out ReadOnlySpan<byte> localSense,
false,
false,
16,
0xFFFF,
_dev.Timeout,
out _);
senseBytes = localSense.ToArray();
});
@@ -2847,10 +2855,13 @@ public sealed partial class DeviceReport
if(!triedLba0) return;
ReadOnlySpan<byte> localSense;
mediaTest.CanReadF1_06 =
!_dev.MediaTekReadDram(out buffer, out localSense, 0, 0xB00, _dev.Timeout, out _);
!_dev.MediaTekReadDram(out buffer,
out ReadOnlySpan<byte> localSense,
0,
0xB00,
_dev.Timeout,
out _);
mediaTest.ReadF1_06Data = mediaTest.CanReadF1_06 == true ? buffer : localSense.ToArray();
@@ -2993,10 +3004,13 @@ public sealed partial class DeviceReport
if(!triedLeadOut) return;
ReadOnlySpan<byte> localSense;
mediaTest.CanReadF1_06LeadOut =
!_dev.MediaTekReadDram(out buffer, out localSense, 0, 0xB00, _dev.Timeout, out _);
!_dev.MediaTekReadDram(out buffer,
out ReadOnlySpan<byte> localSense,
0,
0xB00,
_dev.Timeout,
out _);
mediaTest.ReadF1_06LeadOutData = mediaTest.CanReadF1_06LeadOut == true ? buffer : localSense.ToArray();

45
Aaru.Core/Devices/Report/Scsi.cs
View File

@@ -675,9 +675,17 @@ public sealed partial class DeviceReport
Spectre.ProgressSingleSpinner(ctx =>
{
ReadOnlySpan<byte> localSense;
ctx.AddTask(Localization.Core.Trying_SCSI_READ_LONG_10).IsIndeterminate();
sense = _dev.ReadLong10(out buffer, out localSense, false, false, 0, 0xFFFF, _dev.Timeout, out _);
sense = _dev.ReadLong10(out buffer,
out ReadOnlySpan<byte> localSense,
false,
false,
0,
0xFFFF,
_dev.Timeout,
out _);
senseBytes = localSense.ToArray();
});
@@ -707,9 +715,15 @@ public sealed partial class DeviceReport
Spectre.ProgressSingleSpinner(ctx =>
{
ReadOnlySpan<byte> localSense;
ctx.AddTask(Localization.Core.Trying_SCSI_READ_LONG_16).IsIndeterminate();
sense = _dev.ReadLong16(out buffer, out localSense, false, 0, 0xFFFF, _dev.Timeout, out _);
sense = _dev.ReadLong16(out buffer,
out ReadOnlySpan<byte> localSense,
false,
0,
0xFFFF,
_dev.Timeout,
out _);
if(sense && !_dev.Error)
{
@@ -1059,9 +1073,17 @@ public sealed partial class DeviceReport
Spectre.ProgressSingleSpinner(ctx =>
{
ReadOnlySpan<byte> localSense;
ctx.AddTask(Localization.Core.Trying_SCSI_READ_LONG_10).IsIndeterminate();
sense = _dev.ReadLong10(out buffer, out localSense, false, false, 0, 0xFFFF, _dev.Timeout, out _);
sense = _dev.ReadLong10(out buffer,
out ReadOnlySpan<byte> localSense,
false,
false,
0,
0xFFFF,
_dev.Timeout,
out _);
senseBytes = localSense.ToArray();
});
@@ -1091,9 +1113,16 @@ public sealed partial class DeviceReport
Spectre.ProgressSingleSpinner(ctx =>
{
ReadOnlySpan<byte> localSense;
ctx.AddTask(Localization.Core.Trying_SCSI_READ_LONG_16).IsIndeterminate();
sense = _dev.ReadLong16(out buffer, out localSense, false, 0, 0xFFFF, _dev.Timeout, out _);
sense = _dev.ReadLong16(out buffer,
out ReadOnlySpan<byte> localSense,
false,
0,
0xFFFF,
_dev.Timeout,
out _);
senseBytes = localSense.ToArray();
});

6
Aaru.Devices/Device/ScsiCommands/SyQuest.cs
View File

@@ -80,7 +80,6 @@ public partial class Device
senseBuffer = SenseBuffer;
Span<byte> cdb = CdbBuffer[..6];
cdb.Clear();
bool sense;
cdb[0] = (byte)ScsiCommands.Read6;
cdb[1] = (byte)((lba & 0x1F0000) >> 16);
@@ -103,7 +102,7 @@ public partial class Device
buffer = [];
LastError = !inhibitDma
? SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.In, out duration, out sense)
? SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.In, out duration, out bool sense)
: SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.None, out duration, out sense);
Error = LastError != 0;
@@ -151,7 +150,6 @@ public partial class Device
senseBuffer = SenseBuffer;
Span<byte> cdb = CdbBuffer[..10];
cdb.Clear();
bool sense;
cdb[0] = (byte)ScsiCommands.Read10;
cdb[2] = (byte)((lba & 0xFF000000) >> 24);
@@ -176,7 +174,7 @@ public partial class Device
buffer = [];
LastError = !inhibitDma
? SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.In, out duration, out sense)
? SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.In, out duration, out bool sense)
: SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.None, out duration, out sense);
Error = LastError != 0;

40
Aaru/Commands/Device/DeviceReport.cs
View File

@@ -725,11 +725,11 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
.StartAsync(Localization.Core.Waiting_for_drive_to_become_ready,
async ctx =>
{
ReadOnlySpan<byte> localSense;
sense = dev.ScsiTestUnitReady(out localSense,
dev.Timeout,
out _);
sense =
dev.ScsiTestUnitReady(out ReadOnlySpan<byte>
localSense,
dev.Timeout,
out _);
if(!sense) return;
@@ -941,11 +941,11 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
.StartAsync(Localization.Core.Waiting_for_drive_to_become_ready,
async ctx =>
{
ReadOnlySpan<byte> localSense;
sense = dev.ScsiTestUnitReady(out localSense,
dev.Timeout,
out _);
sense =
dev.ScsiTestUnitReady(out ReadOnlySpan<byte>
localSense,
dev.Timeout,
out _);
AaruLogging.Debug(MODULE_NAME, "sense = {0}", sense);
@@ -1060,11 +1060,11 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
.StartAsync(Localization.Core.Waiting_for_drive_to_become_ready,
async ctx =>
{
ReadOnlySpan<byte> localSense;
sense = dev.ScsiTestUnitReady(out localSense,
dev.Timeout,
out _);
sense =
dev.ScsiTestUnitReady(out ReadOnlySpan<byte>
localSense,
dev.Timeout,
out _);
if(!sense) return;
@@ -1276,11 +1276,11 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
.StartAsync(Localization.Core.Waiting_for_drive_to_become_ready,
async ctx =>
{
ReadOnlySpan<byte> localSense;
sense = dev.ScsiTestUnitReady(out localSense,
dev.Timeout,
out _);
sense =
dev.ScsiTestUnitReady(out ReadOnlySpan<byte>
localSense,
dev.Timeout,
out _);
if(!sense) return;

3
Aaru/Commands/Image/Convert.cs
View File

@@ -253,10 +253,9 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
if(mediaCapabilityResult != (int)ErrorNumber.NoError) return mediaCapabilityResult;
// Validate sector tags compatibility between formats
bool useLong;
int sectorTagValidationResult =
ValidateSectorTags(outputFormat as IWritableImage, inputFormat, settings, out useLong);
ValidateSectorTags(outputFormat as IWritableImage, inputFormat, settings, out bool useLong);
if(sectorTagValidationResult != (int)ErrorNumber.NoError) return sectorTagValidationResult;