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

[Aaru.Tests.Devices] Reformat and cleanup.

Browse Source
This commit is contained in:
Natalia Portillo
2023-10-03 23:49:06 +01:00
parent 1f36ef2424
commit a0a4124a26
35 changed files with 3835 additions and 3454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
Aaru.Tests.Devices/ATA/Ata28.cs
View File

@@ -190,7 +190,8 @@ static class Ata28
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -265,7 +266,8 @@ static class Ata28
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -289,7 +291,8 @@ static class Ata28
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Parameters_for_READ_DMA_WITH_RETRIES_command AaruConsole.WriteLine(retries
? Localization.Parameters_for_READ_DMA_WITH_RETRIES_command
: Localization.Parameters_for_READ_DMA_command); : Localization.Parameters_for_READ_DMA_command);
AaruConsole.WriteLine(Localization.LBA_0, lba); AaruConsole.WriteLine(Localization.LBA_0, lba);
@@ -349,7 +352,8 @@ static class Ata28
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -362,7 +366,8 @@ static class Ata28
menu: menu:
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Sending_READ_DMA_WITH_RETRIES_to_the_device AaruConsole.WriteLine(retries
? Localization.Sending_READ_DMA_WITH_RETRIES_to_the_device
: Localization.Sending_READ_DMA_to_the_device); : Localization.Sending_READ_DMA_to_the_device);
AaruConsole.WriteLine(Localization.Command_took_0_ms, duration); AaruConsole.WriteLine(Localization.Command_took_0_ms, duration);
@@ -399,7 +404,8 @@ static class Ata28
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_DMA_WITH_RETRIES_response AaruConsole.WriteLine(retries
? Localization.READ_DMA_WITH_RETRIES_response
: Localization.READ_DMA_response); : Localization.READ_DMA_response);
if(buffer != null) if(buffer != null)
@@ -415,7 +421,8 @@ static class Ata28
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_DMA_WITH_RETRIES_status_registers AaruConsole.WriteLine(retries
? Localization.READ_DMA_WITH_RETRIES_status_registers
: Localization.READ_DMA_status_registers); : Localization.READ_DMA_status_registers);
AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
@@ -425,8 +432,10 @@ static class Ata28
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -450,7 +459,8 @@ static class Ata28
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Parameters_for_READ_LONG_WITH_RETRIES_command AaruConsole.WriteLine(retries
? Localization.Parameters_for_READ_LONG_WITH_RETRIES_command
: Localization.Parameters_for_READ_LONG_command); : Localization.Parameters_for_READ_LONG_command);
AaruConsole.WriteLine(Localization.LBA_0, lba); AaruConsole.WriteLine(Localization.LBA_0, lba);
@@ -510,7 +520,8 @@ static class Ata28
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -523,7 +534,8 @@ static class Ata28
menu: menu:
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Sending_READ_LONG_WITH_RETRIES_to_the_device AaruConsole.WriteLine(retries
? Localization.Sending_READ_LONG_WITH_RETRIES_to_the_device
: Localization.Sending_READ_LONG_to_the_device); : Localization.Sending_READ_LONG_to_the_device);
AaruConsole.WriteLine(Localization.Command_took_0_ms, duration); AaruConsole.WriteLine(Localization.Command_took_0_ms, duration);
@@ -560,7 +572,8 @@ static class Ata28
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_LONG_WITH_RETRIES_response AaruConsole.WriteLine(retries
? Localization.READ_LONG_WITH_RETRIES_response
: Localization.READ_LONG_response); : Localization.READ_LONG_response);
if(buffer != null) if(buffer != null)
@@ -576,7 +589,8 @@ static class Ata28
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_LONG_WITH_RETRIES_status_registers AaruConsole.WriteLine(retries
? Localization.READ_LONG_WITH_RETRIES_status_registers
: Localization.READ_LONG_status_registers); : Localization.READ_LONG_status_registers);
AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
@@ -586,8 +600,10 @@ static class Ata28
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -668,7 +684,8 @@ static class Ata28
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -736,8 +753,10 @@ static class Ata28
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -796,7 +815,8 @@ static class Ata28
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -820,7 +840,8 @@ static class Ata28
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Parameters_for_READ_SECTORS_WITH_RETRIES_command AaruConsole.WriteLine(retries
? Localization.Parameters_for_READ_SECTORS_WITH_RETRIES_command
: Localization.Parameters_for_READ_SECTORS_command); : Localization.Parameters_for_READ_SECTORS_command);
AaruConsole.WriteLine(Localization.LBA_0, lba); AaruConsole.WriteLine(Localization.LBA_0, lba);
@@ -880,7 +901,8 @@ static class Ata28
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -893,7 +915,8 @@ static class Ata28
menu: menu:
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Sending_READ_SECTORS_WITH_RETRIES_to_the_device AaruConsole.WriteLine(retries
? Localization.Sending_READ_SECTORS_WITH_RETRIES_to_the_device
: Localization.Sending_READ_SECTORS_to_the_device); : Localization.Sending_READ_SECTORS_to_the_device);
AaruConsole.WriteLine(Localization.Command_took_0_ms, duration); AaruConsole.WriteLine(Localization.Command_took_0_ms, duration);
@@ -930,7 +953,8 @@ static class Ata28
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_SECTORS_WITH_RETRIES_response AaruConsole.WriteLine(retries
? Localization.READ_SECTORS_WITH_RETRIES_response
: Localization.READ_SECTORS_response); : Localization.READ_SECTORS_response);
if(buffer != null) if(buffer != null)
@@ -946,7 +970,8 @@ static class Ata28
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_SECTORS_WITH_RETRIES_status_registers AaruConsole.WriteLine(retries
? Localization.READ_SECTORS_WITH_RETRIES_status_registers
: Localization.READ_SECTORS_status_registers); : Localization.READ_SECTORS_status_registers);
AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
@@ -956,8 +981,10 @@ static class Ata28
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1026,7 +1053,8 @@ static class Ata28
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1075,8 +1103,10 @@ static class Ata28
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

51
Aaru.Tests.Devices/ATA/Ata48.cs
View File

@@ -154,7 +154,8 @@ static class Ata48
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -235,7 +236,8 @@ static class Ata48
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -303,8 +305,10 @@ static class Ata48
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -390,7 +394,8 @@ static class Ata48
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -458,8 +463,10 @@ static class Ata48
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -545,7 +552,8 @@ static class Ata48
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -613,8 +621,10 @@ static class Ata48
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -695,7 +705,8 @@ static class Ata48
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -763,8 +774,10 @@ static class Ata48
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -823,7 +836,8 @@ static class Ata48
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -904,7 +918,8 @@ static class Ata48
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -972,8 +987,10 @@ static class Ata48
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

93
Aaru.Tests.Devices/ATA/AtaCHS.cs
View File

