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

[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();
});