diff --git a/DiscImageChef.Tests.Devices/ATA/Ata28.cs b/DiscImageChef.Tests.Devices/ATA/Ata28.cs index 1dee35dc..7b7e8268 100644 --- a/DiscImageChef.Tests.Devices/ATA/Ata28.cs +++ b/DiscImageChef.Tests.Devices/ATA/Ata28.cs @@ -134,9 +134,8 @@ 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("2.- Decode error registers."); + DicConsole.WriteLine("3.- Send command again."); DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu."); DicConsole.Write("Choose: "); @@ -166,17 +165,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 BUFFER 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 BUFFER status registers:"); @@ -186,7 +174,7 @@ namespace DiscImageChef.Tests.Devices.ATA System.Console.Clear(); DicConsole.WriteLine("Device: {0}", devPath); goto menu; - case 4: + case 3: goto start; default: DicConsole.WriteLine("Incorrect option. Press any key to continue..."); @@ -212,9 +200,8 @@ 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("2.- Decode error registers."); + DicConsole.WriteLine("3.- Send command again."); DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu."); DicConsole.Write("Choose: "); @@ -244,17 +231,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 BUFFER DMA 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 BUFFER DMA status registers:"); @@ -264,7 +240,7 @@ namespace DiscImageChef.Tests.Devices.ATA System.Console.Clear(); DicConsole.WriteLine("Device: {0}", devPath); goto menu; - case 4: + case 3: goto start; default: DicConsole.WriteLine("Incorrect option. Press any key to continue..."); @@ -352,10 +328,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 28-bit ATA commands menu."); DicConsole.Write("Choose: "); @@ -385,17 +360,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 " : ""); @@ -405,9 +369,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..."); @@ -486,10 +450,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 28-bit ATA commands menu."); DicConsole.Write("Choose: "); @@ -519,17 +482,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 " : ""); @@ -539,9 +491,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..."); @@ -629,10 +581,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 28-bit ATA commands menu."); DicConsole.Write("Choose: "); @@ -662,17 +613,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:"); @@ -682,9 +622,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..."); @@ -825,10 +765,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 28-bit ATA commands menu."); DicConsole.Write("Choose: "); @@ -858,17 +797,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 " : ""); @@ -878,9 +806,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..."); diff --git a/DiscImageChef.Tests.Devices/ATA/Ata48.cs b/DiscImageChef.Tests.Devices/ATA/Ata48.cs index 3267fbf8..9d9ca03d 100644 --- a/DiscImageChef.Tests.Devices/ATA/Ata48.cs +++ b/DiscImageChef.Tests.Devices/ATA/Ata48.cs @@ -233,10 +233,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 48-bit ATA commands menu."); DicConsole.Write("Choose: "); @@ -266,17 +265,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 EXT 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 DMA EXT status registers:"); @@ -286,9 +274,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..."); @@ -382,10 +370,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 48-bit ATA commands menu."); DicConsole.Write("Choose: "); @@ -415,17 +402,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 LOG EXT 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 LOG EXT status registers:"); @@ -435,9 +411,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..."); @@ -531,10 +507,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 48-bit ATA commands menu."); DicConsole.Write("Choose: "); @@ -564,17 +539,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 LOG DMA EXT 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 LOG DMA EXT status registers:"); @@ -584,9 +548,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..."); @@ -674,10 +638,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 48-bit ATA commands menu."); DicConsole.Write("Choose: "); @@ -707,17 +670,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 EXT 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 EXT status registers:"); @@ -727,9 +679,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..."); @@ -870,10 +822,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 48-bit ATA commands menu."); DicConsole.Write("Choose: "); @@ -903,17 +854,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 EXT 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 SECTORS EXT status registers:"); @@ -923,9 +863,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..."); diff --git a/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs b/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs index 0dd9de2b..d95cd305 100644 --- a/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs +++ b/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs @@ -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..."); diff --git a/DiscImageChef.Tests.Devices/ATA/Cfa.cs b/DiscImageChef.Tests.Devices/ATA/Cfa.cs index 73b73b2f..cf4b8941 100644 --- a/DiscImageChef.Tests.Devices/ATA/Cfa.cs +++ b/DiscImageChef.Tests.Devices/ATA/Cfa.cs @@ -228,10 +228,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 CompactFlash commands menu."); DicConsole.Write("Choose: "); @@ -261,17 +260,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("TRANSLATE SECTOR 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("TRANSLATE SECTOR status registers:"); @@ -281,9 +269,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..."); @@ -360,10 +348,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 CompactFlash commands menu."); DicConsole.Write("Choose: "); @@ -393,17 +380,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("TRANSLATE SECTOR 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("TRANSLATE SECTOR status registers:"); @@ -413,9 +389,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...");