From e2bbb9994fae8d66bacc29520a02bc14df6115b7 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 31 Dec 2018 13:17:27 +0000 Subject: [PATCH] General code refactor and reformat. --- ATA/Identify.cs | 6 +- Blu-ray/BCA.cs | 5 +- Blu-ray/Cartridge.cs | 5 +- Blu-ray/DDS.cs | 5 +- Blu-ray/DI.cs | 5 +- Blu-ray/Spare.cs | 5 +- CD/Sector.cs | 274 ++++++++++++++-------------- DVD/CSS&CPRM.cs | 6 +- DVD/Cartridge.cs | 5 +- DVD/DDS.cs | 5 +- DVD/PFI.cs | 5 +- DVD/Spare.cs | 5 +- Floppy/Apple2.cs | 24 +-- Floppy/AppleSony.cs | 20 +-- LisaTag.cs | 36 ++-- MMC/CID.cs | 10 +- MMC/CSD.cs | 10 +- MMC/ExtendedCSD.cs | 5 +- MMC/OCR.cs | 22 +-- PCMCIA/CIS.cs | 41 ++--- SCSI/EVPD.cs | 83 +++------ SCSI/Enums.cs | 8 +- SCSI/Inquiry.cs | 12 +- SCSI/MMC/Features.cs | 356 +++++++++---------------------------- SCSI/Modes/00_SFF.cs | 6 +- SCSI/Modes/01.cs | 6 +- SCSI/Modes/01_MMC.cs | 6 +- SCSI/Modes/02.cs | 6 +- SCSI/Modes/03.cs | 6 +- SCSI/Modes/04.cs | 6 +- SCSI/Modes/05.cs | 6 +- SCSI/Modes/06.cs | 6 +- SCSI/Modes/07.cs | 6 +- SCSI/Modes/07_MMC.cs | 6 +- SCSI/Modes/08.cs | 6 +- SCSI/Modes/0A.cs | 12 +- SCSI/Modes/0B.cs | 6 +- SCSI/Modes/0D.cs | 6 +- SCSI/Modes/0E.cs | 6 +- SCSI/Modes/0F.cs | 6 +- SCSI/Modes/10.cs | 6 +- SCSI/Modes/10_SSC.cs | 6 +- SCSI/Modes/11.cs | 6 +- SCSI/Modes/12_13_14.cs | 6 +- SCSI/Modes/1A.cs | 12 +- SCSI/Modes/1B.cs | 6 +- SCSI/Modes/1C.cs | 12 +- SCSI/Modes/1C_SFF.cs | 6 +- SCSI/Modes/1D.cs | 6 +- SCSI/Modes/21_Certance.cs | 6 +- SCSI/Modes/22_Certance.cs | 6 +- SCSI/Modes/24_IBM.cs | 6 +- SCSI/Modes/2A.cs | 6 +- SCSI/Modes/2F_IBM.cs | 6 +- SCSI/Modes/30_Apple.cs | 4 +- SCSI/Modes/3B_HP.cs | 6 +- SCSI/Modes/3C_HP.cs | 6 +- SCSI/Modes/3D_HP.cs | 6 +- SCSI/Modes/3D_IBM.cs | 6 +- SCSI/Modes/3E_Fujitsu.cs | 6 +- SCSI/Modes/3E_HP.cs | 6 +- SCSI/Modes/Mode10.cs | 6 +- SCSI/Modes/Mode6.cs | 6 +- SCSI/SSC/BlockLimits.cs | 5 +- SCSI/SSC/DensitySupport.cs | 23 +-- SCSI/Sense.cs | 27 +-- SecureDigital/CID.cs | 10 +- SecureDigital/CSD.cs | 10 +- SecureDigital/OCR.cs | 22 +-- SecureDigital/SCR.cs | 10 +- Xbox/DMI.cs | 10 +- Xbox/SS.cs | 5 +- 72 files changed, 433 insertions(+), 897 deletions(-) diff --git a/ATA/Identify.cs b/ATA/Identify.cs index 97c2153eb..c35e85e8b 100644 --- a/ATA/Identify.cs +++ b/ATA/Identify.cs @@ -3574,7 +3574,7 @@ namespace DiscImageChef.Decoders.ATA static byte[] ScrambleATAString(string str, int length) { - byte[] buf = new byte[length]; + byte[] buf = new byte[length]; for(int i = 0; i < length; i++) buf[i] = 0x20; if(str is null) return buf; @@ -3584,7 +3584,7 @@ namespace DiscImageChef.Decoders.ATA if(bytes.Length % 2 != 0) { byte[] tmp = new byte[bytes.Length + 1]; - tmp[tmp.Length - 1] = 0x20; + tmp[tmp.Length - 1] = 0x20; Array.Copy(bytes, 0, tmp, 0, bytes.Length); bytes = tmp; } @@ -3592,7 +3592,7 @@ namespace DiscImageChef.Decoders.ATA for(int i = 0; i < bytes.Length; i += 2) { buf[i] = bytes[i + 1]; - buf[i + 1] = bytes[i]; + buf[i + 1] = bytes[i]; } string test1 = StringHandlers.CToString(buf); diff --git a/Blu-ray/BCA.cs b/Blu-ray/BCA.cs index 7b70c0a5b..43c8276c5 100644 --- a/Blu-ray/BCA.cs +++ b/Blu-ray/BCA.cs @@ -102,10 +102,7 @@ namespace DiscImageChef.Decoders.Bluray return sb.ToString(); } - public static string Prettify(byte[] BCAResponse) - { - return Prettify(Decode(BCAResponse)); - } + public static string Prettify(byte[] BCAResponse) => Prettify(Decode(BCAResponse)); #endregion Public methods #region Public structures diff --git a/Blu-ray/Cartridge.cs b/Blu-ray/Cartridge.cs index 82e31d152..da60b67b8 100644 --- a/Blu-ray/Cartridge.cs +++ b/Blu-ray/Cartridge.cs @@ -128,10 +128,7 @@ namespace DiscImageChef.Decoders.Bluray return sb.ToString(); } - public static string Prettify(byte[] CSResponse) - { - return Prettify(Decode(CSResponse)); - } + public static string Prettify(byte[] CSResponse) => Prettify(Decode(CSResponse)); #endregion Public methods #region Public structures diff --git a/Blu-ray/DDS.cs b/Blu-ray/DDS.cs index 66b453c62..5d1003352 100644 --- a/Blu-ray/DDS.cs +++ b/Blu-ray/DDS.cs @@ -152,10 +152,7 @@ namespace DiscImageChef.Decoders.Bluray return sb.ToString(); } - public static string Prettify(byte[] DDSResponse) - { - return Prettify(Decode(DDSResponse)); - } + public static string Prettify(byte[] DDSResponse) => Prettify(Decode(DDSResponse)); #endregion Public methods #region Public structures diff --git a/Blu-ray/DI.cs b/Blu-ray/DI.cs index 9a9dc025b..d86482043 100644 --- a/Blu-ray/DI.cs +++ b/Blu-ray/DI.cs @@ -328,10 +328,7 @@ namespace DiscImageChef.Decoders.Bluray return sb.ToString(); } - public static string Prettify(byte[] DIResponse) - { - return Prettify(Decode(DIResponse)); - } + public static string Prettify(byte[] DIResponse) => Prettify(Decode(DIResponse)); #endregion Public methods #region Public structures diff --git a/Blu-ray/Spare.cs b/Blu-ray/Spare.cs index dfa92b6c3..a689a0a2d 100644 --- a/Blu-ray/Spare.cs +++ b/Blu-ray/Spare.cs @@ -104,10 +104,7 @@ namespace DiscImageChef.Decoders.Bluray return sb.ToString(); } - public static string Prettify(byte[] SAIResponse) - { - return Prettify(Decode(SAIResponse)); - } + public static string Prettify(byte[] SAIResponse) => Prettify(Decode(SAIResponse)); #endregion Public methods #region Public structures diff --git a/CD/Sector.cs b/CD/Sector.cs index 79b84dd27..7d7326bad 100644 --- a/CD/Sector.cs +++ b/CD/Sector.cs @@ -43,141 +43,151 @@ namespace DiscImageChef.Decoders.CD { public static readonly byte[] ScrambleTable = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x60, 0x00, 0x28, - 0x00, 0x1E, 0x80, 0x08, 0x60, 0x06, 0xA8, 0x02, 0xFE, 0x81, 0x80, 0x60, 0x60, 0x28, 0x28, 0x1E, 0x9E, 0x88, - 0x68, 0x66, 0xAE, 0xAA, 0xFC, 0x7F, 0x01, 0xE0, 0x00, 0x48, 0x00, 0x36, 0x80, 0x16, 0xE0, 0x0E, 0xC8, 0x04, - 0x56, 0x83, 0x7E, 0xE1, 0xE0, 0x48, 0x48, 0x36, 0xB6, 0x96, 0xF6, 0xEE, 0xC6, 0xCC, 0x52, 0xD5, 0xFD, 0x9F, - 0x01, 0xA8, 0x00, 0x7E, 0x80, 0x20, 0x60, 0x18, 0x28, 0x0A, 0x9E, 0x87, 0x28, 0x62, 0x9E, 0xA9, 0xA8, 0x7E, - 0xFE, 0xA0, 0x40, 0x78, 0x30, 0x22, 0x94, 0x19, 0xAF, 0x4A, 0xFC, 0x37, 0x01, 0xD6, 0x80, 0x5E, 0xE0, 0x38, - 0x48, 0x12, 0xB6, 0x8D, 0xB6, 0xE5, 0xB6, 0xCB, 0x36, 0xD7, 0x56, 0xDE, 0xBE, 0xD8, 0x70, 0x5A, 0xA4, 0x3B, - 0x3B, 0x53, 0x53, 0x7D, 0xFD, 0xE1, 0x81, 0x88, 0x60, 0x66, 0xA8, 0x2A, 0xFE, 0x9F, 0x00, 0x68, 0x00, 0x2E, - 0x80, 0x1C, 0x60, 0x09, 0xE8, 0x06, 0xCE, 0x82, 0xD4, 0x61, 0x9F, 0x68, 0x68, 0x2E, 0xAE, 0x9C, 0x7C, 0x69, - 0xE1, 0xEE, 0xC8, 0x4C, 0x56, 0xB5, 0xFE, 0xF7, 0x00, 0x46, 0x80, 0x32, 0xE0, 0x15, 0x88, 0x0F, 0x26, 0x84, - 0x1A, 0xE3, 0x4B, 0x09, 0xF7, 0x46, 0xC6, 0xB2, 0xD2, 0xF5, 0x9D, 0x87, 0x29, 0xA2, 0x9E, 0xF9, 0xA8, 0x42, - 0xFE, 0xB1, 0x80, 0x74, 0x60, 0x27, 0x68, 0x1A, 0xAE, 0x8B, 0x3C, 0x67, 0x51, 0xEA, 0xBC, 0x4F, 0x31, 0xF4, - 0x14, 0x47, 0x4F, 0x72, 0xB4, 0x25, 0xB7, 0x5B, 0x36, 0xBB, 0x56, 0xF3, 0x7E, 0xC5, 0xE0, 0x53, 0x08, 0x3D, - 0xC6, 0x91, 0x92, 0xEC, 0x6D, 0x8D, 0xED, 0xA5, 0x8D, 0xBB, 0x25, 0xB3, 0x5B, 0x35, 0xFB, 0x57, 0x03, 0x7E, - 0x81, 0xE0, 0x60, 0x48, 0x28, 0x36, 0x9E, 0x96, 0xE8, 0x6E, 0xCE, 0xAC, 0x54, 0x7D, 0xFF, 0x61, 0x80, 0x28, - 0x60, 0x1E, 0xA8, 0x08, 0x7E, 0x86, 0xA0, 0x62, 0xF8, 0x29, 0x82, 0x9E, 0xE1, 0xA8, 0x48, 0x7E, 0xB6, 0xA0, - 0x76, 0xF8, 0x26, 0xC2, 0x9A, 0xD1, 0xAB, 0x1C, 0x7F, 0x49, 0xE0, 0x36, 0xC8, 0x16, 0xD6, 0x8E, 0xDE, 0xE4, - 0x58, 0x4B, 0x7A, 0xB7, 0x63, 0x36, 0xA9, 0xD6, 0xFE, 0xDE, 0xC0, 0x58, 0x50, 0x3A, 0xBC, 0x13, 0x31, 0xCD, - 0xD4, 0x55, 0x9F, 0x7F, 0x28, 0x20, 0x1E, 0x98, 0x08, 0x6A, 0x86, 0xAF, 0x22, 0xFC, 0x19, 0x81, 0xCA, 0xE0, - 0x57, 0x08, 0x3E, 0x86, 0x90, 0x62, 0xEC, 0x29, 0x8D, 0xDE, 0xE5, 0x98, 0x4B, 0x2A, 0xB7, 0x5F, 0x36, 0xB8, - 0x16, 0xF2, 0x8E, 0xC5, 0xA4, 0x53, 0x3B, 0x7D, 0xD3, 0x61, 0x9D, 0xE8, 0x69, 0x8E, 0xAE, 0xE4, 0x7C, 0x4B, - 0x61, 0xF7, 0x68, 0x46, 0xAE, 0xB2, 0xFC, 0x75, 0x81, 0xE7, 0x20, 0x4A, 0x98, 0x37, 0x2A, 0x96, 0x9F, 0x2E, - 0xE8, 0x1C, 0x4E, 0x89, 0xF4, 0x66, 0xC7, 0x6A, 0xD2, 0xAF, 0x1D, 0xBC, 0x09, 0xB1, 0xC6, 0xF4, 0x52, 0xC7, - 0x7D, 0x92, 0xA1, 0xAD, 0xB8, 0x7D, 0xB2, 0xA1, 0xB5, 0xB8, 0x77, 0x32, 0xA6, 0x95, 0xBA, 0xEF, 0x33, 0x0C, - 0x15, 0xC5, 0xCF, 0x13, 0x14, 0x0D, 0xCF, 0x45, 0x94, 0x33, 0x2F, 0x55, 0xDC, 0x3F, 0x19, 0xD0, 0x0A, 0xDC, - 0x07, 0x19, 0xC2, 0x8A, 0xD1, 0xA7, 0x1C, 0x7A, 0x89, 0xE3, 0x26, 0xC9, 0xDA, 0xD6, 0xDB, 0x1E, 0xDB, 0x48, - 0x5B, 0x76, 0xBB, 0x66, 0xF3, 0x6A, 0xC5, 0xEF, 0x13, 0x0C, 0x0D, 0xC5, 0xC5, 0x93, 0x13, 0x2D, 0xCD, 0xDD, - 0x95, 0x99, 0xAF, 0x2A, 0xFC, 0x1F, 0x01, 0xC8, 0x00, 0x56, 0x80, 0x3E, 0xE0, 0x10, 0x48, 0x0C, 0x36, 0x85, - 0xD6, 0xE3, 0x1E, 0xC9, 0xC8, 0x56, 0xD6, 0xBE, 0xDE, 0xF0, 0x58, 0x44, 0x3A, 0xB3, 0x53, 0x35, 0xFD, 0xD7, - 0x01, 0x9E, 0x80, 0x68, 0x60, 0x2E, 0xA8, 0x1C, 0x7E, 0x89, 0xE0, 0x66, 0xC8, 0x2A, 0xD6, 0x9F, 0x1E, 0xE8, - 0x08, 0x4E, 0x86, 0xB4, 0x62, 0xF7, 0x69, 0x86, 0xAE, 0xE2, 0xFC, 0x49, 0x81, 0xF6, 0xE0, 0x46, 0xC8, 0x32, - 0xD6, 0x95, 0x9E, 0xEF, 0x28, 0x4C, 0x1E, 0xB5, 0xC8, 0x77, 0x16, 0xA6, 0x8E, 0xFA, 0xE4, 0x43, 0x0B, 0x71, - 0xC7, 0x64, 0x52, 0xAB, 0x7D, 0xBF, 0x61, 0xB0, 0x28, 0x74, 0x1E, 0xA7, 0x48, 0x7A, 0xB6, 0xA3, 0x36, 0xF9, - 0xD6, 0xC2, 0xDE, 0xD1, 0x98, 0x5C, 0x6A, 0xB9, 0xEF, 0x32, 0xCC, 0x15, 0x95, 0xCF, 0x2F, 0x14, 0x1C, 0x0F, - 0x49, 0xC4, 0x36, 0xD3, 0x56, 0xDD, 0xFE, 0xD9, 0x80, 0x5A, 0xE0, 0x3B, 0x08, 0x13, 0x46, 0x8D, 0xF2, 0xE5, - 0x85, 0x8B, 0x23, 0x27, 0x59, 0xDA, 0xBA, 0xDB, 0x33, 0x1B, 0x55, 0xCB, 0x7F, 0x17, 0x60, 0x0E, 0xA8, 0x04, - 0x7E, 0x83, 0x60, 0x61, 0xE8, 0x28, 0x4E, 0x9E, 0xB4, 0x68, 0x77, 0x6E, 0xA6, 0xAC, 0x7A, 0xFD, 0xE3, 0x01, - 0x89, 0xC0, 0x66, 0xD0, 0x2A, 0xDC, 0x1F, 0x19, 0xC8, 0x0A, 0xD6, 0x87, 0x1E, 0xE2, 0x88, 0x49, 0xA6, 0xB6, - 0xFA, 0xF6, 0xC3, 0x06, 0xD1, 0xC2, 0xDC, 0x51, 0x99, 0xFC, 0x6A, 0xC1, 0xEF, 0x10, 0x4C, 0x0C, 0x35, 0xC5, - 0xD7, 0x13, 0x1E, 0x8D, 0xC8, 0x65, 0x96, 0xAB, 0x2E, 0xFF, 0x5C, 0x40, 0x39, 0xF0, 0x12, 0xC4, 0x0D, 0x93, - 0x45, 0xAD, 0xF3, 0x3D, 0x85, 0xD1, 0xA3, 0x1C, 0x79, 0xC9, 0xE2, 0xD6, 0xC9, 0x9E, 0xD6, 0xE8, 0x5E, 0xCE, - 0xB8, 0x54, 0x72, 0xBF, 0x65, 0xB0, 0x2B, 0x34, 0x1F, 0x57, 0x48, 0x3E, 0xB6, 0x90, 0x76, 0xEC, 0x26, 0xCD, - 0xDA, 0xD5, 0x9B, 0x1F, 0x2B, 0x48, 0x1F, 0x76, 0x88, 0x26, 0xE6, 0x9A, 0xCA, 0xEB, 0x17, 0x0F, 0x4E, 0x84, - 0x34, 0x63, 0x57, 0x69, 0xFE, 0xAE, 0xC0, 0x7C, 0x50, 0x21, 0xFC, 0x18, 0x41, 0xCA, 0xB0, 0x57, 0x34, 0x3E, - 0x97, 0x50, 0x6E, 0xBC, 0x2C, 0x71, 0xDD, 0xE4, 0x59, 0x8B, 0x7A, 0xE7, 0x63, 0x0A, 0xA9, 0xC7, 0x3E, 0xD2, - 0x90, 0x5D, 0xAC, 0x39, 0xBD, 0xD2, 0xF1, 0x9D, 0x84, 0x69, 0xA3, 0x6E, 0xF9, 0xEC, 0x42, 0xCD, 0xF1, 0x95, - 0x84, 0x6F, 0x23, 0x6C, 0x19, 0xED, 0xCA, 0xCD, 0x97, 0x15, 0xAE, 0x8F, 0x3C, 0x64, 0x11, 0xEB, 0x4C, 0x4F, - 0x75, 0xF4, 0x27, 0x07, 0x5A, 0x82, 0xBB, 0x21, 0xB3, 0x58, 0x75, 0xFA, 0xA7, 0x03, 0x3A, 0x81, 0xD3, 0x20, - 0x5D, 0xD8, 0x39, 0x9A, 0x92, 0xEB, 0x2D, 0x8F, 0x5D, 0xA4, 0x39, 0xBB, 0x52, 0xF3, 0x7D, 0x85, 0xE1, 0xA3, - 0x08, 0x79, 0xC6, 0xA2, 0xD2, 0xF9, 0x9D, 0x82, 0xE9, 0xA1, 0x8E, 0xF8, 0x64, 0x42, 0xAB, 0x71, 0xBF, 0x64, - 0x70, 0x2B, 0x64, 0x1F, 0x6B, 0x48, 0x2F, 0x76, 0x9C, 0x26, 0xE9, 0xDA, 0xCE, 0xDB, 0x14, 0x5B, 0x4F, 0x7B, - 0x74, 0x23, 0x67, 0x59, 0xEA, 0xBA, 0xCF, 0x33, 0x14, 0x15, 0xCF, 0x4F, 0x14, 0x34, 0x0F, 0x57, 0x44, 0x3E, - 0xB3, 0x50, 0x75, 0xFC, 0x27, 0x01, 0xDA, 0x80, 0x5B, 0x20, 0x3B, 0x58, 0x13, 0x7A, 0x8D, 0xE3, 0x25, 0x89, - 0xDB, 0x26, 0xDB, 0x5A, 0xDB, 0x7B, 0x1B, 0x63, 0x4B, 0x69, 0xF7, 0x6E, 0xC6, 0xAC, 0x52, 0xFD, 0xFD, 0x81, - 0x81, 0xA0, 0x60, 0x78, 0x28, 0x22, 0x9E, 0x99, 0xA8, 0x6A, 0xFE, 0xAF, 0x00, 0x7C, 0x00, 0x21, 0xC0, 0x18, - 0x50, 0x0A, 0xBC, 0x07, 0x31, 0xC2, 0x94, 0x51, 0xAF, 0x7C, 0x7C, 0x21, 0xE1, 0xD8, 0x48, 0x5A, 0xB6, 0xBB, - 0x36, 0xF3, 0x56, 0xC5, 0xFE, 0xD3, 0x00, 0x5D, 0xC0, 0x39, 0x90, 0x12, 0xEC, 0x0D, 0x8D, 0xC5, 0xA5, 0x93, - 0x3B, 0x2D, 0xD3, 0x5D, 0x9D, 0xF9, 0xA9, 0x82, 0xFE, 0xE1, 0x80, 0x48, 0x60, 0x36, 0xA8, 0x16, 0xFE, 0x8E, - 0xC0, 0x64, 0x50, 0x2B, 0x7C, 0x1F, 0x61, 0xC8, 0x28, 0x56, 0x9E, 0xBE, 0xE8, 0x70, 0x4E, 0xA4, 0x34, 0x7B, - 0x57, 0x63, 0x7E, 0xA9, 0xE0, 0x7E, 0xC8, 0x20, 0x56, 0x98, 0x3E, 0xEA, 0x90, 0x4F, 0x2C, 0x34, 0x1D, 0xD7, - 0x49, 0x9E, 0xB6, 0xE8, 0x76, 0xCE, 0xA6, 0xD4, 0x7A, 0xDF, 0x63, 0x18, 0x29, 0xCA, 0x9E, 0xD7, 0x28, 0x5E, - 0x9E, 0xB8, 0x68, 0x72, 0xAE, 0xA5, 0xBC, 0x7B, 0x31, 0xE3, 0x54, 0x49, 0xFF, 0x76, 0xC0, 0x26, 0xD0, 0x1A, - 0xDC, 0x0B, 0x19, 0xC7, 0x4A, 0xD2, 0xB7, 0x1D, 0xB6, 0x89, 0xB6, 0xE6, 0xF6, 0xCA, 0xC6, 0xD7, 0x12, 0xDE, - 0x8D, 0x98, 0x65, 0xAA, 0xAB, 0x3F, 0x3F, 0x50, 0x10, 0x3C, 0x0C, 0x11, 0xC5, 0xCC, 0x53, 0x15, 0xFD, 0xCF, - 0x01, 0x94, 0x00, 0x6F, 0x40, 0x2C, 0x30, 0x1D, 0xD4, 0x09, 0x9F, 0x46, 0xE8, 0x32, 0xCE, 0x95, 0x94, 0x6F, - 0x2F, 0x6C, 0x1C, 0x2D, 0xC9, 0xDD, 0x96, 0xD9, 0xAE, 0xDA, 0xFC, 0x5B, 0x01, 0xFB, 0x40, 0x43, 0x70, 0x31, - 0xE4, 0x14, 0x4B, 0x4F, 0x77, 0x74, 0x26, 0xA7, 0x5A, 0xFA, 0xBB, 0x03, 0x33, 0x41, 0xD5, 0xF0, 0x5F, 0x04, - 0x38, 0x03, 0x52, 0x81, 0xFD, 0xA0, 0x41, 0xB8, 0x30, 0x72, 0x94, 0x25, 0xAF, 0x5B, 0x3C, 0x3B, 0x51, 0xD3, - 0x7C, 0x5D, 0xE1, 0xF9, 0x88, 0x42, 0xE6, 0xB1, 0x8A, 0xF4, 0x67, 0x07, 0x6A, 0x82, 0xAF, 0x21, 0xBC, 0x18, - 0x71, 0xCA, 0xA4, 0x57, 0x3B, 0x7E, 0x93, 0x60, 0x6D, 0xE8, 0x2D, 0x8E, 0x9D, 0xA4, 0x69, 0xBB, 0x6E, 0xF3, - 0x6C, 0x45, 0xED, 0xF3, 0x0D, 0x85, 0xC5, 0xA3, 0x13, 0x39, 0xCD, 0xD2, 0xD5, 0x9D, 0x9F, 0x29, 0xA8, 0x1E, - 0xFE, 0x88, 0x40, 0x66, 0xB0, 0x2A, 0xF4, 0x1F, 0x07, 0x48, 0x02, 0xB6, 0x81, 0xB6, 0xE0, 0x76, 0xC8, 0x26, - 0xD6, 0x9A, 0xDE, 0xEB, 0x18, 0x4F, 0x4A, 0xB4, 0x37, 0x37, 0x56, 0x96, 0xBE, 0xEE, 0xF0, 0x4C, 0x44, 0x35, - 0xF3, 0x57, 0x05, 0xFE, 0x83, 0x00, 0x61, 0xC0, 0x28, 0x50, 0x1E, 0xBC, 0x08, 0x71, 0xC6, 0xA4, 0x52, 0xFB, - 0x7D, 0x83, 0x61, 0xA1, 0xE8, 0x78, 0x4E, 0xA2, 0xB4, 0x79, 0xB7, 0x62, 0xF6, 0xA9, 0x86, 0xFE, 0xE2, 0xC0, - 0x49, 0x90, 0x36, 0xEC, 0x16, 0xCD, 0xCE, 0xD5, 0x94, 0x5F, 0x2F, 0x78, 0x1C, 0x22, 0x89, 0xD9, 0xA6, 0xDA, - 0xFA, 0xDB, 0x03, 0x1B, 0x41, 0xCB, 0x70, 0x57, 0x64, 0x3E, 0xAB, 0x50, 0x7F, 0x7C, 0x20, 0x21, 0xD8, 0x18, - 0x5A, 0x8A, 0xBB, 0x27, 0x33, 0x5A, 0x95, 0xFB, 0x2F, 0x03, 0x5C, 0x01, 0xF9, 0xC0, 0x42, 0xD0, 0x31, 0x9C, - 0x14, 0x69, 0xCF, 0x6E, 0xD4, 0x2C, 0x5F, 0x5D, 0xF8, 0x39, 0x82, 0x92, 0xE1, 0xAD, 0x88, 0x7D, 0xA6, 0xA1, - 0xBA, 0xF8, 0x73, 0x02, 0xA5, 0xC1, 0xBB, 0x10, 0x73, 0x4C, 0x25, 0xF5, 0xDB, 0x07, 0x1B, 0x42, 0x8B, 0x71, - 0xA7, 0x64, 0x7A, 0xAB, 0x63, 0x3F, 0x69, 0xD0, 0x2E, 0xDC, 0x1C, 0x59, 0xC9, 0xFA, 0xD6, 0xC3, 0x1E, 0xD1, - 0xC8, 0x5C, 0x56, 0xB9, 0xFE, 0xF2, 0xC0, 0x45, 0x90, 0x33, 0x2C, 0x15, 0xDD, 0xCF, 0x19, 0x94, 0x0A, 0xEF, - 0x47, 0x0C, 0x32, 0x85, 0xD5, 0xA3, 0x1F, 0x39, 0xC8, 0x12, 0xD6, 0x8D, 0x9E, 0xE5, 0xA8, 0x4B, 0x3E, 0xB7, - 0x50, 0x76, 0xBC, 0x26, 0xF1, 0xDA, 0xC4, 0x5B, 0x13, 0x7B, 0x4D, 0xE3, 0x75, 0x89, 0xE7, 0x26, 0xCA, 0x9A, - 0xD7, 0x2B, 0x1E, 0x9F, 0x48, 0x68, 0x36, 0xAE, 0x96, 0xFC, 0x6E, 0xC1, 0xEC, 0x50, 0x4D, 0xFC, 0x35, 0x81, - 0xD7, 0x20, 0x5E, 0x98, 0x38, 0x6A, 0x92, 0xAF, 0x2D, 0xBC, 0x1D, 0xB1, 0xC9, 0xB4, 0x56, 0xF7, 0x7E, 0xC6, - 0xA0, 0x52, 0xF8, 0x3D, 0x82, 0x91, 0xA1, 0xAC, 0x78, 0x7D, 0xE2, 0xA1, 0x89, 0xB8, 0x66, 0xF2, 0xAA, 0xC5, - 0xBF, 0x13, 0x30, 0x0D, 0xD4, 0x05, 0x9F, 0x43, 0x28, 0x31, 0xDE, 0x94, 0x58, 0x6F, 0x7A, 0xAC, 0x23, 0x3D, - 0xD9, 0xD1, 0x9A, 0xDC, 0x6B, 0x19, 0xEF, 0x4A, 0xCC, 0x37, 0x15, 0xD6, 0x8F, 0x1E, 0xE4, 0x08, 0x4B, 0x46, - 0xB7, 0x72, 0xF6, 0xA5, 0x86, 0xFB, 0x22, 0xC3, 0x59, 0x91, 0xFA, 0xEC, 0x43, 0x0D, 0xF1, 0xC5, 0x84, 0x53, - 0x23, 0x7D, 0xD9, 0xE1, 0x9A, 0xC8, 0x6B, 0x16, 0xAF, 0x4E, 0xFC, 0x34, 0x41, 0xD7, 0x70, 0x5E, 0xA4, 0x38, - 0x7B, 0x52, 0xA3, 0x7D, 0xB9, 0xE1, 0xB2, 0xC8, 0x75, 0x96, 0xA7, 0x2E, 0xFA, 0x9C, 0x43, 0x29, 0xF1, 0xDE, - 0xC4, 0x58, 0x53, 0x7A, 0xBD, 0xE3, 0x31, 0x89, 0xD4, 0x66, 0xDF, 0x6A, 0xD8, 0x2F, 0x1A, 0x9C, 0x0B, 0x29, - 0xC7, 0x5E, 0xD2, 0xB8, 0x5D, 0xB2, 0xB9, 0xB5, 0xB2, 0xF7, 0x35, 0x86, 0x97, 0x22, 0xEE, 0x99, 0x8C, 0x6A, - 0xE5, 0xEF, 0x0B, 0x0C, 0x07, 0x45, 0xC2, 0xB3, 0x11, 0xB5, 0xCC, 0x77, 0x15, 0xE6, 0x8F, 0x0A, 0xE4, 0x07, - 0x0B, 0x42, 0x87, 0x71, 0xA2, 0xA4, 0x79, 0xBB, 0x62, 0xF3, 0x69, 0x85, 0xEE, 0xE3, 0x0C, 0x49, 0xC5, 0xF6, - 0xD3, 0x06, 0xDD, 0xC2, 0xD9, 0x91, 0x9A, 0xEC, 0x6B, 0x0D, 0xEF, 0x45, 0x8C, 0x33, 0x25, 0xD5, 0xDB, 0x1F, - 0x1B, 0x48, 0x0B, 0x76, 0x87, 0x66, 0xE2, 0xAA, 0xC9, 0xBF, 0x16, 0xF0, 0x0E, 0xC4, 0x04, 0x53, 0x43, 0x7D, - 0xF1, 0xE1, 0x84, 0x48, 0x63, 0x76, 0xA9, 0xE6, 0xFE, 0xCA, 0xC0, 0x57, 0x10, 0x3E, 0x8C, 0x10, 0x65, 0xCC, - 0x2B, 0x15, 0xDF, 0x4F, 0x18, 0x34, 0x0A, 0x97, 0x47, 0x2E, 0xB2, 0x9C, 0x75, 0xA9, 0xE7, 0x3E, 0xCA, 0x90, - 0x57, 0x2C, 0x3E, 0x9D, 0xD0, 0x69, 0x9C, 0x2E, 0xE9, 0xDC, 0x4E, 0xD9, 0xF4, 0x5A, 0xC7, 0x7B, 0x12, 0xA3, - 0x4D, 0xB9, 0xF5, 0xB2, 0xC7, 0x35, 0x92, 0x97, 0x2D, 0xAE, 0x9D, 0xBC, 0x69, 0xB1, 0xEE, 0xF4, 0x4C, 0x47, - 0x75, 0xF2, 0xA7, 0x05, 0xBA, 0x83, 0x33, 0x21, 0xD5, 0xD8, 0x5F, 0x1A, 0xB8, 0x0B, 0x32, 0x87, 0x55, 0xA2, - 0xBF, 0x39, 0xB0, 0x12, 0xF4, 0x0D, 0x87, 0x45, 0xA2, 0xB3, 0x39, 0xB5, 0xD2, 0xF7, 0x1D, 0x86, 0x89, 0xA2, - 0xE6, 0xF9, 0x8A, 0xC2, 0xE7, 0x11, 0x8A, 0x8C, 0x67, 0x25, 0xEA, 0x9B, 0x0F, 0x2B, 0x44, 0x1F, 0x73, 0x48, - 0x25, 0xF6, 0x9B, 0x06, 0xEB, 0x42, 0xCF, 0x71, 0x94, 0x24, 0x6F, 0x5B, 0x6C, 0x3B, 0x6D, 0xD3, 0x6D, 0x9D, - 0xED, 0xA9, 0x8D, 0xBE, 0xE5, 0xB0, 0x4B, 0x34, 0x37, 0x57, 0x56, 0xBE, 0xBE, 0xF0, 0x70, 0x44, 0x24, 0x33, - 0x5B, 0x55, 0xFB, 0x7F, 0x03, 0x60, 0x01, 0xE8, 0x00, 0x4E, 0x80, 0x34, 0x60, 0x17, 0x68, 0x0E, 0xAE, 0x84, - 0x7C, 0x63, 0x61, 0xE9, 0xE8, 0x4E, 0xCE, 0xB4, 0x54, 0x77, 0x7F, 0x66, 0xA0, 0x2A, 0xF8, 0x1F, 0x02, 0x88, - 0x01, 0xA6, 0x80, 0x7A, 0xE0, 0x23, 0x08, 0x19, 0xC6, 0x8A, 0xD2, 0xE7, 0x1D, 0x8A, 0x89, 0xA7, 0x26, 0xFA, - 0x9A, 0xC3, 0x2B, 0x11, 0xDF, 0x4C, 0x58, 0x35, 0xFA, 0x97, 0x03, 0x2E, 0x81, 0xDC, 0x60, 0x59, 0xE8, 0x3A, - 0xCE, 0x93, 0x14, 0x6D, 0xCF, 0x6D, 0x94, 0x2D, 0xAF, 0x5D, 0xBC, 0x39, 0xB1, 0xD2, 0xF4, 0x5D, 0x87, 0x79, - 0xA2, 0xA2, 0xF9, 0xB9, 0x82, 0xF2, 0xE1, 0x85, 0x88, 0x63, 0x26, 0xA9, 0xDA, 0xFE, 0xDB, 0x00, 0x5B, 0x40, - 0x3B, 0x70, 0x13, 0x64, 0x0D, 0xEB, 0x45, 0x8F, 0x73, 0x24, 0x25, 0xDB, 0x5B, 0x1B, 0x7B, 0x4B, 0x63, 0x77, - 0x69, 0xE6, 0xAE, 0xCA, 0xFC, 0x57, 0x01, 0xFE, 0x80, 0x40, 0x60, 0x30, 0x28, 0x14, 0x1E, 0x8F, 0x48, 0x64, - 0x36, 0xAB, 0x56, 0xFF, 0x7E, 0xC0, 0x20, 0x50, 0x18, 0x3C, 0x0A, 0x91, 0xC7, 0x2C, 0x52, 0x9D, 0xFD, 0xA9, - 0x81, 0xBE, 0xE0, 0x70, 0x48, 0x24, 0x36, 0x9B, 0x56, 0xEB, 0x7E, 0xCF, 0x60, 0x54, 0x28, 0x3F, 0x5E, 0x90, - 0x38, 0x6C, 0x12, 0xAD, 0xCD, 0xBD, 0x95, 0xB1, 0xAF, 0x34, 0x7C, 0x17, 0x61, 0xCE, 0xA8, 0x54, 0x7E, 0xBF, - 0x60, 0x70, 0x28, 0x24, 0x1E, 0x9B, 0x48, 0x6B, 0x76, 0xAF, 0x66, 0xFC, 0x2A, 0xC1, 0xDF, 0x10, 0x58, 0x0C, - 0x3A, 0x85, 0xD3, 0x23, 0x1D, 0xD9, 0xC9, 0x9A, 0xD6, 0xEB, 0x1E, 0xCF, 0x48, 0x54, 0x36, 0xBF, 0x56, 0xF0, - 0x3E, 0xC4, 0x10, 0x53, 0x4C, 0x3D, 0xF5, 0xD1, 0x87, 0x1C, 0x62, 0x89, 0xE9, 0xA6, 0xCE, 0xFA, 0xD4, 0x43, - 0x1F, 0x71, 0xC8, 0x24, 0x56, 0x9B, 0x7E, 0xEB, 0x60, 0x4F, 0x68, 0x34, 0x2E, 0x97, 0x5C, 0x6E, 0xB9, 0xEC, - 0x72, 0xCD, 0xE5, 0x95, 0x8B, 0x2F, 0x27, 0x5C, 0x1A, 0xB9, 0xCB, 0x32, 0xD7, 0x55, 0x9E, 0xBF, 0x28, 0x70, - 0x1E, 0xA4, 0x08, 0x7B, 0x46, 0xA3, 0x72, 0xF9, 0xE5, 0x82, 0xCB, 0x21, 0x97, 0x58, 0x6E, 0xBA, 0xAC, 0x73, - 0x3D, 0xE5, 0xD1, 0x8B, 0x1C, 0x67, 0x49, 0xEA, 0xB6, 0xCF, 0x36, 0xD4, 0x16, 0xDF, 0x4E, 0xD8, 0x34, 0x5A, - 0x97, 0x7B, 0x2E, 0xA3, 0x5C, 0x79, 0xF9, 0xE2, 0xC2, 0xC9, 0x91, 0x96, 0xEC, 0x6E, 0xCD, 0xEC, 0x55, 0x8D, - 0xFF, 0x25, 0x80, 0x1B, 0x20, 0x0B, 0x58, 0x07, 0x7A, 0x82, 0xA3, 0x21, 0xB9, 0xD8, 0x72, 0xDA, 0xA5, 0x9B, - 0x3B, 0x2B, 0x53, 0x5F, 0x7D, 0xF8, 0x21, 0x82, 0x98, 0x61, 0xAA, 0xA8, 0x7F, 0x3E, 0xA0, 0x10, 0x78, 0x0C, - 0x22, 0x85, 0xD9, 0xA3, 0x1A, 0xF9, 0xCB, 0x02, 0xD7, 0x41, 0x9E, 0xB0, 0x68, 0x74, 0x2E, 0xA7, 0x5C, 0x7A, - 0xB9, 0xE3, 0x32, 0xC9, 0xD5, 0x96, 0xDF, 0x2E, 0xD8, 0x1C, 0x5A, 0x89, 0xFB, 0x26, 0xC3, 0x5A, 0xD1, 0xFB, - 0x1C, 0x43, 0x49, 0xF1, 0xF6, 0xC4, 0x46, 0xD3, 0x72, 0xDD, 0xE5, 0x99 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x60, 0x00, + 0x28, 0x00, 0x1E, 0x80, 0x08, 0x60, 0x06, 0xA8, 0x02, 0xFE, 0x81, 0x80, 0x60, 0x60, 0x28, 0x28, 0x1E, + 0x9E, 0x88, 0x68, 0x66, 0xAE, 0xAA, 0xFC, 0x7F, 0x01, 0xE0, 0x00, 0x48, 0x00, 0x36, 0x80, 0x16, 0xE0, + 0x0E, 0xC8, 0x04, 0x56, 0x83, 0x7E, 0xE1, 0xE0, 0x48, 0x48, 0x36, 0xB6, 0x96, 0xF6, 0xEE, 0xC6, 0xCC, + 0x52, 0xD5, 0xFD, 0x9F, 0x01, 0xA8, 0x00, 0x7E, 0x80, 0x20, 0x60, 0x18, 0x28, 0x0A, 0x9E, 0x87, 0x28, + 0x62, 0x9E, 0xA9, 0xA8, 0x7E, 0xFE, 0xA0, 0x40, 0x78, 0x30, 0x22, 0x94, 0x19, 0xAF, 0x4A, 0xFC, 0x37, + 0x01, 0xD6, 0x80, 0x5E, 0xE0, 0x38, 0x48, 0x12, 0xB6, 0x8D, 0xB6, 0xE5, 0xB6, 0xCB, 0x36, 0xD7, 0x56, + 0xDE, 0xBE, 0xD8, 0x70, 0x5A, 0xA4, 0x3B, 0x3B, 0x53, 0x53, 0x7D, 0xFD, 0xE1, 0x81, 0x88, 0x60, 0x66, + 0xA8, 0x2A, 0xFE, 0x9F, 0x00, 0x68, 0x00, 0x2E, 0x80, 0x1C, 0x60, 0x09, 0xE8, 0x06, 0xCE, 0x82, 0xD4, + 0x61, 0x9F, 0x68, 0x68, 0x2E, 0xAE, 0x9C, 0x7C, 0x69, 0xE1, 0xEE, 0xC8, 0x4C, 0x56, 0xB5, 0xFE, 0xF7, + 0x00, 0x46, 0x80, 0x32, 0xE0, 0x15, 0x88, 0x0F, 0x26, 0x84, 0x1A, 0xE3, 0x4B, 0x09, 0xF7, 0x46, 0xC6, + 0xB2, 0xD2, 0xF5, 0x9D, 0x87, 0x29, 0xA2, 0x9E, 0xF9, 0xA8, 0x42, 0xFE, 0xB1, 0x80, 0x74, 0x60, 0x27, + 0x68, 0x1A, 0xAE, 0x8B, 0x3C, 0x67, 0x51, 0xEA, 0xBC, 0x4F, 0x31, 0xF4, 0x14, 0x47, 0x4F, 0x72, 0xB4, + 0x25, 0xB7, 0x5B, 0x36, 0xBB, 0x56, 0xF3, 0x7E, 0xC5, 0xE0, 0x53, 0x08, 0x3D, 0xC6, 0x91, 0x92, 0xEC, + 0x6D, 0x8D, 0xED, 0xA5, 0x8D, 0xBB, 0x25, 0xB3, 0x5B, 0x35, 0xFB, 0x57, 0x03, 0x7E, 0x81, 0xE0, 0x60, + 0x48, 0x28, 0x36, 0x9E, 0x96, 0xE8, 0x6E, 0xCE, 0xAC, 0x54, 0x7D, 0xFF, 0x61, 0x80, 0x28, 0x60, 0x1E, + 0xA8, 0x08, 0x7E, 0x86, 0xA0, 0x62, 0xF8, 0x29, 0x82, 0x9E, 0xE1, 0xA8, 0x48, 0x7E, 0xB6, 0xA0, 0x76, + 0xF8, 0x26, 0xC2, 0x9A, 0xD1, 0xAB, 0x1C, 0x7F, 0x49, 0xE0, 0x36, 0xC8, 0x16, 0xD6, 0x8E, 0xDE, 0xE4, + 0x58, 0x4B, 0x7A, 0xB7, 0x63, 0x36, 0xA9, 0xD6, 0xFE, 0xDE, 0xC0, 0x58, 0x50, 0x3A, 0xBC, 0x13, 0x31, + 0xCD, 0xD4, 0x55, 0x9F, 0x7F, 0x28, 0x20, 0x1E, 0x98, 0x08, 0x6A, 0x86, 0xAF, 0x22, 0xFC, 0x19, 0x81, + 0xCA, 0xE0, 0x57, 0x08, 0x3E, 0x86, 0x90, 0x62, 0xEC, 0x29, 0x8D, 0xDE, 0xE5, 0x98, 0x4B, 0x2A, 0xB7, + 0x5F, 0x36, 0xB8, 0x16, 0xF2, 0x8E, 0xC5, 0xA4, 0x53, 0x3B, 0x7D, 0xD3, 0x61, 0x9D, 0xE8, 0x69, 0x8E, + 0xAE, 0xE4, 0x7C, 0x4B, 0x61, 0xF7, 0x68, 0x46, 0xAE, 0xB2, 0xFC, 0x75, 0x81, 0xE7, 0x20, 0x4A, 0x98, + 0x37, 0x2A, 0x96, 0x9F, 0x2E, 0xE8, 0x1C, 0x4E, 0x89, 0xF4, 0x66, 0xC7, 0x6A, 0xD2, 0xAF, 0x1D, 0xBC, + 0x09, 0xB1, 0xC6, 0xF4, 0x52, 0xC7, 0x7D, 0x92, 0xA1, 0xAD, 0xB8, 0x7D, 0xB2, 0xA1, 0xB5, 0xB8, 0x77, + 0x32, 0xA6, 0x95, 0xBA, 0xEF, 0x33, 0x0C, 0x15, 0xC5, 0xCF, 0x13, 0x14, 0x0D, 0xCF, 0x45, 0x94, 0x33, + 0x2F, 0x55, 0xDC, 0x3F, 0x19, 0xD0, 0x0A, 0xDC, 0x07, 0x19, 0xC2, 0x8A, 0xD1, 0xA7, 0x1C, 0x7A, 0x89, + 0xE3, 0x26, 0xC9, 0xDA, 0xD6, 0xDB, 0x1E, 0xDB, 0x48, 0x5B, 0x76, 0xBB, 0x66, 0xF3, 0x6A, 0xC5, 0xEF, + 0x13, 0x0C, 0x0D, 0xC5, 0xC5, 0x93, 0x13, 0x2D, 0xCD, 0xDD, 0x95, 0x99, 0xAF, 0x2A, 0xFC, 0x1F, 0x01, + 0xC8, 0x00, 0x56, 0x80, 0x3E, 0xE0, 0x10, 0x48, 0x0C, 0x36, 0x85, 0xD6, 0xE3, 0x1E, 0xC9, 0xC8, 0x56, + 0xD6, 0xBE, 0xDE, 0xF0, 0x58, 0x44, 0x3A, 0xB3, 0x53, 0x35, 0xFD, 0xD7, 0x01, 0x9E, 0x80, 0x68, 0x60, + 0x2E, 0xA8, 0x1C, 0x7E, 0x89, 0xE0, 0x66, 0xC8, 0x2A, 0xD6, 0x9F, 0x1E, 0xE8, 0x08, 0x4E, 0x86, 0xB4, + 0x62, 0xF7, 0x69, 0x86, 0xAE, 0xE2, 0xFC, 0x49, 0x81, 0xF6, 0xE0, 0x46, 0xC8, 0x32, 0xD6, 0x95, 0x9E, + 0xEF, 0x28, 0x4C, 0x1E, 0xB5, 0xC8, 0x77, 0x16, 0xA6, 0x8E, 0xFA, 0xE4, 0x43, 0x0B, 0x71, 0xC7, 0x64, + 0x52, 0xAB, 0x7D, 0xBF, 0x61, 0xB0, 0x28, 0x74, 0x1E, 0xA7, 0x48, 0x7A, 0xB6, 0xA3, 0x36, 0xF9, 0xD6, + 0xC2, 0xDE, 0xD1, 0x98, 0x5C, 0x6A, 0xB9, 0xEF, 0x32, 0xCC, 0x15, 0x95, 0xCF, 0x2F, 0x14, 0x1C, 0x0F, + 0x49, 0xC4, 0x36, 0xD3, 0x56, 0xDD, 0xFE, 0xD9, 0x80, 0x5A, 0xE0, 0x3B, 0x08, 0x13, 0x46, 0x8D, 0xF2, + 0xE5, 0x85, 0x8B, 0x23, 0x27, 0x59, 0xDA, 0xBA, 0xDB, 0x33, 0x1B, 0x55, 0xCB, 0x7F, 0x17, 0x60, 0x0E, + 0xA8, 0x04, 0x7E, 0x83, 0x60, 0x61, 0xE8, 0x28, 0x4E, 0x9E, 0xB4, 0x68, 0x77, 0x6E, 0xA6, 0xAC, 0x7A, + 0xFD, 0xE3, 0x01, 0x89, 0xC0, 0x66, 0xD0, 0x2A, 0xDC, 0x1F, 0x19, 0xC8, 0x0A, 0xD6, 0x87, 0x1E, 0xE2, + 0x88, 0x49, 0xA6, 0xB6, 0xFA, 0xF6, 0xC3, 0x06, 0xD1, 0xC2, 0xDC, 0x51, 0x99, 0xFC, 0x6A, 0xC1, 0xEF, + 0x10, 0x4C, 0x0C, 0x35, 0xC5, 0xD7, 0x13, 0x1E, 0x8D, 0xC8, 0x65, 0x96, 0xAB, 0x2E, 0xFF, 0x5C, 0x40, + 0x39, 0xF0, 0x12, 0xC4, 0x0D, 0x93, 0x45, 0xAD, 0xF3, 0x3D, 0x85, 0xD1, 0xA3, 0x1C, 0x79, 0xC9, 0xE2, + 0xD6, 0xC9, 0x9E, 0xD6, 0xE8, 0x5E, 0xCE, 0xB8, 0x54, 0x72, 0xBF, 0x65, 0xB0, 0x2B, 0x34, 0x1F, 0x57, + 0x48, 0x3E, 0xB6, 0x90, 0x76, 0xEC, 0x26, 0xCD, 0xDA, 0xD5, 0x9B, 0x1F, 0x2B, 0x48, 0x1F, 0x76, 0x88, + 0x26, 0xE6, 0x9A, 0xCA, 0xEB, 0x17, 0x0F, 0x4E, 0x84, 0x34, 0x63, 0x57, 0x69, 0xFE, 0xAE, 0xC0, 0x7C, + 0x50, 0x21, 0xFC, 0x18, 0x41, 0xCA, 0xB0, 0x57, 0x34, 0x3E, 0x97, 0x50, 0x6E, 0xBC, 0x2C, 0x71, 0xDD, + 0xE4, 0x59, 0x8B, 0x7A, 0xE7, 0x63, 0x0A, 0xA9, 0xC7, 0x3E, 0xD2, 0x90, 0x5D, 0xAC, 0x39, 0xBD, 0xD2, + 0xF1, 0x9D, 0x84, 0x69, 0xA3, 0x6E, 0xF9, 0xEC, 0x42, 0xCD, 0xF1, 0x95, 0x84, 0x6F, 0x23, 0x6C, 0x19, + 0xED, 0xCA, 0xCD, 0x97, 0x15, 0xAE, 0x8F, 0x3C, 0x64, 0x11, 0xEB, 0x4C, 0x4F, 0x75, 0xF4, 0x27, 0x07, + 0x5A, 0x82, 0xBB, 0x21, 0xB3, 0x58, 0x75, 0xFA, 0xA7, 0x03, 0x3A, 0x81, 0xD3, 0x20, 0x5D, 0xD8, 0x39, + 0x9A, 0x92, 0xEB, 0x2D, 0x8F, 0x5D, 0xA4, 0x39, 0xBB, 0x52, 0xF3, 0x7D, 0x85, 0xE1, 0xA3, 0x08, 0x79, + 0xC6, 0xA2, 0xD2, 0xF9, 0x9D, 0x82, 0xE9, 0xA1, 0x8E, 0xF8, 0x64, 0x42, 0xAB, 0x71, 0xBF, 0x64, 0x70, + 0x2B, 0x64, 0x1F, 0x6B, 0x48, 0x2F, 0x76, 0x9C, 0x26, 0xE9, 0xDA, 0xCE, 0xDB, 0x14, 0x5B, 0x4F, 0x7B, + 0x74, 0x23, 0x67, 0x59, 0xEA, 0xBA, 0xCF, 0x33, 0x14, 0x15, 0xCF, 0x4F, 0x14, 0x34, 0x0F, 0x57, 0x44, + 0x3E, 0xB3, 0x50, 0x75, 0xFC, 0x27, 0x01, 0xDA, 0x80, 0x5B, 0x20, 0x3B, 0x58, 0x13, 0x7A, 0x8D, 0xE3, + 0x25, 0x89, 0xDB, 0x26, 0xDB, 0x5A, 0xDB, 0x7B, 0x1B, 0x63, 0x4B, 0x69, 0xF7, 0x6E, 0xC6, 0xAC, 0x52, + 0xFD, 0xFD, 0x81, 0x81, 0xA0, 0x60, 0x78, 0x28, 0x22, 0x9E, 0x99, 0xA8, 0x6A, 0xFE, 0xAF, 0x00, 0x7C, + 0x00, 0x21, 0xC0, 0x18, 0x50, 0x0A, 0xBC, 0x07, 0x31, 0xC2, 0x94, 0x51, 0xAF, 0x7C, 0x7C, 0x21, 0xE1, + 0xD8, 0x48, 0x5A, 0xB6, 0xBB, 0x36, 0xF3, 0x56, 0xC5, 0xFE, 0xD3, 0x00, 0x5D, 0xC0, 0x39, 0x90, 0x12, + 0xEC, 0x0D, 0x8D, 0xC5, 0xA5, 0x93, 0x3B, 0x2D, 0xD3, 0x5D, 0x9D, 0xF9, 0xA9, 0x82, 0xFE, 0xE1, 0x80, + 0x48, 0x60, 0x36, 0xA8, 0x16, 0xFE, 0x8E, 0xC0, 0x64, 0x50, 0x2B, 0x7C, 0x1F, 0x61, 0xC8, 0x28, 0x56, + 0x9E, 0xBE, 0xE8, 0x70, 0x4E, 0xA4, 0x34, 0x7B, 0x57, 0x63, 0x7E, 0xA9, 0xE0, 0x7E, 0xC8, 0x20, 0x56, + 0x98, 0x3E, 0xEA, 0x90, 0x4F, 0x2C, 0x34, 0x1D, 0xD7, 0x49, 0x9E, 0xB6, 0xE8, 0x76, 0xCE, 0xA6, 0xD4, + 0x7A, 0xDF, 0x63, 0x18, 0x29, 0xCA, 0x9E, 0xD7, 0x28, 0x5E, 0x9E, 0xB8, 0x68, 0x72, 0xAE, 0xA5, 0xBC, + 0x7B, 0x31, 0xE3, 0x54, 0x49, 0xFF, 0x76, 0xC0, 0x26, 0xD0, 0x1A, 0xDC, 0x0B, 0x19, 0xC7, 0x4A, 0xD2, + 0xB7, 0x1D, 0xB6, 0x89, 0xB6, 0xE6, 0xF6, 0xCA, 0xC6, 0xD7, 0x12, 0xDE, 0x8D, 0x98, 0x65, 0xAA, 0xAB, + 0x3F, 0x3F, 0x50, 0x10, 0x3C, 0x0C, 0x11, 0xC5, 0xCC, 0x53, 0x15, 0xFD, 0xCF, 0x01, 0x94, 0x00, 0x6F, + 0x40, 0x2C, 0x30, 0x1D, 0xD4, 0x09, 0x9F, 0x46, 0xE8, 0x32, 0xCE, 0x95, 0x94, 0x6F, 0x2F, 0x6C, 0x1C, + 0x2D, 0xC9, 0xDD, 0x96, 0xD9, 0xAE, 0xDA, 0xFC, 0x5B, 0x01, 0xFB, 0x40, 0x43, 0x70, 0x31, 0xE4, 0x14, + 0x4B, 0x4F, 0x77, 0x74, 0x26, 0xA7, 0x5A, 0xFA, 0xBB, 0x03, 0x33, 0x41, 0xD5, 0xF0, 0x5F, 0x04, 0x38, + 0x03, 0x52, 0x81, 0xFD, 0xA0, 0x41, 0xB8, 0x30, 0x72, 0x94, 0x25, 0xAF, 0x5B, 0x3C, 0x3B, 0x51, 0xD3, + 0x7C, 0x5D, 0xE1, 0xF9, 0x88, 0x42, 0xE6, 0xB1, 0x8A, 0xF4, 0x67, 0x07, 0x6A, 0x82, 0xAF, 0x21, 0xBC, + 0x18, 0x71, 0xCA, 0xA4, 0x57, 0x3B, 0x7E, 0x93, 0x60, 0x6D, 0xE8, 0x2D, 0x8E, 0x9D, 0xA4, 0x69, 0xBB, + 0x6E, 0xF3, 0x6C, 0x45, 0xED, 0xF3, 0x0D, 0x85, 0xC5, 0xA3, 0x13, 0x39, 0xCD, 0xD2, 0xD5, 0x9D, 0x9F, + 0x29, 0xA8, 0x1E, 0xFE, 0x88, 0x40, 0x66, 0xB0, 0x2A, 0xF4, 0x1F, 0x07, 0x48, 0x02, 0xB6, 0x81, 0xB6, + 0xE0, 0x76, 0xC8, 0x26, 0xD6, 0x9A, 0xDE, 0xEB, 0x18, 0x4F, 0x4A, 0xB4, 0x37, 0x37, 0x56, 0x96, 0xBE, + 0xEE, 0xF0, 0x4C, 0x44, 0x35, 0xF3, 0x57, 0x05, 0xFE, 0x83, 0x00, 0x61, 0xC0, 0x28, 0x50, 0x1E, 0xBC, + 0x08, 0x71, 0xC6, 0xA4, 0x52, 0xFB, 0x7D, 0x83, 0x61, 0xA1, 0xE8, 0x78, 0x4E, 0xA2, 0xB4, 0x79, 0xB7, + 0x62, 0xF6, 0xA9, 0x86, 0xFE, 0xE2, 0xC0, 0x49, 0x90, 0x36, 0xEC, 0x16, 0xCD, 0xCE, 0xD5, 0x94, 0x5F, + 0x2F, 0x78, 0x1C, 0x22, 0x89, 0xD9, 0xA6, 0xDA, 0xFA, 0xDB, 0x03, 0x1B, 0x41, 0xCB, 0x70, 0x57, 0x64, + 0x3E, 0xAB, 0x50, 0x7F, 0x7C, 0x20, 0x21, 0xD8, 0x18, 0x5A, 0x8A, 0xBB, 0x27, 0x33, 0x5A, 0x95, 0xFB, + 0x2F, 0x03, 0x5C, 0x01, 0xF9, 0xC0, 0x42, 0xD0, 0x31, 0x9C, 0x14, 0x69, 0xCF, 0x6E, 0xD4, 0x2C, 0x5F, + 0x5D, 0xF8, 0x39, 0x82, 0x92, 0xE1, 0xAD, 0x88, 0x7D, 0xA6, 0xA1, 0xBA, 0xF8, 0x73, 0x02, 0xA5, 0xC1, + 0xBB, 0x10, 0x73, 0x4C, 0x25, 0xF5, 0xDB, 0x07, 0x1B, 0x42, 0x8B, 0x71, 0xA7, 0x64, 0x7A, 0xAB, 0x63, + 0x3F, 0x69, 0xD0, 0x2E, 0xDC, 0x1C, 0x59, 0xC9, 0xFA, 0xD6, 0xC3, 0x1E, 0xD1, 0xC8, 0x5C, 0x56, 0xB9, + 0xFE, 0xF2, 0xC0, 0x45, 0x90, 0x33, 0x2C, 0x15, 0xDD, 0xCF, 0x19, 0x94, 0x0A, 0xEF, 0x47, 0x0C, 0x32, + 0x85, 0xD5, 0xA3, 0x1F, 0x39, 0xC8, 0x12, 0xD6, 0x8D, 0x9E, 0xE5, 0xA8, 0x4B, 0x3E, 0xB7, 0x50, 0x76, + 0xBC, 0x26, 0xF1, 0xDA, 0xC4, 0x5B, 0x13, 0x7B, 0x4D, 0xE3, 0x75, 0x89, 0xE7, 0x26, 0xCA, 0x9A, 0xD7, + 0x2B, 0x1E, 0x9F, 0x48, 0x68, 0x36, 0xAE, 0x96, 0xFC, 0x6E, 0xC1, 0xEC, 0x50, 0x4D, 0xFC, 0x35, 0x81, + 0xD7, 0x20, 0x5E, 0x98, 0x38, 0x6A, 0x92, 0xAF, 0x2D, 0xBC, 0x1D, 0xB1, 0xC9, 0xB4, 0x56, 0xF7, 0x7E, + 0xC6, 0xA0, 0x52, 0xF8, 0x3D, 0x82, 0x91, 0xA1, 0xAC, 0x78, 0x7D, 0xE2, 0xA1, 0x89, 0xB8, 0x66, 0xF2, + 0xAA, 0xC5, 0xBF, 0x13, 0x30, 0x0D, 0xD4, 0x05, 0x9F, 0x43, 0x28, 0x31, 0xDE, 0x94, 0x58, 0x6F, 0x7A, + 0xAC, 0x23, 0x3D, 0xD9, 0xD1, 0x9A, 0xDC, 0x6B, 0x19, 0xEF, 0x4A, 0xCC, 0x37, 0x15, 0xD6, 0x8F, 0x1E, + 0xE4, 0x08, 0x4B, 0x46, 0xB7, 0x72, 0xF6, 0xA5, 0x86, 0xFB, 0x22, 0xC3, 0x59, 0x91, 0xFA, 0xEC, 0x43, + 0x0D, 0xF1, 0xC5, 0x84, 0x53, 0x23, 0x7D, 0xD9, 0xE1, 0x9A, 0xC8, 0x6B, 0x16, 0xAF, 0x4E, 0xFC, 0x34, + 0x41, 0xD7, 0x70, 0x5E, 0xA4, 0x38, 0x7B, 0x52, 0xA3, 0x7D, 0xB9, 0xE1, 0xB2, 0xC8, 0x75, 0x96, 0xA7, + 0x2E, 0xFA, 0x9C, 0x43, 0x29, 0xF1, 0xDE, 0xC4, 0x58, 0x53, 0x7A, 0xBD, 0xE3, 0x31, 0x89, 0xD4, 0x66, + 0xDF, 0x6A, 0xD8, 0x2F, 0x1A, 0x9C, 0x0B, 0x29, 0xC7, 0x5E, 0xD2, 0xB8, 0x5D, 0xB2, 0xB9, 0xB5, 0xB2, + 0xF7, 0x35, 0x86, 0x97, 0x22, 0xEE, 0x99, 0x8C, 0x6A, 0xE5, 0xEF, 0x0B, 0x0C, 0x07, 0x45, 0xC2, 0xB3, + 0x11, 0xB5, 0xCC, 0x77, 0x15, 0xE6, 0x8F, 0x0A, 0xE4, 0x07, 0x0B, 0x42, 0x87, 0x71, 0xA2, 0xA4, 0x79, + 0xBB, 0x62, 0xF3, 0x69, 0x85, 0xEE, 0xE3, 0x0C, 0x49, 0xC5, 0xF6, 0xD3, 0x06, 0xDD, 0xC2, 0xD9, 0x91, + 0x9A, 0xEC, 0x6B, 0x0D, 0xEF, 0x45, 0x8C, 0x33, 0x25, 0xD5, 0xDB, 0x1F, 0x1B, 0x48, 0x0B, 0x76, 0x87, + 0x66, 0xE2, 0xAA, 0xC9, 0xBF, 0x16, 0xF0, 0x0E, 0xC4, 0x04, 0x53, 0x43, 0x7D, 0xF1, 0xE1, 0x84, 0x48, + 0x63, 0x76, 0xA9, 0xE6, 0xFE, 0xCA, 0xC0, 0x57, 0x10, 0x3E, 0x8C, 0x10, 0x65, 0xCC, 0x2B, 0x15, 0xDF, + 0x4F, 0x18, 0x34, 0x0A, 0x97, 0x47, 0x2E, 0xB2, 0x9C, 0x75, 0xA9, 0xE7, 0x3E, 0xCA, 0x90, 0x57, 0x2C, + 0x3E, 0x9D, 0xD0, 0x69, 0x9C, 0x2E, 0xE9, 0xDC, 0x4E, 0xD9, 0xF4, 0x5A, 0xC7, 0x7B, 0x12, 0xA3, 0x4D, + 0xB9, 0xF5, 0xB2, 0xC7, 0x35, 0x92, 0x97, 0x2D, 0xAE, 0x9D, 0xBC, 0x69, 0xB1, 0xEE, 0xF4, 0x4C, 0x47, + 0x75, 0xF2, 0xA7, 0x05, 0xBA, 0x83, 0x33, 0x21, 0xD5, 0xD8, 0x5F, 0x1A, 0xB8, 0x0B, 0x32, 0x87, 0x55, + 0xA2, 0xBF, 0x39, 0xB0, 0x12, 0xF4, 0x0D, 0x87, 0x45, 0xA2, 0xB3, 0x39, 0xB5, 0xD2, 0xF7, 0x1D, 0x86, + 0x89, 0xA2, 0xE6, 0xF9, 0x8A, 0xC2, 0xE7, 0x11, 0x8A, 0x8C, 0x67, 0x25, 0xEA, 0x9B, 0x0F, 0x2B, 0x44, + 0x1F, 0x73, 0x48, 0x25, 0xF6, 0x9B, 0x06, 0xEB, 0x42, 0xCF, 0x71, 0x94, 0x24, 0x6F, 0x5B, 0x6C, 0x3B, + 0x6D, 0xD3, 0x6D, 0x9D, 0xED, 0xA9, 0x8D, 0xBE, 0xE5, 0xB0, 0x4B, 0x34, 0x37, 0x57, 0x56, 0xBE, 0xBE, + 0xF0, 0x70, 0x44, 0x24, 0x33, 0x5B, 0x55, 0xFB, 0x7F, 0x03, 0x60, 0x01, 0xE8, 0x00, 0x4E, 0x80, 0x34, + 0x60, 0x17, 0x68, 0x0E, 0xAE, 0x84, 0x7C, 0x63, 0x61, 0xE9, 0xE8, 0x4E, 0xCE, 0xB4, 0x54, 0x77, 0x7F, + 0x66, 0xA0, 0x2A, 0xF8, 0x1F, 0x02, 0x88, 0x01, 0xA6, 0x80, 0x7A, 0xE0, 0x23, 0x08, 0x19, 0xC6, 0x8A, + 0xD2, 0xE7, 0x1D, 0x8A, 0x89, 0xA7, 0x26, 0xFA, 0x9A, 0xC3, 0x2B, 0x11, 0xDF, 0x4C, 0x58, 0x35, 0xFA, + 0x97, 0x03, 0x2E, 0x81, 0xDC, 0x60, 0x59, 0xE8, 0x3A, 0xCE, 0x93, 0x14, 0x6D, 0xCF, 0x6D, 0x94, 0x2D, + 0xAF, 0x5D, 0xBC, 0x39, 0xB1, 0xD2, 0xF4, 0x5D, 0x87, 0x79, 0xA2, 0xA2, 0xF9, 0xB9, 0x82, 0xF2, 0xE1, + 0x85, 0x88, 0x63, 0x26, 0xA9, 0xDA, 0xFE, 0xDB, 0x00, 0x5B, 0x40, 0x3B, 0x70, 0x13, 0x64, 0x0D, 0xEB, + 0x45, 0x8F, 0x73, 0x24, 0x25, 0xDB, 0x5B, 0x1B, 0x7B, 0x4B, 0x63, 0x77, 0x69, 0xE6, 0xAE, 0xCA, 0xFC, + 0x57, 0x01, 0xFE, 0x80, 0x40, 0x60, 0x30, 0x28, 0x14, 0x1E, 0x8F, 0x48, 0x64, 0x36, 0xAB, 0x56, 0xFF, + 0x7E, 0xC0, 0x20, 0x50, 0x18, 0x3C, 0x0A, 0x91, 0xC7, 0x2C, 0x52, 0x9D, 0xFD, 0xA9, 0x81, 0xBE, 0xE0, + 0x70, 0x48, 0x24, 0x36, 0x9B, 0x56, 0xEB, 0x7E, 0xCF, 0x60, 0x54, 0x28, 0x3F, 0x5E, 0x90, 0x38, 0x6C, + 0x12, 0xAD, 0xCD, 0xBD, 0x95, 0xB1, 0xAF, 0x34, 0x7C, 0x17, 0x61, 0xCE, 0xA8, 0x54, 0x7E, 0xBF, 0x60, + 0x70, 0x28, 0x24, 0x1E, 0x9B, 0x48, 0x6B, 0x76, 0xAF, 0x66, 0xFC, 0x2A, 0xC1, 0xDF, 0x10, 0x58, 0x0C, + 0x3A, 0x85, 0xD3, 0x23, 0x1D, 0xD9, 0xC9, 0x9A, 0xD6, 0xEB, 0x1E, 0xCF, 0x48, 0x54, 0x36, 0xBF, 0x56, + 0xF0, 0x3E, 0xC4, 0x10, 0x53, 0x4C, 0x3D, 0xF5, 0xD1, 0x87, 0x1C, 0x62, 0x89, 0xE9, 0xA6, 0xCE, 0xFA, + 0xD4, 0x43, 0x1F, 0x71, 0xC8, 0x24, 0x56, 0x9B, 0x7E, 0xEB, 0x60, 0x4F, 0x68, 0x34, 0x2E, 0x97, 0x5C, + 0x6E, 0xB9, 0xEC, 0x72, 0xCD, 0xE5, 0x95, 0x8B, 0x2F, 0x27, 0x5C, 0x1A, 0xB9, 0xCB, 0x32, 0xD7, 0x55, + 0x9E, 0xBF, 0x28, 0x70, 0x1E, 0xA4, 0x08, 0x7B, 0x46, 0xA3, 0x72, 0xF9, 0xE5, 0x82, 0xCB, 0x21, 0x97, + 0x58, 0x6E, 0xBA, 0xAC, 0x73, 0x3D, 0xE5, 0xD1, 0x8B, 0x1C, 0x67, 0x49, 0xEA, 0xB6, 0xCF, 0x36, 0xD4, + 0x16, 0xDF, 0x4E, 0xD8, 0x34, 0x5A, 0x97, 0x7B, 0x2E, 0xA3, 0x5C, 0x79, 0xF9, 0xE2, 0xC2, 0xC9, 0x91, + 0x96, 0xEC, 0x6E, 0xCD, 0xEC, 0x55, 0x8D, 0xFF, 0x25, 0x80, 0x1B, 0x20, 0x0B, 0x58, 0x07, 0x7A, 0x82, + 0xA3, 0x21, 0xB9, 0xD8, 0x72, 0xDA, 0xA5, 0x9B, 0x3B, 0x2B, 0x53, 0x5F, 0x7D, 0xF8, 0x21, 0x82, 0x98, + 0x61, 0xAA, 0xA8, 0x7F, 0x3E, 0xA0, 0x10, 0x78, 0x0C, 0x22, 0x85, 0xD9, 0xA3, 0x1A, 0xF9, 0xCB, 0x02, + 0xD7, 0x41, 0x9E, 0xB0, 0x68, 0x74, 0x2E, 0xA7, 0x5C, 0x7A, 0xB9, 0xE3, 0x32, 0xC9, 0xD5, 0x96, 0xDF, + 0x2E, 0xD8, 0x1C, 0x5A, 0x89, 0xFB, 0x26, 0xC3, 0x5A, 0xD1, 0xFB, 0x1C, 0x43, 0x49, 0xF1, 0xF6, 0xC4, + 0x46, 0xD3, 0x72, 0xDD, 0xE5, 0x99 }; public static readonly byte[] SyncMark = - {0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00}; + { + 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00 + }; public static byte[] Scramble(byte[] sector) { diff --git a/DVD/CSS&CPRM.cs b/DVD/CSS&CPRM.cs index b920e3204..1a6b52d0e 100644 --- a/DVD/CSS&CPRM.cs +++ b/DVD/CSS&CPRM.cs @@ -182,9 +182,7 @@ namespace DiscImageChef.Decoders.DVD return sb.ToString(); } - public static string PrettifyLeadInCopyright(byte[] response) - { - return PrettifyLeadInCopyright(DecodeLeadInCopyright(response)); - } + public static string PrettifyLeadInCopyright(byte[] response) => + PrettifyLeadInCopyright(DecodeLeadInCopyright(response)); } } \ No newline at end of file diff --git a/DVD/Cartridge.cs b/DVD/Cartridge.cs index 96a286a0d..1e7cedba0 100644 --- a/DVD/Cartridge.cs +++ b/DVD/Cartridge.cs @@ -195,9 +195,6 @@ namespace DiscImageChef.Decoders.DVD return sb.ToString(); } - public static string Prettify(byte[] response) - { - return Prettify(Decode(response)); - } + public static string Prettify(byte[] response) => Prettify(Decode(response)); } } \ No newline at end of file diff --git a/DVD/DDS.cs b/DVD/DDS.cs index c4478e812..61e1d97e6 100644 --- a/DVD/DDS.cs +++ b/DVD/DDS.cs @@ -312,9 +312,6 @@ namespace DiscImageChef.Decoders.DVD return sb.ToString(); } - public static string Prettify(byte[] response) - { - return Prettify(Decode(response)); - } + public static string Prettify(byte[] response) => Prettify(Decode(response)); } } \ No newline at end of file diff --git a/DVD/PFI.cs b/DVD/PFI.cs index 8dc6fd703..c61660faf 100644 --- a/DVD/PFI.cs +++ b/DVD/PFI.cs @@ -1669,9 +1669,6 @@ namespace DiscImageChef.Decoders.DVD return sb.ToString(); } - public static string Prettify(byte[] response) - { - return Prettify(Decode(response)); - } + public static string Prettify(byte[] response) => Prettify(Decode(response)); } } \ No newline at end of file diff --git a/DVD/Spare.cs b/DVD/Spare.cs index 8f13ad019..ca9bfa6f0 100644 --- a/DVD/Spare.cs +++ b/DVD/Spare.cs @@ -123,9 +123,6 @@ namespace DiscImageChef.Decoders.DVD return sb.ToString(); } - public static string Prettify(byte[] response) - { - return Prettify(Decode(response)); - } + public static string Prettify(byte[] response) => Prettify(Decode(response)); } } \ No newline at end of file diff --git a/Floppy/Apple2.cs b/Floppy/Apple2.cs index 1569ebaed..3304c4e37 100644 --- a/Floppy/Apple2.cs +++ b/Floppy/Apple2.cs @@ -315,10 +315,7 @@ namespace DiscImageChef.Decoders.Floppy // Not Apple ][ GCR? } - public static RawSector MarshalSector(byte[] data, int offset = 0) - { - return MarshalSector(data, out _, offset); - } + public static RawSector MarshalSector(byte[] data, int offset = 0) => MarshalSector(data, out _, offset); public static RawSector MarshalSector(byte[] data, out int endOffset, int offset = 0) { @@ -351,7 +348,9 @@ namespace DiscImageChef.Decoders.Floppy sector = new[] {data[position + 7], data[position + 8]}, checksum = new[] {data[position + 9], data[position + 10]}, epilogue = new[] - {data[position + 11], data[position + 12], data[position + 13]} + { + data[position + 11], data[position + 12], data[position + 13] + } } }; @@ -492,10 +491,7 @@ namespace DiscImageChef.Decoders.Floppy return raw.ToArray(); } - public static RawTrack MarshalTrack(byte[] data, int offset = 0) - { - return MarshalTrack(data, out _, offset); - } + public static RawTrack MarshalTrack(byte[] data, int offset = 0) => MarshalTrack(data, out _, offset); public static RawTrack MarshalTrack(byte[] data, out int endOffset, int offset = 0) { @@ -565,10 +561,7 @@ namespace DiscImageChef.Decoders.Floppy return raw.ToArray(); } - public static List MarshalDisk(byte[] data, int offset = 0) - { - return MarshalDisk(data, out _, offset); - } + public static List MarshalDisk(byte[] data, int offset = 0) => MarshalDisk(data, out _, offset); public static List MarshalDisk(byte[] data, out int endOffset, int offset = 0) { @@ -589,10 +582,7 @@ namespace DiscImageChef.Decoders.Floppy return tracks; } - public static byte[] MarshalDisk(List disk) - { - return MarshalDisk(disk.ToArray()); - } + public static byte[] MarshalDisk(List disk) => MarshalDisk(disk.ToArray()); public static byte[] MarshalDisk(RawTrack[] disk) { diff --git a/Floppy/AppleSony.cs b/Floppy/AppleSony.cs index 90d12c1b3..c7b8899da 100644 --- a/Floppy/AppleSony.cs +++ b/Floppy/AppleSony.cs @@ -228,10 +228,7 @@ namespace DiscImageChef.Decoders.Floppy // Not Apple Sony GCR? } - public static RawSector MarshalSector(byte[] data, int offset = 0) - { - return MarshalSector(data, out _, offset); - } + public static RawSector MarshalSector(byte[] data, int offset = 0) => MarshalSector(data, out _, offset); public static RawSector MarshalSector(byte[] data, out int endOffset, int offset = 0) { @@ -384,10 +381,7 @@ namespace DiscImageChef.Decoders.Floppy return raw.ToArray(); } - public static RawTrack MarshalTrack(byte[] data, int offset = 0) - { - return MarshalTrack(data, out _, offset); - } + public static RawTrack MarshalTrack(byte[] data, int offset = 0) => MarshalTrack(data, out _, offset); public static RawTrack MarshalTrack(byte[] data, out int endOffset, int offset = 0) { @@ -453,10 +447,7 @@ namespace DiscImageChef.Decoders.Floppy return raw.ToArray(); } - public static List MarshalDisk(byte[] data, int offset = 0) - { - return MarshalDisk(data, out _, offset); - } + public static List MarshalDisk(byte[] data, int offset = 0) => MarshalDisk(data, out _, offset); public static List MarshalDisk(byte[] data, out int endOffset, int offset = 0) { @@ -477,10 +468,7 @@ namespace DiscImageChef.Decoders.Floppy return tracks; } - public static byte[] MarshalDisk(List disk) - { - return MarshalDisk(disk.ToArray()); - } + public static byte[] MarshalDisk(List disk) => MarshalDisk(disk.ToArray()); public static byte[] MarshalDisk(RawTrack[] disk) { diff --git a/LisaTag.cs b/LisaTag.cs index 140924a6e..16c3b2710 100644 --- a/LisaTag.cs +++ b/LisaTag.cs @@ -92,9 +92,8 @@ namespace DiscImageChef.Decoders /// /// Converts this tag to Priam DataTower format /// - public PriamTag ToPriam() - { - return new PriamTag + public PriamTag ToPriam() => + new PriamTag { AbsPage = AbsPage, Checksum = Checksum, @@ -110,14 +109,12 @@ namespace DiscImageChef.Decoders Version = Version, Volume = Volume }; - } /// /// Converts this tag to Sony format /// - public SonyTag ToSony() - { - return new SonyTag + public SonyTag ToSony() => + new SonyTag { FileId = FileId, IsFirst = IsFirst, @@ -129,7 +126,6 @@ namespace DiscImageChef.Decoders Version = Version, Volume = Volume }; - } /// /// Gets a byte array representation of this tag @@ -219,9 +215,8 @@ namespace DiscImageChef.Decoders /// /// Converts this tag to Apple Profile format /// - public ProfileTag ToProfile() - { - return new ProfileTag + public ProfileTag ToProfile() => + new ProfileTag { AbsPage = AbsPage, Checksum = Checksum, @@ -237,14 +232,12 @@ namespace DiscImageChef.Decoders Version = Version, Volume = Volume }; - } /// /// Converts this tag to Sony format /// - public SonyTag ToSony() - { - return new SonyTag + public SonyTag ToSony() => + new SonyTag { FileId = FileId, IsFirst = IsFirst, @@ -256,7 +249,6 @@ namespace DiscImageChef.Decoders Version = Version, Volume = Volume }; - } /// /// Gets a byte array representation of this tag @@ -328,9 +320,8 @@ namespace DiscImageChef.Decoders /// /// Converts this tag to Apple Profile format /// - public ProfileTag ToProfile() - { - return new ProfileTag + public ProfileTag ToProfile() => + new ProfileTag { FileId = FileId, IsFirst = IsFirst, @@ -342,14 +333,12 @@ namespace DiscImageChef.Decoders Version = Version, Volume = Volume }; - } /// /// Converts this tag to Priam DataTower format /// - public PriamTag ToPriam() - { - return new PriamTag + public PriamTag ToPriam() => + new PriamTag { FileId = FileId, IsFirst = IsFirst, @@ -361,7 +350,6 @@ namespace DiscImageChef.Decoders Version = Version, Volume = Volume }; - } /// /// Gets a byte array representation of this tag diff --git a/MMC/CID.cs b/MMC/CID.cs index dd64d664b..6bea671a0 100644 --- a/MMC/CID.cs +++ b/MMC/CID.cs @@ -181,14 +181,8 @@ namespace DiscImageChef.Decoders.MMC return sb.ToString(); } - public static string PrettifyCID(uint[] response) - { - return PrettifyCID(DecodeCID(response)); - } + public static string PrettifyCID(uint[] response) => PrettifyCID(DecodeCID(response)); - public static string PrettifyCID(byte[] response) - { - return PrettifyCID(DecodeCID(response)); - } + public static string PrettifyCID(byte[] response) => PrettifyCID(DecodeCID(response)); } } \ No newline at end of file diff --git a/MMC/CSD.cs b/MMC/CSD.cs index cf82be92e..24699026c 100644 --- a/MMC/CSD.cs +++ b/MMC/CSD.cs @@ -561,14 +561,8 @@ namespace DiscImageChef.Decoders.MMC return sb.ToString(); } - public static string PrettifyCSD(uint[] response) - { - return PrettifyCSD(DecodeCSD(response)); - } + public static string PrettifyCSD(uint[] response) => PrettifyCSD(DecodeCSD(response)); - public static string PrettifyCSD(byte[] response) - { - return PrettifyCSD(DecodeCSD(response)); - } + public static string PrettifyCSD(byte[] response) => PrettifyCSD(DecodeCSD(response)); } } \ No newline at end of file diff --git a/MMC/ExtendedCSD.cs b/MMC/ExtendedCSD.cs index eed1a0403..574181dd4 100644 --- a/MMC/ExtendedCSD.cs +++ b/MMC/ExtendedCSD.cs @@ -707,9 +707,6 @@ namespace DiscImageChef.Decoders.MMC return sb.ToString(); } - public static string PrettifyExtendedCSD(byte[] response) - { - return PrettifyExtendedCSD(DecodeExtendedCSD(response)); - } + public static string PrettifyExtendedCSD(byte[] response) => PrettifyExtendedCSD(DecodeExtendedCSD(response)); } } \ No newline at end of file diff --git a/MMC/OCR.cs b/MMC/OCR.cs index 2d23a2dbc..5a4dcc13d 100644 --- a/MMC/OCR.cs +++ b/MMC/OCR.cs @@ -68,9 +68,8 @@ namespace DiscImageChef.Decoders.MMC [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] public static partial class Decoders { - public static OCR DecodeOCR(uint response) - { - return new OCR + public static OCR DecodeOCR(uint response) => + new OCR { PowerUp = (response & 0x80000000) == 0x80000000, AccessMode = (byte)((response & 0x60000000) >> 29), @@ -92,12 +91,9 @@ namespace DiscImageChef.Decoders.MMC TwoZero = (response & 0x00000100) == 0x00000100, OneSix = (response & 0x00000080) == 0x00000080 }; - } - public static OCR DecodeOCR(byte[] response) - { - return response?.Length != 4 ? null : DecodeOCR(BitConverter.ToUInt32(response, 0)); - } + public static OCR DecodeOCR(byte[] response) => + response?.Length != 4 ? null : DecodeOCR(BitConverter.ToUInt32(response, 0)); public static string PrettifyOCR(OCR ocr) { @@ -139,14 +135,8 @@ namespace DiscImageChef.Decoders.MMC return sb.ToString(); } - public static string PrettifyOCR(byte[] response) - { - return PrettifyOCR(DecodeOCR(response)); - } + public static string PrettifyOCR(byte[] response) => PrettifyOCR(DecodeOCR(response)); - public static string PrettifyOCR(uint response) - { - return PrettifyOCR(DecodeOCR(response)); - } + public static string PrettifyOCR(uint response) => PrettifyOCR(DecodeOCR(response)); } } \ No newline at end of file diff --git a/PCMCIA/CIS.cs b/PCMCIA/CIS.cs index 1055a94d8..21112ca33 100644 --- a/PCMCIA/CIS.cs +++ b/PCMCIA/CIS.cs @@ -134,15 +134,11 @@ namespace DiscImageChef.Decoders.PCMCIA return sb.ToString(); } - public static string PrettifyDeviceGeometryTuple(Tuple tuple) - { - return PrettifyDeviceGeometryTuple(DecodeDeviceGeometryTuple(tuple)); - } + public static string PrettifyDeviceGeometryTuple(Tuple tuple) => + PrettifyDeviceGeometryTuple(DecodeDeviceGeometryTuple(tuple)); - public static string PrettifyDeviceGeometryTuple(byte[] data) - { - return PrettifyDeviceGeometryTuple(DecodeDeviceGeometryTuple(data)); - } + public static string PrettifyDeviceGeometryTuple(byte[] data) => + PrettifyDeviceGeometryTuple(DecodeDeviceGeometryTuple(data)); public static ManufacturerIdentificationTuple DecodeManufacturerIdentificationTuple(Tuple tuple) { @@ -178,15 +174,11 @@ namespace DiscImageChef.Decoders.PCMCIA return sb.ToString(); } - public static string PrettifyManufacturerIdentificationTuple(Tuple tuple) - { - return PrettifyManufacturerIdentificationTuple(DecodeManufacturerIdentificationTuple(tuple)); - } + public static string PrettifyManufacturerIdentificationTuple(Tuple tuple) => + PrettifyManufacturerIdentificationTuple(DecodeManufacturerIdentificationTuple(tuple)); - public static string PrettifyManufacturerIdentificationTuple(byte[] data) - { - return PrettifyManufacturerIdentificationTuple(DecodeManufacturerIdentificationTuple(data)); - } + public static string PrettifyManufacturerIdentificationTuple(byte[] data) => + PrettifyManufacturerIdentificationTuple(DecodeManufacturerIdentificationTuple(data)); public static Level1VersionTuple DecodeLevel1VersionTuple(Tuple tuple) { @@ -208,10 +200,7 @@ namespace DiscImageChef.Decoders.PCMCIA Level1VersionTuple tuple = new Level1VersionTuple { - Code = (TupleCodes)data[0], - Link = data[1], - MajorVersion = data[2], - MinorVersion = data[3] + Code = (TupleCodes)data[0], Link = data[1], MajorVersion = data[2], MinorVersion = data[3] }; for(int position = 4; position < data.Length; position++) @@ -278,14 +267,10 @@ namespace DiscImageChef.Decoders.PCMCIA return sb.ToString(); } - public static string PrettifyLevel1VersionTuple(Tuple tuple) - { - return PrettifyLevel1VersionTuple(DecodeLevel1VersionTuple(tuple)); - } + public static string PrettifyLevel1VersionTuple(Tuple tuple) => + PrettifyLevel1VersionTuple(DecodeLevel1VersionTuple(tuple)); - public static string PrettifyLevel1VersionTuple(byte[] data) - { - return PrettifyLevel1VersionTuple(DecodeLevel1VersionTuple(data)); - } + public static string PrettifyLevel1VersionTuple(byte[] data) => + PrettifyLevel1VersionTuple(DecodeLevel1VersionTuple(data)); } } \ No newline at end of file diff --git a/SCSI/EVPD.cs b/SCSI/EVPD.cs index 535c2c49f..a147ec9a7 100644 --- a/SCSI/EVPD.cs +++ b/SCSI/EVPD.cs @@ -172,10 +172,7 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_81(byte[] pageResponse) - { - return PrettifyPage_81(DecodePage_81(pageResponse)); - } + public static string PrettifyPage_81(byte[] pageResponse) => PrettifyPage_81(DecodePage_81(pageResponse)); public static string DefinitionToString(ScsiDefinitions definition) { @@ -430,10 +427,7 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_83(byte[] pageResponse) - { - return PrettifyPage_83(DecodePage_83(pageResponse)); - } + public static string PrettifyPage_83(byte[] pageResponse) => PrettifyPage_83(DecodePage_83(pageResponse)); public static string PrettifyPage_83(Page_83? modePage) { @@ -823,10 +817,7 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_84(byte[] pageResponse) - { - return PrettifyPage_84(DecodePage_84(pageResponse)); - } + public static string PrettifyPage_84(byte[] pageResponse) => PrettifyPage_84(DecodePage_84(pageResponse)); public static string PrettifyPage_84(Page_84? modePage) { @@ -955,10 +946,7 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_85(byte[] pageResponse) - { - return PrettifyPage_85(DecodePage_85(pageResponse)); - } + public static string PrettifyPage_85(byte[] pageResponse) => PrettifyPage_85(DecodePage_85(pageResponse)); public static string PrettifyPage_85(Page_85? modePage) { @@ -1216,10 +1204,7 @@ namespace DiscImageChef.Decoders.SCSI }; } - public static string PrettifyPage_86(byte[] pageResponse) - { - return PrettifyPage_86(DecodePage_86(pageResponse)); - } + public static string PrettifyPage_86(byte[] pageResponse) => PrettifyPage_86(DecodePage_86(pageResponse)); public static string PrettifyPage_86(Page_86? modePage) { @@ -1384,10 +1369,7 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_89(byte[] pageResponse) - { - return PrettifyPage_89(DecodePage_89(pageResponse)); - } + public static string PrettifyPage_89(byte[] pageResponse) => PrettifyPage_89(DecodePage_89(pageResponse)); // TODO: Decode ATA signature? public static string PrettifyPage_89(Page_89? modePage) @@ -1511,10 +1493,8 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_C0_Quantum(byte[] pageResponse) - { - return PrettifyPage_C0_Quantum(DecodePage_C0_Quantum(pageResponse)); - } + public static string PrettifyPage_C0_Quantum(byte[] pageResponse) => + PrettifyPage_C0_Quantum(DecodePage_C0_Quantum(pageResponse)); public static string PrettifyPage_C0_Quantum(Page_C0_Quantum? modePage) { @@ -1593,10 +1573,8 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_C0_C1_Certance(byte[] pageResponse) - { - return PrettifyPage_C0_C1_Certance(DecodePage_C0_C1_Certance(pageResponse)); - } + public static string PrettifyPage_C0_C1_Certance(byte[] pageResponse) => + PrettifyPage_C0_C1_Certance(DecodePage_C0_C1_Certance(pageResponse)); public static string PrettifyPage_C0_C1_Certance(Page_C0_C1_Certance? modePage) { @@ -1666,10 +1644,8 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_C2_C3_C4_C5_C6_Certance(byte[] pageResponse) - { - return PrettifyPage_C2_C3_C4_C5_C6_Certance(DecodePage_C2_C3_C4_C5_C6_Certance(pageResponse)); - } + public static string PrettifyPage_C2_C3_C4_C5_C6_Certance(byte[] pageResponse) => + PrettifyPage_C2_C3_C4_C5_C6_Certance(DecodePage_C2_C3_C4_C5_C6_Certance(pageResponse)); public static string PrettifyPage_C2_C3_C4_C5_C6_Certance(Page_C2_C3_C4_C5_C6_Certance? modePage) { @@ -1837,10 +1813,8 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_DF_Certance(byte[] pageResponse) - { - return PrettifyPage_DF_Certance(DecodePage_DF_Certance(pageResponse)); - } + public static string PrettifyPage_DF_Certance(byte[] pageResponse) => + PrettifyPage_DF_Certance(DecodePage_DF_Certance(pageResponse)); public static string PrettifyPage_DF_Certance(Page_DF_Certance? modePage) { @@ -2013,10 +1987,8 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_C0_IBM(byte[] pageResponse) - { - return PrettifyPage_C0_IBM(DecodePage_C0_IBM(pageResponse)); - } + public static string PrettifyPage_C0_IBM(byte[] pageResponse) => + PrettifyPage_C0_IBM(DecodePage_C0_IBM(pageResponse)); public static string PrettifyPage_C0_IBM(Page_C0_IBM? modePage) { @@ -2084,10 +2056,8 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_C1_IBM(byte[] pageResponse) - { - return PrettifyPage_C1_IBM(DecodePage_C1_IBM(pageResponse)); - } + public static string PrettifyPage_C1_IBM(byte[] pageResponse) => + PrettifyPage_C1_IBM(DecodePage_C1_IBM(pageResponse)); public static string PrettifyPage_C1_IBM(Page_C1_IBM? modePage) { @@ -2154,10 +2124,7 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_B0(byte[] pageResponse) - { - return PrettifyPage_B0(DecodePage_B0(pageResponse)); - } + public static string PrettifyPage_B0(byte[] pageResponse) => PrettifyPage_B0(DecodePage_B0(pageResponse)); public static string PrettifyPage_B0(Page_B0? modePage) { @@ -2339,10 +2306,8 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_C0_to_C5_HP(byte[] pageResponse) - { - return PrettifyPage_C0_to_C5_HP(DecodePage_C0_to_C5_HP(pageResponse)); - } + public static string PrettifyPage_C0_to_C5_HP(byte[] pageResponse) => + PrettifyPage_C0_to_C5_HP(DecodePage_C0_to_C5_HP(pageResponse)); public static string PrettifyPage_C0_to_C5_HP(Page_C0_to_C5_HP? modePage) { @@ -2442,10 +2407,8 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static string PrettifyPage_C0_Seagate(byte[] pageResponse) - { - return PrettifyPage_C0_Seagate(DecodePage_C0_Seagate(pageResponse)); - } + public static string PrettifyPage_C0_Seagate(byte[] pageResponse) => + PrettifyPage_C0_Seagate(DecodePage_C0_Seagate(pageResponse)); public static string PrettifyPage_C0_Seagate(Page_C0_Seagate? modePage) { diff --git a/SCSI/Enums.cs b/SCSI/Enums.cs index 055975389..160e4e0e9 100644 --- a/SCSI/Enums.cs +++ b/SCSI/Enums.cs @@ -317,9 +317,9 @@ namespace DiscImageChef.Decoders.SCSI public enum ScsiDefinitions : byte { Current = 0, - SCSI1 = 1, - CCS = 2, - SCSI2 = 3, - SCSI3 = 4 + SCSI1 = 1, + CCS = 2, + SCSI2 = 3, + SCSI3 = 4 } } \ No newline at end of file diff --git a/SCSI/Inquiry.cs b/SCSI/Inquiry.cs index 364a1f5a6..7b1d3950a 100644 --- a/SCSI/Inquiry.cs +++ b/SCSI/Inquiry.cs @@ -67,7 +67,8 @@ namespace DiscImageChef.Decoders.SCSI return null; } - if(SCSIInquiryResponse.Length < SCSIInquiryResponse[4] + 5 && SCSIInquiryResponse.Length != SCSIInquiryResponse[4]) + if(SCSIInquiryResponse.Length < SCSIInquiryResponse[4] + 5 && + SCSIInquiryResponse.Length != SCSIInquiryResponse[4]) { DicConsole.DebugWriteLine("SCSI INQUIRY decoder", "INQUIRY response length ({0} bytes) is different than specified in length field ({1} bytes), decoded data can be incorrect, not decoding.", @@ -357,19 +358,22 @@ namespace DiscImageChef.Decoders.SCSI if(decoded.VendorIdentification != null) { length = 16; - Array.Copy(decoded.VendorIdentification, 0, buffer, 8, decoded.VendorIdentification.Length >= 8 ? 8 : decoded.VendorIdentification.Length); + Array.Copy(decoded.VendorIdentification, 0, buffer, 8, + decoded.VendorIdentification.Length >= 8 ? 8 : decoded.VendorIdentification.Length); } if(decoded.ProductIdentification != null) { length = 32; - Array.Copy(decoded.ProductIdentification, 0, buffer, 16, decoded.ProductIdentification.Length >= 16 ? 16 : decoded.ProductIdentification.Length); + Array.Copy(decoded.ProductIdentification, 0, buffer, 16, + decoded.ProductIdentification.Length >= 16 ? 16 : decoded.ProductIdentification.Length); } if(decoded.ProductRevisionLevel != null) { length = 36; - Array.Copy(decoded.ProductRevisionLevel, 0, buffer, 32, decoded.ProductRevisionLevel.Length >= 4 ? 4 : decoded.ProductRevisionLevel.Length); + Array.Copy(decoded.ProductRevisionLevel, 0, buffer, 32, + decoded.ProductRevisionLevel.Length >= 4 ? 4 : decoded.ProductRevisionLevel.Length); } if(decoded.Seagate_DriveSerialNumber != null) diff --git a/SCSI/MMC/Features.cs b/SCSI/MMC/Features.cs index a7d5f2d3c..55e65a9c1 100644 --- a/SCSI/MMC/Features.cs +++ b/SCSI/MMC/Features.cs @@ -4132,12 +4132,10 @@ namespace DiscImageChef.Decoders.SCSI.MMC return sb.ToString(); } - public static string Prettify_001D(Feature_001D? feature) - { - return !feature.HasValue - ? null - : "Drive claims capability to read all CD formats according to OSTA Multi-Read Specification\n"; - } + public static string Prettify_001D(Feature_001D? feature) => + !feature.HasValue + ? null + : "Drive claims capability to read all CD formats according to OSTA Multi-Read Specification\n"; public static string Prettify_001E(Feature_001E? feature) { @@ -4235,10 +4233,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC return sb.ToString(); } - public static string Prettify_0022(Feature_0022? feature) - { - return !feature.HasValue ? null : "Drive supports media that require erasing before writing\n"; - } + public static string Prettify_0022(Feature_0022? feature) => + !feature.HasValue ? null : "Drive supports media that require erasing before writing\n"; public static string Prettify_0023(Feature_0023? feature) { @@ -4294,12 +4290,10 @@ namespace DiscImageChef.Decoders.SCSI.MMC return sb.ToString(); } - public static string Prettify_0026(Feature_0026? feature) - { - return !feature.HasValue - ? null - : "Drive shall have the ability to overwrite logical blocks only in fixed sets at a time\n"; - } + public static string Prettify_0026(Feature_0026? feature) => + !feature.HasValue + ? null + : "Drive shall have the ability to overwrite logical blocks only in fixed sets at a time\n"; public static string Prettify_0027(Feature_0027? feature) { @@ -4510,10 +4504,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC return sb.ToString(); } - public static string Prettify_0030(Feature_0030? feature) - { - return !feature.HasValue ? null : "Drive can read DDCDs\n"; - } + public static string Prettify_0030(Feature_0030? feature) => + !feature.HasValue ? null : "Drive can read DDCDs\n"; public static string Prettify_0031(Feature_0031? feature) { @@ -4561,10 +4553,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC return sb.ToString(); } - public static string Prettify_0035(Feature_0035? feature) - { - return !feature.HasValue ? null : "Drive can stop a long immediate operation\n"; - } + public static string Prettify_0035(Feature_0035? feature) => + !feature.HasValue ? null : "Drive can stop a long immediate operation\n"; public static string Prettify_0037(Feature_0037? feature) { @@ -4590,10 +4580,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC return sb.ToString(); } - public static string Prettify_0038(Feature_0038? feature) - { - return !feature.HasValue ? null : "Drive can write BD-R on Pseudo-OVerwrite SRM mode\n"; - } + public static string Prettify_0038(Feature_0038? feature) => + !feature.HasValue ? null : "Drive can write BD-R on Pseudo-OVerwrite SRM mode\n"; public static string Prettify_003A(Feature_003A? feature) { @@ -4689,12 +4677,10 @@ namespace DiscImageChef.Decoders.SCSI.MMC return sb.ToString(); } - public static string Prettify_0042(Feature_0042? feature) - { - return !feature.HasValue - ? null - : "Drive is able to detect and report defective writable unit and behave accordinly\n"; - } + public static string Prettify_0042(Feature_0042? feature) => + !feature.HasValue + ? null + : "Drive is able to detect and report defective writable unit and behave accordinly\n"; public static string Prettify_0050(Feature_0050? feature) { @@ -4749,10 +4735,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC return sb.ToString(); } - public static string Prettify_0100(Feature_0100? feature) - { - return !feature.HasValue ? null : "Drive is able to perform host and drive directed power management\n"; - } + public static string Prettify_0100(Feature_0100? feature) => + !feature.HasValue ? null : "Drive is able to perform host and drive directed power management\n"; public static string Prettify_0101(Feature_0101? feature) { @@ -4881,10 +4865,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC return sb.ToString(); } - public static string Prettify_0109(Feature_0109? feature) - { - return !feature.HasValue ? null : "Drive is able to read media serial number\n"; - } + public static string Prettify_0109(Feature_0109? feature) => + !feature.HasValue ? null : "Drive is able to read media serial number\n"; public static string Prettify_010A(Feature_010A? feature) { @@ -5059,295 +5041,121 @@ namespace DiscImageChef.Decoders.SCSI.MMC return sb.ToString(); } - public static string Prettify_0000(byte[] feature) - { - return Prettify_0000(Decode_0000(feature)); - } + public static string Prettify_0000(byte[] feature) => Prettify_0000(Decode_0000(feature)); - public static string Prettify_0001(byte[] feature) - { - return Prettify_0001(Decode_0001(feature)); - } + public static string Prettify_0001(byte[] feature) => Prettify_0001(Decode_0001(feature)); - public static string Prettify_0002(byte[] feature) - { - return Prettify_0002(Decode_0002(feature)); - } + public static string Prettify_0002(byte[] feature) => Prettify_0002(Decode_0002(feature)); - public static string Prettify_0003(byte[] feature) - { - return Prettify_0003(Decode_0003(feature)); - } + public static string Prettify_0003(byte[] feature) => Prettify_0003(Decode_0003(feature)); - public static string Prettify_0004(byte[] feature) - { - return Prettify_0004(Decode_0004(feature)); - } + public static string Prettify_0004(byte[] feature) => Prettify_0004(Decode_0004(feature)); - public static string Prettify_0010(byte[] feature) - { - return Prettify_0010(Decode_0010(feature)); - } + public static string Prettify_0010(byte[] feature) => Prettify_0010(Decode_0010(feature)); - public static string Prettify_001D(byte[] feature) - { - return Prettify_001D(Decode_001D(feature)); - } + public static string Prettify_001D(byte[] feature) => Prettify_001D(Decode_001D(feature)); - public static string Prettify_001E(byte[] feature) - { - return Prettify_001E(Decode_001E(feature)); - } + public static string Prettify_001E(byte[] feature) => Prettify_001E(Decode_001E(feature)); - public static string Prettify_001F(byte[] feature) - { - return Prettify_001F(Decode_001F(feature)); - } + public static string Prettify_001F(byte[] feature) => Prettify_001F(Decode_001F(feature)); - public static string Prettify_0020(byte[] feature) - { - return Prettify_0020(Decode_0020(feature)); - } + public static string Prettify_0020(byte[] feature) => Prettify_0020(Decode_0020(feature)); - public static string Prettify_0021(byte[] feature) - { - return Prettify_0021(Decode_0021(feature)); - } + public static string Prettify_0021(byte[] feature) => Prettify_0021(Decode_0021(feature)); - public static string Prettify_0022(byte[] feature) - { - return Prettify_0022(Decode_0022(feature)); - } + public static string Prettify_0022(byte[] feature) => Prettify_0022(Decode_0022(feature)); - public static string Prettify_0023(byte[] feature) - { - return Prettify_0023(Decode_0023(feature)); - } + public static string Prettify_0023(byte[] feature) => Prettify_0023(Decode_0023(feature)); - public static string Prettify_0024(byte[] feature) - { - return Prettify_0024(Decode_0024(feature)); - } + public static string Prettify_0024(byte[] feature) => Prettify_0024(Decode_0024(feature)); - public static string Prettify_0025(byte[] feature) - { - return Prettify_0025(Decode_0025(feature)); - } + public static string Prettify_0025(byte[] feature) => Prettify_0025(Decode_0025(feature)); - public static string Prettify_0026(byte[] feature) - { - return Prettify_0026(Decode_0026(feature)); - } + public static string Prettify_0026(byte[] feature) => Prettify_0026(Decode_0026(feature)); - public static string Prettify_0027(byte[] feature) - { - return Prettify_0027(Decode_0027(feature)); - } + public static string Prettify_0027(byte[] feature) => Prettify_0027(Decode_0027(feature)); - public static string Prettify_0028(byte[] feature) - { - return Prettify_0028(Decode_0028(feature)); - } + public static string Prettify_0028(byte[] feature) => Prettify_0028(Decode_0028(feature)); - public static string Prettify_0029(byte[] feature) - { - return Prettify_0029(Decode_0029(feature)); - } + public static string Prettify_0029(byte[] feature) => Prettify_0029(Decode_0029(feature)); - public static string Prettify_002A(byte[] feature) - { - return Prettify_002A(Decode_002A(feature)); - } + public static string Prettify_002A(byte[] feature) => Prettify_002A(Decode_002A(feature)); - public static string Prettify_002B(byte[] feature) - { - return Prettify_002B(Decode_002B(feature)); - } + public static string Prettify_002B(byte[] feature) => Prettify_002B(Decode_002B(feature)); - public static string Prettify_002C(byte[] feature) - { - return Prettify_002C(Decode_002C(feature)); - } + public static string Prettify_002C(byte[] feature) => Prettify_002C(Decode_002C(feature)); - public static string Prettify_002D(byte[] feature) - { - return Prettify_002D(Decode_002D(feature)); - } + public static string Prettify_002D(byte[] feature) => Prettify_002D(Decode_002D(feature)); - public static string Prettify_002E(byte[] feature) - { - return Prettify_002E(Decode_002E(feature)); - } + public static string Prettify_002E(byte[] feature) => Prettify_002E(Decode_002E(feature)); - public static string Prettify_002F(byte[] feature) - { - return Prettify_002F(Decode_002F(feature)); - } + public static string Prettify_002F(byte[] feature) => Prettify_002F(Decode_002F(feature)); - public static string Prettify_0030(byte[] feature) - { - return Prettify_0030(Decode_0030(feature)); - } + public static string Prettify_0030(byte[] feature) => Prettify_0030(Decode_0030(feature)); - public static string Prettify_0031(byte[] feature) - { - return Prettify_0031(Decode_0031(feature)); - } + public static string Prettify_0031(byte[] feature) => Prettify_0031(Decode_0031(feature)); - public static string Prettify_0032(byte[] feature) - { - return Prettify_0032(Decode_0032(feature)); - } + public static string Prettify_0032(byte[] feature) => Prettify_0032(Decode_0032(feature)); - public static string Prettify_0033(byte[] feature) - { - return Prettify_0033(Decode_0033(feature)); - } + public static string Prettify_0033(byte[] feature) => Prettify_0033(Decode_0033(feature)); - public static string Prettify_0035(byte[] feature) - { - return Prettify_0035(Decode_0035(feature)); - } + public static string Prettify_0035(byte[] feature) => Prettify_0035(Decode_0035(feature)); - public static string Prettify_0037(byte[] feature) - { - return Prettify_0037(Decode_0037(feature)); - } + public static string Prettify_0037(byte[] feature) => Prettify_0037(Decode_0037(feature)); - public static string Prettify_0038(byte[] feature) - { - return Prettify_0038(Decode_0038(feature)); - } + public static string Prettify_0038(byte[] feature) => Prettify_0038(Decode_0038(feature)); - public static string Prettify_003A(byte[] feature) - { - return Prettify_003A(Decode_003A(feature)); - } + public static string Prettify_003A(byte[] feature) => Prettify_003A(Decode_003A(feature)); - public static string Prettify_003B(byte[] feature) - { - return Prettify_003B(Decode_003B(feature)); - } + public static string Prettify_003B(byte[] feature) => Prettify_003B(Decode_003B(feature)); - public static string Prettify_0040(byte[] feature) - { - return Prettify_0040(Decode_0040(feature)); - } + public static string Prettify_0040(byte[] feature) => Prettify_0040(Decode_0040(feature)); - public static string Prettify_0041(byte[] feature) - { - return Prettify_0041(Decode_0041(feature)); - } + public static string Prettify_0041(byte[] feature) => Prettify_0041(Decode_0041(feature)); - public static string Prettify_0042(byte[] feature) - { - return Prettify_0042(Decode_0042(feature)); - } + public static string Prettify_0042(byte[] feature) => Prettify_0042(Decode_0042(feature)); - public static string Prettify_0050(byte[] feature) - { - return Prettify_0050(Decode_0050(feature)); - } + public static string Prettify_0050(byte[] feature) => Prettify_0050(Decode_0050(feature)); - public static string Prettify_0051(byte[] feature) - { - return Prettify_0051(Decode_0051(feature)); - } + public static string Prettify_0051(byte[] feature) => Prettify_0051(Decode_0051(feature)); - public static string Prettify_0080(byte[] feature) - { - return Prettify_0080(Decode_0080(feature)); - } + public static string Prettify_0080(byte[] feature) => Prettify_0080(Decode_0080(feature)); - public static string Prettify_0100(byte[] feature) - { - return Prettify_0100(Decode_0100(feature)); - } + public static string Prettify_0100(byte[] feature) => Prettify_0100(Decode_0100(feature)); - public static string Prettify_0101(byte[] feature) - { - return Prettify_0101(Decode_0101(feature)); - } + public static string Prettify_0101(byte[] feature) => Prettify_0101(Decode_0101(feature)); - public static string Prettify_0102(byte[] feature) - { - return Prettify_0102(Decode_0102(feature)); - } + public static string Prettify_0102(byte[] feature) => Prettify_0102(Decode_0102(feature)); - public static string Prettify_0103(byte[] feature) - { - return Prettify_0103(Decode_0103(feature)); - } + public static string Prettify_0103(byte[] feature) => Prettify_0103(Decode_0103(feature)); - public static string Prettify_0104(byte[] feature) - { - return Prettify_0104(Decode_0104(feature)); - } + public static string Prettify_0104(byte[] feature) => Prettify_0104(Decode_0104(feature)); - public static string Prettify_0105(byte[] feature) - { - return Prettify_0105(Decode_0105(feature)); - } + public static string Prettify_0105(byte[] feature) => Prettify_0105(Decode_0105(feature)); - public static string Prettify_0106(byte[] feature) - { - return Prettify_0106(Decode_0106(feature)); - } + public static string Prettify_0106(byte[] feature) => Prettify_0106(Decode_0106(feature)); - public static string Prettify_0107(byte[] feature) - { - return Prettify_0107(Decode_0107(feature)); - } + public static string Prettify_0107(byte[] feature) => Prettify_0107(Decode_0107(feature)); - public static string Prettify_0108(byte[] feature) - { - return Prettify_0108(Decode_0108(feature)); - } + public static string Prettify_0108(byte[] feature) => Prettify_0108(Decode_0108(feature)); - public static string Prettify_0109(byte[] feature) - { - return Prettify_0109(Decode_0109(feature)); - } + public static string Prettify_0109(byte[] feature) => Prettify_0109(Decode_0109(feature)); - public static string Prettify_010A(byte[] feature) - { - return Prettify_010A(Decode_010A(feature)); - } + public static string Prettify_010A(byte[] feature) => Prettify_010A(Decode_010A(feature)); - public static string Prettify_010B(byte[] feature) - { - return Prettify_010B(Decode_010B(feature)); - } + public static string Prettify_010B(byte[] feature) => Prettify_010B(Decode_010B(feature)); - public static string Prettify_010C(byte[] feature) - { - return Prettify_010C(Decode_010C(feature)); - } + public static string Prettify_010C(byte[] feature) => Prettify_010C(Decode_010C(feature)); - public static string Prettify_010D(byte[] feature) - { - return Prettify_010D(Decode_010D(feature)); - } + public static string Prettify_010D(byte[] feature) => Prettify_010D(Decode_010D(feature)); - public static string Prettify_010E(byte[] feature) - { - return Prettify_010E(Decode_010E(feature)); - } + public static string Prettify_010E(byte[] feature) => Prettify_010E(Decode_010E(feature)); - public static string Prettify_0110(byte[] feature) - { - return Prettify_0110(Decode_0110(feature)); - } + public static string Prettify_0110(byte[] feature) => Prettify_0110(Decode_0110(feature)); - public static string Prettify_0113(byte[] feature) - { - return Prettify_0113(Decode_0113(feature)); - } + public static string Prettify_0113(byte[] feature) => Prettify_0113(Decode_0113(feature)); - public static string Prettify_0142(byte[] feature) - { - return Prettify_0142(Decode_0142(feature)); - } + public static string Prettify_0142(byte[] feature) => Prettify_0142(Decode_0142(feature)); public static SeparatedFeatures Separate(byte[] response) { diff --git a/SCSI/Modes/00_SFF.cs b/SCSI/Modes/00_SFF.cs index 36f7dad20..267badb1d 100644 --- a/SCSI/Modes/00_SFF.cs +++ b/SCSI/Modes/00_SFF.cs @@ -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) { diff --git a/SCSI/Modes/01.cs b/SCSI/Modes/01.cs index 434cadba5..00bc8f8dd 100644 --- a/SCSI/Modes/01.cs +++ b/SCSI/Modes/01.cs @@ -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) { diff --git a/SCSI/Modes/01_MMC.cs b/SCSI/Modes/01_MMC.cs index 2629ce5c5..c94e6d10c 100644 --- a/SCSI/Modes/01_MMC.cs +++ b/SCSI/Modes/01_MMC.cs @@ -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) { diff --git a/SCSI/Modes/02.cs b/SCSI/Modes/02.cs index d420ef1b9..bd0ce87ad 100644 --- a/SCSI/Modes/02.cs +++ b/SCSI/Modes/02.cs @@ -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) { diff --git a/SCSI/Modes/03.cs b/SCSI/Modes/03.cs index bfa9edec4..3ff17764b 100644 --- a/SCSI/Modes/03.cs +++ b/SCSI/Modes/03.cs @@ -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) { diff --git a/SCSI/Modes/04.cs b/SCSI/Modes/04.cs index 4bdc88694..052e7758e 100644 --- a/SCSI/Modes/04.cs +++ b/SCSI/Modes/04.cs @@ -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) { diff --git a/SCSI/Modes/05.cs b/SCSI/Modes/05.cs index fafb76576..e9a229fa1 100644 --- a/SCSI/Modes/05.cs +++ b/SCSI/Modes/05.cs @@ -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) { diff --git a/SCSI/Modes/06.cs b/SCSI/Modes/06.cs index 690ff8c9a..1cc4bc071 100644 --- a/SCSI/Modes/06.cs +++ b/SCSI/Modes/06.cs @@ -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) { diff --git a/SCSI/Modes/07.cs b/SCSI/Modes/07.cs index 5fa677132..6e6e8e229 100644 --- a/SCSI/Modes/07.cs +++ b/SCSI/Modes/07.cs @@ -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) { diff --git a/SCSI/Modes/07_MMC.cs b/SCSI/Modes/07_MMC.cs index bef397bc9..a74336267 100644 --- a/SCSI/Modes/07_MMC.cs +++ b/SCSI/Modes/07_MMC.cs @@ -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) { diff --git a/SCSI/Modes/08.cs b/SCSI/Modes/08.cs index ab2057d36..70a8a8e20 100644 --- a/SCSI/Modes/08.cs +++ b/SCSI/Modes/08.cs @@ -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) { diff --git a/SCSI/Modes/0A.cs b/SCSI/Modes/0A.cs index aea339dc2..fb0c1833a 100644 --- a/SCSI/Modes/0A.cs +++ b/SCSI/Modes/0A.cs @@ -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) { diff --git a/SCSI/Modes/0B.cs b/SCSI/Modes/0B.cs index a9a1d058a..263e78472 100644 --- a/SCSI/Modes/0B.cs +++ b/SCSI/Modes/0B.cs @@ -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) { diff --git a/SCSI/Modes/0D.cs b/SCSI/Modes/0D.cs index b35f09808..7b5dfec3b 100644 --- a/SCSI/Modes/0D.cs +++ b/SCSI/Modes/0D.cs @@ -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) { diff --git a/SCSI/Modes/0E.cs b/SCSI/Modes/0E.cs index f1935740e..ac9aae1f8 100644 --- a/SCSI/Modes/0E.cs +++ b/SCSI/Modes/0E.cs @@ -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) { diff --git a/SCSI/Modes/0F.cs b/SCSI/Modes/0F.cs index e4e25d419..662a9d713 100644 --- a/SCSI/Modes/0F.cs +++ b/SCSI/Modes/0F.cs @@ -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) { diff --git a/SCSI/Modes/10.cs b/SCSI/Modes/10.cs index e354559e4..4bc2f2290 100644 --- a/SCSI/Modes/10.cs +++ b/SCSI/Modes/10.cs @@ -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) { diff --git a/SCSI/Modes/10_SSC.cs b/SCSI/Modes/10_SSC.cs index e16192ced..71bd2394b 100644 --- a/SCSI/Modes/10_SSC.cs +++ b/SCSI/Modes/10_SSC.cs @@ -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) { diff --git a/SCSI/Modes/11.cs b/SCSI/Modes/11.cs index b3c07bbdd..28b83a760 100644 --- a/SCSI/Modes/11.cs +++ b/SCSI/Modes/11.cs @@ -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) { diff --git a/SCSI/Modes/12_13_14.cs b/SCSI/Modes/12_13_14.cs index 968f02cb2..abce55427 100644 --- a/SCSI/Modes/12_13_14.cs +++ b/SCSI/Modes/12_13_14.cs @@ -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) { diff --git a/SCSI/Modes/1A.cs b/SCSI/Modes/1A.cs index 17b5aebc9..5c0fa97f3 100644 --- a/SCSI/Modes/1A.cs +++ b/SCSI/Modes/1A.cs @@ -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) { diff --git a/SCSI/Modes/1B.cs b/SCSI/Modes/1B.cs index ad7d84e70..01ede31b0 100644 --- a/SCSI/Modes/1B.cs +++ b/SCSI/Modes/1B.cs @@ -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) { diff --git a/SCSI/Modes/1C.cs b/SCSI/Modes/1C.cs index 7693a6891..4064fc057 100644 --- a/SCSI/Modes/1C.cs +++ b/SCSI/Modes/1C.cs @@ -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) { diff --git a/SCSI/Modes/1C_SFF.cs b/SCSI/Modes/1C_SFF.cs index 5173f456d..3707e6bee 100644 --- a/SCSI/Modes/1C_SFF.cs +++ b/SCSI/Modes/1C_SFF.cs @@ -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) { diff --git a/SCSI/Modes/1D.cs b/SCSI/Modes/1D.cs index 58d4c6eba..bc119d723 100644 --- a/SCSI/Modes/1D.cs +++ b/SCSI/Modes/1D.cs @@ -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) { diff --git a/SCSI/Modes/21_Certance.cs b/SCSI/Modes/21_Certance.cs index 9a871c357..527085863 100644 --- a/SCSI/Modes/21_Certance.cs +++ b/SCSI/Modes/21_Certance.cs @@ -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) { diff --git a/SCSI/Modes/22_Certance.cs b/SCSI/Modes/22_Certance.cs index 99a7e46e0..e3b8ccca0 100644 --- a/SCSI/Modes/22_Certance.cs +++ b/SCSI/Modes/22_Certance.cs @@ -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) { diff --git a/SCSI/Modes/24_IBM.cs b/SCSI/Modes/24_IBM.cs index 508d8c4ff..625abf169 100644 --- a/SCSI/Modes/24_IBM.cs +++ b/SCSI/Modes/24_IBM.cs @@ -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) { diff --git a/SCSI/Modes/2A.cs b/SCSI/Modes/2A.cs index e69e58cea..0055d4183 100644 --- a/SCSI/Modes/2A.cs +++ b/SCSI/Modes/2A.cs @@ -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) { diff --git a/SCSI/Modes/2F_IBM.cs b/SCSI/Modes/2F_IBM.cs index 62b431799..58de6bdbc 100644 --- a/SCSI/Modes/2F_IBM.cs +++ b/SCSI/Modes/2F_IBM.cs @@ -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) { diff --git a/SCSI/Modes/30_Apple.cs b/SCSI/Modes/30_Apple.cs index 4c6054990..b1876fd63 100644 --- a/SCSI/Modes/30_Apple.cs +++ b/SCSI/Modes/30_Apple.cs @@ -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) diff --git a/SCSI/Modes/3B_HP.cs b/SCSI/Modes/3B_HP.cs index 3c70a34af..a959d7816 100644 --- a/SCSI/Modes/3B_HP.cs +++ b/SCSI/Modes/3B_HP.cs @@ -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) { diff --git a/SCSI/Modes/3C_HP.cs b/SCSI/Modes/3C_HP.cs index 00cba9327..24ea30afe 100644 --- a/SCSI/Modes/3C_HP.cs +++ b/SCSI/Modes/3C_HP.cs @@ -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) { diff --git a/SCSI/Modes/3D_HP.cs b/SCSI/Modes/3D_HP.cs index cd06442b5..2cdc9a94e 100644 --- a/SCSI/Modes/3D_HP.cs +++ b/SCSI/Modes/3D_HP.cs @@ -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) { diff --git a/SCSI/Modes/3D_IBM.cs b/SCSI/Modes/3D_IBM.cs index b75920df3..6a63ca089 100644 --- a/SCSI/Modes/3D_IBM.cs +++ b/SCSI/Modes/3D_IBM.cs @@ -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) { diff --git a/SCSI/Modes/3E_Fujitsu.cs b/SCSI/Modes/3E_Fujitsu.cs index 8908b7526..f19d2cde5 100644 --- a/SCSI/Modes/3E_Fujitsu.cs +++ b/SCSI/Modes/3E_Fujitsu.cs @@ -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) { diff --git a/SCSI/Modes/3E_HP.cs b/SCSI/Modes/3E_HP.cs index 1fe1563eb..a938bbf94 100644 --- a/SCSI/Modes/3E_HP.cs +++ b/SCSI/Modes/3E_HP.cs @@ -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) { diff --git a/SCSI/Modes/Mode10.cs b/SCSI/Modes/Mode10.cs index 690cc6521..29a0b1812 100644 --- a/SCSI/Modes/Mode10.cs +++ b/SCSI/Modes/Mode10.cs @@ -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) { diff --git a/SCSI/Modes/Mode6.cs b/SCSI/Modes/Mode6.cs index 0c3e4b70f..89531b52a 100644 --- a/SCSI/Modes/Mode6.cs +++ b/SCSI/Modes/Mode6.cs @@ -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) { diff --git a/SCSI/SSC/BlockLimits.cs b/SCSI/SSC/BlockLimits.cs index 166459174..18456ff99 100644 --- a/SCSI/SSC/BlockLimits.cs +++ b/SCSI/SSC/BlockLimits.cs @@ -92,9 +92,6 @@ namespace DiscImageChef.Decoders.SCSI.SSC return sb.ToString(); } - public static string Prettify(byte[] response) - { - return Prettify(Decode(response)); - } + public static string Prettify(byte[] response) => Prettify(Decode(response)); } } \ No newline at end of file diff --git a/SCSI/SSC/DensitySupport.cs b/SCSI/SSC/DensitySupport.cs index cdaf27b76..8e885673f 100644 --- a/SCSI/SSC/DensitySupport.cs +++ b/SCSI/SSC/DensitySupport.cs @@ -115,17 +115,12 @@ namespace DiscImageChef.Decoders.SCSI.SSC duplicate = (response[offset + 2] & 0x40) == 0x40, defaultDensity = (response[offset + 2] & 0x20) == 0x20, reserved = (byte)((response[offset + 2] & 0x1E) >> 1), - lenvalid = - (response[offset + 2] & - 0x01) == 0x01, - len = - (ushort)((response[offset + 3] << 8) + response[offset + 4]), + lenvalid = (response[offset + 2] & 0x01) == 0x01, + len = (ushort)((response[offset + 3] << 8) + response[offset + 4]), bpmm = (uint)((response[offset + 5] << 16) + (response[offset + 6] << 8) + response[offset + 7]), - width = - (ushort)((response[offset + 8] << 8) + response[offset + 9]), - tracks = - (ushort)((response[offset + 10] << 8) + response[offset + 11]), + width = (ushort)((response[offset + 8] << 8) + response[offset + 9]), + tracks = (ushort)((response[offset + 10] << 8) + response[offset + 11]), capacity = (uint)((response[offset + 12] << 24) + (response[offset + 13] << 16) + (response[offset + 14] << 8) + response[offset + 15]) }; @@ -182,10 +177,7 @@ namespace DiscImageChef.Decoders.SCSI.SSC return sb.ToString(); } - public static string PrettifyDensity(byte[] response) - { - return PrettifyDensity(DecodeDensity(response)); - } + public static string PrettifyDensity(byte[] response) => PrettifyDensity(DecodeDensity(response)); public static MediaTypeSupportHeader? DecodeMediumType(byte[] response) { @@ -272,9 +264,6 @@ namespace DiscImageChef.Decoders.SCSI.SSC return sb.ToString(); } - public static string PrettifyMediumType(byte[] response) - { - return PrettifyMediumType(DecodeMediumType(response)); - } + public static string PrettifyMediumType(byte[] response) => PrettifyMediumType(DecodeMediumType(response)); } } \ No newline at end of file diff --git a/SCSI/Sense.cs b/SCSI/Sense.cs index caef98fcf..47b32b9bc 100644 --- a/SCSI/Sense.cs +++ b/SCSI/Sense.cs @@ -279,10 +279,7 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static FixedSense? DecodeFixed(byte[] sense) - { - return DecodeFixed(sense, out _); - } + public static FixedSense? DecodeFixed(byte[] sense) => DecodeFixed(sense, out _); public static FixedSense? DecodeFixed(byte[] sense, out string senseDescription) { @@ -325,10 +322,7 @@ namespace DiscImageChef.Decoders.SCSI return decoded; } - public static DescriptorSense? DecodeDescriptor(byte[] sense) - { - return DecodeDescriptor(sense, out _); - } + public static DescriptorSense? DecodeDescriptor(byte[] sense) => DecodeDescriptor(sense, out _); public static DescriptorSense? DecodeDescriptor(byte[] sense, out string senseDescription) { @@ -586,9 +580,8 @@ namespace DiscImageChef.Decoders.SCSI throw new NotImplementedException("Check OSD"); } - public static AtaErrorRegistersLba48 DecodeDescriptor09(byte[] descriptor) - { - return new AtaErrorRegistersLba48 + public static AtaErrorRegistersLba48 DecodeDescriptor09(byte[] descriptor) => + new AtaErrorRegistersLba48 { Error = descriptor[3], SectorCount = (ushort)((descriptor[4] << 8) + descriptor[5]), @@ -598,7 +591,6 @@ namespace DiscImageChef.Decoders.SCSI DeviceHead = descriptor[12], Status = descriptor[13] }; - } public static void DecodeDescriptor0B(byte[] descriptor) { @@ -610,15 +602,10 @@ namespace DiscImageChef.Decoders.SCSI throw new NotImplementedException("Check SBC-3"); } - public static string PrettifyDescriptor00(ulong information) - { - return $"On logical block {information}\n"; - } + public static string PrettifyDescriptor00(ulong information) => $"On logical block {information}\n"; - public static string PrettifyDescriptor00(byte[] descriptor) - { - return PrettifyDescriptor00(DecodeDescriptor00(descriptor)); - } + public static string PrettifyDescriptor00(byte[] descriptor) => + PrettifyDescriptor00(DecodeDescriptor00(descriptor)); public static string GetSenseKey(SenseKeys key) { diff --git a/SecureDigital/CID.cs b/SecureDigital/CID.cs index dc8877586..cd821f421 100644 --- a/SecureDigital/CID.cs +++ b/SecureDigital/CID.cs @@ -116,14 +116,8 @@ namespace DiscImageChef.Decoders.SecureDigital return sb.ToString(); } - public static string PrettifyCID(uint[] response) - { - return PrettifyCID(DecodeCID(response)); - } + public static string PrettifyCID(uint[] response) => PrettifyCID(DecodeCID(response)); - public static string PrettifyCID(byte[] response) - { - return PrettifyCID(DecodeCID(response)); - } + public static string PrettifyCID(byte[] response) => PrettifyCID(DecodeCID(response)); } } \ No newline at end of file diff --git a/SecureDigital/CSD.cs b/SecureDigital/CSD.cs index 2cc2604d2..f4fc8ae2b 100644 --- a/SecureDigital/CSD.cs +++ b/SecureDigital/CSD.cs @@ -538,14 +538,8 @@ namespace DiscImageChef.Decoders.SecureDigital return sb.ToString(); } - public static string PrettifyCSD(uint[] response) - { - return PrettifyCSD(DecodeCSD(response)); - } + public static string PrettifyCSD(uint[] response) => PrettifyCSD(DecodeCSD(response)); - public static string PrettifyCSD(byte[] response) - { - return PrettifyCSD(DecodeCSD(response)); - } + public static string PrettifyCSD(byte[] response) => PrettifyCSD(DecodeCSD(response)); } } \ No newline at end of file diff --git a/SecureDigital/OCR.cs b/SecureDigital/OCR.cs index f345707ff..87dfcc4f0 100644 --- a/SecureDigital/OCR.cs +++ b/SecureDigital/OCR.cs @@ -63,9 +63,8 @@ namespace DiscImageChef.Decoders.SecureDigital [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] public static partial class Decoders { - public static OCR DecodeOCR(uint response) - { - return new OCR + public static OCR DecodeOCR(uint response) => + new OCR { PowerUp = (response & 0x80000000) == 0x80000000, CCS = (response & 0x40000000) == 0x40000000, @@ -82,12 +81,9 @@ namespace DiscImageChef.Decoders.SecureDigital TwoSeven = (response & 0x00008000) == 0x00008000, LowPower = (response & 0x00000080) == 0x00000080 }; - } - public static OCR DecodeOCR(byte[] response) - { - return response?.Length != 4 ? null : DecodeOCR(BitConverter.ToUInt32(response, 0)); - } + public static OCR DecodeOCR(byte[] response) => + response?.Length != 4 ? null : DecodeOCR(BitConverter.ToUInt32(response, 0)); public static string PrettifyOCR(OCR ocr) { @@ -112,14 +108,8 @@ namespace DiscImageChef.Decoders.SecureDigital return sb.ToString(); } - public static string PrettifyOCR(byte[] response) - { - return PrettifyOCR(DecodeOCR(response)); - } + public static string PrettifyOCR(byte[] response) => PrettifyOCR(DecodeOCR(response)); - public static string PrettifyOCR(uint response) - { - return PrettifyOCR(DecodeOCR(response)); - } + public static string PrettifyOCR(uint response) => PrettifyOCR(DecodeOCR(response)); } } \ No newline at end of file diff --git a/SecureDigital/SCR.cs b/SecureDigital/SCR.cs index 6a87855cb..4fe1438ac 100644 --- a/SecureDigital/SCR.cs +++ b/SecureDigital/SCR.cs @@ -159,14 +159,8 @@ namespace DiscImageChef.Decoders.SecureDigital return sb.ToString(); } - public static string PrettifySCR(uint[] response) - { - return PrettifySCR(DecodeSCR(response)); - } + public static string PrettifySCR(uint[] response) => PrettifySCR(DecodeSCR(response)); - public static string PrettifySCR(byte[] response) - { - return PrettifySCR(DecodeSCR(response)); - } + public static string PrettifySCR(byte[] response) => PrettifySCR(DecodeSCR(response)); } } \ No newline at end of file diff --git a/Xbox/DMI.cs b/Xbox/DMI.cs index d193ce364..4938b89ae 100644 --- a/Xbox/DMI.cs +++ b/Xbox/DMI.cs @@ -282,14 +282,8 @@ namespace DiscImageChef.Decoders.Xbox return sb.ToString(); } - public static string PrettifyXbox(byte[] response) - { - return PrettifyXbox(DecodeXbox(response)); - } + public static string PrettifyXbox(byte[] response) => PrettifyXbox(DecodeXbox(response)); - public static string PrettifyXbox360(byte[] response) - { - return PrettifyXbox360(DecodeXbox360(response)); - } + public static string PrettifyXbox360(byte[] response) => PrettifyXbox360(DecodeXbox360(response)); } } \ No newline at end of file diff --git a/Xbox/SS.cs b/Xbox/SS.cs index ab5e568f3..b2f893056 100644 --- a/Xbox/SS.cs +++ b/Xbox/SS.cs @@ -461,9 +461,6 @@ namespace DiscImageChef.Decoders.Xbox return sb.ToString(); } - public static string Prettify(byte[] response) - { - return Prettify(Decode(response)); - } + public static string Prettify(byte[] response) => Prettify(Decode(response)); } } \ No newline at end of file