@@ -199,7 +199,8 @@ static class AtaChs
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -225,7 +226,8 @@ static class AtaChs
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Parameters_for_READ_DMA_WITH_RETRIES_command AaruConsole.WriteLine(retries
? Localization.Parameters_for_READ_DMA_WITH_RETRIES_command
: Localization.Parameters_for_READ_DMA_command); : Localization.Parameters_for_READ_DMA_command);
AaruConsole.WriteLine(Localization.Cylinder_0, cylinder); AaruConsole.WriteLine(Localization.Cylinder_0, cylinder);
@@ -308,7 +310,8 @@ static class AtaChs
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -321,7 +324,8 @@ static class AtaChs
menu: menu:
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Sending_READ_DMA_WITH_RETRIES_to_the_device AaruConsole.WriteLine(retries
? Localization.Sending_READ_DMA_WITH_RETRIES_to_the_device
: Localization.Sending_READ_DMA_to_the_device); : Localization.Sending_READ_DMA_to_the_device);
AaruConsole.WriteLine(Localization.Command_took_0_ms, duration); AaruConsole.WriteLine(Localization.Command_took_0_ms, duration);
@@ -358,7 +362,8 @@ static class AtaChs
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_DMA_WITH_RETRIES_response AaruConsole.WriteLine(retries
? Localization.READ_DMA_WITH_RETRIES_response
: Localization.READ_DMA_response); : Localization.READ_DMA_response);
if(buffer != null) if(buffer != null)
@@ -374,7 +379,8 @@ static class AtaChs
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_DMA_WITH_RETRIES_status_registers AaruConsole.WriteLine(retries
? Localization.READ_DMA_WITH_RETRIES_status_registers
: Localization.READ_DMA_status_registers); : Localization.READ_DMA_status_registers);
AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
@@ -384,8 +390,10 @@ static class AtaChs
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -411,7 +419,8 @@ static class AtaChs
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Parameters_for_READ_LONG_WITH_RETRIES_command AaruConsole.WriteLine(retries
? Localization.Parameters_for_READ_LONG_WITH_RETRIES_command
: Localization.Parameters_for_READ_LONG_command); : Localization.Parameters_for_READ_LONG_command);
AaruConsole.WriteLine(Localization.Cylinder_0, cylinder); AaruConsole.WriteLine(Localization.Cylinder_0, cylinder);
@@ -494,7 +503,8 @@ static class AtaChs
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -507,7 +517,8 @@ static class AtaChs
menu: menu:
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Sending_READ_LONG_WITH_RETRIES_to_the_device AaruConsole.WriteLine(retries
? Localization.Sending_READ_LONG_WITH_RETRIES_to_the_device
: Localization.Sending_READ_LONG_to_the_device); : Localization.Sending_READ_LONG_to_the_device);
AaruConsole.WriteLine(Localization.Command_took_0_ms, duration); AaruConsole.WriteLine(Localization.Command_took_0_ms, duration);
@@ -544,7 +555,8 @@ static class AtaChs
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_LONG_WITH_RETRIES_response AaruConsole.WriteLine(retries
? Localization.READ_LONG_WITH_RETRIES_response
: Localization.READ_LONG_response); : Localization.READ_LONG_response);
if(buffer != null) if(buffer != null)
@@ -560,7 +572,8 @@ static class AtaChs
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_LONG_WITH_RETRIES_status_registers AaruConsole.WriteLine(retries
? Localization.READ_LONG_WITH_RETRIES_status_registers
: Localization.READ_LONG_status_registers); : Localization.READ_LONG_status_registers);
AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
@@ -570,8 +583,10 @@ static class AtaChs
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -677,7 +692,8 @@ static class AtaChs
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -745,8 +761,10 @@ static class AtaChs
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -772,7 +790,8 @@ static class AtaChs
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Parameters_for_READ_SECTORS_WITH_RETRIES_command AaruConsole.WriteLine(retries
? Localization.Parameters_for_READ_SECTORS_WITH_RETRIES_command
: Localization.Parameters_for_READ_SECTORS_command); : Localization.Parameters_for_READ_SECTORS_command);
AaruConsole.WriteLine(Localization.Cylinder_0, cylinder); AaruConsole.WriteLine(Localization.Cylinder_0, cylinder);
@@ -855,7 +874,8 @@ static class AtaChs
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -868,7 +888,8 @@ static class AtaChs
menu: menu:
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.Sending_READ_SECTORS_WITH_RETRIES_to_the_device AaruConsole.WriteLine(retries
? Localization.Sending_READ_SECTORS_WITH_RETRIES_to_the_device
: Localization.Sending_READ_SECTORS_to_the_device); : Localization.Sending_READ_SECTORS_to_the_device);
AaruConsole.WriteLine(Localization.Command_took_0_ms, duration); AaruConsole.WriteLine(Localization.Command_took_0_ms, duration);
@@ -905,7 +926,8 @@ static class AtaChs
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_SECTORS_WITH_RETRIES_response AaruConsole.WriteLine(retries
? Localization.READ_SECTORS_WITH_RETRIES_response
: Localization.READ_SECTORS_response); : Localization.READ_SECTORS_response);
if(buffer != null) if(buffer != null)
@@ -921,7 +943,8 @@ static class AtaChs
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(retries ? Localization.READ_SECTORS_WITH_RETRIES_status_registers AaruConsole.WriteLine(retries
? Localization.READ_SECTORS_WITH_RETRIES_status_registers
: Localization.READ_SECTORS_status_registers); : Localization.READ_SECTORS_status_registers);
AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
@@ -931,8 +954,10 @@ static class AtaChs
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1024,7 +1049,8 @@ static class AtaChs
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1075,8 +1101,10 @@ static class AtaChs
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1192,7 +1220,8 @@ static class AtaChs
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1243,8 +1272,10 @@ static class AtaChs
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

3
Aaru.Tests.Devices/ATA/Atapi.cs
View File

@@ -154,7 +154,8 @@ static class Atapi
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

21
Aaru.Tests.Devices/ATA/Cfa.cs
View File

@@ -134,7 +134,8 @@ static class Cfa
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -226,7 +227,8 @@ static class Cfa
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -294,8 +296,10 @@ static class Cfa
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -364,7 +368,8 @@ static class Cfa
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -432,8 +437,10 @@ static class Cfa
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

9
Aaru.Tests.Devices/ATA/MCPT.cs
View File

@@ -122,7 +122,8 @@ static class Mcpt
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -163,8 +164,10 @@ static class Mcpt
AaruConsole.WriteLine(Localization.Returning_to_Media_Card_Pass_Through_commands_menu); AaruConsole.WriteLine(Localization.Returning_to_Media_Card_Pass_Through_commands_menu);
return; return;
case 1: goto start; case 1:
case 2: goto parameters; goto start;
case 2:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

36
Aaru.Tests.Devices/ATA/Smart.cs
View File

@@ -149,7 +149,8 @@ static class Smart
AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu); AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu);
return; return;
case 1: goto start; case 1:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -195,7 +196,8 @@ static class Smart
AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu); AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu);
return; return;
case 1: goto start; case 1:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -244,7 +246,8 @@ static class Smart
AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu); AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu);
return; return;
case 1: goto start; case 1:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -290,7 +293,8 @@ static class Smart
AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu); AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu);
return; return;
case 1: goto start; case 1:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -348,7 +352,8 @@ static class Smart
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -389,8 +394,10 @@ static class Smart
AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu); AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu);
return; return;
case 1: goto start; case 1:
case 2: goto parameters; goto start;
case 2:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -465,7 +472,8 @@ static class Smart
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -523,7 +531,8 @@ static class Smart
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -591,8 +600,10 @@ static class Smart
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -639,7 +650,8 @@ static class Smart
AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu); AaruConsole.WriteLine(Localization.Returning_to_SMART_commands_menu);
return; return;
case 1: goto start; case 1:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

12
Aaru.Tests.Devices/DecodeATARegisters.cs
View File

