General cleanup and refactor.

This commit is contained in:
2022-03-07 07:36:44 +00:00
parent bc6e432565
commit 762e3eb6d2
1321 changed files with 44657 additions and 45479 deletions

View File

@@ -1,11 +1,12 @@
namespace Aaru.Tests.Devices;
using System;
using Aaru.Console;
using Aaru.Decoders.SCSI;
using Aaru.Devices;
using Aaru.Helpers;
namespace Aaru.Tests.Devices;
internal static partial class ScsiMmc
static partial class ScsiMmc
{
static void MediaTekReadCache(string devPath, Device dev)
{
@@ -13,11 +14,11 @@ internal static partial class ScsiMmc
string strDev;
int item;
parameters:
parameters:
while(true)
{
System.Console.Clear();
Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Parameters for MediaTek READ CACHE command:");
AaruConsole.WriteLine("LBA: {0}", address);
@@ -27,12 +28,12 @@ internal static partial class ScsiMmc
AaruConsole.WriteLine("2.- Send command with these parameters.");
AaruConsole.WriteLine("0.- Return to special SCSI MultiMedia Commands menu.");
strDev = System.Console.ReadLine();
strDev = Console.ReadLine();
if(!int.TryParse(strDev, out item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
System.Console.ReadKey();
Console.ReadKey();
continue;
}
@@ -45,13 +46,13 @@ internal static partial class ScsiMmc
return;
case 1:
AaruConsole.Write("LBA?: ");
strDev = System.Console.ReadLine();
strDev = Console.ReadLine();
if(!uint.TryParse(strDev, out address))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
address = 0;
System.Console.ReadKey();
Console.ReadKey();
}
break;
@@ -59,14 +60,14 @@ internal static partial class ScsiMmc
}
}
start:
System.Console.Clear();
start:
Console.Clear();
AaruConsole.WriteLine("Sending READ CD to the device...");
bool sense = dev.ReadCd(out byte[] buffer, out byte[] senseBuffer, address, 2352, 1,
MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out double duration);
bool sense = dev.ReadCd(out byte[] buffer, out byte[] senseBuffer, address, 2352, 1, MmcSectorTypes.AllTypes,
false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
MmcSubchannel.None, dev.Timeout, out double duration);
if(sense)
AaruConsole.WriteLine("READ CD failed...");
@@ -74,7 +75,7 @@ internal static partial class ScsiMmc
AaruConsole.WriteLine("Sending MediaTek READ DRAM to the device...");
sense = dev.MediaTekReadDram(out buffer, out senseBuffer, 0, 0xB00, dev.Timeout, out duration);
menu:
menu:
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Command took {0} ms.", duration);
AaruConsole.WriteLine("Sense is {0}.", sense);
@@ -93,13 +94,13 @@ internal static partial class ScsiMmc
AaruConsole.WriteLine("0.- Return to special SCSI MultiMedia Commands menu.");
AaruConsole.Write("Choose: ");
strDev = System.Console.ReadLine();
strDev = Console.ReadLine();
if(!int.TryParse(strDev, out item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
System.Console.ReadKey();
System.Console.Clear();
Console.ReadKey();
Console.Clear();
goto menu;
}
@@ -111,7 +112,7 @@ internal static partial class ScsiMmc
return;
case 1:
System.Console.Clear();
Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("MediaTek's READ CACHE response:");
@@ -119,13 +120,13 @@ internal static partial class ScsiMmc
PrintHex.PrintHexArray(buffer, 64);
AaruConsole.WriteLine("Press any key to continue...");
System.Console.ReadKey();
System.Console.Clear();
Console.ReadKey();
Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 2:
System.Console.Clear();
Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("MediaTek's READ CACHE sense:");
@@ -133,19 +134,19 @@ internal static partial class ScsiMmc
PrintHex.PrintHexArray(senseBuffer, 64);
AaruConsole.WriteLine("Press any key to continue...");
System.Console.ReadKey();
System.Console.Clear();
Console.ReadKey();
Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 3:
System.Console.Clear();
Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("MediaTek's READ CACHE decoded sense:");
AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
AaruConsole.WriteLine("Press any key to continue...");
System.Console.ReadKey();
System.Console.Clear();
Console.ReadKey();
Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
goto menu;
@@ -153,8 +154,8 @@ internal static partial class ScsiMmc
case 5: goto parameters;
default:
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
System.Console.ReadKey();
System.Console.Clear();
Console.ReadKey();
Console.Clear();
goto menu;
}