mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
General code cleanup and style refactor.
This commit is contained in:
@@ -26,21 +26,20 @@
|
||||
// Copyright © 2011-2022 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
namespace Aaru.Tests.Devices.SCSI;
|
||||
|
||||
using System;
|
||||
using Aaru.Console;
|
||||
using Aaru.Decoders.SCSI;
|
||||
using Aaru.Devices;
|
||||
using Aaru.Helpers;
|
||||
|
||||
namespace Aaru.Tests.Devices.SCSI;
|
||||
|
||||
static class ArchiveCorp
|
||||
{
|
||||
internal static void Menu(string devPath, Device dev)
|
||||
{
|
||||
while(true)
|
||||
{
|
||||
Console.Clear();
|
||||
System.Console.Clear();
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
AaruConsole.WriteLine("Send an Archive vendor command to the device:");
|
||||
AaruConsole.WriteLine("1.- Send REQUEST BLOCK ADDRESS command.");
|
||||
@@ -48,12 +47,12 @@ static class ArchiveCorp
|
||||
AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
|
||||
AaruConsole.Write("Choose: ");
|
||||
|
||||
string strDev = Console.ReadLine();
|
||||
string strDev = System.Console.ReadLine();
|
||||
|
||||
if(!int.TryParse(strDev, out int item))
|
||||
{
|
||||
AaruConsole.WriteLine("Not a number. Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
System.Console.ReadKey();
|
||||
|
||||
continue;
|
||||
}
|
||||
@@ -74,7 +73,7 @@ static class ArchiveCorp
|
||||
continue;
|
||||
default:
|
||||
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
System.Console.ReadKey();
|
||||
|
||||
continue;
|
||||
}
|
||||
@@ -87,11 +86,11 @@ static class ArchiveCorp
|
||||
string strDev;
|
||||
int item;
|
||||
|
||||
parameters:
|
||||
parameters:
|
||||
|
||||
while(true)
|
||||
{
|
||||
Console.Clear();
|
||||
System.Console.Clear();
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
AaruConsole.WriteLine("Parameters for REQUEST BLOCK ADDRESS command:");
|
||||
AaruConsole.WriteLine("LBA: {0}", lba);
|
||||
@@ -101,12 +100,12 @@ static class ArchiveCorp
|
||||
AaruConsole.WriteLine("2.- Send command with these parameters.");
|
||||
AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
|
||||
|
||||
strDev = Console.ReadLine();
|
||||
strDev = System.Console.ReadLine();
|
||||
|
||||
if(!int.TryParse(strDev, out item))
|
||||
{
|
||||
AaruConsole.WriteLine("Not a number. Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
System.Console.ReadKey();
|
||||
|
||||
continue;
|
||||
}
|
||||
@@ -119,13 +118,13 @@ static class ArchiveCorp
|
||||
return;
|
||||
case 1:
|
||||
AaruConsole.Write("LBA?: ");
|
||||
strDev = Console.ReadLine();
|
||||
strDev = System.Console.ReadLine();
|
||||
|
||||
if(!uint.TryParse(strDev, out lba))
|
||||
{
|
||||
AaruConsole.WriteLine("Not a number. Press any key to continue...");
|
||||
lba = 0;
|
||||
Console.ReadKey();
|
||||
System.Console.ReadKey();
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -133,13 +132,13 @@ static class ArchiveCorp
|
||||
}
|
||||
}
|
||||
|
||||
start:
|
||||
Console.Clear();
|
||||
start:
|
||||
System.Console.Clear();
|
||||
|
||||
bool sense = dev.ArchiveCorpRequestBlockAddress(out byte[] buffer, out byte[] senseBuffer, lba, dev.Timeout,
|
||||
out double duration);
|
||||
|
||||
menu:
|
||||
menu:
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
AaruConsole.WriteLine("Sending REQUEST BLOCK ADDRESS to the device:");
|
||||
AaruConsole.WriteLine("Command took {0} ms.", duration);
|
||||
@@ -158,13 +157,13 @@ static class ArchiveCorp
|
||||
AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
|
||||
AaruConsole.Write("Choose: ");
|
||||
|
||||
strDev = Console.ReadLine();
|
||||
strDev = System.Console.ReadLine();
|
||||
|
||||
if(!int.TryParse(strDev, out item))
|
||||
{
|
||||
AaruConsole.WriteLine("Not a number. Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
Console.Clear();
|
||||
System.Console.ReadKey();
|
||||
System.Console.Clear();
|
||||
|
||||
goto menu;
|
||||
}
|
||||
@@ -176,7 +175,7 @@ static class ArchiveCorp
|
||||
|
||||
return;
|
||||
case 1:
|
||||
Console.Clear();
|
||||
System.Console.Clear();
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
AaruConsole.WriteLine("REQUEST BLOCK ADDRESS response:");
|
||||
|
||||
@@ -184,13 +183,13 @@ static class ArchiveCorp
|
||||
PrintHex.PrintHexArray(buffer, 64);
|
||||
|
||||
AaruConsole.WriteLine("Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
Console.Clear();
|
||||
System.Console.ReadKey();
|
||||
System.Console.Clear();
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
|
||||
goto menu;
|
||||
case 2:
|
||||
Console.Clear();
|
||||
System.Console.Clear();
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
AaruConsole.WriteLine("REQUEST BLOCK ADDRESS sense:");
|
||||
|
||||
@@ -198,19 +197,19 @@ static class ArchiveCorp
|
||||
PrintHex.PrintHexArray(senseBuffer, 64);
|
||||
|
||||
AaruConsole.WriteLine("Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
Console.Clear();
|
||||
System.Console.ReadKey();
|
||||
System.Console.Clear();
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
|
||||
goto menu;
|
||||
case 3:
|
||||
Console.Clear();
|
||||
System.Console.Clear();
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
AaruConsole.WriteLine("REQUEST BLOCK ADDRESS decoded sense:");
|
||||
AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
|
||||
AaruConsole.WriteLine("Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
Console.Clear();
|
||||
System.Console.ReadKey();
|
||||
System.Console.Clear();
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
|
||||
goto menu;
|
||||
@@ -218,8 +217,8 @@ static class ArchiveCorp
|
||||
case 5: goto parameters;
|
||||
default:
|
||||
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
Console.Clear();
|
||||
System.Console.ReadKey();
|
||||
System.Console.Clear();
|
||||
|
||||
goto menu;
|
||||
}
|
||||
@@ -227,16 +226,16 @@ static class ArchiveCorp
|
||||
|
||||
static void SeekBlock(string devPath, Device dev)
|
||||
{
|
||||
var immediate = false;
|
||||
bool immediate = false;
|
||||
uint lba = 0;
|
||||
string strDev;
|
||||
int item;
|
||||
|
||||
parameters:
|
||||
parameters:
|
||||
|
||||
while(true)
|
||||
{
|
||||
Console.Clear();
|
||||
System.Console.Clear();
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
AaruConsole.WriteLine("Parameters for SEEK BLOCK command:");
|
||||
AaruConsole.WriteLine("Immediate?: {0}", immediate);
|
||||
@@ -247,12 +246,12 @@ static class ArchiveCorp
|
||||
AaruConsole.WriteLine("2.- Send command with these parameters.");
|
||||
AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
|
||||
|
||||
strDev = Console.ReadLine();
|
||||
strDev = System.Console.ReadLine();
|
||||
|
||||
if(!int.TryParse(strDev, out item))
|
||||
{
|
||||
AaruConsole.WriteLine("Not a number. Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
System.Console.ReadKey();
|
||||
|
||||
continue;
|
||||
}
|
||||
@@ -265,25 +264,25 @@ static class ArchiveCorp
|
||||
return;
|
||||
case 1:
|
||||
AaruConsole.Write("Immediate?: ");
|
||||
strDev = Console.ReadLine();
|
||||
strDev = System.Console.ReadLine();
|
||||
|
||||
if(!bool.TryParse(strDev, out immediate))
|
||||
{
|
||||
AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
|
||||
immediate = false;
|
||||
Console.ReadKey();
|
||||
System.Console.ReadKey();
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
AaruConsole.Write("LBA?: ");
|
||||
strDev = Console.ReadLine();
|
||||
strDev = System.Console.ReadLine();
|
||||
|
||||
if(!uint.TryParse(strDev, out lba))
|
||||
{
|
||||
AaruConsole.WriteLine("Not a number. Press any key to continue...");
|
||||
lba = 0;
|
||||
Console.ReadKey();
|
||||
System.Console.ReadKey();
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -291,12 +290,12 @@ static class ArchiveCorp
|
||||
}
|
||||
}
|
||||
|
||||
start:
|
||||
Console.Clear();
|
||||
start:
|
||||
System.Console.Clear();
|
||||
|
||||
bool sense = dev.ArchiveCorpSeekBlock(out byte[] senseBuffer, immediate, lba, dev.Timeout, out double duration);
|
||||
|
||||
menu:
|
||||
menu:
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
AaruConsole.WriteLine("Sending SEEK BLOCK to the device:");
|
||||
AaruConsole.WriteLine("Command took {0} ms.", duration);
|
||||
@@ -313,13 +312,13 @@ static class ArchiveCorp
|
||||
AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
|
||||
AaruConsole.Write("Choose: ");
|
||||
|
||||
strDev = Console.ReadLine();
|
||||
strDev = System.Console.ReadLine();
|
||||
|
||||
if(!int.TryParse(strDev, out item))
|
||||
{
|
||||
AaruConsole.WriteLine("Not a number. Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
Console.Clear();
|
||||
System.Console.ReadKey();
|
||||
System.Console.Clear();
|
||||
|
||||
goto menu;
|
||||
}
|
||||
@@ -331,7 +330,7 @@ static class ArchiveCorp
|
||||
|
||||
return;
|
||||
case 1:
|
||||
Console.Clear();
|
||||
System.Console.Clear();
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
AaruConsole.WriteLine("SEEK BLOCK sense:");
|
||||
|
||||
@@ -339,8 +338,8 @@ static class ArchiveCorp
|
||||
PrintHex.PrintHexArray(senseBuffer, 64);
|
||||
|
||||
AaruConsole.WriteLine("Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
Console.Clear();
|
||||
System.Console.ReadKey();
|
||||
System.Console.Clear();
|
||||
AaruConsole.WriteLine("Device: {0}", devPath);
|
||||
|
||||
goto menu;
|
||||
@@ -348,8 +347,8 @@ static class ArchiveCorp
|
||||
case 3: goto parameters;
|
||||
default:
|
||||
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
|
||||
Console.ReadKey();
|
||||
Console.Clear();
|
||||
System.Console.ReadKey();
|
||||
System.Console.Clear();
|
||||
|
||||
goto menu;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user