@@ -36,7 +36,7 @@ static partial class MainClass
{ {
static string DecodeAtaStatus(byte status) static string DecodeAtaStatus(byte status)
{ {
string ret = ""; var ret = "";
if((status & 0x80) == 0x80) if((status & 0x80) == 0x80)
ret += "BSY "; ret += "BSY ";
@@ -67,7 +67,7 @@ static partial class MainClass
static string DecodeAtaError(byte status) static string DecodeAtaError(byte status)
{ {
string ret = ""; var ret = "";
if((status & 0x80) == 0x80) if((status & 0x80) == 0x80)
ret += "BBK "; ret += "BBK ";
@@ -101,8 +101,8 @@ static partial class MainClass
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendFormat(Localization.Status_0, DecodeAtaStatus(registers.Status)).AppendLine(); sb.AppendFormat(Localization.Status_0, DecodeAtaStatus(registers.Status)).AppendLine();
sb.AppendFormat(Localization.Error_0, DecodeAtaStatus(registers.Error)).AppendLine(); sb.AppendFormat(Localization.Error_0, DecodeAtaStatus(registers.Error)).AppendLine();
sb.AppendFormat(Localization.Device_0, (registers.DeviceHead >> 4) & 0x01).AppendLine(); sb.AppendFormat(Localization.Device_0, registers.DeviceHead >> 4 & 0x01).AppendLine();
sb.AppendFormat(Localization.Cylinder_0, registers.CylinderHigh << (8 + registers.CylinderLow)).AppendLine(); sb.AppendFormat(Localization.Cylinder_0, registers.CylinderHigh << 8 + registers.CylinderLow).AppendLine();
sb.AppendFormat(Localization.Head_0, registers.DeviceHead & 0xF).AppendLine(); sb.AppendFormat(Localization.Head_0, registers.DeviceHead & 0xF).AppendLine();
sb.AppendFormat(Localization.Sector_0, registers.Sector).AppendLine(); sb.AppendFormat(Localization.Sector_0, registers.Sector).AppendLine();
sb.AppendFormat(Localization.Count_0, registers.SectorCount).AppendLine(); sb.AppendFormat(Localization.Count_0, registers.SectorCount).AppendLine();
@@ -118,7 +118,7 @@ static partial class MainClass
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendFormat(Localization.Status_0, DecodeAtaStatus(registers.Status)).AppendLine(); sb.AppendFormat(Localization.Status_0, DecodeAtaStatus(registers.Status)).AppendLine();
sb.AppendFormat(Localization.Error_0, DecodeAtaStatus(registers.Error)).AppendLine(); sb.AppendFormat(Localization.Error_0, DecodeAtaStatus(registers.Error)).AppendLine();
sb.AppendFormat(Localization.Device_0, (registers.DeviceHead >> 4) & 0x01).AppendLine(); sb.AppendFormat(Localization.Device_0, registers.DeviceHead >> 4 & 0x01).AppendLine();
sb.AppendFormat(Localization.LBA_0, sb.AppendFormat(Localization.LBA_0,
((registers.DeviceHead & 0xF) << 24) + (registers.LbaHigh << 16) + (registers.LbaMid << 8) + ((registers.DeviceHead & 0xF) << 24) + (registers.LbaHigh << 16) + (registers.LbaMid << 8) +
@@ -137,7 +137,7 @@ static partial class MainClass
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendFormat(Localization.Status_0, DecodeAtaStatus(registers.Status)).AppendLine(); sb.AppendFormat(Localization.Status_0, DecodeAtaStatus(registers.Status)).AppendLine();
sb.AppendFormat(Localization.Error_0, DecodeAtaStatus(registers.Error)).AppendLine(); sb.AppendFormat(Localization.Error_0, DecodeAtaStatus(registers.Error)).AppendLine();
sb.AppendFormat(Localization.Device_0, (registers.DeviceHead >> 4) & 0x01).AppendLine(); sb.AppendFormat(Localization.Device_0, registers.DeviceHead >> 4 & 0x01).AppendLine();
ulong lba = registers.LbaHighPrevious * 0x10000000000UL; ulong lba = registers.LbaHighPrevious * 0x10000000000UL;
lba += registers.LbaMidPrevious * 0x100000000UL; lba += registers.LbaMidPrevious * 0x100000000UL;

4
Aaru.Tests.Devices/Localization/Localization.resx
View File

@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<root> <root>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
id="root"
xmlns=""> xmlns="">
<xsd:element name="root" msdata:IsDataSet="true"></xsd:element> <xsd:element name="root" msdata:IsDataSet="true"></xsd:element>
</xsd:schema> </xsd:schema>

4
Aaru.Tests.Devices/Main.cs
View File

@@ -68,10 +68,12 @@ static partial class MainClass
"----------------", "------------------------", "------------------------", "----------------", "------------------------", "------------------------",
"----------", "----------", "--------"); "----------", "----------", "--------");
for(int i = 0; i < devices.Length; i++) for(var i = 0; i < devices.Length; i++)
{
AaruConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", devices[i].Path, AaruConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", devices[i].Path,
devices[i].Vendor, devices[i].Model, devices[i].Serial, devices[i].Bus, devices[i].Vendor, devices[i].Model, devices[i].Serial, devices[i].Bus,
devices[i].Supported, i + 1); devices[i].Supported, i + 1);
}
AaruConsole.Write(Localization.Please_choose_which_drive_to_test_zero_to_exit); AaruConsole.Write(Localization.Please_choose_which_drive_to_test_zero_to_exit);
string strDev = System.Console.ReadLine(); string strDev = System.Console.ReadLine();

36
Aaru.Tests.Devices/SCSI/Adaptec.cs
View File

@@ -92,7 +92,7 @@ static class Adaptec
static void ReadResetUsageCounter(string devPath, Device dev) static void ReadResetUsageCounter(string devPath, Device dev)
{ {
bool drive1 = false; var drive1 = false;
string strDev; string strDev;
int item; int item;
@@ -138,7 +138,8 @@ static class Adaptec
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -228,8 +229,10 @@ static class Adaptec
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -325,7 +328,8 @@ static class Adaptec
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -337,7 +341,7 @@ static class Adaptec
static void SetErrorThreshold(string devPath, Device dev) static void SetErrorThreshold(string devPath, Device dev)
{ {
bool drive1 = false; var drive1 = false;
byte threshold = 0; byte threshold = 0;
string strDev; string strDev;
int item; int item;
@@ -397,7 +401,8 @@ static class Adaptec
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -460,8 +465,10 @@ static class Adaptec
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -473,7 +480,7 @@ static class Adaptec
static void Translate(string devPath, Device dev) static void Translate(string devPath, Device dev)
{ {
bool drive1 = false; var drive1 = false;
uint lba = 0; uint lba = 0;
string strDev; string strDev;
int item; int item;
@@ -533,7 +540,8 @@ static class Adaptec
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -623,8 +631,10 @@ static class Adaptec
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

20
Aaru.Tests.Devices/SCSI/ArchiveCorp.cs
View File

@@ -132,7 +132,8 @@ static class ArchiveCorp
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -223,8 +224,10 @@ static class ArchiveCorp
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -236,7 +239,7 @@ static class ArchiveCorp
static void SeekBlock(string devPath, Device dev) static void SeekBlock(string devPath, Device dev)
{ {
bool immediate = false; var immediate = false;
uint lba = 0; uint lba = 0;
string strDev; string strDev;
int item; int item;
@@ -297,7 +300,8 @@ static class ArchiveCorp
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -360,8 +364,10 @@ static class ArchiveCorp
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

6
Aaru.Tests.Devices/SCSI/Certance.cs
View File

@@ -138,7 +138,8 @@ static class Certance
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -206,7 +207,8 @@ static class Certance
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

15
Aaru.Tests.Devices/SCSI/Fujitsu.cs
View File

@@ -78,10 +78,10 @@ static class Fujitsu
static void Display(string devPath, Device dev) static void Display(string devPath, Device dev)
{ {
bool flash = false; var flash = false;
FujitsuDisplayModes mode = FujitsuDisplayModes.Ready; FujitsuDisplayModes mode = FujitsuDisplayModes.Ready;
string firstHalf = "AARUTEST"; var firstHalf = "AARUTEST";
string secondHalf = "TESTAARU"; var secondHalf = "TESTAARU";
string strDev; string strDev;
int item; int item;
@@ -152,7 +152,8 @@ static class Fujitsu
secondHalf = System.Console.ReadLine(); secondHalf = System.Console.ReadLine();
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -215,8 +216,10 @@ static class Fujitsu
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

9
Aaru.Tests.Devices/SCSI/HL-DT-ST.cs
View File

@@ -137,7 +137,8 @@ static class HlDtSt
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -227,8 +228,10 @@ static class HlDtSt
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

21
Aaru.Tests.Devices/SCSI/HP.cs
View File

@@ -77,12 +77,12 @@ static class Hp
static void ReadLong(string devPath, Device dev) static void ReadLong(string devPath, Device dev)
{ {
bool relative = false; var relative = false;
uint address = 0; uint address = 0;
ushort length = 1; ushort length = 1;
ushort bps = 512; ushort bps = 512;
bool physical = false; var physical = false;
bool sectorCount = true; var sectorCount = true;
string strDev; string strDev;
int item; int item;
@@ -154,7 +154,8 @@ static class Hp
continue; continue;
} }
AaruConsole.Write(physical ? Localization.Physical_Block_Address_Q AaruConsole.Write(physical
? Localization.Physical_Block_Address_Q
: Localization.Logical_Block_Address_Q); : Localization.Logical_Block_Address_Q);
strDev = System.Console.ReadLine(); strDev = System.Console.ReadLine();
@@ -180,7 +181,8 @@ static class Hp
continue; continue;
} }
AaruConsole.Write(sectorCount ? Localization.How_many_sectors_to_transfer_Q AaruConsole.Write(sectorCount
? Localization.How_many_sectors_to_transfer_Q
: Localization.How_many_bytes_to_transfer_Q); : Localization.How_many_bytes_to_transfer_Q);
strDev = System.Console.ReadLine(); strDev = System.Console.ReadLine();
@@ -208,7 +210,8 @@ static class Hp
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -298,8 +301,10 @@ static class Hp
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

24
Aaru.Tests.Devices/SCSI/Kreon.cs
View File

@@ -139,7 +139,8 @@ static class Kreon
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -229,8 +230,10 @@ static class Kreon
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -301,7 +304,8 @@ static class Kreon
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -364,7 +368,8 @@ static class Kreon
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -403,8 +408,10 @@ static class Kreon
AaruConsole.WriteLine(Localization.Returning_to_Kreon_vendor_commands_menu); AaruConsole.WriteLine(Localization.Returning_to_Kreon_vendor_commands_menu);
return; return;
case 1: goto start; case 1:
case 2: goto parameters; goto start;
case 2:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -472,7 +479,8 @@ static class Kreon
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

112
Aaru.Tests.Devices/SCSI/MMC.cs
View File

@@ -181,7 +181,8 @@ static class Mmc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -259,6 +260,7 @@ static class Mmc
AaruConsole.WriteLine(Localization.GET_CONFIGURATION_current_profile_is_0_X4, ftr.CurrentProfile); AaruConsole.WriteLine(Localization.GET_CONFIGURATION_current_profile_is_0_X4, ftr.CurrentProfile);
if(ftr.Descriptors != null) if(ftr.Descriptors != null)
{
foreach(Features.FeatureDescriptor desc in ftr.Descriptors) foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
{ {
AaruConsole.WriteLine(Localization.Feature_0_X4, desc.Code); AaruConsole.WriteLine(Localization.Feature_0_X4, desc.Code);
@@ -563,6 +565,7 @@ static class Mmc
} }
} }
} }
}
AaruConsole.WriteLine(Localization.Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -598,8 +601,10 @@ static class Mmc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 5: goto start; case 5:
case 6: goto parameters; goto start;
case 6:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -611,8 +616,8 @@ static class Mmc
static void PreventAllowMediumRemoval(string devPath, Device dev) static void PreventAllowMediumRemoval(string devPath, Device dev)
{ {
bool prevent = false; var prevent = false;
bool persistent = false; var persistent = false;
string strDev; string strDev;
int item; int item;
@@ -671,7 +676,8 @@ static class Mmc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -734,8 +740,10 @@ static class Mmc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -750,12 +758,12 @@ static class Mmc
uint address = 0; uint address = 0;
uint length = 1; uint length = 1;
MmcSectorTypes sectorType = MmcSectorTypes.AllTypes; MmcSectorTypes sectorType = MmcSectorTypes.AllTypes;
bool dap = false; var dap = false;
bool relative = false; var relative = false;
bool sync = false; var sync = false;
MmcHeaderCodes header = MmcHeaderCodes.None; MmcHeaderCodes header = MmcHeaderCodes.None;
bool user = true; var user = true;
bool edc = false; var edc = false;
MmcErrorField c2 = MmcErrorField.None; MmcErrorField c2 = MmcErrorField.None;
MmcSubchannel subchan = MmcSubchannel.None; MmcSubchannel subchan = MmcSubchannel.None;
uint blockSize = 2352; uint blockSize = 2352;
@@ -969,7 +977,8 @@ static class Mmc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1059,8 +1068,10 @@ static class Mmc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1079,11 +1090,11 @@ static class Mmc
const byte endSecond = 0; const byte endSecond = 0;
byte endMinute = 0; byte endMinute = 0;
MmcSectorTypes sectorType = MmcSectorTypes.AllTypes; MmcSectorTypes sectorType = MmcSectorTypes.AllTypes;
bool dap = false; var dap = false;
bool sync = false; var sync = false;
MmcHeaderCodes header = MmcHeaderCodes.None; MmcHeaderCodes header = MmcHeaderCodes.None;
bool user = true; var user = true;
bool edc = false; var edc = false;
MmcErrorField c2 = MmcErrorField.None; MmcErrorField c2 = MmcErrorField.None;
MmcSubchannel subchan = MmcSubchannel.None; MmcSubchannel subchan = MmcSubchannel.None;
uint blockSize = 2352; uint blockSize = 2352;
@@ -1332,13 +1343,14 @@ static class Mmc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
start: start:
uint startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); var startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
uint endMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); var endMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
System.Console.Clear(); System.Console.Clear();
bool sense = dev.ReadCdMsf(out byte[] buffer, out byte[] senseBuffer, startMsf, endMsf, blockSize, sectorType, bool sense = dev.ReadCdMsf(out byte[] buffer, out byte[] senseBuffer, startMsf, endMsf, blockSize, sectorType,
@@ -1424,8 +1436,10 @@ static class Mmc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1490,7 +1504,8 @@ static class Mmc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1592,8 +1607,10 @@ static class Mmc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 5: goto start; case 5:
case 6: goto parameters; goto start;
case 6:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1776,7 +1793,8 @@ static class Mmc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1879,8 +1897,10 @@ static class Mmc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 5: goto start; case 5:
case 6: goto parameters; goto start;
case 6:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1892,7 +1912,7 @@ static class Mmc
static void ReadTocPmaAtip(string devPath, Device dev) static void ReadTocPmaAtip(string devPath, Device dev)
{ {
bool msf = false; var msf = false;
byte format = 0; byte format = 0;
byte session = 0; byte session = 0;
string strDev; string strDev;
@@ -1966,7 +1986,8 @@ static class Mmc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -2038,6 +2059,7 @@ static class Mmc
AaruConsole.WriteLine(Localization.READ_TOC_PMA_ATIP_decoded_buffer); AaruConsole.WriteLine(Localization.READ_TOC_PMA_ATIP_decoded_buffer);
if(buffer != null) if(buffer != null)
{
switch(format) switch(format)
{ {
case 0: case 0:
@@ -2071,6 +2093,7 @@ static class Mmc
break; break;
} }
}
AaruConsole.WriteLine(Localization.Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -2106,8 +2129,10 @@ static class Mmc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 5: goto start; case 5:
case 6: goto parameters; goto start;
case 6:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -2119,10 +2144,10 @@ static class Mmc
static void StartStopUnit(string devPath, Device dev) static void StartStopUnit(string devPath, Device dev)
{ {
bool immediate = false; var immediate = false;
bool changeFormatLayer = false; var changeFormatLayer = false;
bool loadEject = false; var loadEject = false;
bool start = false; var start = false;
byte formatLayer = 0; byte formatLayer = 0;
byte powerConditions = 0; byte powerConditions = 0;
string strDev; string strDev;
@@ -2235,7 +2260,8 @@ static class Mmc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -2298,8 +2324,10 @@ static class Mmc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

9
Aaru.Tests.Devices/SCSI/NEC.cs
View File

@@ -137,7 +137,8 @@ static class Nec
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -227,8 +228,10 @@ static class Nec
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

35
Aaru.Tests.Devices/SCSI/Pioneer.cs
View File

@@ -179,7 +179,8 @@ static class Pioneer
}; };
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -269,8 +270,10 @@ static class Pioneer
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -425,13 +428,14 @@ static class Pioneer
}; };
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
start: start:
uint startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); var startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
uint endMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); var endMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
System.Console.Clear(); System.Console.Clear();
bool sense = dev.PioneerReadCdDaMsf(out byte[] buffer, out byte[] senseBuffer, startMsf, endMsf, blockSize, bool sense = dev.PioneerReadCdDaMsf(out byte[] buffer, out byte[] senseBuffer, startMsf, endMsf, blockSize,
@@ -517,8 +521,10 @@ static class Pioneer
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -532,8 +538,8 @@ static class Pioneer
{ {
uint address = 0; uint address = 0;
uint length = 1; uint length = 1;
bool errorFlags = false; var errorFlags = false;
bool wholeSector = false; var wholeSector = false;
string strDev; string strDev;
int item; int item;
@@ -618,7 +624,8 @@ static class Pioneer
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -708,8 +715,10 @@ static class Pioneer
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

35
Aaru.Tests.Devices/SCSI/Plasmon.cs
View File

@@ -82,12 +82,12 @@ static class Plasmon
static void ReadLong(string devPath, Device dev) static void ReadLong(string devPath, Device dev)
{ {
bool relative = false; var relative = false;
uint address = 0; uint address = 0;
ushort length = 1; ushort length = 1;
ushort bps = 512; ushort bps = 512;
bool physical = false; var physical = false;
bool sectorCount = true; var sectorCount = true;
string strDev; string strDev;
int item; int item;
@@ -159,7 +159,8 @@ static class Plasmon
continue; continue;
} }
AaruConsole.Write(physical ? Localization.Physical_Block_Address_Q AaruConsole.Write(physical
? Localization.Physical_Block_Address_Q
: Localization.Logical_Block_Address_Q); : Localization.Logical_Block_Address_Q);
strDev = System.Console.ReadLine(); strDev = System.Console.ReadLine();
@@ -185,7 +186,8 @@ static class Plasmon
continue; continue;
} }
AaruConsole.Write(sectorCount ? Localization.How_many_sectors_to_transfer_Q AaruConsole.Write(sectorCount
? Localization.How_many_sectors_to_transfer_Q
: Localization.How_many_bytes_to_transfer_Q); : Localization.How_many_bytes_to_transfer_Q);
strDev = System.Console.ReadLine(); strDev = System.Console.ReadLine();
@@ -213,7 +215,8 @@ static class Plasmon
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -303,8 +306,10 @@ static class Plasmon
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -317,7 +322,7 @@ static class Plasmon
static void ReadSectorLocation(string devPath, Device dev) static void ReadSectorLocation(string devPath, Device dev)
{ {
uint address = 0; uint address = 0;
bool physical = false; var physical = false;
string strDev; string strDev;
int item; int item;
@@ -368,7 +373,8 @@ static class Plasmon
continue; continue;
} }
AaruConsole.Write(physical ? Localization.Physical_Block_Address_Q AaruConsole.Write(physical
? Localization.Physical_Block_Address_Q
: Localization.Logical_Block_Address_Q); : Localization.Logical_Block_Address_Q);
strDev = System.Console.ReadLine(); strDev = System.Console.ReadLine();
@@ -381,7 +387,8 @@ static class Plasmon
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -471,8 +478,10 @@ static class Plasmon
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

76
Aaru.Tests.Devices/SCSI/Plextor.cs
View File

@@ -143,7 +143,7 @@ static class Plextor
static void GetBookBitsetting(string devPath, Device dev) static void GetBookBitsetting(string devPath, Device dev)
{ {
bool dl = false; var dl = false;
string strDev; string strDev;
int item; int item;
@@ -189,7 +189,8 @@ static class Plextor
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -279,8 +280,10 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -376,7 +379,8 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -472,7 +476,8 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -569,7 +574,8 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -665,7 +671,8 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -762,7 +769,8 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -859,7 +867,8 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -871,7 +880,7 @@ static class Plextor
static void GetVariRec(string devPath, Device dev) static void GetVariRec(string devPath, Device dev)
{ {
bool dvd = false; var dvd = false;
string strDev; string strDev;
int item; int item;
@@ -917,7 +926,8 @@ static class Plextor
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1007,8 +1017,10 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1080,7 +1092,8 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1197,7 +1210,8 @@ static class Plextor
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1287,8 +1301,10 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1360,7 +1376,8 @@ static class Plextor
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1450,8 +1467,10 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1548,7 +1567,8 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1620,7 +1640,8 @@ static class Plextor
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1710,8 +1731,10 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1807,7 +1830,8 @@ static class Plextor
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

104
Aaru.Tests.Devices/SCSI/SBC.cs
View File

@@ -192,7 +192,8 @@ static class Sbc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -282,8 +283,10 @@ static class Sbc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -299,11 +302,11 @@ static class Sbc
uint blockSize = 512; uint blockSize = 512;
byte count = 1; byte count = 1;
byte rdprotect = 0; byte rdprotect = 0;
bool dpo = false; var dpo = false;
bool fua = false; var fua = false;
bool fuaNv = false; var fuaNv = false;
const byte groupNumber = 0; const byte groupNumber = 0;
bool relative = false; var relative = false;
string strDev; string strDev;
int item; int item;
@@ -453,7 +456,8 @@ static class Sbc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -543,8 +547,10 @@ static class Sbc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -560,12 +566,12 @@ static class Sbc
uint blockSize = 512; uint blockSize = 512;
byte count = 1; byte count = 1;
byte rdprotect = 0; byte rdprotect = 0;
bool dpo = false; var dpo = false;
bool fua = false; var fua = false;
bool fuaNv = false; var fuaNv = false;
const byte groupNumber = 0; const byte groupNumber = 0;
bool relative = false; var relative = false;
bool streaming = false; var streaming = false;
string strDev; string strDev;
int item; int item;
@@ -728,7 +734,8 @@ static class Sbc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -818,8 +825,10 @@ static class Sbc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -835,11 +844,11 @@ static class Sbc
uint blockSize = 512; uint blockSize = 512;
byte count = 1; byte count = 1;
byte rdprotect = 0; byte rdprotect = 0;
bool dpo = false; var dpo = false;
bool fua = false; var fua = false;
bool fuaNv = false; var fuaNv = false;
const byte groupNumber = 0; const byte groupNumber = 0;
bool streaming = false; var streaming = false;
string strDev; string strDev;
int item; int item;
@@ -989,7 +998,8 @@ static class Sbc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1079,8 +1089,10 @@ static class Sbc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1094,8 +1106,8 @@ static class Sbc
{ {
uint lba = 0; uint lba = 0;
ushort blockSize = 512; ushort blockSize = 512;
bool correct = false; var correct = false;
bool relative = false; var relative = false;
string strDev; string strDev;
int item; int item;
@@ -1180,7 +1192,8 @@ static class Sbc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1270,8 +1283,10 @@ static class Sbc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1285,7 +1300,7 @@ static class Sbc
{ {
ulong lba = 0; ulong lba = 0;
uint blockSize = 512; uint blockSize = 512;
bool correct = false; var correct = false;
string strDev; string strDev;
int item; int item;
@@ -1357,7 +1372,8 @@ static class Sbc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1447,8 +1463,10 @@ static class Sbc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1514,7 +1532,8 @@ static class Sbc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1575,8 +1594,10 @@ static class Sbc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1634,7 +1655,8 @@ static class Sbc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1695,8 +1717,10 @@ static class Sbc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

11
Aaru.Tests.Devices/SCSI/SMC.cs
View File

@@ -83,7 +83,7 @@ static class Smc
byte volume = 0; byte volume = 0;
byte partition = 0; byte partition = 0;
ushort firstAttribute = 0; ushort firstAttribute = 0;
bool cache = false; var cache = false;
ScsiAttributeAction action = ScsiAttributeAction.Values; ScsiAttributeAction action = ScsiAttributeAction.Values;
string strDev; string strDev;
int item; int item;
@@ -215,7 +215,8 @@ static class Smc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -305,8 +306,10 @@ static class Smc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

86
Aaru.Tests.Devices/SCSI/SPC.cs
View File

@@ -221,7 +221,8 @@ static class Spc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 5: goto start; case 5:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -279,7 +280,8 @@ static class Spc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -368,8 +370,10 @@ static class Spc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -381,7 +385,7 @@ static class Spc
static void ModeSense6(string devPath, Device dev) static void ModeSense6(string devPath, Device dev)
{ {
bool dbd = false; var dbd = false;
ScsiModeSensePageControl pageControl = ScsiModeSensePageControl.Current; ScsiModeSensePageControl pageControl = ScsiModeSensePageControl.Current;
byte page = 0x3F; byte page = 0x3F;
byte subpage = 0xFF; byte subpage = 0xFF;
@@ -475,7 +479,8 @@ static class Spc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -580,8 +585,10 @@ static class Spc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 5: goto start; case 5:
case 6: goto parameters; goto start;
case 6:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -593,8 +600,8 @@ static class Spc
static void ModeSense10(string devPath, Device dev) static void ModeSense10(string devPath, Device dev)
{ {
bool llba = false; var llba = false;
bool dbd = false; var dbd = false;
ScsiModeSensePageControl pageControl = ScsiModeSensePageControl.Current; ScsiModeSensePageControl pageControl = ScsiModeSensePageControl.Current;
byte page = 0x3F; byte page = 0x3F;
byte subpage = 0xFF; byte subpage = 0xFF;
@@ -701,7 +708,8 @@ static class Spc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -806,8 +814,10 @@ static class Spc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 5: goto start; case 5:
case 6: goto parameters; goto start;
case 6:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -871,7 +881,8 @@ static class Spc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -911,8 +922,10 @@ static class Spc
AaruConsole.WriteLine(Localization.Returning_to_SCSI_Primary_Commands_menu); AaruConsole.WriteLine(Localization.Returning_to_SCSI_Primary_Commands_menu);
return; return;
case 1: goto start; case 1:
case 2: goto parameters; goto start;
case 2:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -924,8 +937,8 @@ static class Spc
static void ReadCapacity10(string devPath, Device dev) static void ReadCapacity10(string devPath, Device dev)
{ {
bool relative = false; var relative = false;
bool partial = false; var partial = false;
uint address = 0; uint address = 0;
string strDev; string strDev;
int item; int item;
@@ -998,7 +1011,8 @@ static class Spc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1088,8 +1102,10 @@ static class Spc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1101,7 +1117,7 @@ static class Spc
static void ReadCapacity16(string devPath, Device dev) static void ReadCapacity16(string devPath, Device dev)
{ {
bool partial = false; var partial = false;
ulong address = 0; ulong address = 0;
string strDev; string strDev;
int item; int item;
@@ -1161,7 +1177,8 @@ static class Spc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1251,8 +1268,10 @@ static class Spc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1349,7 +1368,8 @@ static class Spc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1361,7 +1381,7 @@ static class Spc
static void RequestSense(string devPath, Device dev) static void RequestSense(string devPath, Device dev)
{ {
bool descriptor = false; var descriptor = false;
string strDev; string strDev;
int item; int item;
@@ -1407,7 +1427,8 @@ static class Spc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1468,8 +1489,10 @@ static class Spc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1537,7 +1560,8 @@ static class Spc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

215
Aaru.Tests.Devices/SCSI/SSC.cs
View File

@@ -144,11 +144,11 @@ static class Ssc
static void LoadUnload(string devPath, Device dev) static void LoadUnload(string devPath, Device dev)
{ {
bool load = true; var load = true;
bool immediate = false; var immediate = false;
bool retense = false; var retense = false;
bool eot = false; var eot = false;
bool hold = false; var hold = false;
string strDev; string strDev;
int item; int item;
@@ -246,7 +246,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -309,8 +310,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -322,9 +325,9 @@ static class Ssc
static void Locate10(string devPath, Device dev) static void Locate10(string devPath, Device dev)
{ {
bool blockType = true; var blockType = true;
bool immediate = false; var immediate = false;
bool changePartition = false; var changePartition = false;
byte partition = 0; byte partition = 0;
uint objectId = 0; uint objectId = 0;
string strDev; string strDev;
@@ -424,7 +427,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -487,8 +491,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -501,9 +507,9 @@ static class Ssc
static void Locate16(string devPath, Device dev) static void Locate16(string devPath, Device dev)
{ {
SscLogicalIdTypes destType = SscLogicalIdTypes.FileId; SscLogicalIdTypes destType = SscLogicalIdTypes.FileId;
bool immediate = false; var immediate = false;
bool changePartition = false; var changePartition = false;
bool bam = false; var bam = false;
byte partition = 0; byte partition = 0;
ulong objectId = 1; ulong objectId = 1;
string strDev; string strDev;
@@ -622,7 +628,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -685,8 +692,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -698,8 +707,8 @@ static class Ssc
static void Read6(string devPath, Device dev) static void Read6(string devPath, Device dev)
{ {
bool sili = false; var sili = false;
bool fixedLen = true; var fixedLen = true;
uint blockSize = 512; uint blockSize = 512;
uint length = 1; uint length = 1;
string strDev; string strDev;
@@ -754,7 +763,8 @@ static class Ssc
continue; continue;
} }
AaruConsole.Write(fixedLen ? Localization.How_many_blocks_to_read_Q AaruConsole.Write(fixedLen
? Localization.How_many_blocks_to_read_Q
: Localization.How_many_bytes_to_read_Q); : Localization.How_many_bytes_to_read_Q);
strDev = System.Console.ReadLine(); strDev = System.Console.ReadLine();
@@ -771,7 +781,10 @@ static class Ssc
if(length > 0xFFFFFF) if(length > 0xFFFFFF)
{ {
AaruConsole. AaruConsole.
WriteLine(fixedLen ? Localization.Max_number_of_blocks_is_0_setting_to_0 : Localization.Max_number_of_bytes_is_0_setting_to_0, WriteLine(
fixedLen
? Localization.Max_number_of_blocks_is_0_setting_to_0
: Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF); 0xFFFFFF);
length = 0xFFFFFF; length = 0xFFFFFF;
@@ -803,7 +816,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -893,8 +907,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -906,8 +922,8 @@ static class Ssc
static void Read16(string devPath, Device dev) static void Read16(string devPath, Device dev)
{ {
bool sili = false; var sili = false;
bool fixedLen = true; var fixedLen = true;
uint objectSize = 512; uint objectSize = 512;
uint length = 1; uint length = 1;
byte partition = 0; byte partition = 0;
@@ -965,7 +981,8 @@ static class Ssc
continue; continue;
} }
AaruConsole.Write(fixedLen ? Localization.How_many_objects_to_read_Q AaruConsole.Write(fixedLen
? Localization.How_many_objects_to_read_Q
: Localization.How_many_bytes_to_read_Q); : Localization.How_many_bytes_to_read_Q);
strDev = System.Console.ReadLine(); strDev = System.Console.ReadLine();
@@ -982,7 +999,10 @@ static class Ssc
if(length > 0xFFFFFF) if(length > 0xFFFFFF)
{ {
AaruConsole. AaruConsole.
WriteLine(fixedLen ? Localization.Max_number_of_blocks_is_0_setting_to_0 : Localization.Max_number_of_bytes_is_0_setting_to_0, WriteLine(
fixedLen
? Localization.Max_number_of_blocks_is_0_setting_to_0
: Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF); 0xFFFFFF);
length = 0xFFFFFF; length = 0xFFFFFF;
@@ -1038,7 +1058,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1128,8 +1149,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1240,7 +1263,8 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 5: goto start; case 5:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1306,7 +1330,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1368,8 +1393,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1381,9 +1408,9 @@ static class Ssc
static void ReadReverse6(string devPath, Device dev) static void ReadReverse6(string devPath, Device dev)
{ {
bool byteOrder = false; var byteOrder = false;
bool sili = false; var sili = false;
bool fixedLen = true; var fixedLen = true;
uint blockSize = 512; uint blockSize = 512;
uint length = 1; uint length = 1;
string strDev; string strDev;
@@ -1439,7 +1466,8 @@ static class Ssc
continue; continue;
} }
AaruConsole.Write(fixedLen ? Localization.How_many_blocks_to_read_Q AaruConsole.Write(fixedLen
? Localization.How_many_blocks_to_read_Q
: Localization.How_many_bytes_to_read_Q); : Localization.How_many_bytes_to_read_Q);
strDev = System.Console.ReadLine(); strDev = System.Console.ReadLine();
@@ -1456,7 +1484,10 @@ static class Ssc
if(length > 0xFFFFFF) if(length > 0xFFFFFF)
{ {
AaruConsole. AaruConsole.
WriteLine(fixedLen ? Localization.Max_number_of_blocks_is_0_setting_to_0 : Localization.Max_number_of_bytes_is_0_setting_to_0, WriteLine(
fixedLen
? Localization.Max_number_of_blocks_is_0_setting_to_0
: Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF); 0xFFFFFF);
length = 0xFFFFFF; length = 0xFFFFFF;
@@ -1500,7 +1531,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1590,8 +1622,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1603,9 +1637,9 @@ static class Ssc
static void ReadReverse16(string devPath, Device dev) static void ReadReverse16(string devPath, Device dev)
{ {
bool byteOrder = false; var byteOrder = false;
bool sili = false; var sili = false;
bool fixedLen = true; var fixedLen = true;
uint objectSize = 512; uint objectSize = 512;
uint length = 1; uint length = 1;
byte partition = 0; byte partition = 0;
@@ -1664,7 +1698,8 @@ static class Ssc
continue; continue;
} }
AaruConsole.Write(fixedLen ? Localization.How_many_objects_to_read_Q AaruConsole.Write(fixedLen
? Localization.How_many_objects_to_read_Q
: Localization.How_many_bytes_to_read_Q); : Localization.How_many_bytes_to_read_Q);
strDev = System.Console.ReadLine(); strDev = System.Console.ReadLine();
@@ -1681,7 +1716,10 @@ static class Ssc
if(length > 0xFFFFFF) if(length > 0xFFFFFF)
{ {
AaruConsole. AaruConsole.
WriteLine(fixedLen ? Localization.Max_number_of_blocks_is_0_setting_to_0 : Localization.Max_number_of_bytes_is_0_setting_to_0, WriteLine(
fixedLen
? Localization.Max_number_of_blocks_is_0_setting_to_0
: Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF); 0xFFFFFF);
length = 0xFFFFFF; length = 0xFFFFFF;
@@ -1749,7 +1787,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -1839,8 +1878,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -1852,8 +1893,8 @@ static class Ssc
static void RecoverBufferedData(string devPath, Device dev) static void RecoverBufferedData(string devPath, Device dev)
{ {
bool sili = false; var sili = false;
bool fixedLen = true; var fixedLen = true;
uint blockSize = 512; uint blockSize = 512;
uint length = 1; uint length = 1;
string strDev; string strDev;
@@ -1908,7 +1949,8 @@ static class Ssc
continue; continue;
} }
AaruConsole.Write(fixedLen ? Localization.How_many_blocks_to_read_Q AaruConsole.Write(fixedLen
? Localization.How_many_blocks_to_read_Q
: Localization.How_many_bytes_to_read_Q); : Localization.How_many_bytes_to_read_Q);
strDev = System.Console.ReadLine(); strDev = System.Console.ReadLine();
@@ -1925,7 +1967,10 @@ static class Ssc
if(length > 0xFFFFFF) if(length > 0xFFFFFF)
{ {
AaruConsole. AaruConsole.
WriteLine(fixedLen ? Localization.Max_number_of_blocks_is_0_setting_to_0 : Localization.Max_number_of_bytes_is_0_setting_to_0, WriteLine(
fixedLen
? Localization.Max_number_of_blocks_is_0_setting_to_0
: Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF); 0xFFFFFF);
length = 0xFFFFFF; length = 0xFFFFFF;
@@ -1957,7 +2002,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -2047,8 +2093,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -2060,8 +2108,8 @@ static class Ssc
static void ReportDensitySupport(string devPath, Device dev) static void ReportDensitySupport(string devPath, Device dev)
{ {
bool medium = false; var medium = false;
bool current = false; var current = false;
string strDev; string strDev;
int item; int item;
@@ -2120,7 +2168,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -2192,7 +2241,8 @@ static class Ssc
AaruConsole.WriteLine(Localization.REPORT_DENSITY_SUPPORT_decoded_buffer); AaruConsole.WriteLine(Localization.REPORT_DENSITY_SUPPORT_decoded_buffer);
AaruConsole.Write("{0}", AaruConsole.Write("{0}",
medium ? DensitySupport.PrettifyMediumType(buffer) medium
? DensitySupport.PrettifyMediumType(buffer)
: DensitySupport.PrettifyDensity(buffer)); : DensitySupport.PrettifyDensity(buffer));
AaruConsole.WriteLine(Localization.Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Press_any_key_to_continue);
@@ -2226,8 +2276,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 5: goto start; case 5:
case 6: goto parameters; goto start;
case 6:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -2239,7 +2291,7 @@ static class Ssc
static void Rewind(string devPath, Device dev) static void Rewind(string devPath, Device dev)
{ {
bool immediate = false; var immediate = false;
string strDev; string strDev;
int item; int item;
@@ -2285,7 +2337,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -2346,8 +2399,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -2425,7 +2480,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -2486,8 +2542,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -2545,7 +2603,8 @@ static class Ssc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -2606,8 +2665,10 @@ static class Ssc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 2: goto start; case 2:
case 3: goto parameters; goto start;
case 3:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

43
Aaru.Tests.Devices/SCSI/SyQuest.cs
View File

@@ -100,7 +100,7 @@ static class SyQuest
uint lba = 0; uint lba = 0;
uint blockSize = 512; uint blockSize = 512;
byte count = 1; byte count = 1;
bool noDma = false; var noDma = false;
string strDev; string strDev;
int item; int item;
@@ -111,7 +111,8 @@ static class SyQuest
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(readlong ? Localization.Parameters_for_READ_LONG_6_command AaruConsole.WriteLine(readlong
? Localization.Parameters_for_READ_LONG_6_command
: Localization.Parameters_for_READ_6_command); : Localization.Parameters_for_READ_6_command);
AaruConsole.WriteLine(Localization.LBA_0, lba); AaruConsole.WriteLine(Localization.LBA_0, lba);
@@ -194,7 +195,8 @@ static class SyQuest
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -207,7 +209,8 @@ static class SyQuest
menu: menu:
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(readlong ? Localization.Sending_READ_LONG_6_to_the_device AaruConsole.WriteLine(readlong
? Localization.Sending_READ_LONG_6_to_the_device
: Localization.Sending_READ_6_to_the_device); : Localization.Sending_READ_6_to_the_device);
AaruConsole.WriteLine(Localization.Command_took_0_ms, duration); AaruConsole.WriteLine(Localization.Command_took_0_ms, duration);
@@ -280,7 +283,8 @@ static class SyQuest
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(readlong ? Localization.READ_LONG_6_decoded_sense AaruConsole.WriteLine(readlong
? Localization.READ_LONG_6_decoded_sense
: Localization.READ_6_decoded_sense); : Localization.READ_6_decoded_sense);
AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer)); AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -290,8 +294,10 @@ static class SyQuest
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -306,7 +312,7 @@ static class SyQuest
uint lba = 0; uint lba = 0;
uint blockSize = 512; uint blockSize = 512;
byte count = 1; byte count = 1;
bool noDma = false; var noDma = false;
string strDev; string strDev;
int item; int item;
@@ -317,7 +323,8 @@ static class SyQuest
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(readlong ? Localization.Parameters_for_READ_LONG_10_command AaruConsole.WriteLine(readlong
? Localization.Parameters_for_READ_LONG_10_command
: Localization.Parameters_for_READ_10_command); : Localization.Parameters_for_READ_10_command);
AaruConsole.WriteLine(Localization.LBA_0, lba); AaruConsole.WriteLine(Localization.LBA_0, lba);
@@ -394,7 +401,8 @@ static class SyQuest
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -407,7 +415,8 @@ static class SyQuest
menu: menu:
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(readlong ? Localization.Sending_READ_LONG_10_to_the_device AaruConsole.WriteLine(readlong
? Localization.Sending_READ_LONG_10_to_the_device
: Localization.Sending_READ_10_to_the_device); : Localization.Sending_READ_10_to_the_device);
AaruConsole.WriteLine(Localization.Command_took_0_ms, duration); AaruConsole.WriteLine(Localization.Command_took_0_ms, duration);
@@ -480,7 +489,8 @@ static class SyQuest
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(readlong ? Localization.READ_LONG_10_decoded_sense AaruConsole.WriteLine(readlong
? Localization.READ_LONG_10_decoded_sense
: Localization.READ_10_decoded_sense); : Localization.READ_10_decoded_sense);
AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer)); AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -490,8 +500,10 @@ static class SyQuest
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -588,7 +600,8 @@ static class SyQuest
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

18
Aaru.Tests.Devices/SCSI_MMC/GdRom.cs
View File

@@ -12,7 +12,7 @@ static partial class ScsiMmc
{ {
static void CheckGdromReadability(string devPath, Device dev) static void CheckGdromReadability(string devPath, Device dev)
{ {
bool tocIsNotBcd = false; var tocIsNotBcd = false;
bool sense; bool sense;
byte[] senseBuffer; byte[] senseBuffer;
@@ -30,7 +30,7 @@ static partial class ScsiMmc
AaruConsole.WriteLine(Localization.Sending_READ_FULL_TOC_to_the_device); AaruConsole.WriteLine(Localization.Sending_READ_FULL_TOC_to_the_device);
int retries = 0; var retries = 0;
do do
{ {
@@ -110,12 +110,12 @@ static partial class ScsiMmc
} }
else else
{ {
min += ((leadOutTrack.PMIN >> 4) * 10) + (leadOutTrack.PMIN & 0x0F); min += (leadOutTrack.PMIN >> 4) * 10 + (leadOutTrack.PMIN & 0x0F);
sec = ((leadOutTrack.PSEC >> 4) * 10) + (leadOutTrack.PSEC & 0x0F); sec = (leadOutTrack.PSEC >> 4) * 10 + (leadOutTrack.PSEC & 0x0F);
frame = ((leadOutTrack.PFRAME >> 4) * 10) + (leadOutTrack.PFRAME & 0x0F); frame = (leadOutTrack.PFRAME >> 4) * 10 + (leadOutTrack.PFRAME & 0x0F);
} }
int sectors = (min * 60 * 75) + (sec * 75) + frame - 150; int sectors = min * 60 * 75 + sec * 75 + frame - 150;
AaruConsole.WriteLine(Localization.Trap_disc_shows_0_sectors, sectors); AaruConsole.WriteLine(Localization.Trap_disc_shows_0_sectors, sectors);
@@ -279,7 +279,8 @@ static partial class ScsiMmc
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(lba450000Result ? Localization.Device_cannot_read_HD_area AaruConsole.WriteLine(lba450000Result
? Localization.Device_cannot_read_HD_area
: Localization.Device_can_read_HD_area); : Localization.Device_can_read_HD_area);
AaruConsole.WriteLine(Localization.LBA_zero_sense_is_0_buffer_is_1_sense_buffer_is_2, lba0Result, AaruConsole.WriteLine(Localization.LBA_zero_sense_is_0_buffer_is_1_sense_buffer_is_2, lba0Result,
@@ -689,7 +690,8 @@ static partial class ScsiMmc
System.Console.ReadKey(); System.Console.ReadKey();
goto menu; goto menu;
case 25: goto start; case 25:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

30
Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs
View File

@@ -12,7 +12,7 @@ static partial class ScsiMmc
{ {
static void ReadLeadOutUsingTrapDisc(string devPath, Device dev) static void ReadLeadOutUsingTrapDisc(string devPath, Device dev)
{ {
bool tocIsNotBcd = false; var tocIsNotBcd = false;
bool sense; bool sense;
byte[] senseBuffer; byte[] senseBuffer;
@@ -30,7 +30,7 @@ static partial class ScsiMmc
AaruConsole.WriteLine(Localization.Sending_READ_FULL_TOC_to_the_device); AaruConsole.WriteLine(Localization.Sending_READ_FULL_TOC_to_the_device);
int retries = 0; var retries = 0;
do do
{ {
@@ -87,11 +87,11 @@ static partial class ScsiMmc
return; return;
} }
int min = ((leadOutTrack.PMIN >> 4) * 10) + (leadOutTrack.PMIN & 0x0F); int min = (leadOutTrack.PMIN >> 4) * 10 + (leadOutTrack.PMIN & 0x0F);
int sec = ((leadOutTrack.PSEC >> 4) * 10) + (leadOutTrack.PSEC & 0x0F); int sec = (leadOutTrack.PSEC >> 4) * 10 + (leadOutTrack.PSEC & 0x0F);
int frame = ((leadOutTrack.PFRAME >> 4) * 10) + (leadOutTrack.PFRAME & 0x0F); int frame = (leadOutTrack.PFRAME >> 4) * 10 + (leadOutTrack.PFRAME & 0x0F);
int sectors = (min * 60 * 75) + (sec * 75) + frame - 150; int sectors = min * 60 * 75 + sec * 75 + frame - 150;
AaruConsole.WriteLine(Localization.Data_disc_shows_0_sectors, sectors); AaruConsole.WriteLine(Localization.Data_disc_shows_0_sectors, sectors);
@@ -186,12 +186,12 @@ static partial class ScsiMmc
} }
else else
{ {
min += ((leadOutTrack.PMIN >> 4) * 10) + (leadOutTrack.PMIN & 0x0F); min += (leadOutTrack.PMIN >> 4) * 10 + (leadOutTrack.PMIN & 0x0F);
sec = ((leadOutTrack.PSEC >> 4) * 10) + (leadOutTrack.PSEC & 0x0F); sec = (leadOutTrack.PSEC >> 4) * 10 + (leadOutTrack.PSEC & 0x0F);
frame = ((leadOutTrack.PFRAME >> 4) * 10) + (leadOutTrack.PFRAME & 0x0F); frame = (leadOutTrack.PFRAME >> 4) * 10 + (leadOutTrack.PFRAME & 0x0F);
} }
int trapSectors = (min * 60 * 75) + (sec * 75) + frame - 150; int trapSectors = min * 60 * 75 + sec * 75 + frame - 150;
AaruConsole.WriteLine(Localization.Trap_disc_shows_0_sectors, trapSectors); AaruConsole.WriteLine(Localization.Trap_disc_shows_0_sectors, trapSectors);
@@ -308,9 +308,11 @@ static partial class ScsiMmc
MmcErrorField.None, MmcSubchannel.Q16, dev.Timeout, out _); MmcErrorField.None, MmcSubchannel.Q16, dev.Timeout, out _);
if(pqResult) if(pqResult)
{
pqResult = dev.ReadCd(out pqBuffer, out pqSense, (uint)(sectors + 5), 16, 1, MmcSectorTypes.AllTypes, false, pqResult = dev.ReadCd(out pqBuffer, out pqSense, (uint)(sectors + 5), 16, 1, MmcSectorTypes.AllTypes, false,
false, false, MmcHeaderCodes.None, false, false, MmcErrorField.None, false, false, MmcHeaderCodes.None, false, false, MmcErrorField.None,
MmcSubchannel.Q16, dev.Timeout, out _); MmcSubchannel.Q16, dev.Timeout, out _);
}
AaruConsole.WriteLine(pqResult ? Localization.FAIL : Localization.Success); AaruConsole.WriteLine(pqResult ? Localization.FAIL : Localization.Success);
@@ -321,9 +323,11 @@ static partial class ScsiMmc
MmcErrorField.None, MmcSubchannel.Rw, dev.Timeout, out _); MmcErrorField.None, MmcSubchannel.Rw, dev.Timeout, out _);
if(rwResult) if(rwResult)
{
rwResult = dev.ReadCd(out rwBuffer, out rwSense, (uint)(sectors + 5), 16, 1, MmcSectorTypes.Cdda, false, rwResult = dev.ReadCd(out rwBuffer, out rwSense, (uint)(sectors + 5), 16, 1, MmcSectorTypes.Cdda, false,
false, false, MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Rw, false, false, MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Rw,
dev.Timeout, out _); dev.Timeout, out _);
}
AaruConsole.WriteLine(pqResult ? Localization.FAIL : Localization.Success); AaruConsole.WriteLine(pqResult ? Localization.FAIL : Localization.Success);
@@ -331,7 +335,8 @@ static partial class ScsiMmc
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(dataResult && scrambledResult ? Localization.Device_cannot_read_Lead_Out AaruConsole.WriteLine(dataResult && scrambledResult
? Localization.Device_cannot_read_Lead_Out
: Localization.Device_can_read_Lead_Out); : Localization.Device_can_read_Lead_Out);
AaruConsole.WriteLine(Localization.LBA_0_sense_is_1_buffer_is_2_sense_buffer_is_3, sectors + 5, dataResult, AaruConsole.WriteLine(Localization.LBA_0_sense_is_1_buffer_is_2_sense_buffer_is_3, sectors + 5, dataResult,
@@ -546,7 +551,8 @@ static partial class ScsiMmc
System.Console.ReadKey(); System.Console.ReadKey();
goto menu; goto menu;
case 13: goto start; case 13:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

9
Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs
View File

@@ -55,7 +55,8 @@ static partial class ScsiMmc
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -154,8 +155,10 @@ static partial class ScsiMmc
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
case 5: goto parameters; goto start;
case 5:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

47
Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs
View File

@@ -114,7 +114,7 @@ static class MultiMediaCard
uint address = 0; uint address = 0;
uint blockSize = 512; uint blockSize = 512;
ushort count = 1; ushort count = 1;
bool byteAddr = false; var byteAddr = false;
string strDev; string strDev;
int item; int item;
@@ -125,7 +125,8 @@ static class MultiMediaCard
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(multiple ? Localization.Parameters_for_READ_MULTIPLE_BLOCK_command AaruConsole.WriteLine(multiple
? Localization.Parameters_for_READ_MULTIPLE_BLOCK_command
: Localization.Parameters_for_READ_SINGLE_BLOCK_command); : Localization.Parameters_for_READ_SINGLE_BLOCK_command);
AaruConsole.WriteLine(byteAddr ? Localization.Read_from_byte_0 : Localization.Read_from_block_0, address); AaruConsole.WriteLine(byteAddr ? Localization.Read_from_byte_0 : Localization.Read_from_block_0, address);
@@ -207,7 +208,8 @@ static class MultiMediaCard
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -220,7 +222,8 @@ static class MultiMediaCard
menu: menu:
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(multiple ? Localization.Sending_READ_MULTIPLE_BLOCK_to_the_device AaruConsole.WriteLine(multiple
? Localization.Sending_READ_MULTIPLE_BLOCK_to_the_device
: Localization.Sending_READ_SINGLE_BLOCK_to_the_device); : Localization.Sending_READ_SINGLE_BLOCK_to_the_device);
AaruConsole.WriteLine(Localization.Command_took_0_ms, duration); AaruConsole.WriteLine(Localization.Command_took_0_ms, duration);
@@ -258,7 +261,8 @@ static class MultiMediaCard
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(multiple ? Localization.READ_MULTIPLE_BLOCK_buffer AaruConsole.WriteLine(multiple
? Localization.READ_MULTIPLE_BLOCK_buffer
: Localization.READ_SINGLE_BLOCK_buffer); : Localization.READ_SINGLE_BLOCK_buffer);
if(buffer != null) if(buffer != null)
@@ -274,7 +278,8 @@ static class MultiMediaCard
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(multiple ? Localization.READ_MULTIPLE_BLOCK_response AaruConsole.WriteLine(multiple
? Localization.READ_MULTIPLE_BLOCK_response
: Localization.READ_SINGLE_BLOCK_response); : Localization.READ_SINGLE_BLOCK_response);
if(response != null) if(response != null)
@@ -291,8 +296,10 @@ static class MultiMediaCard
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -389,7 +396,8 @@ static class MultiMediaCard
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -471,7 +479,8 @@ static class MultiMediaCard
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -568,7 +577,8 @@ static class MultiMediaCard
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -665,7 +675,8 @@ static class MultiMediaCard
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -762,7 +773,8 @@ static class MultiMediaCard
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -820,7 +832,8 @@ static class MultiMediaCard
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -868,8 +881,10 @@ static class MultiMediaCard
AaruConsole.WriteLine(Localization.Returning_to_MultiMediaCard_commands_menu); AaruConsole.WriteLine(Localization.Returning_to_MultiMediaCard_commands_menu);
return; return;
case 1: goto start; case 1:
case 2: goto parameters; goto start;
case 2:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();

47
Aaru.Tests.Devices/SecureDigital/SecureDigital.cs
View File

@@ -114,7 +114,7 @@ static class SecureDigital
uint address = 0; uint address = 0;
uint blockSize = 512; uint blockSize = 512;
ushort count = 1; ushort count = 1;
bool byteAddr = false; var byteAddr = false;
string strDev; string strDev;
int item; int item;
@@ -125,7 +125,8 @@ static class SecureDigital
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(multiple ? Localization.Parameters_for_READ_MULTIPLE_BLOCK_command AaruConsole.WriteLine(multiple
? Localization.Parameters_for_READ_MULTIPLE_BLOCK_command
: Localization.Parameters_for_READ_SINGLE_BLOCK_command); : Localization.Parameters_for_READ_SINGLE_BLOCK_command);
AaruConsole.WriteLine(byteAddr ? Localization.Read_from_byte_0 : Localization.Read_from_block_0, address); AaruConsole.WriteLine(byteAddr ? Localization.Read_from_byte_0 : Localization.Read_from_block_0, address);
@@ -207,7 +208,8 @@ static class SecureDigital
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -220,7 +222,8 @@ static class SecureDigital
menu: menu:
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(multiple ? Localization.Sending_READ_MULTIPLE_BLOCK_to_the_device AaruConsole.WriteLine(multiple
? Localization.Sending_READ_MULTIPLE_BLOCK_to_the_device
: Localization.Sending_READ_SINGLE_BLOCK_to_the_device); : Localization.Sending_READ_SINGLE_BLOCK_to_the_device);
AaruConsole.WriteLine(Localization.Command_took_0_ms, duration); AaruConsole.WriteLine(Localization.Command_took_0_ms, duration);
@@ -258,7 +261,8 @@ static class SecureDigital
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(multiple ? Localization.READ_MULTIPLE_BLOCK_buffer AaruConsole.WriteLine(multiple
? Localization.READ_MULTIPLE_BLOCK_buffer
: Localization.READ_SINGLE_BLOCK_buffer); : Localization.READ_SINGLE_BLOCK_buffer);
if(buffer != null) if(buffer != null)
@@ -274,7 +278,8 @@ static class SecureDigital
System.Console.Clear(); System.Console.Clear();
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
AaruConsole.WriteLine(multiple ? Localization.READ_MULTIPLE_BLOCK_response AaruConsole.WriteLine(multiple
? Localization.READ_MULTIPLE_BLOCK_response
: Localization.READ_SINGLE_BLOCK_response); : Localization.READ_SINGLE_BLOCK_response);
if(response != null) if(response != null)
@@ -291,8 +296,10 @@ static class SecureDigital
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
case 4: goto parameters; goto start;
case 4:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -389,7 +396,8 @@ static class SecureDigital
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -471,7 +479,8 @@ static class SecureDigital
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 3: goto start; case 3:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -568,7 +577,8 @@ static class SecureDigital
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -665,7 +675,8 @@ static class SecureDigital
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -762,7 +773,8 @@ static class SecureDigital
AaruConsole.WriteLine(Localization.Device_0, devPath); AaruConsole.WriteLine(Localization.Device_0, devPath);
goto menu; goto menu;
case 4: goto start; case 4:
goto start;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();
@@ -820,7 +832,8 @@ static class SecureDigital
} }
break; break;
case 2: goto start; case 2:
goto start;
} }
} }
@@ -868,8 +881,10 @@ static class SecureDigital
AaruConsole.WriteLine(Localization.Returning_to_SecureDigital_commands_menu); AaruConsole.WriteLine(Localization.Returning_to_SecureDigital_commands_menu);
return; return;
case 1: goto start; case 1:
case 2: goto parameters; goto start;
case 2:
goto parameters;
default: default:
AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue); AaruConsole.WriteLine(Localization.Incorrect_option_Press_any_key_to_continue);
System.Console.ReadKey(); System.Console.ReadKey();