aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't try to decode as identify things that are not identify.

Browse Source
This commit is contained in:
Natalia Portillo
2017-09-08 18:29:31 +01:00
parent b92d64beb1
commit 739a4acf4b
4 changed files with 81 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
DiscImageChef.Tests.Devices/ATA/AtaCHS.cs
View File

@@ -288,10 +288,9 @@ namespace DiscImageChef.Tests.Devices.ATA
DicConsole.WriteLine();
DicConsole.WriteLine("Choose what to do:");
DicConsole.WriteLine("1.- Print buffer.");
DicConsole.WriteLine("2.- Decode buffer.");
DicConsole.WriteLine("3.- Decode error registers.");
DicConsole.WriteLine("4.- Send command again.");
DicConsole.WriteLine("5.- Change parameters.");
DicConsole.WriteLine("2.- Decode error registers.");
DicConsole.WriteLine("3.- Send command again.");
DicConsole.WriteLine("4.- Change parameters.");
DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
DicConsole.Write("Choose: ");
@@ -321,17 +320,6 @@ namespace DiscImageChef.Tests.Devices.ATA
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 2:
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("READ DMA {0}decoded response:", retries ? "WITH RETRIES " : "");
if(buffer != null)
DicConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
DicConsole.WriteLine("Press any key to continue...");
System.Console.ReadKey();
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 3:
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("READ DMA {0}status registers:", retries ? "WITH RETRIES " : "");
@@ -341,9 +329,9 @@ namespace DiscImageChef.Tests.Devices.ATA
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 4:
case 3:
goto start;
case 5:
case 4:
goto parameters;
default:
DicConsole.WriteLine("Incorrect option. Press any key to continue...");
@@ -453,10 +441,9 @@ namespace DiscImageChef.Tests.Devices.ATA
DicConsole.WriteLine();
DicConsole.WriteLine("Choose what to do:");
DicConsole.WriteLine("1.- Print buffer.");
DicConsole.WriteLine("2.- Decode buffer.");
DicConsole.WriteLine("3.- Decode error registers.");
DicConsole.WriteLine("4.- Send command again.");
DicConsole.WriteLine("5.- Change parameters.");
DicConsole.WriteLine("2.- Decode error registers.");
DicConsole.WriteLine("3.- Send command again.");
DicConsole.WriteLine("4.- Change parameters.");
DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
DicConsole.Write("Choose: ");
@@ -486,17 +473,6 @@ namespace DiscImageChef.Tests.Devices.ATA
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 2:
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("READ LONG {0}decoded response:", retries ? "WITH RETRIES " : "");
if(buffer != null)
DicConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
DicConsole.WriteLine("Press any key to continue...");
System.Console.ReadKey();
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 3:
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("READ LONG {0}status registers:", retries ? "WITH RETRIES " : "");
@@ -506,9 +482,9 @@ namespace DiscImageChef.Tests.Devices.ATA
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 4:
case 3:
goto start;
case 5:
case 4:
goto parameters;
default:
DicConsole.WriteLine("Incorrect option. Press any key to continue...");
@@ -618,10 +594,9 @@ namespace DiscImageChef.Tests.Devices.ATA
DicConsole.WriteLine();
DicConsole.WriteLine("Choose what to do:");
DicConsole.WriteLine("1.- Print buffer.");
DicConsole.WriteLine("2.- Decode buffer.");
DicConsole.WriteLine("3.- Decode error registers.");
DicConsole.WriteLine("4.- Send command again.");
DicConsole.WriteLine("5.- Change parameters.");
DicConsole.WriteLine("2.- Decode error registers.");
DicConsole.WriteLine("3.- Send command again.");
DicConsole.WriteLine("4.- Change parameters.");
DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
DicConsole.Write("Choose: ");
@@ -651,17 +626,6 @@ namespace DiscImageChef.Tests.Devices.ATA
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 2:
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("READ MULTIPLE decoded response:");
if(buffer != null)
DicConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
DicConsole.WriteLine("Press any key to continue...");
System.Console.ReadKey();
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 3:
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("READ MULTIPLE status registers:");
@@ -671,9 +635,9 @@ namespace DiscImageChef.Tests.Devices.ATA
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 4:
case 3:
goto start;
case 5:
case 4:
goto parameters;
default:
DicConsole.WriteLine("Incorrect option. Press any key to continue...");
@@ -783,10 +747,9 @@ namespace DiscImageChef.Tests.Devices.ATA
DicConsole.WriteLine();
DicConsole.WriteLine("Choose what to do:");
DicConsole.WriteLine("1.- Print buffer.");
DicConsole.WriteLine("2.- Decode buffer.");
DicConsole.WriteLine("3.- Decode error registers.");
DicConsole.WriteLine("4.- Send command again.");
DicConsole.WriteLine("5.- Change parameters.");
DicConsole.WriteLine("2.- Decode error registers.");
DicConsole.WriteLine("3.- Send command again.");
DicConsole.WriteLine("4.- Change parameters.");
DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
DicConsole.Write("Choose: ");
@@ -816,17 +779,6 @@ namespace DiscImageChef.Tests.Devices.ATA
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 2:
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("READ SECTORS {0}decoded response:", retries ? "WITH RETRIES " : "");
if(buffer != null)
DicConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
DicConsole.WriteLine("Press any key to continue...");
System.Console.ReadKey();
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 3:
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("READ SECTORS {0}status registers:", retries ? "WITH RETRIES " : "");
@@ -836,9 +788,9 @@ namespace DiscImageChef.Tests.Devices.ATA
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 4:
case 3:
goto start;
case 5:
case 4:
goto parameters;
default:
DicConsole.WriteLine("Incorrect option. Press any key to continue...");