General code refactor and reformat.

This commit is contained in:
2018-12-31 13:17:27 +00:00
parent 06a27f18b0
commit e2bbb9994f
72 changed files with 433 additions and 897 deletions

View File

@@ -93,10 +93,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_00_SFF(byte[] pageResponse)
{
return PrettifyModePage_00_SFF(DecodeModePage_00_SFF(pageResponse));
}
public static string PrettifyModePage_00_SFF(byte[] pageResponse) =>
PrettifyModePage_00_SFF(DecodeModePage_00_SFF(pageResponse));
public static string PrettifyModePage_00_SFF(ModePage_00_SFF? modePage)
{

View File

@@ -151,10 +151,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_01(byte[] pageResponse)
{
return PrettifyModePage_01(DecodeModePage_01(pageResponse));
}
public static string PrettifyModePage_01(byte[] pageResponse) =>
PrettifyModePage_01(DecodeModePage_01(pageResponse));
public static string PrettifyModePage_01(ModePage_01? modePage)
{

View File

@@ -95,10 +95,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_01_MMC(byte[] pageResponse)
{
return PrettifyModePage_01_MMC(DecodeModePage_01_MMC(pageResponse));
}
public static string PrettifyModePage_01_MMC(byte[] pageResponse) =>
PrettifyModePage_01_MMC(DecodeModePage_01_MMC(pageResponse));
public static string PrettifyModePage_01_MMC(ModePage_01_MMC? modePage)
{

View File

@@ -133,10 +133,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_02(byte[] pageResponse)
{
return PrettifyModePage_02(DecodeModePage_02(pageResponse));
}
public static string PrettifyModePage_02(byte[] pageResponse) =>
PrettifyModePage_02(DecodeModePage_02(pageResponse));
public static string PrettifyModePage_02(ModePage_02? modePage)
{

View File

@@ -137,10 +137,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_03(byte[] pageResponse)
{
return PrettifyModePage_03(DecodeModePage_03(pageResponse));
}
public static string PrettifyModePage_03(byte[] pageResponse) =>
PrettifyModePage_03(DecodeModePage_03(pageResponse));
public static string PrettifyModePage_03(ModePage_03? modePage)
{

View File

@@ -120,10 +120,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_04(byte[] pageResponse)
{
return PrettifyModePage_04(DecodeModePage_04(pageResponse));
}
public static string PrettifyModePage_04(byte[] pageResponse) =>
PrettifyModePage_04(DecodeModePage_04(pageResponse));
public static string PrettifyModePage_04(ModePage_04? modePage)
{

View File

@@ -196,10 +196,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_05(byte[] pageResponse)
{
return PrettifyModePage_05(DecodeModePage_05(pageResponse));
}
public static string PrettifyModePage_05(byte[] pageResponse) =>
PrettifyModePage_05(DecodeModePage_05(pageResponse));
public static string PrettifyModePage_05(ModePage_05? modePage)
{

View File

@@ -76,10 +76,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_06(byte[] pageResponse)
{
return PrettifyModePage_06(DecodeModePage_06(pageResponse));
}
public static string PrettifyModePage_06(byte[] pageResponse) =>
PrettifyModePage_06(DecodeModePage_06(pageResponse));
public static string PrettifyModePage_06(ModePage_06? modePage)
{

View File

@@ -108,10 +108,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_07(byte[] pageResponse)
{
return PrettifyModePage_07(DecodeModePage_07(pageResponse));
}
public static string PrettifyModePage_07(byte[] pageResponse) =>
PrettifyModePage_07(DecodeModePage_07(pageResponse));
public static string PrettifyModePage_07(ModePage_07? modePage)
{

View File

@@ -81,10 +81,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_07_MMC(byte[] pageResponse)
{
return PrettifyModePage_07_MMC(DecodeModePage_07_MMC(pageResponse));
}
public static string PrettifyModePage_07_MMC(byte[] pageResponse) =>
PrettifyModePage_07_MMC(DecodeModePage_07_MMC(pageResponse));
public static string PrettifyModePage_07_MMC(ModePage_07_MMC? modePage)
{

View File

@@ -183,10 +183,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_08(byte[] pageResponse)
{
return PrettifyModePage_08(DecodeModePage_08(pageResponse));
}
public static string PrettifyModePage_08(byte[] pageResponse) =>
PrettifyModePage_08(DecodeModePage_08(pageResponse));
public static string PrettifyModePage_08(ModePage_08? modePage)
{

View File

@@ -223,10 +223,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_0A(byte[] pageResponse)
{
return PrettifyModePage_0A(DecodeModePage_0A(pageResponse));
}
public static string PrettifyModePage_0A(byte[] pageResponse) =>
PrettifyModePage_0A(DecodeModePage_0A(pageResponse));
public static string PrettifyModePage_0A(ModePage_0A? modePage)
{
@@ -420,10 +418,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_0A_S01(byte[] pageResponse)
{
return PrettifyModePage_0A_S01(DecodeModePage_0A_S01(pageResponse));
}
public static string PrettifyModePage_0A_S01(byte[] pageResponse) =>
PrettifyModePage_0A_S01(DecodeModePage_0A_S01(pageResponse));
public static string PrettifyModePage_0A_S01(ModePage_0A_S01? modePage)
{

View File

@@ -79,10 +79,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_0B(byte[] pageResponse)
{
return PrettifyModePage_0B(DecodeModePage_0B(pageResponse));
}
public static string PrettifyModePage_0B(byte[] pageResponse) =>
PrettifyModePage_0B(DecodeModePage_0B(pageResponse));
public static string PrettifyModePage_0B(ModePage_0B? modePage)
{

View File

@@ -86,10 +86,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_0D(byte[] pageResponse)
{
return PrettifyModePage_0D(DecodeModePage_0D(pageResponse));
}
public static string PrettifyModePage_0D(byte[] pageResponse) =>
PrettifyModePage_0D(DecodeModePage_0D(pageResponse));
public static string PrettifyModePage_0D(ModePage_0D? modePage)
{

View File

@@ -136,10 +136,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_0E(byte[] pageResponse)
{
return PrettifyModePage_0E(DecodeModePage_0E(pageResponse));
}
public static string PrettifyModePage_0E(byte[] pageResponse) =>
PrettifyModePage_0E(DecodeModePage_0E(pageResponse));
public static string PrettifyModePage_0E(ModePage_0E? modePage)
{

View File

@@ -105,10 +105,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_0F(byte[] pageResponse)
{
return PrettifyModePage_0F(DecodeModePage_0F(pageResponse));
}
public static string PrettifyModePage_0F(byte[] pageResponse) =>
PrettifyModePage_0F(DecodeModePage_0F(pageResponse));
public static string PrettifyModePage_0F(ModePage_0F? modePage)
{

View File

@@ -100,10 +100,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_10(byte[] pageResponse)
{
return PrettifyModePage_10(DecodeModePage_10(pageResponse));
}
public static string PrettifyModePage_10(byte[] pageResponse) =>
PrettifyModePage_10(DecodeModePage_10(pageResponse));
public static string PrettifyModePage_10(ModePage_10? modePage)
{

View File

@@ -213,10 +213,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_10_SSC(byte[] pageResponse)
{
return PrettifyModePage_10_SSC(DecodeModePage_10_SSC(pageResponse));
}
public static string PrettifyModePage_10_SSC(byte[] pageResponse) =>
PrettifyModePage_10_SSC(DecodeModePage_10_SSC(pageResponse));
public static string PrettifyModePage_10_SSC(ModePage_10_SSC? modePage)
{

View File

@@ -166,10 +166,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_11(byte[] pageResponse)
{
return PrettifyModePage_11(DecodeModePage_11(pageResponse));
}
public static string PrettifyModePage_11(byte[] pageResponse) =>
PrettifyModePage_11(DecodeModePage_11(pageResponse));
public static string PrettifyModePage_11(ModePage_11? modePage)
{

View File

@@ -85,10 +85,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_12_13_14(byte[] pageResponse)
{
return PrettifyModePage_12_13_14(DecodeModePage_12_13_14(pageResponse));
}
public static string PrettifyModePage_12_13_14(byte[] pageResponse) =>
PrettifyModePage_12_13_14(DecodeModePage_12_13_14(pageResponse));
public static string PrettifyModePage_12_13_14(ModePage_12_13_14? modePage)
{

View File

@@ -146,10 +146,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_1A(byte[] pageResponse)
{
return PrettifyModePage_1A(DecodeModePage_1A(pageResponse));
}
public static string PrettifyModePage_1A(byte[] pageResponse) =>
PrettifyModePage_1A(DecodeModePage_1A(pageResponse));
public static string PrettifyModePage_1A(ModePage_1A? modePage)
{
@@ -242,10 +240,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_1A_S01(byte[] pageResponse)
{
return PrettifyModePage_1A_S01(DecodeModePage_1A_S01(pageResponse));
}
public static string PrettifyModePage_1A_S01(byte[] pageResponse) =>
PrettifyModePage_1A_S01(DecodeModePage_1A_S01(pageResponse));
public static string PrettifyModePage_1A_S01(ModePage_1A_S01? modePage)
{

View File

@@ -97,10 +97,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_1B(byte[] pageResponse)
{
return PrettifyModePage_1B(DecodeModePage_1B(pageResponse));
}
public static string PrettifyModePage_1B(byte[] pageResponse) =>
PrettifyModePage_1B(DecodeModePage_1B(pageResponse));
public static string PrettifyModePage_1B(ModePage_1B? modePage)
{

View File

@@ -132,10 +132,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_1C(byte[] pageResponse)
{
return PrettifyModePage_1C(DecodeModePage_1C(pageResponse));
}
public static string PrettifyModePage_1C(byte[] pageResponse) =>
PrettifyModePage_1C(DecodeModePage_1C(pageResponse));
public static string PrettifyModePage_1C(ModePage_1C? modePage)
{
@@ -280,10 +278,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_1C_S01(byte[] pageResponse)
{
return PrettifyModePage_1C_S01(DecodeModePage_1C_S01(pageResponse));
}
public static string PrettifyModePage_1C_S01(byte[] pageResponse) =>
PrettifyModePage_1C_S01(DecodeModePage_1C_S01(pageResponse));
public static string PrettifyModePage_1C_S01(ModePage_1C_S01? modePage)
{

View File

@@ -87,10 +87,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_1C_SFF(byte[] pageResponse)
{
return PrettifyModePage_1C_SFF(DecodeModePage_1C_SFF(pageResponse));
}
public static string PrettifyModePage_1C_SFF(byte[] pageResponse) =>
PrettifyModePage_1C_SFF(DecodeModePage_1C_SFF(pageResponse));
public static string PrettifyModePage_1C_SFF(ModePage_1C_SFF? modePage)
{

View File

@@ -72,10 +72,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyModePage_1D(byte[] pageResponse)
{
return PrettifyModePage_1D(DecodeModePage_1D(pageResponse));
}
public static string PrettifyModePage_1D(byte[] pageResponse) =>
PrettifyModePage_1D(DecodeModePage_1D(pageResponse));
public static string PrettifyModePage_1D(ModePage_1D? modePage)
{

View File

@@ -82,10 +82,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyCertanceModePage_21(byte[] pageResponse)
{
return PrettifyCertanceModePage_21(DecodeCertanceModePage_21(pageResponse));
}
public static string PrettifyCertanceModePage_21(byte[] pageResponse) =>
PrettifyCertanceModePage_21(DecodeCertanceModePage_21(pageResponse));
public static string PrettifyCertanceModePage_21(Certance_ModePage_21? modePage)
{

View File

@@ -89,10 +89,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyCertanceModePage_22(byte[] pageResponse)
{
return PrettifyCertanceModePage_22(DecodeCertanceModePage_22(pageResponse));
}
public static string PrettifyCertanceModePage_22(byte[] pageResponse) =>
PrettifyCertanceModePage_22(DecodeCertanceModePage_22(pageResponse));
public static string PrettifyCertanceModePage_22(Certance_ModePage_22? modePage)
{

View File

@@ -74,10 +74,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyIBMModePage_24(byte[] pageResponse)
{
return PrettifyIBMModePage_24(DecodeIBMModePage_24(pageResponse));
}
public static string PrettifyIBMModePage_24(byte[] pageResponse) =>
PrettifyIBMModePage_24(DecodeIBMModePage_24(pageResponse));
public static string PrettifyIBMModePage_24(IBM_ModePage_24? modePage)
{

View File

@@ -422,10 +422,8 @@ namespace DiscImageChef.Decoders.SCSI
return buf;
}
public static string PrettifyModePage_2A(byte[] pageResponse)
{
return PrettifyModePage_2A(DecodeModePage_2A(pageResponse));
}
public static string PrettifyModePage_2A(byte[] pageResponse) =>
PrettifyModePage_2A(DecodeModePage_2A(pageResponse));
public static string PrettifyModePage_2A(ModePage_2A modePage)
{

View File

@@ -87,10 +87,8 @@ namespace DiscImageChef.Decoders.SCSI
};
}
public static string PrettifyIBMModePage_2F(byte[] pageResponse)
{
return PrettifyIBMModePage_2F(DecodeIBMModePage_2F(pageResponse));
}
public static string PrettifyIBMModePage_2F(byte[] pageResponse) =>
PrettifyIBMModePage_2F(DecodeIBMModePage_2F(pageResponse));
public static string PrettifyIBMModePage_2F(IBM_ModePage_2F? modePage)
{

View File

@@ -44,8 +44,8 @@ namespace DiscImageChef.Decoders.SCSI
#region Apple Mode Page 0x30: Apple OEM String
static readonly byte[] AppleOEMString =
{
0x41, 0x50, 0x50, 0x4C, 0x45, 0x20, 0x43, 0x4F, 0x4D, 0x50, 0x55, 0x54, 0x45, 0x52, 0x2C, 0x20, 0x49, 0x4E,
0x43, 0x2E
0x41, 0x50, 0x50, 0x4C, 0x45, 0x20, 0x43, 0x4F, 0x4D, 0x50, 0x55, 0x54, 0x45, 0x52, 0x2C, 0x20, 0x49,
0x4E, 0x43, 0x2E
};
public static bool IsAppleModePage_30(byte[] pageResponse)

View File

@@ -72,10 +72,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyHPModePage_3B(byte[] pageResponse)
{
return PrettifyHPModePage_3B(DecodeHPModePage_3B(pageResponse));
}
public static string PrettifyHPModePage_3B(byte[] pageResponse) =>
PrettifyHPModePage_3B(DecodeHPModePage_3B(pageResponse));
public static string PrettifyHPModePage_3B(HP_ModePage_3B? modePage)
{

View File

@@ -94,10 +94,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyHPModePage_3C(byte[] pageResponse)
{
return PrettifyHPModePage_3C(DecodeHPModePage_3C(pageResponse));
}
public static string PrettifyHPModePage_3C(byte[] pageResponse) =>
PrettifyHPModePage_3C(DecodeHPModePage_3C(pageResponse));
public static string PrettifyHPModePage_3C(HP_ModePage_3C? modePage)
{

View File

@@ -68,10 +68,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyHPModePage_3D(byte[] pageResponse)
{
return PrettifyHPModePage_3D(DecodeHPModePage_3D(pageResponse));
}
public static string PrettifyHPModePage_3D(byte[] pageResponse) =>
PrettifyHPModePage_3D(DecodeHPModePage_3D(pageResponse));
public static string PrettifyHPModePage_3D(HP_ModePage_3D? modePage)
{

View File

@@ -68,10 +68,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyIBMModePage_3D(byte[] pageResponse)
{
return PrettifyIBMModePage_3D(DecodeIBMModePage_3D(pageResponse));
}
public static string PrettifyIBMModePage_3D(byte[] pageResponse) =>
PrettifyIBMModePage_3D(DecodeIBMModePage_3D(pageResponse));
public static string PrettifyIBMModePage_3D(IBM_ModePage_3D? modePage)
{

View File

@@ -115,10 +115,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyFujitsuModePage_3E(byte[] pageResponse)
{
return PrettifyFujitsuModePage_3E(DecodeFujitsuModePage_3E(pageResponse));
}
public static string PrettifyFujitsuModePage_3E(byte[] pageResponse) =>
PrettifyFujitsuModePage_3E(DecodeFujitsuModePage_3E(pageResponse));
public static string PrettifyFujitsuModePage_3E(Fujitsu_ModePage_3E? modePage)
{

View File

@@ -70,10 +70,8 @@ namespace DiscImageChef.Decoders.SCSI
return decoded;
}
public static string PrettifyHPModePage_3E(byte[] pageResponse)
{
return PrettifyHPModePage_3E(DecodeHPModePage_3E(pageResponse));
}
public static string PrettifyHPModePage_3E(byte[] pageResponse) =>
PrettifyHPModePage_3E(DecodeHPModePage_3E(pageResponse));
public static string PrettifyHPModePage_3E(HP_ModePage_3E? modePage)
{

View File

@@ -130,10 +130,8 @@ namespace DiscImageChef.Decoders.SCSI
return header;
}
public static string PrettifyModeHeader10(byte[] modeResponse, PeripheralDeviceTypes deviceType)
{
return PrettifyModeHeader(DecodeModeHeader10(modeResponse, deviceType), deviceType);
}
public static string PrettifyModeHeader10(byte[] modeResponse, PeripheralDeviceTypes deviceType) =>
PrettifyModeHeader(DecodeModeHeader10(modeResponse, deviceType), deviceType);
public static DecodedMode? DecodeMode10(byte[] modeResponse, PeripheralDeviceTypes deviceType)
{

View File

@@ -89,10 +89,8 @@ namespace DiscImageChef.Decoders.SCSI
return header;
}
public static string PrettifyModeHeader6(byte[] modeResponse, PeripheralDeviceTypes deviceType)
{
return PrettifyModeHeader(DecodeModeHeader6(modeResponse, deviceType), deviceType);
}
public static string PrettifyModeHeader6(byte[] modeResponse, PeripheralDeviceTypes deviceType) =>
PrettifyModeHeader(DecodeModeHeader6(modeResponse, deviceType), deviceType);
public static DecodedMode? DecodeMode6(byte[] modeResponse, PeripheralDeviceTypes deviceType)
{