diff --git a/Aaru.Archives/Symbian/Parser.cs b/Aaru.Archives/Symbian/Parser.cs index ad982f114..ec91a8e49 100644 --- a/Aaru.Archives/Symbian/Parser.cs +++ b/Aaru.Archives/Symbian/Parser.cs @@ -51,15 +51,11 @@ public sealed partial class Symbian if(currentFile > maxFiles) return; - char[] tabulationChars = new char[conditionLevel]; - for(int i = 0; i < conditionLevel; i++) tabulationChars[i] = '\t'; + var tabulationChars = new char[conditionLevel]; + for(var i = 0; i < conditionLevel; i++) tabulationChars[i] = '\t'; string tabulation = new(tabulationChars); - AaruLogging.Debug(MODULE_NAME, - "Seeking to {0} for parsing of file {1} of {2}", - offset, - currentFile, - maxFiles); + AaruLogging.Debug(MODULE_NAME, "Seeking to {0} for parsing of file {1} of {2}", offset, currentFile, maxFiles); br.BaseStream.Seek(offset, SeekOrigin.Begin); var recordType = (FileRecordType)br.ReadUInt32(); @@ -119,10 +115,10 @@ public sealed partial class Symbian } AaruLogging.Debug(MODULE_NAME, - "Found file for \"{0}\" with length {1} at {2}", - decodedFileRecord.destinationName, - decodedFileRecord.length, - decodedFileRecord.pointer); + "Found file for \"{0}\" with length {1} at {2}", + decodedFileRecord.destinationName, + decodedFileRecord.length, + decodedFileRecord.pointer); _files.Add(decodedFileRecord); @@ -323,7 +319,7 @@ public sealed partial class Symbian var decodedFileRecords = new DecodedFileRecord[languages.Count]; - for(int i = 0; i < languages.Count; i++) + for(var i = 0; i < languages.Count; i++) { decodedFileRecords[i].type = multipleFileRecord.record.type; decodedFileRecords[i].details = multipleFileRecord.record.details; @@ -488,7 +484,7 @@ public sealed partial class Symbian optionsLineRecord.options = new OptionRecord[(int)optionsLineRecord.numberOfOptions]; - for(int i = 0; i < optionsLineRecord.numberOfOptions; i++) + for(var i = 0; i < optionsLineRecord.numberOfOptions; i++) { optionsLineRecord.options[i] = new OptionRecord(); @@ -508,7 +504,7 @@ public sealed partial class Symbian offset = (uint)br.BaseStream.Position; - for(int j = 0; j < languages.Count; j++) + for(var j = 0; j < languages.Count; j++) { br.BaseStream.Seek(optionsLineRecord.options[i].pointers[j], SeekOrigin.Begin); buffer = br.ReadBytes((int)optionsLineRecord.options[i].lengths[j]); @@ -527,7 +523,7 @@ public sealed partial class Symbian conditionLevel--; tabulationChars = new char[conditionLevel]; - for(int i = 0; i < conditionLevel; i++) tabulationChars[i] = '\t'; + for(var i = 0; i < conditionLevel; i++) tabulationChars[i] = '\t'; tabulation = new string(tabulationChars); conditionalRecord = new ConditionalRecord @@ -552,7 +548,7 @@ public sealed partial class Symbian break; case FileRecordType.ElseIf: tabulationChars = new char[conditionLevel - 1]; - for(int i = 0; i < conditionLevel - 1; i++) tabulationChars[i] = '\t'; + for(var i = 0; i < conditionLevel - 1; i++) tabulationChars[i] = '\t'; tabulation = new string(tabulationChars); conditionalRecord = new ConditionalRecord @@ -577,7 +573,7 @@ public sealed partial class Symbian break; case FileRecordType.Else: tabulationChars = new char[conditionLevel - 1]; - for(int i = 0; i < conditionLevel - 1; i++) tabulationChars[i] = '\t'; + for(var i = 0; i < conditionLevel - 1; i++) tabulationChars[i] = '\t'; tabulation = new string(tabulationChars); offset = (uint)(br.BaseStream.Position + Marshal.SizeOf()); diff --git a/Aaru.Checksums/CDChecksums.cs b/Aaru.Checksums/CDChecksums.cs index dae05b9e4..1555f70dd 100644 --- a/Aaru.Checksums/CDChecksums.cs +++ b/Aaru.Checksums/CDChecksums.cs @@ -82,8 +82,8 @@ public static class CdChecksums { case 2448: { - byte[] subchannel = new byte[96]; - byte[] channel = new byte[2352]; + var subchannel = new byte[96]; + var channel = new byte[2352]; Array.Copy(buffer, 0, channel, 0, 2352); Array.Copy(buffer, 2352, subchannel, 0, 96); @@ -121,7 +121,7 @@ public static class CdChecksums for(uint i = 0; i < 256; i++) { uint edc = i; - uint j = (uint)(i << 1 ^ ((i & 0x80) == 0x80 ? 0x11D : 0)); + var j = (uint)(i << 1 ^ ((i & 0x80) == 0x80 ? 0x11D : 0)); _eccFTable[i] = (byte)j; _eccBTable[i ^ j] = (byte)i; @@ -197,15 +197,15 @@ public static class CdChecksums { //AaruLogging.DebugWriteLine(MODULE_NAME, "Mode 0 sector at address {0:X2}:{1:X2}:{2:X2}", // channel[0x00C], channel[0x00D], channel[0x00E]); - for(int i = 0x010; i < 0x930; i++) + for(var i = 0x010; i < 0x930; i++) { if(channel[i] == 0x00) continue; AaruLogging.Debug(MODULE_NAME, - "Mode 0 sector with error at address: {0:X2}:{1:X2}:{2:X2}", - channel[0x00C], - channel[0x00D], - channel[0x00E]); + "Mode 0 sector with error at address: {0:X2}:{1:X2}:{2:X2}", + channel[0x00C], + channel[0x00D], + channel[0x00E]); return false; } @@ -225,19 +225,19 @@ public static class CdChecksums channel[0x81A] != 0x00 || channel[0x81B] != 0x00: AaruLogging.Debug(MODULE_NAME, - "Mode 1 sector with data in reserved bytes at address: {0:X2}:{1:X2}:{2:X2}", - channel[0x00C], - channel[0x00D], - channel[0x00E]); + "Mode 1 sector with data in reserved bytes at address: {0:X2}:{1:X2}:{2:X2}", + channel[0x00C], + channel[0x00D], + channel[0x00E]); return false; case 0x01: { - byte[] address = new byte[4]; - byte[] data = new byte[2060]; - byte[] data2 = new byte[2232]; - byte[] eccP = new byte[172]; - byte[] eccQ = new byte[104]; + var address = new byte[4]; + var data = new byte[2060]; + var data2 = new byte[2232]; + var eccP = new byte[172]; + var eccQ = new byte[104]; Array.Copy(channel, 0x0C, address, 0, 4); Array.Copy(channel, 0x10, data, 0, 2060); @@ -254,22 +254,22 @@ public static class CdChecksums if(failedEccP) { AaruLogging.Debug(MODULE_NAME, - "Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check", - channel[0x00C], - channel[0x00D], - channel[0x00E]); + "Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check", + channel[0x00C], + channel[0x00D], + channel[0x00E]); } if(failedEccQ) { AaruLogging.Debug(MODULE_NAME, - "Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check", - channel[0x00C], - channel[0x00D], - channel[0x00E]); + "Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check", + channel[0x00C], + channel[0x00D], + channel[0x00E]); } - uint storedEdc = BitConverter.ToUInt32(channel, 0x810); + var storedEdc = BitConverter.ToUInt32(channel, 0x810); uint calculatedEdc = ComputeEdc(0, channel, 0x810); correctEdc = calculatedEdc == storedEdc; @@ -277,12 +277,12 @@ public static class CdChecksums if(calculatedEdc == storedEdc) return !failedEccP && !failedEccQ; AaruLogging.Debug(MODULE_NAME, - "Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}", - channel[0x00C], - channel[0x00D], - channel[0x00E], - calculatedEdc, - storedEdc); + "Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}", + channel[0x00C], + channel[0x00D], + channel[0x00E], + calculatedEdc, + storedEdc); return false; } @@ -292,7 +292,7 @@ public static class CdChecksums { //AaruLogging.DebugWriteLine(MODULE_NAME, "Mode 2 sector at address {0:X2}:{1:X2}:{2:X2}", // channel[0x00C], channel[0x00D], channel[0x00E]); - byte[] mode2Sector = new byte[channel.Length - 0x10]; + var mode2Sector = new byte[channel.Length - 0x10]; Array.Copy(channel, 0x10, mode2Sector, 0, mode2Sector.Length); if((channel[0x012] & 0x20) == 0x20) // mode 2 form 2 @@ -303,13 +303,13 @@ public static class CdChecksums channel[0x013] != channel[0x017]) { AaruLogging.Debug(MODULE_NAME, - "Subheader copies differ in mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}", - channel[0x00C], - channel[0x00D], - channel[0x00E]); + "Subheader copies differ in mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}", + channel[0x00C], + channel[0x00D], + channel[0x00E]); } - uint storedEdc = BitConverter.ToUInt32(mode2Sector, 0x91C); + var storedEdc = BitConverter.ToUInt32(mode2Sector, 0x91C); // No CRC stored! if(storedEdc == 0x00000000) return true; @@ -321,12 +321,12 @@ public static class CdChecksums if(calculatedEdc == storedEdc) return true; AaruLogging.Debug(MODULE_NAME, - "Mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}", - channel[0x00C], - channel[0x00D], - channel[0x00E], - calculatedEdc, - storedEdc); + "Mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}", + channel[0x00C], + channel[0x00D], + channel[0x00E], + calculatedEdc, + storedEdc); return false; } @@ -338,15 +338,15 @@ public static class CdChecksums channel[0x013] != channel[0x017]) { AaruLogging.Debug(MODULE_NAME, - "Subheader copies differ in mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}", - channel[0x00C], - channel[0x00D], - channel[0x00E]); + "Subheader copies differ in mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}", + channel[0x00C], + channel[0x00D], + channel[0x00E]); } - byte[] address = new byte[4]; - byte[] eccP = new byte[172]; - byte[] eccQ = new byte[104]; + var address = new byte[4]; + var eccP = new byte[172]; + var eccQ = new byte[104]; Array.Copy(mode2Sector, 0x80C, eccP, 0, 172); Array.Copy(mode2Sector, 0x8B8, eccQ, 0, 104); @@ -360,22 +360,22 @@ public static class CdChecksums if(failedEccP) { AaruLogging.Debug(MODULE_NAME, - "Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check", - channel[0x00C], - channel[0x00D], - channel[0x00E]); + "Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check", + channel[0x00C], + channel[0x00D], + channel[0x00E]); } if(failedEccQ) { AaruLogging.Debug(MODULE_NAME, - "Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check", - channel[0x00C], - channel[0x00D], - channel[0x00E]); + "Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check", + channel[0x00C], + channel[0x00D], + channel[0x00E]); } - uint storedEdc = BitConverter.ToUInt32(mode2Sector, 0x808); + var storedEdc = BitConverter.ToUInt32(mode2Sector, 0x808); uint calculatedEdc = ComputeEdc(0, mode2Sector, 0x808); correctEdc = calculatedEdc == storedEdc; @@ -383,23 +383,23 @@ public static class CdChecksums if(calculatedEdc == storedEdc) return !failedEccP && !failedEccQ; AaruLogging.Debug(MODULE_NAME, - "Mode 2 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}", - channel[0x00C], - channel[0x00D], - channel[0x00E], - calculatedEdc, - storedEdc); + "Mode 2 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}", + channel[0x00C], + channel[0x00D], + channel[0x00E], + calculatedEdc, + storedEdc); return false; } } default: AaruLogging.Debug(MODULE_NAME, - "Unknown mode {0} sector at address: {1:X2}:{2:X2}:{3:X2}", - channel[0x00F], - channel[0x00C], - channel[0x00D], - channel[0x00E]); + "Unknown mode {0} sector at address: {1:X2}:{2:X2}:{3:X2}", + channel[0x00F], + channel[0x00C], + channel[0x00D], + channel[0x00E]); return null; } @@ -407,7 +407,7 @@ public static class CdChecksums static uint ComputeEdc(uint edc, IReadOnlyList src, int size) { - int pos = 0; + var pos = 0; for(; size > 0; size--) edc = edc >> 8 ^ _edcTable[(edc ^ src[pos++]) & 0xFF]; @@ -416,22 +416,22 @@ public static class CdChecksums static bool? CheckCdSectorSubChannel(IReadOnlyList subchannel) { - bool? status = true; - byte[] qSubChannel = new byte[12]; - byte[] cdTextPack1 = new byte[18]; - byte[] cdTextPack2 = new byte[18]; - byte[] cdTextPack3 = new byte[18]; - byte[] cdTextPack4 = new byte[18]; - byte[] cdSubRwPack1 = new byte[24]; - byte[] cdSubRwPack2 = new byte[24]; - byte[] cdSubRwPack3 = new byte[24]; - byte[] cdSubRwPack4 = new byte[24]; + bool? status = true; + var qSubChannel = new byte[12]; + var cdTextPack1 = new byte[18]; + var cdTextPack2 = new byte[18]; + var cdTextPack3 = new byte[18]; + var cdTextPack4 = new byte[18]; + var cdSubRwPack1 = new byte[24]; + var cdSubRwPack2 = new byte[24]; + var cdSubRwPack3 = new byte[24]; + var cdSubRwPack4 = new byte[24]; - int i = 0; + var i = 0; - for(int j = 0; j < 12; j++) qSubChannel[j] = 0; + for(var j = 0; j < 12; j++) qSubChannel[j] = 0; - for(int j = 0; j < 18; j++) + for(var j = 0; j < 18; j++) { cdTextPack1[j] = 0; cdTextPack2[j] = 0; @@ -439,7 +439,7 @@ public static class CdChecksums cdTextPack4[j] = 0; } - for(int j = 0; j < 24; j++) + for(var j = 0; j < 24; j++) { cdSubRwPack1[j] = 0; cdSubRwPack2[j] = 0; @@ -447,7 +447,7 @@ public static class CdChecksums cdSubRwPack4[j] = 0; } - for(int j = 0; j < 12; j++) + for(var j = 0; j < 12; j++) { qSubChannel[j] = (byte)(qSubChannel[j] | (subchannel[i++] & 0x40) << 1); qSubChannel[j] = (byte)(qSubChannel[j] | subchannel[i++] & 0x40); @@ -461,7 +461,7 @@ public static class CdChecksums i = 0; - for(int j = 0; j < 18; j++) + for(var j = 0; j < 18; j++) { cdTextPack1[j] = (byte)(cdTextPack1[j] | (subchannel[i++] & 0x3F) << 2); @@ -476,7 +476,7 @@ public static class CdChecksums cdTextPack1[j] = (byte)(cdTextPack1[j] | subchannel[i++] & 0x3F); } - for(int j = 0; j < 18; j++) + for(var j = 0; j < 18; j++) { cdTextPack2[j] = (byte)(cdTextPack2[j] | (subchannel[i++] & 0x3F) << 2); @@ -491,7 +491,7 @@ public static class CdChecksums cdTextPack2[j] = (byte)(cdTextPack2[j] | subchannel[i++] & 0x3F); } - for(int j = 0; j < 18; j++) + for(var j = 0; j < 18; j++) { cdTextPack3[j] = (byte)(cdTextPack3[j] | (subchannel[i++] & 0x3F) << 2); @@ -506,7 +506,7 @@ public static class CdChecksums cdTextPack3[j] = (byte)(cdTextPack3[j] | subchannel[i++] & 0x3F); } - for(int j = 0; j < 18; j++) + for(var j = 0; j < 18; j++) { cdTextPack4[j] = (byte)(cdTextPack4[j] | (subchannel[i++] & 0x3F) << 2); @@ -523,13 +523,13 @@ public static class CdChecksums i = 0; - for(int j = 0; j < 24; j++) cdSubRwPack1[j] = (byte)(subchannel[i++] & 0x3F); + for(var j = 0; j < 24; j++) cdSubRwPack1[j] = (byte)(subchannel[i++] & 0x3F); - for(int j = 0; j < 24; j++) cdSubRwPack2[j] = (byte)(subchannel[i++] & 0x3F); + for(var j = 0; j < 24; j++) cdSubRwPack2[j] = (byte)(subchannel[i++] & 0x3F); - for(int j = 0; j < 24; j++) cdSubRwPack3[j] = (byte)(subchannel[i++] & 0x3F); + for(var j = 0; j < 24; j++) cdSubRwPack3[j] = (byte)(subchannel[i++] & 0x3F); - for(int j = 0; j < 24; j++) cdSubRwPack4[j] = (byte)(subchannel[i++] & 0x3F); + for(var j = 0; j < 24; j++) cdSubRwPack4[j] = (byte)(subchannel[i++] & 0x3F); switch(cdSubRwPack1[0]) { @@ -563,41 +563,38 @@ public static class CdChecksums break; default: AaruLogging.Debug(MODULE_NAME, - Localization.Detected_unknown_Pack_type_in_subchannel_mode_0_item_1, - Convert.ToString(cdSubRwPack1[0] & 0x38, 2), - Convert.ToString(cdSubRwPack1[0] & 0x07, 2)); + Localization.Detected_unknown_Pack_type_in_subchannel_mode_0_item_1, + Convert.ToString(cdSubRwPack1[0] & 0x38, 2), + Convert.ToString(cdSubRwPack1[0] & 0x07, 2)); break; } - ushort qSubChannelCrc = BigEndianBitConverter.ToUInt16(qSubChannel, 10); - byte[] qSubChannelForCrc = new byte[10]; + var qSubChannelCrc = BigEndianBitConverter.ToUInt16(qSubChannel, 10); + var qSubChannelForCrc = new byte[10]; Array.Copy(qSubChannel, 0, qSubChannelForCrc, 0, 10); ushort calculatedQcrc = CRC16CcittContext.Calculate(qSubChannelForCrc); if(qSubChannelCrc != calculatedQcrc) { - AaruLogging.Debug(MODULE_NAME, - Localization.Q_subchannel_CRC_0_expected_1, - calculatedQcrc, - qSubChannelCrc); + AaruLogging.Debug(MODULE_NAME, Localization.Q_subchannel_CRC_0_expected_1, calculatedQcrc, qSubChannelCrc); status = false; } if((cdTextPack1[0] & 0x80) == 0x80) { - ushort cdTextPack1Crc = BigEndianBitConverter.ToUInt16(cdTextPack1, 16); - byte[] cdTextPack1ForCrc = new byte[16]; + var cdTextPack1Crc = BigEndianBitConverter.ToUInt16(cdTextPack1, 16); + var cdTextPack1ForCrc = new byte[16]; Array.Copy(cdTextPack1, 0, cdTextPack1ForCrc, 0, 16); ushort calculatedCdtp1Crc = CRC16CcittContext.Calculate(cdTextPack1ForCrc); if(cdTextPack1Crc != calculatedCdtp1Crc && cdTextPack1Crc != 0) { AaruLogging.Debug(MODULE_NAME, - Localization.CD_Text_Pack_one_CRC_0_expected_1, - cdTextPack1Crc, - calculatedCdtp1Crc); + Localization.CD_Text_Pack_one_CRC_0_expected_1, + cdTextPack1Crc, + calculatedCdtp1Crc); status = false; } @@ -605,22 +602,22 @@ public static class CdChecksums if((cdTextPack2[0] & 0x80) == 0x80) { - ushort cdTextPack2Crc = BigEndianBitConverter.ToUInt16(cdTextPack2, 16); - byte[] cdTextPack2ForCrc = new byte[16]; + var cdTextPack2Crc = BigEndianBitConverter.ToUInt16(cdTextPack2, 16); + var cdTextPack2ForCrc = new byte[16]; Array.Copy(cdTextPack2, 0, cdTextPack2ForCrc, 0, 16); ushort calculatedCdtp2Crc = CRC16CcittContext.Calculate(cdTextPack2ForCrc); AaruLogging.Debug(MODULE_NAME, - Localization.Cyclic_CDTP2_0_Calc_CDTP2_1, - cdTextPack2Crc, - calculatedCdtp2Crc); + Localization.Cyclic_CDTP2_0_Calc_CDTP2_1, + cdTextPack2Crc, + calculatedCdtp2Crc); if(cdTextPack2Crc != calculatedCdtp2Crc && cdTextPack2Crc != 0) { AaruLogging.Debug(MODULE_NAME, - Localization.CD_Text_Pack_two_CRC_0_expected_1, - cdTextPack2Crc, - calculatedCdtp2Crc); + Localization.CD_Text_Pack_two_CRC_0_expected_1, + cdTextPack2Crc, + calculatedCdtp2Crc); status = false; } @@ -628,22 +625,22 @@ public static class CdChecksums if((cdTextPack3[0] & 0x80) == 0x80) { - ushort cdTextPack3Crc = BigEndianBitConverter.ToUInt16(cdTextPack3, 16); - byte[] cdTextPack3ForCrc = new byte[16]; + var cdTextPack3Crc = BigEndianBitConverter.ToUInt16(cdTextPack3, 16); + var cdTextPack3ForCrc = new byte[16]; Array.Copy(cdTextPack3, 0, cdTextPack3ForCrc, 0, 16); ushort calculatedCdtp3Crc = CRC16CcittContext.Calculate(cdTextPack3ForCrc); AaruLogging.Debug(MODULE_NAME, - Localization.Cyclic_CDTP3_0_Calc_CDTP3_1, - cdTextPack3Crc, - calculatedCdtp3Crc); + Localization.Cyclic_CDTP3_0_Calc_CDTP3_1, + cdTextPack3Crc, + calculatedCdtp3Crc); if(cdTextPack3Crc != calculatedCdtp3Crc && cdTextPack3Crc != 0) { AaruLogging.Debug(MODULE_NAME, - Localization.CD_Text_Pack_three_CRC_0_expected_1, - cdTextPack3Crc, - calculatedCdtp3Crc); + Localization.CD_Text_Pack_three_CRC_0_expected_1, + cdTextPack3Crc, + calculatedCdtp3Crc); status = false; } @@ -651,22 +648,19 @@ public static class CdChecksums if((cdTextPack4[0] & 0x80) != 0x80) return status; - ushort cdTextPack4Crc = BigEndianBitConverter.ToUInt16(cdTextPack4, 16); - byte[] cdTextPack4ForCrc = new byte[16]; + var cdTextPack4Crc = BigEndianBitConverter.ToUInt16(cdTextPack4, 16); + var cdTextPack4ForCrc = new byte[16]; Array.Copy(cdTextPack4, 0, cdTextPack4ForCrc, 0, 16); ushort calculatedCdtp4Crc = CRC16CcittContext.Calculate(cdTextPack4ForCrc); - AaruLogging.Debug(MODULE_NAME, - Localization.Cyclic_CDTP4_0_Calc_CDTP4_1, - cdTextPack4Crc, - calculatedCdtp4Crc); + AaruLogging.Debug(MODULE_NAME, Localization.Cyclic_CDTP4_0_Calc_CDTP4_1, cdTextPack4Crc, calculatedCdtp4Crc); if(cdTextPack4Crc == calculatedCdtp4Crc || cdTextPack4Crc == 0) return status; AaruLogging.Debug(MODULE_NAME, - Localization.CD_Text_Pack_four_CRC_0_expected_1, - cdTextPack4Crc, - calculatedCdtp4Crc); + Localization.CD_Text_Pack_four_CRC_0_expected_1, + cdTextPack4Crc, + calculatedCdtp4Crc); return false; } diff --git a/Aaru.Checksums/ReedSolomon.cs b/Aaru.Checksums/ReedSolomon.cs index 213edfe4b..732adf762 100644 --- a/Aaru.Checksums/ReedSolomon.cs +++ b/Aaru.Checksums/ReedSolomon.cs @@ -194,7 +194,7 @@ public class ReedSolomon { int i; - int mask = 1; + var mask = 1; _alphaTo[_mm] = 0; for(i = 0; i < _mm; i++) @@ -299,9 +299,8 @@ public class ReedSolomon for(i = _kk - 1; i >= 0; i--) { if(_mm != 8) - { - if(data[i] > _nn) return -1; /* Illegal symbol */ - } + if(data[i] > _nn) + return -1; /* Illegal symbol */ int feedback = _indexOf[data[i] ^ bb[_nn - _kk - 1]]; @@ -355,26 +354,25 @@ public class ReedSolomon throw new UnauthorizedAccessException(Localization.Trying_to_calculate_RS_without_initializing); erasPos = new int[_nn - _kk]; - int i, j; - int q, tmp; - int[] recd = new int[_nn]; - int[] lambda = new int[_nn - _kk + 1]; /* Err+Eras Locator poly */ - int[] s = new int[_nn - _kk + 1]; /* syndrome poly */ - int[] b = new int[_nn - _kk + 1]; - int[] t = new int[_nn - _kk + 1]; - int[] omega = new int[_nn - _kk + 1]; - int[] root = new int[_nn - _kk]; - int[] reg = new int[_nn - _kk + 1]; - int[] loc = new int[_nn - _kk]; - int count; + int i, j; + int q, tmp; + var recd = new int[_nn]; + var lambda = new int[_nn - _kk + 1]; /* Err+Eras Locator poly */ + var s = new int[_nn - _kk + 1]; /* syndrome poly */ + var b = new int[_nn - _kk + 1]; + var t = new int[_nn - _kk + 1]; + var omega = new int[_nn - _kk + 1]; + var root = new int[_nn - _kk]; + var reg = new int[_nn - _kk + 1]; + var loc = new int[_nn - _kk]; + int count; /* data[] is in polynomial form, copy and convert to index form */ for(i = _nn - 1; i >= 0; i--) { if(_mm != 8) - { - if(data[i] > _nn) return -1; /* Illegal symbol */ - } + if(data[i] > _nn) + return -1; /* Illegal symbol */ recd[i] = _indexOf[data[i]]; } @@ -382,16 +380,15 @@ public class ReedSolomon /* first form the syndromes; i.e., evaluate recd(x) at roots of g(x) * namely @**(B0+i), i = 0, ... ,(NN-KK-1) */ - int synError = 0; + var synError = 0; for(i = 1; i <= _nn - _kk; i++) { tmp = 0; for(j = 0; j < _nn; j++) - { - if(recd[j] != _a0) /* recd[j] in index form */ tmp ^= _alphaTo[Modnn(recd[j] + (B0 + i - 1) * j)]; - } + if(recd[j] != _a0) /* recd[j] in index form */ + tmp ^= _alphaTo[Modnn(recd[j] + (B0 + i - 1) * j)]; synError |= tmp; /* set flag if non-zero syndrome => * error */ @@ -457,8 +454,7 @@ public class ReedSolomon return -1; } - AaruLogging.Debug(MODULE_NAME, - Localization.Erasure_positions_as_determined_by_roots_of_Eras_Loc_Poly); + AaruLogging.Debug(MODULE_NAME, Localization.Erasure_positions_as_determined_by_roots_of_Eras_Loc_Poly); for(i = 0; i < count; i++) AaruLogging.Debug(MODULE_NAME, "{0} ", loc[i]); @@ -479,12 +475,11 @@ public class ReedSolomon { /* r is the step number */ /* Compute discrepancy at the r-th step in poly-form */ - int discrR = 0; + var discrR = 0; for(i = 0; i < r; i++) - { - if(lambda[i] != 0 && s[r - i] != _a0) discrR ^= _alphaTo[Modnn(_indexOf[lambda[i]] + s[r - i])]; - } + if(lambda[i] != 0 && s[r - i] != _a0) + discrR ^= _alphaTo[Modnn(_indexOf[lambda[i]] + s[r - i])]; discrR = _indexOf[discrR]; /* Index form */ @@ -530,7 +525,7 @@ public class ReedSolomon } /* Convert lambda to index form and compute deg(lambda(x)) */ - int degLambda = 0; + var degLambda = 0; for(i = 0; i < _nn - _kk + 1; i++) { @@ -582,7 +577,7 @@ public class ReedSolomon * Compute err+eras evaluator poly omega(x) = s(x)*lambda(x) (modulo * x**(NN-KK)). in index form. Also find deg(omega). */ - int degOmega = 0; + var degOmega = 0; for(i = 0; i < _nn - _kk; i++) { @@ -590,9 +585,8 @@ public class ReedSolomon j = degLambda < i ? degLambda : i; for(; j >= 0; j--) - { - if(s[i + 1 - j] != _a0 && lambda[j] != _a0) tmp ^= _alphaTo[Modnn(s[i + 1 - j] + lambda[j])]; - } + if(s[i + 1 - j] != _a0 && lambda[j] != _a0) + tmp ^= _alphaTo[Modnn(s[i + 1 - j] + lambda[j])]; if(tmp != 0) degOmega = i; @@ -607,21 +601,19 @@ public class ReedSolomon */ for(j = count - 1; j >= 0; j--) { - int num1 = 0; + var num1 = 0; for(i = degOmega; i >= 0; i--) - { - if(omega[i] != _a0) num1 ^= _alphaTo[Modnn(omega[i] + i * root[j])]; - } + if(omega[i] != _a0) + num1 ^= _alphaTo[Modnn(omega[i] + i * root[j])]; int num2 = _alphaTo[Modnn(root[j] * (B0 - 1) + _nn)]; - int den = 0; + var den = 0; /* lambda[i+1] for i even is the formal derivative lambda_pr of lambda[i] */ for(i = Min(degLambda, _nn - _kk - 1) & ~1; i >= 0; i -= 2) - { - if(lambda[i + 1] != _a0) den ^= _alphaTo[Modnn(lambda[i + 1] + i * root[j])]; - } + if(lambda[i + 1] != _a0) + den ^= _alphaTo[Modnn(lambda[i + 1] + i * root[j])]; if(den == 0) { diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromAta.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromAta.cs index d0fce76d1..28397e3ca 100644 --- a/Aaru.CommonTypes/MediaTypeFromDevice/FromAta.cs +++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromAta.cs @@ -63,8 +63,8 @@ public static partial class MediaTypeFromDevice return MediaType.Unknown; AaruLogging.Debug(MODULE_NAME, - Localization - .Drive_manufacturer_is_SyQuest_media_has_1961069_blocks_of_512_bytes_setting_media_type_to_SparQ); + Localization + .Drive_manufacturer_is_SyQuest_media_has_1961069_blocks_of_512_bytes_setting_media_type_to_SparQ); return MediaType.SparQ; } diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromMmc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromMmc.cs index cf418a84c..30188cc6d 100644 --- a/Aaru.CommonTypes/MediaTypeFromDevice/FromMmc.cs +++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromMmc.cs @@ -60,56 +60,55 @@ public static partial class MediaTypeFromDevice if(blocks == 1281856) { AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650, - mediumType, - blocks, - blockSize); + Localization + .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650, + mediumType, + blocks, + blockSize); return MediaType.PD650_WORM; } AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650, - mediumType, - blocks, - blockSize); + Localization + .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650, + mediumType, + blocks, + blockSize); return MediaType.PD650; } AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc, - mediumType); + Localization.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc, + mediumType); return MediaType.CD; case 0x01: case 0x05: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_ROM, - mediumType); + Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_ROM, + mediumType); return MediaType.CDROM; case 0x02: case 0x06: AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc_Digital_Audio, - mediumType); + Localization.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc_Digital_Audio, + mediumType); return MediaType.CDDA; case 0x03: case 0x07: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_Plus, - mediumType); + Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_Plus, + mediumType); return MediaType.CDPLUS; case 0x04: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_medium_type_is_0_setting_media_type_to_Photo_CD, - mediumType); + Localization.SCSI_medium_type_is_0_setting_media_type_to_Photo_CD, + mediumType); return MediaType.PCD; case 0x10: @@ -122,8 +121,8 @@ public static partial class MediaTypeFromDevice case 0x17: case 0x18: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_medium_type_is_0_setting_media_type_to_CDR, - mediumType); + Localization.SCSI_medium_type_is_0_setting_media_type_to_CDR, + mediumType); return MediaType.CDR; case 0x20: @@ -136,17 +135,17 @@ public static partial class MediaTypeFromDevice case 0x27: case 0x28: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_medium_type_is_0_setting_media_type_to_CDRW, - mediumType); + Localization.SCSI_medium_type_is_0_setting_media_type_to_CDRW, + mediumType); return MediaType.CDRW; case 0x40 when isUsb && !opticalDisc: case 0x41 when isUsb && !opticalDisc: case 0x42 when isUsb && !opticalDisc: AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_and_device_is_USB_setting_media_type_to_Flash_Drive, - mediumType); + Localization + .SCSI_medium_type_is_0_and_device_is_USB_setting_media_type_to_Flash_Drive, + mediumType); return MediaType.FlashDrive; case 0x80: @@ -156,34 +155,34 @@ public static partial class MediaTypeFromDevice { case 0x42: AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO2, - mediumType, - densityCode); + Localization + .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO2, + mediumType, + densityCode); return MediaType.LTO2; case 0x44: AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO3, - mediumType, - densityCode); + Localization + .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO3, + mediumType, + densityCode); return MediaType.LTO3; case 0x46: AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO4, - mediumType, - densityCode); + Localization + .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO4, + mediumType, + densityCode); return MediaType.LTO4; case 0x58: AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO5, - mediumType, - densityCode); + Localization + .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO5, + mediumType, + densityCode); return MediaType.LTO5; } diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromOdc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromOdc.cs index 69b05010b..fc2dc5320 100644 --- a/Aaru.CommonTypes/MediaTypeFromDevice/FromOdc.cs +++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromOdc.cs @@ -48,8 +48,8 @@ public static partial class MediaTypeFromDevice if(mediumType != 0x01 && mediumType != 0x02 && mediumType != 0x03 && mediumType != 0x05 && mediumType != 0x07) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_medium_type_is_0_setting_media_type_to_unknown_magneto_optical, - mediumType); + Localization.SCSI_medium_type_is_0_setting_media_type_to_unknown_magneto_optical, + mediumType); return MediaType.UnknownMO; } @@ -62,102 +62,102 @@ public static partial class MediaTypeFromDevice { case 248826: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA154, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA154, + mediumType, + blocks, + blockSize); return MediaType.ECMA_154; case 429975: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA201_embossed, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA201_embossed, + mediumType, + blocks, + blockSize); return MediaType.ECMA_201_ROM; case 446325: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA201, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA201, + mediumType, + blocks, + blockSize); return MediaType.ECMA_201; case 694929: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA223, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA223, + mediumType, + blocks, + blockSize); return MediaType.ECMA_223_512; case 904995: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA183, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA183, + mediumType, + blocks, + blockSize); return MediaType.ECMA_183_512; case 1041500: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO15041, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO15041, + mediumType, + blocks, + blockSize); return MediaType.ISO_15041_512; case 1128772: case 1163337: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA184, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA184, + mediumType, + blocks, + blockSize); return MediaType.ECMA_184_512; case 1281856: AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650, - mediumType, - blocks, - blockSize); + Localization + .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650, + mediumType, + blocks, + blockSize); return MediaType.PD650_WORM; case 1298496: AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650, - mediumType, - blocks, - blockSize); + Localization + .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650, + mediumType, + blocks, + blockSize); return MediaType.PD650; case 1644581: case 1647371: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA195, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA195, + mediumType, + blocks, + blockSize); return MediaType.ECMA_195_512; case 2244958: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO14517, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO14517, + mediumType, + blocks, + blockSize); return MediaType.ISO_14517_512; default: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Unknown_MO, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Unknown_MO, + mediumType, + blocks, + blockSize); return MediaType.UnknownMO; } @@ -169,100 +169,100 @@ public static partial class MediaTypeFromDevice { case 314569: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO10089, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO10089, + mediumType, + blocks, + blockSize); return MediaType.ISO_10089; case 371371: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA223, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA223, + mediumType, + blocks, + blockSize); return MediaType.ECMA_223; case 498526: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA184, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA184, + mediumType, + blocks, + blockSize); return MediaType.ECMA_183; case 603466: case 637041: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA184, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA184, + mediumType, + blocks, + blockSize); return MediaType.ECMA_184; case 936921: case 948770: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA195, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA195, + mediumType, + blocks, + blockSize); return MediaType.ECMA_195; case 1244621: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA238, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA238, + mediumType, + blocks, + blockSize); return MediaType.ECMA_238; case 1273011: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO14517, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO14517, + mediumType, + blocks, + blockSize); return MediaType.ISO_14517; case 2319786: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO15286, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO15286, + mediumType, + blocks, + blockSize); return MediaType.ISO_15286_1024; case 4383356: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA322, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA322, + mediumType, + blocks, + blockSize); return MediaType.ECMA_322_1k; case 14476734: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA260, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA260, + mediumType, + blocks, + blockSize); return MediaType.ECMA_260; case 24445990: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA260, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA260, + mediumType, + blocks, + blockSize); return MediaType.ECMA_260_Double; default: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Unknown_MO, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Unknown_MO, + mediumType, + blocks, + blockSize); return MediaType.UnknownMO; } @@ -277,66 +277,66 @@ public static partial class MediaTypeFromDevice case 320332: case 321100: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA239, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA239, + mediumType, + blocks, + blockSize); return MediaType.ECMA_239; case 605846: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_GigaMO, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_GigaMO, + mediumType, + blocks, + blockSize); return MediaType.GigaMo; case 1063146: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_GigaMO2, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_GigaMO2, + mediumType, + blocks, + blockSize); return MediaType.GigaMo2; case 1128134: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA280, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA280, + mediumType, + blocks, + blockSize); return MediaType.ECMA_280; case 1263472: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO15286, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO15286, + mediumType, + blocks, + blockSize); return MediaType.ISO_15286; case 2043664: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA322, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA322, + mediumType, + blocks, + blockSize); return MediaType.ECMA_322_2k; case 7355716: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA317, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA317, + mediumType, + blocks, + blockSize); return MediaType.ECMA_317; default: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Unknown_MO, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Unknown_MO, + mediumType, + blocks, + blockSize); return MediaType.UnknownMO; } @@ -348,18 +348,18 @@ public static partial class MediaTypeFromDevice { case 1095840: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA322, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA322, + mediumType, + blocks, + blockSize); return MediaType.ECMA_322; default: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Unknown_MO, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Unknown_MO, + mediumType, + blocks, + blockSize); return MediaType.UnknownMO; } @@ -371,34 +371,34 @@ public static partial class MediaTypeFromDevice { case 1834348: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_UDO, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_UDO, + mediumType, + blocks, + blockSize); return MediaType.UDO; case 3668759: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_WORM_UDO2, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_WORM_UDO2, + mediumType, + blocks, + blockSize); return MediaType.UDO2_WORM; case 3669724: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_UDO2, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_UDO2, + mediumType, + blocks, + blockSize); return MediaType.UDO2; default: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Unknown_MO, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Unknown_MO, + mediumType, + blocks, + blockSize); return MediaType.UnknownMO; } @@ -406,10 +406,10 @@ public static partial class MediaTypeFromDevice default: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Unknown_MO, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Unknown_MO, + mediumType, + blocks, + blockSize); return MediaType.UnknownMO; } diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromSbc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromSbc.cs index 7c226aac7..4743d2991 100644 --- a/Aaru.CommonTypes/MediaTypeFromDevice/FromSbc.cs +++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromSbc.cs @@ -52,18 +52,18 @@ public static partial class MediaTypeFromDevice { case 0x09: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA54, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA54, + mediumType, + blocks, + blockSize); return MediaType.ECMA_54; case 0x0A: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA59, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA59, + mediumType, + blocks, + blockSize); return MediaType.ECMA_59; case 0x0B: @@ -71,51 +71,51 @@ public static partial class MediaTypeFromDevice { case 256: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA69, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA69, + mediumType, + blocks, + blockSize); return MediaType.ECMA_69_26; case 512: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA69, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA69, + mediumType, + blocks, + blockSize); return MediaType.ECMA_69_15; case 1024: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA69, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA69, + mediumType, + blocks, + blockSize); return MediaType.ECMA_69_8; } AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Unknown, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Unknown, + mediumType, + blocks, + blockSize); return MediaType.Unknown; case 0x0E: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA66, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA66, + mediumType, + blocks, + blockSize); return MediaType.ECMA_66; case 0x12: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA70, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA70, + mediumType, + blocks, + blockSize); return MediaType.ECMA_70; case 0x16: @@ -123,27 +123,27 @@ public static partial class MediaTypeFromDevice { case 256: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA78, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA78, + mediumType, + blocks, + blockSize); return MediaType.ECMA_78; case 512: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA78, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA78, + mediumType, + blocks, + blockSize); return MediaType.ECMA_78_2; } AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Unknown, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Unknown, + mediumType, + blocks, + blockSize); return MediaType.Unknown; case 0x1A: @@ -151,43 +151,43 @@ public static partial class MediaTypeFromDevice { case 256: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA99, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA99, + mediumType, + blocks, + blockSize); return MediaType.ECMA_99_26; case 512: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA99, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA99, + mediumType, + blocks, + blockSize); return MediaType.ECMA_99_15; case 1024: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA99, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA99, + mediumType, + blocks, + blockSize); return MediaType.ECMA_99_8; } AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Unknown, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Unknown, + mediumType, + blocks, + blockSize); return MediaType.Unknown; case 0x1E: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MF2DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MF2DD, + mediumType, + blocks, + blockSize); return MediaType.DOS_35_DS_DD_9; case 0x41: @@ -195,26 +195,26 @@ public static partial class MediaTypeFromDevice { case 58620544: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_REV120, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_REV120, + mediumType, + blocks, + blockSize); return MediaType.REV120; case 34185728: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_REV70, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_REV70, + mediumType, + blocks, + blockSize); return MediaType.REV70; case 17090880: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_REV35, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_REV35, + mediumType, + blocks, + blockSize); return MediaType.REV35; } @@ -222,18 +222,18 @@ public static partial class MediaTypeFromDevice break; case 0x93: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_PC98_MF2HD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_PC98_MF2HD, + mediumType, + blocks, + blockSize); return MediaType.NEC_35_HD_15; case 0x94: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MF2HD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MF2HD, + mediumType, + blocks, + blockSize); return MediaType.DOS_35_HD; } @@ -245,50 +245,50 @@ public static partial class MediaTypeFromDevice { case 720: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Atari_MD1SD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Atari_MD1SD, + mediumType, + blocks, + blockSize); return MediaType.ATARI_525_SD; case 1040: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Atari_MD1DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Atari_MD1DD, + mediumType, + blocks, + blockSize); return MediaType.ATARI_525_DD; case 1898: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_33FD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_33FD, + mediumType, + blocks, + blockSize); return MediaType.IBM33FD_128; case 2002: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA54, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA54, + mediumType, + blocks, + blockSize); return MediaType.ECMA_54; case 3848: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_43FD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_43FD, + mediumType, + blocks, + blockSize); return MediaType.IBM43FD_128; case 4004: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA59, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA59, + mediumType, + blocks, + blockSize); return MediaType.ECMA_59; } @@ -299,156 +299,154 @@ public static partial class MediaTypeFromDevice { case 322: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA56, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA56, + mediumType, + blocks, + blockSize); return MediaType.ECMA_66; case 400: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Acorn_MD1SD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Acorn_MD1SD, + mediumType, + blocks, + blockSize); return MediaType.ACORN_525_SS_SD_40; case 455: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Apple_DOS32, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Apple_DOS32, + mediumType, + blocks, + blockSize); return MediaType.Apple32SS; case 560: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Apple_DOS33, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Apple_DOS33, + mediumType, + blocks, + blockSize); return MediaType.Apple33SS; case 640: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Acorn_MD1DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Acorn_MD1DD, + mediumType, + blocks, + blockSize); return MediaType.ACORN_525_SS_DD_40; case 720: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Atari_MD1DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Atari_MD1DD, + mediumType, + blocks, + blockSize); return MediaType.ATARI_525_DD; case 800: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80, + mediumType, + blocks, + blockSize); return MediaType.ACORN_525_SS_SD_80; case 910: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Apple_DOS32_DS, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Apple_DOS32_DS, + mediumType, + blocks, + blockSize); return MediaType.Apple32DS; case 1120: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Apple_DOS33_DS, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Apple_DOS33_DS, + mediumType, + blocks, + blockSize); return MediaType.Apple33DS; case 1121: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_33FD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_33FD, + mediumType, + blocks, + blockSize); return MediaType.IBM33FD_256; case 1232: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_MetaFloppy, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_MetaFloppy, + mediumType, + blocks, + blockSize); return MediaType.MetaFloppy_Mod_II; case 1280 when mediumType == 0x01: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80, + mediumType, + blocks, + blockSize); return MediaType.ACORN_525_SS_DD_80; case 1280: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA70, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA70, + mediumType, + blocks, + blockSize); return MediaType.ECMA_70; case 2002: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DEC_RX02, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_DEC_RX02, + mediumType, + blocks, + blockSize); return MediaType.RX02; case 2560: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA78, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA78, + mediumType, + blocks, + blockSize); return MediaType.ECMA_78; case 3848: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_53FD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_53FD, + mediumType, + blocks, + blockSize); return MediaType.IBM53FD_256; case 4004: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA99, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA99, + mediumType, + blocks, + blockSize); return MediaType.ECMA_99_26; case 19584 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase): AaruLogging.Debug(MODULE_NAME, - "Drive manufacturer is SyQuest, media has 19584 blocks of 256 bytes, setting media type to SQ100."); + "Drive manufacturer is SyQuest, media has 19584 blocks of 256 bytes, setting media type to SQ100."); return MediaType.SQ200; case 39360 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase): AaruLogging.Debug(MODULE_NAME, - "Drive manufacturer is SyQuest, media has 39360 blocks of 256 bytes, setting media type to SQ200."); + "Drive manufacturer is SyQuest, media has 39360 blocks of 256 bytes, setting media type to SQ200."); return MediaType.SQ200; case 39168 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase): case 41004 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase): - AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Bernoulli10, - blocks); + AaruLogging.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli10, blocks); return MediaType.Bernoulli10; case 46956: @@ -467,10 +465,10 @@ public static partial class MediaTypeFromDevice { case 256: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_23FD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_23FD, + mediumType, + blocks, + blockSize); return MediaType.IBM23FD; } @@ -481,186 +479,186 @@ public static partial class MediaTypeFromDevice { case 320: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MD1DD_8, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MD1DD_8, + mediumType, + blocks, + blockSize); return MediaType.DOS_525_SS_DD_8; case 360: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MD1DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MD1DD, + mediumType, + blocks, + blockSize); return MediaType.DOS_525_SS_DD_9; case 610: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_33FD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_33FD, + mediumType, + blocks, + blockSize); return MediaType.IBM33FD_512; case 630 when mediumType == 0x01: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Apricot_MF2DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Apricot_MF2DD, + mediumType, + blocks, + blockSize); return MediaType.Apricot_35; case 640 when mediumType == 0x01: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MF1DD_8, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MF1DD_8, + mediumType, + blocks, + blockSize); return MediaType.DOS_35_SS_DD_8; case 640: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MD2DD_8, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MD2DD_8, + mediumType, + blocks, + blockSize); return MediaType.DOS_525_DS_DD_8; case 720 when mediumType == 0x01: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MF1DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MF1DD, + mediumType, + blocks, + blockSize); return MediaType.DOS_35_SS_DD_9; case 720: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MD2DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MD2DD, + mediumType, + blocks, + blockSize); return MediaType.DOS_525_DS_DD_9; case 800: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Apple_MF1DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Apple_MF1DD, + mediumType, + blocks, + blockSize); return MediaType.AppleSonySS; case 1280: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MF2DD_8, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MF2DD_8, + mediumType, + blocks, + blockSize); return MediaType.DOS_35_DS_DD_8; case 1440: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MF2DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MF2DD, + mediumType, + blocks, + blockSize); return MediaType.DOS_35_DS_DD_9; case 1640: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_FDFORMAT_MF2DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_FDFORMAT_MF2DD, + mediumType, + blocks, + blockSize); return MediaType.FDFORMAT_35_DD; case 1760: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Amiga_MF2DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Amiga_MF2DD, + mediumType, + blocks, + blockSize); return MediaType.CBM_AMIGA_35_DD; case 2242: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_53FD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_53FD, + mediumType, + blocks, + blockSize); return MediaType.IBM53FD_512; case 2332: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA99, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA99, + mediumType, + blocks, + blockSize); return MediaType.ECMA_99_15; case 2400: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MD2HD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MD2HD, + mediumType, + blocks, + blockSize); return MediaType.DOS_525_HD; case 2788: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_FDFORMAT_MD2HD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_FDFORMAT_MD2HD, + mediumType, + blocks, + blockSize); return MediaType.FDFORMAT_525_HD; case 2880: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MF2HD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MF2HD, + mediumType, + blocks, + blockSize); return MediaType.DOS_35_HD; case 3360: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DMF_MF2HD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_DMF_MF2HD, + mediumType, + blocks, + blockSize); return MediaType.DMF; case 3444: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_FDFORMAT_MF2HD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_FDFORMAT_MF2HD, + mediumType, + blocks, + blockSize); return MediaType.FDFORMAT_35_HD; case 3520: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Amiga_MF2HD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Amiga_MF2HD, + mediumType, + blocks, + blockSize); return MediaType.CBM_AMIGA_35_HD; case 5760: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_MF2ED, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_MF2ED, + mediumType, + blocks, + blockSize); return MediaType.DOS_35_ED; case 40662 when mediumType == 0x20: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Floptical, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Floptical, + mediumType, + blocks, + blockSize); return MediaType.Floptical; case 65536 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal): @@ -702,10 +700,10 @@ public static partial class MediaTypeFromDevice return MediaType.LS120; case 248826 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA154, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA154, + mediumType, + blocks, + blockSize); return MediaType.ECMA_154; case 262144 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase): @@ -713,8 +711,7 @@ public static partial class MediaTypeFromDevice return MediaType.EZ135; case 294918 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase): - AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Bernoulli2_150); + AaruLogging.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli2_150); return MediaType.Bernoulli150; case 390696 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase): @@ -723,25 +720,25 @@ public static partial class MediaTypeFromDevice return MediaType.SQ2000; case 393380 when model.ToLowerInvariant().StartsWith("hifd", StringComparison.Ordinal): AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_HiFD, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_HiFD, + blocks, + blockSize); return MediaType.HiFD; case 429975 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA201_embossed, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA201_embossed, + mediumType, + blocks, + blockSize); return MediaType.ECMA_201_ROM; case 446325 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA201, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA201, + mediumType, + blocks, + blockSize); return MediaType.ECMA_201; case 450560 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase): @@ -762,53 +759,53 @@ public static partial class MediaTypeFromDevice return MediaType.SQ327; case 694929 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA223, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA223, + mediumType, + blocks, + blockSize); return MediaType.ECMA_223_512; case 904995 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA183, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA183, + mediumType, + blocks, + blockSize); return MediaType.ECMA_183_512; case 1041500 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO15041, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO15041, + mediumType, + blocks, + blockSize); return MediaType.ISO_15041_512; case 1128772 when mediumType is 0x01 or 0x02: case 1163337 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA184, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA184, + mediumType, + blocks, + blockSize); return MediaType.ECMA_184_512; case 1281856 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650, - mediumType, - blocks, - blockSize); + Localization + .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650, + mediumType, + blocks, + blockSize); return MediaType.PD650_WORM; case 1298496 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization - .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650, - mediumType, - blocks, - blockSize); + Localization + .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650, + mediumType, + blocks, + blockSize); return MediaType.PD650; case 1470500 when model.ToLowerInvariant().StartsWith("zip", StringComparison.OrdinalIgnoreCase): @@ -818,16 +815,16 @@ public static partial class MediaTypeFromDevice case 1644581 when mediumType is 0x01 or 0x02: case 1647371 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA195, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA195, + mediumType, + blocks, + blockSize); return MediaType.ECMA_195_512; case 1961069 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase): AaruLogging.Debug(MODULE_NAME, - Localization - .Drive_manufacturer_is_SyQuest_media_has_1961069_blocks_of_512_bytes_setting_media_type_to_SparQ); + Localization + .Drive_manufacturer_is_SyQuest_media_has_1961069_blocks_of_512_bytes_setting_media_type_to_SparQ); return MediaType.SparQ; case 2091050 when model.ToLowerInvariant().StartsWith("jaz", StringComparison.Ordinal): @@ -836,10 +833,10 @@ public static partial class MediaTypeFromDevice return MediaType.Jaz; case 2244958 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO14517, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO14517, + mediumType, + blocks, + blockSize); return MediaType.ISO_14517_512; case 2929800 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase): @@ -856,9 +853,9 @@ public static partial class MediaTypeFromDevice return MediaType.Orb; case 625134256 when model.ToLowerInvariant().StartsWith("rdx", StringComparison.Ordinal): AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_RDX320, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_RDX320, + blocks, + blockSize); return MediaType.RDX320; } @@ -870,18 +867,18 @@ public static partial class MediaTypeFromDevice { case 800 when mediumType == 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Acorn_MF2DD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Acorn_MF2DD, + mediumType, + blocks, + blockSize); return MediaType.ACORN_35_DS_DD; case 1220: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM_53FD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_IBM_53FD, + mediumType, + blocks, + blockSize); return MediaType.IBM53FD_1024; case 1232 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal): @@ -890,132 +887,132 @@ public static partial class MediaTypeFromDevice return MediaType.NEC_35_HD_8; case 1232: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Sharp_MF2HD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Sharp_MF2HD, + mediumType, + blocks, + blockSize); return MediaType.SHARP_35; case 1268: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA69, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA69, + mediumType, + blocks, + blockSize); return MediaType.ECMA_69_8; case 1280: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_PC98_MD2HD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_PC98_MD2HD, + mediumType, + blocks, + blockSize); return MediaType.NEC_525_HD; case 1316: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA99, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA99, + mediumType, + blocks, + blockSize); return MediaType.ECMA_99_8; case 1600 when mediumType == 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Acorn_MF2HD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_Acorn_MF2HD, + mediumType, + blocks, + blockSize); return MediaType.ACORN_35_DS_HD; case 314569 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO10089, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO10089, + mediumType, + blocks, + blockSize); return MediaType.ISO_10089; case 371371 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA223, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA223, + mediumType, + blocks, + blockSize); return MediaType.ECMA_223; case 498526 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA183, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA183, + mediumType, + blocks, + blockSize); return MediaType.ECMA_183; case 603466 when mediumType is 0x01 or 0x02: case 637041 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA184, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA184, + mediumType, + blocks, + blockSize); return MediaType.ECMA_184; case 936921 when mediumType is 0x01 or 0x02: case 948770 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA195, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA195, + mediumType, + blocks, + blockSize); return MediaType.ECMA_195; case 1244621 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA238, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA238, + mediumType, + blocks, + blockSize); return MediaType.ECMA_238; case 1273011 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO14517, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO14517, + mediumType, + blocks, + blockSize); return MediaType.ISO_14517; case 2319786 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO15286, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO15286, + mediumType, + blocks, + blockSize); return MediaType.ISO_15286_1024; case 4383356 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA322, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA322, + mediumType, + blocks, + blockSize); return MediaType.ECMA_322_1k; case 14476734 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA260, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA260, + mediumType, + blocks, + blockSize); return MediaType.ECMA_260; case 24445990 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA260, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA260, + mediumType, + blocks, + blockSize); return MediaType.ECMA_260_Double; } @@ -1028,26 +1025,26 @@ public static partial class MediaTypeFromDevice { case 112311: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_MD60, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_MD60, + mediumType, + blocks, + blockSize); return MediaType.MD60; case 138363: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_MD74, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_MD74, + mediumType, + blocks, + blockSize); return MediaType.MD74; case 149373: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_MD80, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_MD80, + mediumType, + blocks, + blockSize); return MediaType.MD80; case 310352 when mediumType is 0x01 or 0x02: // Found in real media @@ -1055,66 +1052,66 @@ public static partial class MediaTypeFromDevice case 320332 when mediumType is 0x01 or 0x02: case 321100 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA239, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA239, + mediumType, + blocks, + blockSize); return MediaType.ECMA_239; case 494023: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_HiMD, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_HiMD, + mediumType, + blocks, + blockSize); return MediaType.HiMD; case 605846 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_GigaMO, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_GigaMO, + mediumType, + blocks, + blockSize); return MediaType.GigaMo; case 1063146 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_GigaMO2, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_GigaMO2, + mediumType, + blocks, + blockSize); return MediaType.GigaMo2; case 1128134 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA280, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA280, + mediumType, + blocks, + blockSize); return MediaType.ECMA_280; case 1263472 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ISO15286, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ISO15286, + mediumType, + blocks, + blockSize); return MediaType.ISO_15286; case 2043664 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA322, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA322, + mediumType, + blocks, + blockSize); return MediaType.ECMA_322_2k; case 7355716 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA317, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA317, + mediumType, + blocks, + blockSize); return MediaType.ECMA_317; } @@ -1127,10 +1124,10 @@ public static partial class MediaTypeFromDevice { case 1095840 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ECMA322, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ECMA322, + mediumType, + blocks, + blockSize); return MediaType.ECMA_322; } @@ -1143,26 +1140,26 @@ public static partial class MediaTypeFromDevice { case 1834348 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_UDO, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_UDO, + mediumType, + blocks, + blockSize); return MediaType.UDO; case 3668759 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_WORM_UDO2, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_WORM_UDO2, + mediumType, + blocks, + blockSize); return MediaType.UDO2_WORM; case 3669724 when mediumType is 0x01 or 0x02: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_UDO2, - mediumType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_UDO2, + mediumType, + blocks, + blockSize); return MediaType.UDO2; } diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromScsi.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromScsi.cs index af49b4964..99245aa80 100644 --- a/Aaru.CommonTypes/MediaTypeFromDevice/FromScsi.cs +++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromScsi.cs @@ -85,10 +85,10 @@ public static partial class MediaTypeFromDevice if(blockSize == 2048) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_MDDATA, - scsiPeripheralType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_MDDATA, + scsiPeripheralType, + blocks, + blockSize); return MediaType.MDData; } @@ -97,45 +97,45 @@ public static partial class MediaTypeFromDevice { case 57312: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_MD60_MDDATA, - scsiPeripheralType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_MD60_MDDATA, + scsiPeripheralType, + blocks, + blockSize); return MediaType.MD60; case 70464: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_MD74_MDDATA, - scsiPeripheralType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_MD74_MDDATA, + scsiPeripheralType, + blocks, + blockSize); return MediaType.MD74; case 76096: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_MD80_MDDATA, - scsiPeripheralType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_MD80_MDDATA, + scsiPeripheralType, + blocks, + blockSize); return MediaType.MD80; } AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_MD60_MDDATA, - scsiPeripheralType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_MD60_MDDATA, + scsiPeripheralType, + blocks, + blockSize); return MediaType.MD; // Host managed zoned block device case 0x14: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_ZBC_Host_Managed, - scsiPeripheralType, - blocks, - blockSize); + Localization.SCSI_Media_Type_Description_ZBC_Host_Managed, + scsiPeripheralType, + blocks, + blockSize); return MediaType.Zone_HDD; } diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromSsc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromSsc.cs index 822698c4b..0014c374a 100644 --- a/Aaru.CommonTypes/MediaTypeFromDevice/FromSsc.cs +++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromSsc.cs @@ -54,81 +54,81 @@ public static partial class MediaTypeFromDevice { case 0x04: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_QIC11, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_QIC11, + mediumType, + densityCode); return MediaType.QIC11; case 0x05: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_QIC24, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_QIC24, + mediumType, + densityCode); return MediaType.QIC24; case 0x09: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM3490, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_IBM3490, + mediumType, + densityCode); return MediaType.IBM3490; case 0x0F: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_QIC120, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_QIC120, + mediumType, + densityCode); return MediaType.QIC120; case 0x10: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_QIC150, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_QIC150, + mediumType, + densityCode); return MediaType.QIC150; case 0x13: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DDS, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DDS, + mediumType, + densityCode); return MediaType.DDS1; case 0x24: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DDS2, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DDS2, + mediumType, + densityCode); return MediaType.DDS2; case 0x25: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DDS3, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DDS3, + mediumType, + densityCode); return MediaType.DDS3; case 0x26: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DDS4, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DDS4, + mediumType, + densityCode); return MediaType.DDS4; case 0x28: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM3490E, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_IBM3490E, + mediumType, + densityCode); return MediaType.IBM3490E; case 0x40: if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO_ult, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO_ult, + mediumType, + densityCode); return MediaType.LTO; } @@ -136,9 +136,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("sdz", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_SAIT, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_SAIT, + mediumType, + densityCode); return MediaType.SAIT1; } @@ -150,9 +150,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO2_ult, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO2_ult, + mediumType, + densityCode); return MediaType.LTO2; } @@ -165,9 +165,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO2_ult, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO2_ult, + mediumType, + densityCode); return MediaType.LTO2; } @@ -175,9 +175,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_T9840A, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_T9840A, + mediumType, + densityCode); return MediaType.T9840A; } @@ -190,9 +190,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_T9940A, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_T9940A, + mediumType, + densityCode); return MediaType.T9940A; } @@ -205,9 +205,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO3, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO3, + mediumType, + densityCode); return MediaType.LTO3; } @@ -215,9 +215,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_T9940B, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_T9940B, + mediumType, + densityCode); return MediaType.T9940B; } @@ -230,9 +230,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_T9940C, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_T9940C, + mediumType, + densityCode); return MediaType.T9840C; } @@ -245,9 +245,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO4, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO4, + mediumType, + densityCode); return MediaType.LTO4; } @@ -255,9 +255,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_T9840D, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_T9840D, + mediumType, + densityCode); return MediaType.T9840D; } @@ -270,9 +270,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_T10000A, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_T10000A, + mediumType, + densityCode); return MediaType.T10000A; } @@ -285,9 +285,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_T10000B, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_T10000B, + mediumType, + densityCode); return MediaType.T10000B; } @@ -300,9 +300,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_T10000C, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_T10000C, + mediumType, + densityCode); return MediaType.T10000C; } @@ -315,9 +315,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_T10000D, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_T10000D, + mediumType, + densityCode); return MediaType.T10000D; } @@ -330,9 +330,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO5, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO5, + mediumType, + densityCode); return MediaType.LTO5; } @@ -344,9 +344,9 @@ public static partial class MediaTypeFromDevice case 0x8C: { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DDS, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DDS, + mediumType, + densityCode); return MediaType.DDS1; } @@ -362,9 +362,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_WORM_LTO3, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_WORM_LTO3, + mediumType, + densityCode); return MediaType.LTO3WORM; } @@ -377,9 +377,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_WORM_LTO4, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_WORM_LTO4, + mediumType, + densityCode); return MediaType.LTO4WORM; } @@ -392,9 +392,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_WORM_LTO5, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_WORM_LTO5, + mediumType, + densityCode); return MediaType.LTO5WORM; } @@ -414,9 +414,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO_ult, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO_ult, + mediumType, + densityCode); return MediaType.LTO; } @@ -427,9 +427,9 @@ public static partial class MediaTypeFromDevice case 0x40: { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO, + mediumType, + densityCode); return MediaType.LTO; } @@ -446,9 +446,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO2_ult, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO2_ult, + mediumType, + densityCode); return MediaType.LTO2; } @@ -459,9 +459,9 @@ public static partial class MediaTypeFromDevice case 0x42: { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO2, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO2, + mediumType, + densityCode); return MediaType.LTO2; } @@ -479,9 +479,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DDS3_dat, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DDS3_dat, + mediumType, + densityCode); return MediaType.DDS3; } @@ -502,9 +502,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DDS4_alt, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DDS4_alt, + mediumType, + densityCode); return MediaType.DDS4; } @@ -525,9 +525,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DAT72_dat, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DAT72_dat, + mediumType, + densityCode); return MediaType.DAT72; } @@ -548,9 +548,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO3, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO3, + mediumType, + densityCode); return MediaType.LTO3; } @@ -571,9 +571,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_WORM_LTO3, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_WORM_LTO3, + mediumType, + densityCode); return MediaType.LTO3WORM; } @@ -594,9 +594,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO4, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO4, + mediumType, + densityCode); return MediaType.LTO4; } @@ -617,9 +617,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_WORM_LTO4, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_WORM_LTO4, + mediumType, + densityCode); return MediaType.LTO4WORM; } @@ -640,9 +640,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DDS2_dat, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DDS2_dat, + mediumType, + densityCode); return MediaType.DDS2; } @@ -663,9 +663,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO5, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO5, + mediumType, + densityCode); return MediaType.LTO5; } @@ -686,9 +686,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_WORM_LTO5, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_WORM_LTO5, + mediumType, + densityCode); return MediaType.LTO5WORM; } @@ -709,9 +709,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO6_ult, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO6_ult, + mediumType, + densityCode); return MediaType.LTO6; } @@ -732,9 +732,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_WORM_LTO6_ult, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_WORM_LTO6_ult, + mediumType, + densityCode); return MediaType.LTO6WORM; } @@ -755,9 +755,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_LTO7_ult, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_LTO7_ult, + mediumType, + densityCode); return MediaType.LTO7; } @@ -778,9 +778,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_WORM_LTO7_ult, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_WORM_LTO7_ult, + mediumType, + densityCode); return MediaType.LTO7WORM; } @@ -800,9 +800,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_15m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_15m, + mediumType, + densityCode); return MediaType.Exatape15m; } @@ -810,9 +810,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM3592, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_IBM3592, + mediumType, + densityCode); return MediaType.IBM3592; } @@ -820,9 +820,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_VXA, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_VXA, + mediumType, + densityCode); return MediaType.VXA1; } @@ -839,9 +839,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_15m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_15m, + mediumType, + densityCode); return MediaType.Exatape15m; } @@ -855,9 +855,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM3592, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_IBM3592, + mediumType, + densityCode); return MediaType.IBM3592; } @@ -870,9 +870,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_VXA, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_VXA, + mediumType, + densityCode); return MediaType.VXA1; } @@ -892,9 +892,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_28m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_28m, + mediumType, + densityCode); return MediaType.Exatape28m; } @@ -902,9 +902,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM3592, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_IBM3592, + mediumType, + densityCode); return MediaType.IBM3592; } @@ -917,9 +917,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_CompactTape, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_CompactTape, + mediumType, + densityCode); return MediaType.CompactTapeI; } @@ -936,9 +936,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_28m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_28m, + mediumType, + densityCode); return MediaType.Exatape28m; } @@ -951,9 +951,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_CompactTapeII, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_CompactTapeII, + mediumType, + densityCode); return MediaType.CompactTapeII; } @@ -967,9 +967,9 @@ public static partial class MediaTypeFromDevice if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_IBM3592, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_IBM3592, + mediumType, + densityCode); return MediaType.IBM3592; } @@ -982,9 +982,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_VXA2, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_VXA2, + mediumType, + densityCode); return MediaType.VXA2; } @@ -997,9 +997,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_VXA3, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_VXA3, + mediumType, + densityCode); return MediaType.VXA3; } @@ -1019,9 +1019,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_54m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_54m, + mediumType, + densityCode); return MediaType.Exatape54m; } @@ -1029,9 +1029,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DLTtapeIII, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DLTtapeIII, + mediumType, + densityCode); return MediaType.DLTtapeIII; } @@ -1048,9 +1048,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_54m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_54m, + mediumType, + densityCode); return MediaType.Exatape54m; } @@ -1067,9 +1067,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DLTtapeIII, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DLTtapeIII, + mediumType, + densityCode); return MediaType.DLTtapeIII; } @@ -1089,9 +1089,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_80m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_80m, + mediumType, + densityCode); return MediaType.Exatape80m; } @@ -1099,9 +1099,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DLTtapeIIIxt, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DLTtapeIIIxt, + mediumType, + densityCode); return MediaType.DLTtapeIIIxt; } @@ -1118,9 +1118,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_80m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_80m, + mediumType, + densityCode); return MediaType.Exatape80m; } @@ -1135,9 +1135,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DLTtapeIIIxt, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DLTtapeIIIxt, + mediumType, + densityCode); return MediaType.DLTtapeIIIxt; } @@ -1157,9 +1157,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_106m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_106m, + mediumType, + densityCode); return MediaType.Exatape106m; } @@ -1169,9 +1169,9 @@ public static partial class MediaTypeFromDevice model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DLTtapeIV, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DLTtapeIV, + mediumType, + densityCode); return MediaType.DLTtapeIV; } @@ -1179,9 +1179,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("stt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Travan5_stt, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Travan5_stt, + mediumType, + densityCode); return MediaType.Travan5; } @@ -1198,9 +1198,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_106m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_106m, + mediumType, + densityCode); return MediaType.Exatape106m; } @@ -1226,9 +1226,9 @@ public static partial class MediaTypeFromDevice model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_DLTtapeIV, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_DLTtapeIV, + mediumType, + densityCode); return MediaType.DLTtapeIV; } @@ -1241,9 +1241,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("stt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Travan5_stt, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Travan5_stt, + mediumType, + densityCode); return MediaType.Travan5; } @@ -1264,9 +1264,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_160m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_160m, + mediumType, + densityCode); return MediaType.Exatape160mXL; } @@ -1276,9 +1276,9 @@ public static partial class MediaTypeFromDevice model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_SDLT, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_SDLT, + mediumType, + densityCode); return MediaType.SDLT1; } @@ -1291,9 +1291,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_160m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_160m, + mediumType, + densityCode); return MediaType.Exatape160mXL; } @@ -1310,9 +1310,9 @@ public static partial class MediaTypeFromDevice model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_SDLT, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_SDLT, + mediumType, + densityCode); return MediaType.SDLT1; } @@ -1335,9 +1335,9 @@ public static partial class MediaTypeFromDevice model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_SDLT2, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_SDLT2, + mediumType, + densityCode); return MediaType.SDLT2; } @@ -1362,9 +1362,9 @@ public static partial class MediaTypeFromDevice model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_VStape, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_VStape, + mediumType, + densityCode); return MediaType.VStapeI; } @@ -1380,9 +1380,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("stt", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Travan7, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Travan7, + mediumType, + densityCode); return MediaType.Travan7; } @@ -1396,9 +1396,9 @@ public static partial class MediaTypeFromDevice case 0x45: // HP Colorado tapes have a different capacity but return same density code at least in Seagate drives AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Travan4, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Travan4, + mediumType, + densityCode); return MediaType.Travan4; } @@ -1411,9 +1411,9 @@ public static partial class MediaTypeFromDevice { case 0x47: AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Travan5, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Travan5, + mediumType, + densityCode); return MediaType.Travan5; } @@ -1433,9 +1433,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_22m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_22m, + mediumType, + densityCode); return MediaType.Exatape22m; } @@ -1460,9 +1460,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_40m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_40m, + mediumType, + densityCode); return MediaType.Exatape40m; } @@ -1487,9 +1487,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_76m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_76m, + mediumType, + densityCode); return MediaType.Exatape76m; } @@ -1514,9 +1514,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_112m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_112m, + mediumType, + densityCode); return MediaType.Exatape112m; } @@ -1538,9 +1538,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_22m_AME, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_22m_AME, + mediumType, + densityCode); return MediaType.Exatape22mAME; } @@ -1562,9 +1562,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_170m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_170m, + mediumType, + densityCode); return MediaType.Exatape170m; } @@ -1586,9 +1586,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_125m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_125m, + mediumType, + densityCode); return MediaType.Exatape125m; } @@ -1610,9 +1610,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_45m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_45m, + mediumType, + densityCode); return MediaType.Exatape45m; } @@ -1634,9 +1634,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_225m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_225m, + mediumType, + densityCode); return MediaType.Exatape225m; } @@ -1658,9 +1658,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_150m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_150m, + mediumType, + densityCode); return MediaType.Exatape150m; } @@ -1682,9 +1682,9 @@ public static partial class MediaTypeFromDevice if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, - Localization.SCSI_Media_Type_Description_Exatape_75m, - mediumType, - densityCode); + Localization.SCSI_Media_Type_Description_Exatape_75m, + mediumType, + densityCode); return MediaType.Exatape75m; } diff --git a/Aaru.CommonTypes/Structs/Devices/ATA/Identify.cs b/Aaru.CommonTypes/Structs/Devices/ATA/Identify.cs index 3c8f35cfc..96aa447d9 100644 --- a/Aaru.CommonTypes/Structs/Devices/ATA/Identify.cs +++ b/Aaru.CommonTypes/Structs/Devices/ATA/Identify.cs @@ -800,8 +800,7 @@ public static class Identify if(IdentifyDeviceResponse.Length != 512) { - AaruLogging.Debug(MODULE_NAME, - Localization.IDENTIFY_response_is_different_than_512_bytes_not_decoding); + AaruLogging.Debug(MODULE_NAME, Localization.IDENTIFY_response_is_different_than_512_bytes_not_decoding); return null; } @@ -833,8 +832,8 @@ public static class Identify ataId.WWN = DescrambleWWN(ataId.WWN); ataId.WWNExtension = DescrambleWWN(ataId.WWNExtension); - byte[] buf = new byte[512]; - nint ptr = System.Runtime.InteropServices.Marshal.AllocHGlobal(512); + var buf = new byte[512]; + nint ptr = System.Runtime.InteropServices.Marshal.AllocHGlobal(512); System.Runtime.InteropServices.Marshal.StructureToPtr(ataId, ptr, false); System.Runtime.InteropServices.Marshal.Copy(ptr, buf, 0, 512); System.Runtime.InteropServices.Marshal.FreeHGlobal(ptr); @@ -858,7 +857,7 @@ public static class Identify static ulong DescrambleWWN(ulong WWN) { byte[] qwb = BitConverter.GetBytes(WWN); - byte[] qword = new byte[8]; + var qword = new byte[8]; qword[7] = qwb[1]; qword[6] = qwb[0]; @@ -876,7 +875,7 @@ public static class Identify { byte[] outbuf = buffer[offset + length - 1] != 0x00 ? new byte[length + 1] : new byte[length]; - for(int i = 0; i < length; i += 2) + for(var i = 0; i < length; i += 2) { outbuf[i] = buffer[offset + i + 1]; outbuf[i + 1] = buffer[offset + i]; @@ -889,9 +888,9 @@ public static class Identify static byte[] ScrambleATAString(string str, int length) { - byte[] buf = new byte[length]; + var buf = new byte[length]; - for(int i = 0; i < length; i++) buf[i] = 0x20; + for(var i = 0; i < length; i++) buf[i] = 0x20; if(str is null) return buf; @@ -899,13 +898,13 @@ public static class Identify if(bytes.Length % 2 != 0) { - byte[] tmp = new byte[bytes.Length + 1]; + var tmp = new byte[bytes.Length + 1]; tmp[^1] = 0x20; Array.Copy(bytes, 0, tmp, 0, bytes.Length); bytes = tmp; } - for(int i = 0; i < bytes.Length; i += 2) + for(var i = 0; i < bytes.Length; i += 2) { buf[i] = bytes[i + 1]; buf[i + 1] = bytes[i]; diff --git a/Aaru.CommonTypes/Structs/Devices/SCSI/Inquiry.cs b/Aaru.CommonTypes/Structs/Devices/SCSI/Inquiry.cs index 379b50b02..c00213dbb 100644 --- a/Aaru.CommonTypes/Structs/Devices/SCSI/Inquiry.cs +++ b/Aaru.CommonTypes/Structs/Devices/SCSI/Inquiry.cs @@ -38,7 +38,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Linq; using Aaru.Logging; namespace Aaru.CommonTypes.Structs.Devices.SCSI; @@ -276,8 +275,8 @@ public struct Inquiry if(SCSIInquiryResponse.Length < 36 && SCSIInquiryResponse.Length != 5) { AaruLogging.Debug(MODULE_NAME, - Localization.INQUIRY_response_is_0_bytes_less_than_minimum_of_36_bytes, - SCSIInquiryResponse.Length); + Localization.INQUIRY_response_is_0_bytes_less_than_minimum_of_36_bytes, + SCSIInquiryResponse.Length); return null; } @@ -286,10 +285,9 @@ public struct Inquiry SCSIInquiryResponse.Length != SCSIInquiryResponse[4]) { AaruLogging.Debug(MODULE_NAME, - Localization - .INQUIRY_response_length_0_bytes_is_different_than_specified_in_length_field, - SCSIInquiryResponse.Length, - SCSIInquiryResponse[4] + 4); + Localization.INQUIRY_response_length_0_bytes_is_different_than_specified_in_length_field, + SCSIInquiryResponse.Length, + SCSIInquiryResponse[4] + 4); return null; } @@ -477,7 +475,7 @@ public struct Inquiry decoded.VersionDescriptors = new ushort[descriptorsNo]; - for(int i = 0; i < descriptorsNo; i++) + for(var i = 0; i < descriptorsNo; i++) decoded.VersionDescriptors[i] = BitConverter.ToUInt16(SCSIInquiryResponse, 58 + i * 2); } @@ -528,8 +526,8 @@ public struct Inquiry Inquiry decoded = inq.Value; - byte[] buffer = new byte[512]; - byte length = 0; + var buffer = new byte[512]; + byte length = 0; buffer[0] = (byte)(decoded.PeripheralQualifier << 5); buffer[0] += decoded.PeripheralDeviceType; @@ -729,7 +727,7 @@ public struct Inquiry { length = (byte)(58 + decoded.VersionDescriptors.Length * 2); - for(int i = 0; i < decoded.VersionDescriptors.Length; i++) + for(var i = 0; i < decoded.VersionDescriptors.Length; i++) Array.Copy(BitConverter.GetBytes(decoded.VersionDescriptors[i]), 0, buffer, 56 + i * 2, 2); } @@ -758,7 +756,7 @@ public struct Inquiry } buffer[4] = length; - byte[] dest = new byte[length]; + var dest = new byte[length]; Array.Copy(buffer, 0, dest, 0, length); return dest; diff --git a/Aaru.Compression/LZFSE.cs b/Aaru.Compression/LZFSE.cs index e8f3cfc65..97fd9836d 100644 --- a/Aaru.Compression/LZFSE.cs +++ b/Aaru.Compression/LZFSE.cs @@ -52,10 +52,10 @@ public partial class LZFSE public static int DecodeBuffer(byte[] source, byte[] destination) => Native.IsSupported ? (int) AARU_lzfse_decode_buffer(destination, - (nuint)destination.Length, - source, - (nuint)source.Length, - null) + (nuint)destination.Length, + source, + (nuint)source.Length, + null) : 0; /// Compresses a buffer using BZIP2 @@ -65,9 +65,9 @@ public partial class LZFSE public static int EncodeBuffer(byte[] source, byte[] destination) => Native.IsSupported ? (int) AARU_lzfse_encode_buffer(destination, - (nuint)destination.Length, - source, - (nuint)source.Length, - null) + (nuint)destination.Length, + source, + (nuint)source.Length, + null) : 0; } \ No newline at end of file diff --git a/Aaru.Core/Devices/Report/ATA.cs b/Aaru.Core/Devices/Report/ATA.cs index 41f103b27..5a9bc1c7c 100644 --- a/Aaru.Core/Devices/Report/ATA.cs +++ b/Aaru.Core/Devices/Report/ATA.cs @@ -46,7 +46,7 @@ public sealed partial class DeviceReport /// Media report public TestedMedia ReportAtaMedia() { - bool sense = true; + var sense = true; AtaErrorRegistersChs errorChs = new(); AtaErrorRegistersLba28 errorLba = new(); AtaErrorRegistersLba48 errorLba48 = new(); @@ -181,7 +181,7 @@ public sealed partial class DeviceReport mediaTest.Manufacturer = ataId.MediaManufacturer; } - ulong checkCorrectRead = BitConverter.ToUInt64(buffer, 0); + var checkCorrectRead = BitConverter.ToUInt64(buffer, 0); Spectre.ProgressSingleSpinner(ctx => { @@ -193,11 +193,11 @@ public sealed partial class DeviceReport !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadSectorsData = readBuf; @@ -211,11 +211,11 @@ public sealed partial class DeviceReport !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadSectorsRetryData = readBuf; @@ -229,11 +229,11 @@ public sealed partial class DeviceReport !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadDmaData = readBuf; @@ -247,11 +247,11 @@ public sealed partial class DeviceReport !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadDmaRetryData = readBuf; @@ -264,10 +264,10 @@ public sealed partial class DeviceReport mediaTest.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2, - sense, - errorChs.Status, - errorChs.Error); + Localization.Core.Sense_0_Status_1_Error_2, + sense, + errorChs.Status, + errorChs.Error); Spectre.ProgressSingleSpinner(ctx => { @@ -279,11 +279,11 @@ public sealed partial class DeviceReport !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadLbaData = readBuf; @@ -297,11 +297,11 @@ public sealed partial class DeviceReport !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadRetryLbaData = readBuf; @@ -315,11 +315,11 @@ public sealed partial class DeviceReport !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadDmaLbaData = readBuf; @@ -333,11 +333,11 @@ public sealed partial class DeviceReport !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadDmaRetryLbaData = readBuf; @@ -350,10 +350,10 @@ public sealed partial class DeviceReport mediaTest.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2, - sense, - errorChs.Status, - errorChs.Error); + Localization.Core.Sense_0_Status_1_Error_2, + sense, + errorChs.Status, + errorChs.Error); Spectre.ProgressSingleSpinner(ctx => { @@ -365,11 +365,11 @@ public sealed partial class DeviceReport !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadLba48Data = readBuf; @@ -383,11 +383,11 @@ public sealed partial class DeviceReport !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadDmaLba48Data = readBuf; @@ -432,11 +432,11 @@ public sealed partial class DeviceReport BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadLongData = readBuf; @@ -462,11 +462,11 @@ public sealed partial class DeviceReport BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadLongRetryData = readBuf; @@ -490,11 +490,11 @@ public sealed partial class DeviceReport BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadLongLbaData = readBuf; @@ -518,11 +518,11 @@ public sealed partial class DeviceReport BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); mediaTest.ReadLongRetryLbaData = readBuf; } @@ -535,7 +535,7 @@ public sealed partial class DeviceReport /// Creates a report of an ATA device public TestedMedia ReportAta(Identify.IdentifyDevice ataId) { - bool sense = true; + var sense = true; byte[] readBuf = []; AtaErrorRegistersChs errorChs = new(); AtaErrorRegistersLba28 errorLba = new(); @@ -657,11 +657,11 @@ public sealed partial class DeviceReport !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); capabilities.ReadSectorsData = readBuf; @@ -675,11 +675,11 @@ public sealed partial class DeviceReport !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); capabilities.ReadSectorsRetryData = readBuf; @@ -693,11 +693,11 @@ public sealed partial class DeviceReport !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); capabilities.ReadDmaData = readBuf; @@ -711,11 +711,11 @@ public sealed partial class DeviceReport !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); capabilities.ReadDmaRetryData = readBuf; @@ -728,10 +728,10 @@ public sealed partial class DeviceReport capabilities.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2, - sense, - errorChs.Status, - errorChs.Error); + Localization.Core.Sense_0_Status_1_Error_2, + sense, + errorChs.Status, + errorChs.Error); Spectre.ProgressSingleSpinner(ctx => { @@ -743,11 +743,11 @@ public sealed partial class DeviceReport !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorLba.Status, - errorLba.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorLba.Status, + errorLba.Error, + readBuf.Length); capabilities.ReadLbaData = readBuf; @@ -761,11 +761,11 @@ public sealed partial class DeviceReport !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorLba.Status, - errorLba.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorLba.Status, + errorLba.Error, + readBuf.Length); capabilities.ReadRetryLbaData = readBuf; @@ -779,11 +779,11 @@ public sealed partial class DeviceReport !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorLba.Status, - errorLba.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorLba.Status, + errorLba.Error, + readBuf.Length); capabilities.ReadDmaLbaData = readBuf; @@ -797,11 +797,11 @@ public sealed partial class DeviceReport !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorLba.Status, - errorLba.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorLba.Status, + errorLba.Error, + readBuf.Length); capabilities.ReadDmaRetryLbaData = readBuf; @@ -814,10 +814,10 @@ public sealed partial class DeviceReport capabilities.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2, - sense, - errorLba.Status, - errorLba.Error); + Localization.Core.Sense_0_Status_1_Error_2, + sense, + errorLba.Status, + errorLba.Error); Spectre.ProgressSingleSpinner(ctx => { @@ -829,11 +829,11 @@ public sealed partial class DeviceReport !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorLba48.Status, - errorLba48.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorLba48.Status, + errorLba48.Error, + readBuf.Length); capabilities.ReadLba48Data = readBuf; @@ -847,11 +847,11 @@ public sealed partial class DeviceReport !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorLba48.Status, - errorLba48.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorLba48.Status, + errorLba48.Error, + readBuf.Length); capabilities.ReadDmaLba48Data = readBuf; @@ -896,11 +896,11 @@ public sealed partial class DeviceReport BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); capabilities.ReadLongData = readBuf; @@ -926,11 +926,11 @@ public sealed partial class DeviceReport BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorChs.Status, - errorChs.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorChs.Status, + errorChs.Error, + readBuf.Length); capabilities.ReadLongRetryData = readBuf; @@ -954,11 +954,11 @@ public sealed partial class DeviceReport BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorLba.Status, - errorLba.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorLba.Status, + errorLba.Error, + readBuf.Length); capabilities.ReadLongLbaData = readBuf; @@ -982,11 +982,11 @@ public sealed partial class DeviceReport BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead; AaruLogging.Debug(ATA_MODULE_NAME, - Localization.Core.Sense_0_Status_1_Error_2_Length_3, - sense, - errorLba.Status, - errorLba.Error, - readBuf.Length); + Localization.Core.Sense_0_Status_1_Error_2_Length_3, + sense, + errorLba.Status, + errorLba.Error, + readBuf.Length); capabilities.ReadLongRetryLbaData = readBuf; @@ -998,7 +998,7 @@ public sealed partial class DeviceReport /// IDENTIFY ATA DEVICE response without the private fields public static byte[] ClearIdentify(byte[] buffer) { - byte[] empty = new byte[512]; + var empty = new byte[512]; Array.Copy(empty, 0, buffer, 20, 20); Array.Copy(empty, 0, buffer, 216, 8); diff --git a/Aaru.Core/Devices/Scanning/SCSI.cs b/Aaru.Core/Devices/Scanning/SCSI.cs index 745690469..a42b45203 100644 --- a/Aaru.Core/Devices/Scanning/SCSI.cs +++ b/Aaru.Core/Devices/Scanning/SCSI.cs @@ -624,7 +624,8 @@ public sealed partial class MediaScan } if(accumulatedSpeedMs < 100) continue; - currentSpeed = accumulatedSpeedSectors * blockSize / (1048576 * (accumulatedSpeedMs / 1000.0)); + + currentSpeed = accumulatedSpeedSectors * blockSize / (1048576 * (accumulatedSpeedMs / 1000.0)); ScanSpeed?.Invoke(i, currentSpeed * 1024); accumulatedSpeedMs = 0; accumulatedSpeedSectors = 0; diff --git a/Aaru.Core/Media/Detection/MMC.cs b/Aaru.Core/Media/Detection/MMC.cs index 7a6687055..51e6885d9 100644 --- a/Aaru.Core/Media/Detection/MMC.cs +++ b/Aaru.Core/Media/Detection/MMC.cs @@ -66,14 +66,11 @@ public static class MMC const string PS2_JAPANESE_HASH = "b82bffb809070d61fe050b7e1545df53d8f3cc648257cdff7502bc0ba6b38870"; const string MODULE_NAME = "Media detection"; - static readonly byte[] _ps3Id = - "PlayStation3\0\0\0\0"u8.ToArray(); + static readonly byte[] _ps3Id = "PlayStation3\0\0\0\0"u8.ToArray(); - static readonly byte[] _ps4Id = - "PlayStation4\0\0\0\0"u8.ToArray(); + static readonly byte[] _ps4Id = "PlayStation4\0\0\0\0"u8.ToArray(); - static readonly byte[] _ps5Id = - "PlayStation5\0\0\0\0"u8.ToArray(); + static readonly byte[] _ps5Id = "PlayStation5\0\0\0\0"u8.ToArray(); static readonly byte[] _operaId = [0x01, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x01]; diff --git a/Aaru.Core/Sidecar/LinearMedia.cs b/Aaru.Core/Sidecar/LinearMedia.cs index 322cf1f15..39d4b92ef 100644 --- a/Aaru.Core/Sidecar/LinearMedia.cs +++ b/Aaru.Core/Sidecar/LinearMedia.cs @@ -57,17 +57,17 @@ public sealed partial class Sidecar static void LinearMedia(IByteAddressableImage image, Guid filterId, string imagePath, FileInfo fi, PluginRegister plugins, List imgChecksums, ref Metadata sidecar, Encoding encoding) => sidecar.LinearMedias = - [ - new LinearMedia - { - Checksums = imgChecksums, - Image = new Image - { - Format = image.Format, - Offset = 0, - Value = Path.GetFileName(imagePath) - }, - Size = image.Info.Sectors - } - ]; + [ + new LinearMedia + { + Checksums = imgChecksums, + Image = new Image + { + Format = image.Format, + Offset = 0, + Value = Path.GetFileName(imagePath) + }, + Size = image.Info.Sectors + } + ]; } \ No newline at end of file diff --git a/Aaru.Core/Sidecar/Sidecar.cs b/Aaru.Core/Sidecar/Sidecar.cs index 57240b060..74720d8d7 100644 --- a/Aaru.Core/Sidecar/Sidecar.cs +++ b/Aaru.Core/Sidecar/Sidecar.cs @@ -148,7 +148,7 @@ public sealed partial class Sidecar else { AaruLogging.Error(Localization.Core - .The_specified_image_says_it_contains_an_optical_media_but_at_the_same_time_says_it_does_not_support_them); + .The_specified_image_says_it_contains_an_optical_media_but_at_the_same_time_says_it_does_not_support_them); AaruLogging.Error(Localization.Core.Please_open_an_issue_at_Github); } @@ -160,7 +160,7 @@ public sealed partial class Sidecar else { AaruLogging.Error(Localization.Core - .The_specified_image_says_it_contains_a_block_addressable_media_but_at_the_same_time_says_it_does_not_support_them); + .The_specified_image_says_it_contains_a_block_addressable_media_but_at_the_same_time_says_it_does_not_support_them); AaruLogging.Error(Localization.Core.Please_open_an_issue_at_Github); } @@ -181,7 +181,7 @@ public sealed partial class Sidecar else { AaruLogging.Error(Localization.Core - .The_specified_image_says_it_contains_a_byte_addressable_media_but_at_the_same_time_says_it_does_not_support_them); + .The_specified_image_says_it_contains_a_byte_addressable_media_but_at_the_same_time_says_it_does_not_support_them); AaruLogging.Error(Localization.Core.Please_open_an_issue_at_Github); } diff --git a/Aaru.Core/Spectre.cs b/Aaru.Core/Spectre.cs index 8f85a174d..ee5c4ac09 100644 --- a/Aaru.Core/Spectre.cs +++ b/Aaru.Core/Spectre.cs @@ -9,8 +9,8 @@ public static class Spectre /// Initializes a progress bar with a single spinner /// Action to execute in the progress bar public static void ProgressSingleSpinner(Action action) => AnsiConsole.Progress() - .AutoClear(true) - .HideCompleted(true) - .Columns(new TaskDescriptionColumn(), new SpinnerColumn()) - .Start(action); + .AutoClear(true) + .HideCompleted(true) + .Columns(new TaskDescriptionColumn(), new SpinnerColumn()) + .Start(action); } \ No newline at end of file diff --git a/Aaru.Decoders/Bluray/BCA.cs b/Aaru.Decoders/Bluray/BCA.cs index 2cfa4c9ff..932594c92 100644 --- a/Aaru.Decoders/Bluray/BCA.cs +++ b/Aaru.Decoders/Bluray/BCA.cs @@ -88,9 +88,7 @@ public static class BCA if(BCAResponse.Length != 68) { - AaruLogging.Debug(MODULE_NAME, - Localization.Found_incorrect_Blu_ray_BCA_size_0_bytes, - BCAResponse.Length); + AaruLogging.Debug(MODULE_NAME, Localization.Found_incorrect_Blu_ray_BCA_size_0_bytes, BCAResponse.Length); return null; } @@ -125,7 +123,7 @@ public static class BCA #endif sb.AppendLine(Localization.Blu_ray_Burst_Cutting_Area_in_hex_follows); - sb.AppendLine(Markup.Escape(PrintHex.ByteArrayToHexArrayString(response.BCA, color:true))); + sb.AppendLine(Markup.Escape(PrintHex.ByteArrayToHexArrayString(response.BCA, color: true))); return sb.ToString(); } diff --git a/Aaru.Decoders/Bluray/Cartridge.cs b/Aaru.Decoders/Bluray/Cartridge.cs index de6a82cd8..d326db0ea 100644 --- a/Aaru.Decoders/Bluray/Cartridge.cs +++ b/Aaru.Decoders/Bluray/Cartridge.cs @@ -103,8 +103,8 @@ public static class Cartridge if(CSResponse.Length != 8) { AaruLogging.Debug(MODULE_NAME, - Localization.Found_incorrect_Blu_ray_Cartridge_Status_size_0_bytes, - CSResponse.Length); + Localization.Found_incorrect_Blu_ray_Cartridge_Status_size_0_bytes, + CSResponse.Length); return null; } diff --git a/Aaru.Decoders/Bluray/Spare.cs b/Aaru.Decoders/Bluray/Spare.cs index 581e0ff43..5e22516fe 100644 --- a/Aaru.Decoders/Bluray/Spare.cs +++ b/Aaru.Decoders/Bluray/Spare.cs @@ -91,9 +91,8 @@ public static class Spare if(SAIResponse.Length != 16) { AaruLogging.Debug(MODULE_NAME, - Localization - .Spare_Decode_Found_incorrect_Blu_ray_Spare_Area_Information_size_0_bytes, - SAIResponse.Length); + Localization.Spare_Decode_Found_incorrect_Blu_ray_Spare_Area_Information_size_0_bytes, + SAIResponse.Length); return null; } diff --git a/Aaru.Decoders/CD/ATIP.cs b/Aaru.Decoders/CD/ATIP.cs index 389ea7574..94919f3cf 100644 --- a/Aaru.Decoders/CD/ATIP.cs +++ b/Aaru.Decoders/CD/ATIP.cs @@ -68,9 +68,8 @@ public static class ATIP if(CDATIPResponse.Length != 32 && CDATIPResponse.Length != 28) { AaruLogging.Debug(MODULE_NAME, - Localization - .Expected_CD_ATIP_size_32_bytes_is_not_received_size_0_bytes_not_decoding, - CDATIPResponse.Length); + Localization.Expected_CD_ATIP_size_32_bytes_is_not_received_size_0_bytes_not_decoding, + CDATIPResponse.Length); return null; } diff --git a/Aaru.Decoders/CD/CDTextOnLeadIn.cs b/Aaru.Decoders/CD/CDTextOnLeadIn.cs index 78a13a82d..d65e24d33 100644 --- a/Aaru.Decoders/CD/CDTextOnLeadIn.cs +++ b/Aaru.Decoders/CD/CDTextOnLeadIn.cs @@ -119,15 +119,14 @@ public static class CDTextOnLeadIn if(decoded.DataLength + 2 != CDTextResponse.Length) { AaruLogging.Debug(MODULE_NAME, - Localization - .Expected_CD_TEXT_size_0_bytes_is_not_received_size_1_bytes_not_decoding, - decoded.DataLength + 2, - CDTextResponse.Length); + Localization.Expected_CD_TEXT_size_0_bytes_is_not_received_size_1_bytes_not_decoding, + decoded.DataLength + 2, + CDTextResponse.Length); return null; } - for(int i = 0; i < (decoded.DataLength - 2) / 18; i++) + for(var i = 0; i < (decoded.DataLength - 2) / 18; i++) { decoded.DataPacks[i].HeaderID1 = CDTextResponse[0 + i * 18 + 4]; decoded.DataPacks[i].HeaderID2 = CDTextResponse[1 + i * 18 + 4]; diff --git a/Aaru.Decoders/CD/Session.cs b/Aaru.Decoders/CD/Session.cs index fef06daf1..593bf00a0 100644 --- a/Aaru.Decoders/CD/Session.cs +++ b/Aaru.Decoders/CD/Session.cs @@ -72,15 +72,15 @@ public static class Session if(decoded.DataLength + 2 != CDSessionInfoResponse.Length) { AaruLogging.Debug(MODULE_NAME, - Localization - .Expected_CDSessionInfo_size_0_bytes_is_not_received_size_1_bytes_not_decoding, - decoded.DataLength + 2, - CDSessionInfoResponse.Length); + Localization + .Expected_CDSessionInfo_size_0_bytes_is_not_received_size_1_bytes_not_decoding, + decoded.DataLength + 2, + CDSessionInfoResponse.Length); return null; } - for(int i = 0; i < (decoded.DataLength - 2) / 8; i++) + for(var i = 0; i < (decoded.DataLength - 2) / 8; i++) { decoded.TrackDescriptors[i].Reserved1 = CDSessionInfoResponse[0 + i * 8 + 4]; decoded.TrackDescriptors[i].ADR = (byte)((CDSessionInfoResponse[1 + i * 8 + 4] & 0xF0) >> 4); diff --git a/Aaru.Decoders/CD/TOC.cs b/Aaru.Decoders/CD/TOC.cs index c886ceeb9..dd5202777 100644 --- a/Aaru.Decoders/CD/TOC.cs +++ b/Aaru.Decoders/CD/TOC.cs @@ -75,15 +75,14 @@ public static class TOC if(decoded.DataLength + 2 != CDTOCResponse.Length) { AaruLogging.Debug(MODULE_NAME, - Localization - .Expected_CD_TOC_size_0_bytes_is_not_received_size_1_bytes_not_decoding, - decoded.DataLength + 2, - CDTOCResponse.Length); + Localization.Expected_CD_TOC_size_0_bytes_is_not_received_size_1_bytes_not_decoding, + decoded.DataLength + 2, + CDTOCResponse.Length); return null; } - for(int i = 0; i < (decoded.DataLength - 2) / 8; i++) + for(var i = 0; i < (decoded.DataLength - 2) / 8; i++) { decoded.TrackDescriptors[i].Reserved1 = CDTOCResponse[0 + i * 8 + 4]; decoded.TrackDescriptors[i].ADR = (byte)((CDTOCResponse[1 + i * 8 + 4] & 0xF0) >> 4); diff --git a/Aaru.Decoders/Floppy/Apple2.cs b/Aaru.Decoders/Floppy/Apple2.cs index ac76cf550..7d2e5e4d2 100644 --- a/Aaru.Decoders/Floppy/Apple2.cs +++ b/Aaru.Decoders/Floppy/Apple2.cs @@ -158,24 +158,24 @@ public static class Apple2 { if(data is not { Length: 410 }) return null; - byte[] buffer = new byte[data.Length]; - byte carry = 0; + var buffer = new byte[data.Length]; + byte carry = 0; - for(int i = 0; i < data.Length; i++) + for(var i = 0; i < data.Length; i++) { carry ^= ReadTable5and3[data[i]]; buffer[i] = carry; } - byte[] output = new byte[256]; + var output = new byte[256]; - for(int i = 0; i < 51; i++) + for(var i = 0; i < 51; i++) { byte b1 = buffer[51 * 3 - i]; byte b2 = buffer[51 * 2 - i]; byte b3 = buffer[51 - i]; - byte b4 = (byte)(((b1 & 2) << 1 | b2 & 2 | (b3 & 2) >> 1) & 0xFF); - byte b5 = (byte)(((b1 & 1) << 2 | (b2 & 1) << 1 | b3 & 1) & 0xFF); + var b4 = (byte)(((b1 & 2) << 1 | b2 & 2 | (b3 & 2) >> 1) & 0xFF); + var b5 = (byte)(((b1 & 1) << 2 | (b2 & 1) << 1 | b3 & 1) & 0xFF); output[250 - 5 * i] = (byte)((buffer[i + 51 * 3 + 1] << 3 | b1 >> 2 & 0x7) & 0xFF); output[251 - 5 * i] = (byte)((buffer[i + 51 * 4 + 1] << 3 | b2 >> 2 & 0x7) & 0xFF); output[252 - 5 * i] = (byte)((buffer[i + 51 * 5 + 1] << 3 | b3 >> 2 & 0x7) & 0xFF); @@ -194,16 +194,16 @@ public static class Apple2 { if(data is not { Length: 342 }) return null; - byte[] buffer = new byte[data.Length]; - byte carry = 0; + var buffer = new byte[data.Length]; + byte carry = 0; - for(int i = 0; i < data.Length; i++) + for(var i = 0; i < data.Length; i++) { carry ^= ReadTable6and2[data[i]]; buffer[i] = carry; } - byte[] output = new byte[256]; + var output = new byte[256]; for(uint i = 0; i < 256; i++) { @@ -284,39 +284,39 @@ public static class Apple2 }; AaruLogging.Debug(MODULE_NAME, - Localization.Volume_0, - ((sector.addressField.volume[0] & 0x55) << 1 | - sector.addressField.volume[1] & 0x55) & - 0xFF); + Localization.Volume_0, + ((sector.addressField.volume[0] & 0x55) << 1 | + sector.addressField.volume[1] & 0x55) & + 0xFF); AaruLogging.Debug(MODULE_NAME, - Core.Track_0, - ((sector.addressField.track[0] & 0x55) << 1 | - sector.addressField.track[1] & 0x55) & - 0xFF); + Core.Track_0, + ((sector.addressField.track[0] & 0x55) << 1 | + sector.addressField.track[1] & 0x55) & + 0xFF); AaruLogging.Debug(MODULE_NAME, - Localization.Sector_0, - ((sector.addressField.sector[0] & 0x55) << 1 | - sector.addressField.sector[1] & 0x55) & - 0xFF); + Localization.Sector_0, + ((sector.addressField.sector[0] & 0x55) << 1 | + sector.addressField.sector[1] & 0x55) & + 0xFF); AaruLogging.Debug(MODULE_NAME, - Localization.Checksum_0, - ((sector.addressField.checksum[0] & 0x55) << 1 | - sector.addressField.checksum[1] & 0x55) & - 0xFF); + Localization.Checksum_0, + ((sector.addressField.checksum[0] & 0x55) << 1 | + sector.addressField.checksum[1] & 0x55) & + 0xFF); AaruLogging.Debug(MODULE_NAME, - Localization.Epilogue_0_1_2, - sector.addressField.epilogue[0], - sector.addressField.epilogue[1], - sector.addressField.epilogue[2]); + Localization.Epilogue_0_1_2, + sector.addressField.epilogue[0], + sector.addressField.epilogue[1], + sector.addressField.epilogue[2]); position += 14; - int syncCount = 0; - bool onSync = false; - var gaps = new MemoryStream(); + var syncCount = 0; + var onSync = false; + var gaps = new MemoryStream(); while(data[position] == 0xFF) { @@ -358,9 +358,7 @@ public static class Apple2 sector.dataField.data = gaps.ToArray(); - AaruLogging.Debug(MODULE_NAME, - Localization.Data_has_0_bytes, - sector.dataField.data.Length); + AaruLogging.Debug(MODULE_NAME, Localization.Data_has_0_bytes, sector.dataField.data.Length); sector.dataField.checksum = data[position]; sector.dataField.epilogue = new byte[3]; @@ -454,12 +452,12 @@ public static class Apple2 public static RawTrack MarshalTrack(byte[] data, out int endOffset, int offset = 0) { int position = offset; - bool firstSector = true; - bool onSync = false; + var firstSector = true; + var onSync = false; var gaps = new MemoryStream(); - int count = 0; + var count = 0; List sectors = []; - byte[] trackNumber = new byte[2]; + var trackNumber = new byte[2]; endOffset = offset; while(position < data.Length && data[position] == 0xFF) @@ -496,13 +494,11 @@ public static class Apple2 } AaruLogging.Debug(MODULE_NAME, - Localization.Adding_sector_0_of_track_1, - ((sector.addressField.sector[0] & 0x55) << 1 | - sector.addressField.sector[1] & 0x55) & - 0xFF, - ((sector.addressField.track[0] & 0x55) << 1 | - sector.addressField.track[1] & 0x55) & - 0xFF); + Localization.Adding_sector_0_of_track_1, + ((sector.addressField.sector[0] & 0x55) << 1 | sector.addressField.sector[1] & 0x55) & + 0xFF, + ((sector.addressField.track[0] & 0x55) << 1 | sector.addressField.track[1] & 0x55) & + 0xFF); sectors.Add(sector); } diff --git a/Aaru.Decoders/SCSI/Modes/Headers.cs b/Aaru.Decoders/SCSI/Modes/Headers.cs index e32e66185..331016611 100644 --- a/Aaru.Decoders/SCSI/Modes/Headers.cs +++ b/Aaru.Decoders/SCSI/Modes/Headers.cs @@ -119,7 +119,8 @@ public static partial class Modes { if(header.Value.MediumType != MediumTypes.Default) { - sb.AppendFormat($"\t[slateblue1]{Localization.Medium_is_0}[/]", $"[italic][fuchsia]{GetMediumTypeDescription(header.Value.MediumType)}[/][/]") + sb.AppendFormat($"\t[slateblue1]{Localization.Medium_is_0}[/]", + $"[italic][fuchsia]{GetMediumTypeDescription(header.Value.MediumType)}[/][/]") .AppendLine(); } @@ -160,18 +161,20 @@ public static partial class Modes { if(descriptor.Blocks == 0) { - sb.AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_have_0_and_are_1_bytes_each}[/]", - $"[lime]{density}[/]", - $"[lime]{descriptor.BlockLength}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_have_0_and_are_1_bytes_each}[/]", + $"[lime]{density}[/]", + $"[lime]{descriptor.BlockLength}[/]") + .AppendLine(); } else { - sb.AppendFormat($"\t[slateblue1]{Localization._0_blocks_have_1_and_are_2_bytes_each}[/]", - $"[lime]{descriptor.Blocks}[/]", - $"[lime]{density}[/]", - $"[lime{descriptor.BlockLength}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization._0_blocks_have_1_and_are_2_bytes_each}[/]", + $"[lime]{descriptor.Blocks}[/]", + $"[lime]{density}[/]", + $"[lime{descriptor.BlockLength}[/]") + .AppendLine(); } } else if(descriptor.Blocks == 0) @@ -211,11 +214,12 @@ public static partial class Modes break; case 2: sb.AppendLine($"\t[green]{ - Localization.Device_uses_a_write_cache_but_doesn_t_return_until_cache_is_flushed}[/]"); + Localization.Device_uses_a_write_cache_but_doesn_t_return_until_cache_is_flushed}[/]"); break; default: - sb.AppendFormat($"\t[green]{Localization.Unknown_buffered_mode_code_0}[/]", $"[teal]{header.Value.BufferedMode}[/]") + sb.AppendFormat($"\t[green]{Localization.Unknown_buffered_mode_code_0}[/]", + $"[teal]{header.Value.BufferedMode}[/]") .AppendLine(); break; @@ -224,7 +228,8 @@ public static partial class Modes if(header.Value.Speed == 0) sb.AppendLine($"\t[green]{Localization.Device_uses_default_speed}[/]"); else - sb.AppendFormat($"\t[green]{Localization.Device_uses_speed_0}[/]", $"[teal]{header.Value.Speed}[/]").AppendLine(); + sb.AppendFormat($"\t[green]{Localization.Device_uses_speed_0}[/]", $"[teal]{header.Value.Speed}[/]") + .AppendLine(); if(header.Value.WriteProtected) sb.AppendLine($"\t[red]{Localization.Medium_is_write_protected}[/]"); @@ -1086,15 +1091,15 @@ public static partial class Modes if(descriptor.BlockLength == 0) { sb.AppendFormat($"\t[slateblue1]{ - Localization - .All_remaining_blocks_conform_to_0_and_have_a_variable_length}[/]", + Localization + .All_remaining_blocks_conform_to_0_and_have_a_variable_length}[/]", $"[fuchsia]{density}[/]") .AppendLine(); } else { sb.AppendFormat($"\t[slateblue1]{ - Localization.All_remaining_blocks_conform_to_0_and_are_1_bytes_each}[/]", + Localization.All_remaining_blocks_conform_to_0_and_are_1_bytes_each}[/]", $"[fuchsia]{density}[/]", $"[teal]{descriptor.BlockLength}[/]") .AppendLine(); @@ -1102,37 +1107,42 @@ public static partial class Modes } else if(descriptor.BlockLength == 0) { - sb.AppendFormat($"\t[slateblue1]{Localization._0_blocks_conform_to_1_and_have_a_variable_length}[/]", - $"[teal]{descriptor.Blocks}[/]", - $"[fuchsia]{density}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization._0_blocks_conform_to_1_and_have_a_variable_length}[/]", + $"[teal]{descriptor.Blocks}[/]", + $"[fuchsia]{density}[/]") + .AppendLine(); } else { - sb.AppendFormat($"\t[slateblue1]{Localization._0_blocks_conform_to_1_and_are_2_bytes_each}[/]", - $"[teal]{descriptor.Blocks}[/]", - $"[fuchsia]{density}[/]", - $"[teal]{descriptor.BlockLength}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization._0_blocks_conform_to_1_and_are_2_bytes_each}[/]", + $"[teal]{descriptor.Blocks}[/]", + $"[fuchsia]{density}[/]", + $"[teal]{descriptor.BlockLength}[/]") + .AppendLine(); } } else if(descriptor.Blocks == 0) { if(descriptor.BlockLength == 0) { - sb.AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_have_a_variable_length}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_have_a_variable_length}[/]") + .AppendLine(); } else { - sb.AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_are_0_bytes_each}[/]", - $"[teal]{descriptor.BlockLength}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_are_0_bytes_each}[/]", + $"[teal]{descriptor.BlockLength}[/]") + .AppendLine(); } } else if(descriptor.BlockLength == 0) { - sb.AppendFormat($"\t[slateblue1]{Localization._0_blocks_have_a_variable_length}[/]", $"[teal]{descriptor.Blocks}[/]") + sb.AppendFormat($"\t[slateblue1]{Localization._0_blocks_have_a_variable_length}[/]", + $"[teal]{descriptor.Blocks}[/]") .AppendLine(); } else @@ -1165,7 +1175,8 @@ public static partial class Modes break; default: - sb.AppendFormat($"\t[red]{Localization.Unknown_buffered_mode_code_0}[/]", $"[teal]{header.Value.BufferedMode}[/]") + sb.AppendFormat($"\t[red]{Localization.Unknown_buffered_mode_code_0}[/]", + $"[teal]{header.Value.BufferedMode}[/]") .AppendLine(); break; @@ -1215,7 +1226,8 @@ public static partial class Modes break; default: - sb.AppendFormat(Localization.an_unknown_medium_type_0, $"[teal]{(byte)header.Value.MediumType}[/]"); + sb.AppendFormat(Localization.an_unknown_medium_type_0, + $"[teal]{(byte)header.Value.MediumType}[/]"); break; } @@ -1225,7 +1237,8 @@ public static partial class Modes if(header.Value.WriteProtected) sb.AppendLine($"\t[red]{Localization.Medium_is_write_protected}[/]"); - if(header.Value.EBC) sb.AppendLine($"\t[green]{Localization.Blank_checking_during_write_is_enabled}[/]"); + if(header.Value.EBC) + sb.AppendLine($"\t[green]{Localization.Blank_checking_during_write_is_enabled}[/]"); if(header.Value.DPOFUA) sb.AppendLine($"\t[green]{Localization.Drive_supports_DPO_and_FUA_bits}[/]"); @@ -1288,24 +1301,26 @@ public static partial class Modes if(descriptor.BlockLength == 0) { sb.AppendFormat($"\t[slateblue1]{ - Localization.All_remaining_blocks_are_0_and_have_a_variable_length}[/]", + Localization.All_remaining_blocks_are_0_and_have_a_variable_length}[/]", $"[fuchsia]{density}[/]") .AppendLine(); } else { - sb.AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_are_0_and_are_1_bytes_each}[/]", - $"[fuchsia]{density}[/]", - $"[teal]{descriptor.BlockLength}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_are_0_and_are_1_bytes_each}[/]", + $"[fuchsia]{density}[/]", + $"[teal]{descriptor.BlockLength}[/]") + .AppendLine(); } } else if(descriptor.BlockLength == 0) { - sb.AppendFormat($"\t[slateblue1]{Localization._0_blocks_are_1_and_have_a_variable_length}[/]", - $"[teal]{descriptor.Blocks}[/]", - $"[fuchsia]{density}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization._0_blocks_are_1_and_have_a_variable_length}[/]", + $"[teal]{descriptor.Blocks}[/]", + $"[fuchsia]{density}[/]") + .AppendLine(); } else { @@ -1320,19 +1335,22 @@ public static partial class Modes { if(descriptor.BlockLength == 0) { - sb.AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_have_a_variable_length}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_have_a_variable_length}[/]") + .AppendLine(); } else { - sb.AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_are_0_bytes_each}[/]", - $"[teal]{descriptor.BlockLength}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_are_0_bytes_each}[/]", + $"[teal]{descriptor.BlockLength}[/]") + .AppendLine(); } } else if(descriptor.BlockLength == 0) { - sb.AppendFormat($"\t[slateblue1]{Localization._0_blocks_have_a_variable_length}[/]", $"[teal]{descriptor.Blocks}[/]") + sb.AppendFormat($"\t[slateblue1]{Localization._0_blocks_have_a_variable_length}[/]", + $"[teal]{descriptor.Blocks}[/]") .AppendLine(); } else @@ -1503,7 +1521,8 @@ public static partial class Modes break; default: - sb.AppendFormat(Localization.Unknown_medium_type_0, $"[teal]{(byte)header.Value.MediumType}[/]"); + sb.AppendFormat(Localization.Unknown_medium_type_0, + $"[teal]{(byte)header.Value.MediumType}[/]"); break; } @@ -1567,18 +1586,20 @@ public static partial class Modes { if(descriptor.Blocks == 0) { - sb.AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_have_0_and_are_1_bytes_each}[/]", - $"[fuchsia]{density}[/]", - $"[teal]{descriptor.BlockLength}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization.All_remaining_blocks_have_0_and_are_1_bytes_each}[/]", + $"[fuchsia]{density}[/]", + $"[teal]{descriptor.BlockLength}[/]") + .AppendLine(); } else { - sb.AppendFormat($"\t[slateblue1]{Localization._0_blocks_have_1_and_are_2_bytes_each}[/]", - $"[teal]{descriptor.Blocks}[/]", - $"[fuchsia]{density}[/]", - $"[teal]{descriptor.BlockLength}[/]") - .AppendLine(); + sb + .AppendFormat($"\t[slateblue1]{Localization._0_blocks_have_1_and_are_2_bytes_each}[/]", + $"[teal]{descriptor.Blocks}[/]", + $"[fuchsia]{density}[/]", + $"[teal]{descriptor.BlockLength}[/]") + .AppendLine(); } } else if(descriptor.Blocks == 0) diff --git a/Aaru.Decoders/Sega/Dreamcast.cs b/Aaru.Decoders/Sega/Dreamcast.cs index 2977a2af0..fa4f7df53 100644 --- a/Aaru.Decoders/Sega/Dreamcast.cs +++ b/Aaru.Decoders/Sega/Dreamcast.cs @@ -59,61 +59,55 @@ public static class Dreamcast IPBin ipbin = Marshal.ByteArrayToStructureLittleEndian(ipbin_sector); - AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.maker_id = \"{0}\"", - Encoding.ASCII.GetString(ipbin.maker_id)); + AaruLogging.Debug(MODULE_NAME, "dreamcast_ipbin.maker_id = \"{0}\"", Encoding.ASCII.GetString(ipbin.maker_id)); AaruLogging.Debug(MODULE_NAME, "dreamcast_ipbin.spare_space1 = \"{0}\"", (char)ipbin.spare_space1); AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.dreamcast_media = \"{0}\"", - Encoding.ASCII.GetString(ipbin.dreamcast_media)); + "dreamcast_ipbin.dreamcast_media = \"{0}\"", + Encoding.ASCII.GetString(ipbin.dreamcast_media)); AaruLogging.Debug(MODULE_NAME, "dreamcast_ipbin.disc_no = {0}", (char)ipbin.disc_no); - AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.disc_no_separator = \"{0}\"", - (char)ipbin.disc_no_separator); + AaruLogging.Debug(MODULE_NAME, "dreamcast_ipbin.disc_no_separator = \"{0}\"", (char)ipbin.disc_no_separator); AaruLogging.Debug(MODULE_NAME, "dreamcast_ipbin.disc_total_nos = \"{0}\"", (char)ipbin.disc_total_nos); AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.spare_space2 = \"{0}\"", - Encoding.ASCII.GetString(ipbin.spare_space2)); + "dreamcast_ipbin.spare_space2 = \"{0}\"", + Encoding.ASCII.GetString(ipbin.spare_space2)); AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.region_codes = \"{0}\"", - Encoding.ASCII.GetString(ipbin.region_codes)); + "dreamcast_ipbin.region_codes = \"{0}\"", + Encoding.ASCII.GetString(ipbin.region_codes)); AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.peripherals = \"{0}\"", - Encoding.ASCII.GetString(ipbin.peripherals)); + "dreamcast_ipbin.peripherals = \"{0}\"", + Encoding.ASCII.GetString(ipbin.peripherals)); AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.product_no = \"{0}\"", - Encoding.ASCII.GetString(ipbin.product_no)); + "dreamcast_ipbin.product_no = \"{0}\"", + Encoding.ASCII.GetString(ipbin.product_no)); AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.product_version = \"{0}\"", - Encoding.ASCII.GetString(ipbin.product_version)); + "dreamcast_ipbin.product_version = \"{0}\"", + Encoding.ASCII.GetString(ipbin.product_version)); AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.release_date = \"{0}\"", - Encoding.ASCII.GetString(ipbin.release_date)); + "dreamcast_ipbin.release_date = \"{0}\"", + Encoding.ASCII.GetString(ipbin.release_date)); AaruLogging.Debug(MODULE_NAME, "dreamcast_ipbin.spare_space3 = \"{0}\"", (char)ipbin.spare_space3); AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.boot_filename = \"{0}\"", - Encoding.ASCII.GetString(ipbin.boot_filename)); + "dreamcast_ipbin.boot_filename = \"{0}\"", + Encoding.ASCII.GetString(ipbin.boot_filename)); + + AaruLogging.Debug(MODULE_NAME, "dreamcast_ipbin.producer = \"{0}\"", Encoding.ASCII.GetString(ipbin.producer)); AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.producer = \"{0}\"", - Encoding.ASCII.GetString(ipbin.producer)); - - AaruLogging.Debug(MODULE_NAME, - "dreamcast_ipbin.product_name = \"{0}\"", - Encoding.ASCII.GetString(ipbin.product_name)); + "dreamcast_ipbin.product_name = \"{0}\"", + Encoding.ASCII.GetString(ipbin.product_name)); return Encoding.ASCII.GetString(ipbin.SegaHardwareID) == "SEGA SEGAKATANA " ? ipbin : null; } @@ -199,7 +193,7 @@ public static class Dreamcast } } - int iPeripherals = int.Parse(Encoding.ASCII.GetString(ipbin.peripherals), NumberStyles.HexNumber); + var iPeripherals = int.Parse(Encoding.ASCII.GetString(ipbin.peripherals), NumberStyles.HexNumber); if((iPeripherals & 0x00000001) == 0x00000001) IPBinInformation.AppendLine(Localization.Game_uses_Windows_CE); diff --git a/Aaru.Decoders/Sega/Saturn.cs b/Aaru.Decoders/Sega/Saturn.cs index 992ab0bcb..a00e9e26c 100644 --- a/Aaru.Decoders/Sega/Saturn.cs +++ b/Aaru.Decoders/Sega/Saturn.cs @@ -59,53 +59,47 @@ public static class Saturn IPBin ipbin = Marshal.ByteArrayToStructureLittleEndian(ipbin_sector); - AaruLogging.Debug(MODULE_NAME, - "saturn_ipbin.maker_id = \"{0}\"", - Encoding.ASCII.GetString(ipbin.maker_id)); + AaruLogging.Debug(MODULE_NAME, "saturn_ipbin.maker_id = \"{0}\"", Encoding.ASCII.GetString(ipbin.maker_id)); + + AaruLogging.Debug(MODULE_NAME, "saturn_ipbin.product_no = \"{0}\"", Encoding.ASCII.GetString(ipbin.product_no)); AaruLogging.Debug(MODULE_NAME, - "saturn_ipbin.product_no = \"{0}\"", - Encoding.ASCII.GetString(ipbin.product_no)); + "saturn_ipbin.product_version = \"{0}\"", + Encoding.ASCII.GetString(ipbin.product_version)); AaruLogging.Debug(MODULE_NAME, - "saturn_ipbin.product_version = \"{0}\"", - Encoding.ASCII.GetString(ipbin.product_version)); + "saturn_ipbin.release_date = \"{0}\"", + Encoding.ASCII.GetString(ipbin.release_date)); AaruLogging.Debug(MODULE_NAME, - "saturn_ipbin.release_date = \"{0}\"", - Encoding.ASCII.GetString(ipbin.release_date)); - - AaruLogging.Debug(MODULE_NAME, - "saturn_ipbin.saturn_media = \"{0}\"", - Encoding.ASCII.GetString(ipbin.saturn_media)); + "saturn_ipbin.saturn_media = \"{0}\"", + Encoding.ASCII.GetString(ipbin.saturn_media)); AaruLogging.Debug(MODULE_NAME, "saturn_ipbin.disc_no = {0}", (char)ipbin.disc_no); - AaruLogging.Debug(MODULE_NAME, - "saturn_ipbin.disc_no_separator = \"{0}\"", - (char)ipbin.disc_no_separator); + AaruLogging.Debug(MODULE_NAME, "saturn_ipbin.disc_no_separator = \"{0}\"", (char)ipbin.disc_no_separator); AaruLogging.Debug(MODULE_NAME, "saturn_ipbin.disc_total_nos = {0}", (char)ipbin.disc_total_nos); AaruLogging.Debug(MODULE_NAME, - "saturn_ipbin.release_date = \"{0}\"", - Encoding.ASCII.GetString(ipbin.release_date)); + "saturn_ipbin.release_date = \"{0}\"", + Encoding.ASCII.GetString(ipbin.release_date)); AaruLogging.Debug(MODULE_NAME, - "saturn_ipbin.spare_space1 = \"{0}\"", - Encoding.ASCII.GetString(ipbin.spare_space1)); + "saturn_ipbin.spare_space1 = \"{0}\"", + Encoding.ASCII.GetString(ipbin.spare_space1)); AaruLogging.Debug(MODULE_NAME, - "saturn_ipbin.region_codes = \"{0}\"", - Encoding.ASCII.GetString(ipbin.region_codes)); + "saturn_ipbin.region_codes = \"{0}\"", + Encoding.ASCII.GetString(ipbin.region_codes)); AaruLogging.Debug(MODULE_NAME, - "saturn_ipbin.peripherals = \"{0}\"", - Encoding.ASCII.GetString(ipbin.peripherals)); + "saturn_ipbin.peripherals = \"{0}\"", + Encoding.ASCII.GetString(ipbin.peripherals)); AaruLogging.Debug(MODULE_NAME, - "saturn_ipbin.product_name = \"{0}\"", - Encoding.ASCII.GetString(ipbin.product_name)); + "saturn_ipbin.product_name = \"{0}\"", + Encoding.ASCII.GetString(ipbin.product_name)); return Encoding.ASCII.GetString(ipbin.SegaHardwareID) == "SEGA SEGASATURN " ? ipbin : null; } diff --git a/Aaru.Devices/Device/MmcCommands/MMC.cs b/Aaru.Devices/Device/MmcCommands/MMC.cs index 120480810..e9db3d274 100644 --- a/Aaru.Devices/Device/MmcCommands/MMC.cs +++ b/Aaru.Devices/Device/MmcCommands/MMC.cs @@ -206,7 +206,7 @@ public partial class Device public bool Read(out byte[] buffer, out uint[] response, uint lba, uint blockSize, ushort transferLength, bool byteAddressed, uint timeout, out double duration) { - bool sense = true; + var sense = true; buffer = null; response = null; duration = -1; @@ -320,10 +320,10 @@ public partial class Device Error = LastError != 0; AaruLogging.Debug(MMC_MODULE_NAME, - transferLength > 1 - ? Localization.READ_MULTIPLE_BLOCK_took_0_ms - : Localization.READ_SINGLE_BLOCK_took_0_ms, - duration); + transferLength > 1 + ? Localization.READ_MULTIPLE_BLOCK_took_0_ms + : Localization.READ_SINGLE_BLOCK_took_0_ms, + duration); return sense; } @@ -342,9 +342,9 @@ public partial class Device ushort transferLength, bool byteAddressed, uint timeout, out double duration) { buffer = new byte[transferLength * blockSize]; - byte[] blockBuffer = new byte[blockSize]; + var blockBuffer = new byte[blockSize]; duration = 0; - bool sense = true; + var sense = true; response = null; for(uint i = 0; i < transferLength; i++) diff --git a/Aaru.Filesystems/ISO9660/PathTable.cs b/Aaru.Filesystems/ISO9660/PathTable.cs index 1a6dbbdbc..f826b2352 100644 --- a/Aaru.Filesystems/ISO9660/PathTable.cs +++ b/Aaru.Filesystems/ISO9660/PathTable.cs @@ -53,9 +53,7 @@ public sealed partial class ISO9660 while(off < data.Length) { - entry = Marshal.ByteArrayToStructureBigEndian(data, - off, - Marshal.SizeOf()); + entry = Marshal.ByteArrayToStructureBigEndian(data, off, Marshal.SizeOf()); if(entry.name_len == 0) break; @@ -91,8 +89,10 @@ public sealed partial class ISO9660 { HighSierraPathTableEntry entry = Marshal.ByteArrayToStructureBigEndian(data, - off, - Marshal.SizeOf()); + off, + Marshal + .SizeOf< + HighSierraPathTableEntry>()); if(entry.name_len == 0) break; diff --git a/Aaru.Filesystems/QNX4/Consts.cs b/Aaru.Filesystems/QNX4/Consts.cs index 0506f7552..46ba9143c 100644 --- a/Aaru.Filesystems/QNX4/Consts.cs +++ b/Aaru.Filesystems/QNX4/Consts.cs @@ -35,7 +35,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "UnusedType.Local")] public sealed partial class QNX4 { - const string FS_TYPE = "qnx4"; - readonly byte[] _rootDirFname = - "/\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"u8.ToArray(); + const string FS_TYPE = "qnx4"; + readonly byte[] _rootDirFname = "/\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"u8.ToArray(); } \ No newline at end of file diff --git a/Aaru.Filesystems/Reiser4/Consts.cs b/Aaru.Filesystems/Reiser4/Consts.cs index 0fdc5fbf1..aeaab9042 100644 --- a/Aaru.Filesystems/Reiser4/Consts.cs +++ b/Aaru.Filesystems/Reiser4/Consts.cs @@ -36,6 +36,5 @@ public sealed partial class Reiser4 const string FS_TYPE = "reiser4"; - readonly byte[] _magic = - "ReIsEr4\0\0\0\0\0\0\0\0\0"u8.ToArray(); + readonly byte[] _magic = "ReIsEr4\0\0\0\0\0\0\0\0\0"u8.ToArray(); } \ No newline at end of file diff --git a/Aaru.Filesystems/UDF/Consts.cs b/Aaru.Filesystems/UDF/Consts.cs index 2b9acf00c..2bf4b5e87 100644 --- a/Aaru.Filesystems/UDF/Consts.cs +++ b/Aaru.Filesystems/UDF/Consts.cs @@ -36,7 +36,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "UnusedMember.Local")] public sealed partial class UDF { - const string FS_TYPE = "udf"; - readonly byte[] _magic = - "*OSTA UDF Compliant\0\0\0\0"u8.ToArray(); + const string FS_TYPE = "udf"; + readonly byte[] _magic = "*OSTA UDF Compliant\0\0\0\0"u8.ToArray(); } \ No newline at end of file diff --git a/Aaru.Helpers/DateHandlers.cs b/Aaru.Helpers/DateHandlers.cs index 151590d1a..4fe4f052d 100644 --- a/Aaru.Helpers/DateHandlers.cs +++ b/Aaru.Helpers/DateHandlers.cs @@ -91,7 +91,7 @@ public static class DateHandlers /// .NET DateTime public static DateTime HighSierraToDateTime(byte[] vdDateTime) { - byte[] isoTime = new byte[17]; + var isoTime = new byte[17]; Array.Copy(vdDateTime, 0, isoTime, 0, 16); return Iso9660ToDateTime(isoTime); @@ -103,8 +103,8 @@ public static class DateHandlers /// .NET DateTime public static DateTime Iso9660ToDateTime(byte[] vdDateTime) { - byte[] twoCharValue = new byte[2]; - byte[] fourCharValue = new byte[4]; + var twoCharValue = new byte[2]; + var fourCharValue = new byte[4]; fourCharValue[0] = vdDateTime[0]; fourCharValue[1] = vdDateTime[1]; @@ -112,8 +112,8 @@ public static class DateHandlers fourCharValue[3] = vdDateTime[3]; AaruLogging.Debug(ISO9660_MODULE_NAME, - "year = \"{0}\"", - StringHandlers.CToString(fourCharValue, Encoding.ASCII)); + "year = \"{0}\"", + StringHandlers.CToString(fourCharValue, Encoding.ASCII)); if(!int.TryParse(StringHandlers.CToString(fourCharValue, Encoding.ASCII), out int year)) year = 0; @@ -121,17 +121,15 @@ public static class DateHandlers twoCharValue[1] = vdDateTime[5]; AaruLogging.Debug(ISO9660_MODULE_NAME, - "month = \"{0}\"", - StringHandlers.CToString(twoCharValue, Encoding.ASCII)); + "month = \"{0}\"", + StringHandlers.CToString(twoCharValue, Encoding.ASCII)); if(!int.TryParse(StringHandlers.CToString(twoCharValue, Encoding.ASCII), out int month)) month = 0; twoCharValue[0] = vdDateTime[6]; twoCharValue[1] = vdDateTime[7]; - AaruLogging.Debug(ISO9660_MODULE_NAME, - "day = \"{0}\"", - StringHandlers.CToString(twoCharValue, Encoding.ASCII)); + AaruLogging.Debug(ISO9660_MODULE_NAME, "day = \"{0}\"", StringHandlers.CToString(twoCharValue, Encoding.ASCII)); if(!int.TryParse(StringHandlers.CToString(twoCharValue, Encoding.ASCII), out int day)) day = 0; @@ -139,8 +137,8 @@ public static class DateHandlers twoCharValue[1] = vdDateTime[9]; AaruLogging.Debug(ISO9660_MODULE_NAME, - "hour = \"{0}\"", - StringHandlers.CToString(twoCharValue, Encoding.ASCII)); + "hour = \"{0}\"", + StringHandlers.CToString(twoCharValue, Encoding.ASCII)); if(!int.TryParse(StringHandlers.CToString(twoCharValue, Encoding.ASCII), out int hour)) hour = 0; @@ -148,8 +146,8 @@ public static class DateHandlers twoCharValue[1] = vdDateTime[11]; AaruLogging.Debug(ISO9660_MODULE_NAME, - "minute = \"{0}\"", - StringHandlers.CToString(twoCharValue, Encoding.ASCII)); + "minute = \"{0}\"", + StringHandlers.CToString(twoCharValue, Encoding.ASCII)); if(!int.TryParse(StringHandlers.CToString(twoCharValue, Encoding.ASCII), out int minute)) minute = 0; @@ -157,8 +155,8 @@ public static class DateHandlers twoCharValue[1] = vdDateTime[13]; AaruLogging.Debug(ISO9660_MODULE_NAME, - "second = \"{0}\"", - StringHandlers.CToString(twoCharValue, Encoding.ASCII)); + "second = \"{0}\"", + StringHandlers.CToString(twoCharValue, Encoding.ASCII)); if(!int.TryParse(StringHandlers.CToString(twoCharValue, Encoding.ASCII), out int second)) second = 0; @@ -166,22 +164,22 @@ public static class DateHandlers twoCharValue[1] = vdDateTime[15]; AaruLogging.Debug(ISO9660_MODULE_NAME, - "hundredths = \"{0}\"", - StringHandlers.CToString(twoCharValue, Encoding.ASCII)); + "hundredths = \"{0}\"", + StringHandlers.CToString(twoCharValue, Encoding.ASCII)); if(!int.TryParse(StringHandlers.CToString(twoCharValue, Encoding.ASCII), out int hundredths)) hundredths = 0; AaruLogging.Debug(ISO9660_MODULE_NAME, - "decodedDT = new DateTime({0}, {1}, {2}, {3}, {4}, {5}, {6}, DateTimeKind.Unspecified);", - year, - month, - day, - hour, - minute, - second, - hundredths * 10); + "decodedDT = new DateTime({0}, {1}, {2}, {3}, {4}, {5}, {6}, DateTimeKind.Unspecified);", + year, + month, + day, + hour, + minute, + second, + hundredths * 10); - sbyte difference = (sbyte)vdDateTime[16]; + var difference = (sbyte)vdDateTime[16]; var decodedDt = new DateTime(year, month, day, hour, minute, second, hundredths * 10, DateTimeKind.Utc); @@ -222,11 +220,11 @@ public static class DateHandlers int month = dateRecord & 0x000F; AaruLogging.Debug(PASCAL_MODULE_NAME, - "dateRecord = 0x{0:X4}, year = {1}, month = {2}, day = {3}", - dateRecord, - year, - month, - day); + "dateRecord = 0x{0:X4}, year = {1}, month = {2}, day = {3}", + dateRecord, + year, + month, + day); return new DateTime(year, month, day); } @@ -245,18 +243,18 @@ public static class DateHandlers int second = (time & 0x1F) * 2; AaruLogging.Debug(DOS_MODULE_NAME, - "date = 0x{0:X4}, year = {1}, month = {2}, day = {3}", - date, - year, - month, - day); + "date = 0x{0:X4}, year = {1}, month = {2}, day = {3}", + date, + year, + month, + day); AaruLogging.Debug(DOS_MODULE_NAME, - "time = 0x{0:X4}, hour = {1}, minute = {2}, second = {3}", - time, - hour, - minute, - second); + "time = 0x{0:X4}, hour = {1}, minute = {2}, second = {3}", + time, + hour, + minute, + second); DateTime dosDate; @@ -277,9 +275,9 @@ public static class DateHandlers /// .NET DateTime public static DateTime CpmToDateTime(byte[] timestamp) { - ushort days = BitConverter.ToUInt16(timestamp, 0); - int hours = timestamp[2]; - int minutes = timestamp[3]; + var days = BitConverter.ToUInt16(timestamp, 0); + int hours = timestamp[2]; + int minutes = timestamp[3]; DateTime temp = _amigaEpoch.AddDays(days); temp = temp.AddHours(hours); @@ -304,15 +302,15 @@ public static class DateHandlers byte minute, byte second, byte centiseconds, byte hundredsOfMicroseconds, byte microseconds) { - byte specification = (byte)((typeAndTimeZone & 0xF000) >> 12); + var specification = (byte)((typeAndTimeZone & 0xF000) >> 12); long ticks = (long)centiseconds * 100000 + (long)hundredsOfMicroseconds * 1000 + (long)microseconds * 10; if(specification == 0) return new DateTime(year, month, day, hour, minute, second, DateTimeKind.Utc).AddTicks(ticks); - ushort preOffset = (ushort)(typeAndTimeZone & 0xFFF); - short offset; + var preOffset = (ushort)(typeAndTimeZone & 0xFFF); + short offset; if((preOffset & 0x800) == 0x800) offset = (short)(preOffset | 0xF000); diff --git a/Aaru.Images/D88/Identify.cs b/Aaru.Images/D88/Identify.cs index d62494b35..cbd1943e4 100644 --- a/Aaru.Images/D88/Identify.cs +++ b/Aaru.Images/D88/Identify.cs @@ -54,16 +54,14 @@ public sealed partial class D88 if(stream.Length < Marshal.SizeOf
()) return false; - byte[] hdrB = new byte[Marshal.SizeOf
()]; + var hdrB = new byte[Marshal.SizeOf
()]; stream.EnsureRead(hdrB, 0, hdrB.Length); Header hdr = Marshal.ByteArrayToStructureLittleEndian
(hdrB); AaruLogging.Debug(MODULE_NAME, "d88hdr.name = \"{0}\"", StringHandlers.CToString(hdr.name, shiftjis)); - AaruLogging.Debug(MODULE_NAME, - "d88hdr.reserved is empty? = {0}", - hdr.reserved.SequenceEqual(_reservedEmpty)); + AaruLogging.Debug(MODULE_NAME, "d88hdr.reserved is empty? = {0}", hdr.reserved.SequenceEqual(_reservedEmpty)); AaruLogging.Debug(MODULE_NAME, "d88hdr.write_protect = 0x{0:X2}", hdr.write_protect); @@ -77,7 +75,7 @@ public sealed partial class D88 if(!hdr.reserved.SequenceEqual(_reservedEmpty)) return false; - int counter = 0; + var counter = 0; foreach(int t in hdr.track_table) { diff --git a/Aaru.Images/DiskCopy42/Identify.cs b/Aaru.Images/DiskCopy42/Identify.cs index 329133995..12acd8412 100644 --- a/Aaru.Images/DiskCopy42/Identify.cs +++ b/Aaru.Images/DiskCopy42/Identify.cs @@ -48,8 +48,8 @@ public sealed partial class DiskCopy42 { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); - byte[] buffer = new byte[0x58]; - byte[] pString = new byte[64]; + var buffer = new byte[0x58]; + var pString = new byte[64]; stream.EnsureRead(buffer, 0, 0x58); // Incorrect pascal string length, not DC42 @@ -103,9 +103,7 @@ public sealed partial class DiskCopy42 tmpHeader.Format != kSigmaFormatTwiggy && tmpHeader.Format != kNotStandardFormat) { - AaruLogging.Debug(MODULE_NAME, - Localization.Unknown_tmp_header_format_equals_0_value, - tmpHeader.Format); + AaruLogging.Debug(MODULE_NAME, Localization.Unknown_tmp_header_format_equals_0_value, tmpHeader.Format); return false; } @@ -119,9 +117,7 @@ public sealed partial class DiskCopy42 tmpHeader.FmtByte != kFmtNotStandard && tmpHeader.FmtByte != kMacOSXFmtByte) { - AaruLogging.Debug(MODULE_NAME, - Localization.Unknown_tmp_header_fmtByte_equals_0_value, - tmpHeader.FmtByte); + AaruLogging.Debug(MODULE_NAME, Localization.Unknown_tmp_header_fmtByte_equals_0_value, tmpHeader.FmtByte); return false; } diff --git a/Aaru.Images/DiskDupe/Helpers.cs b/Aaru.Images/DiskDupe/Helpers.cs index 46815d121..d8c4dbb6c 100644 --- a/Aaru.Images/DiskDupe/Helpers.cs +++ b/Aaru.Images/DiskDupe/Helpers.cs @@ -42,7 +42,7 @@ public sealed partial class DiskDupe { bool TryReadHeader(Stream stream, ref FileHeader fhdr, ref TrackInfo[] tmap, ref long[] toffsets) { - byte[] buffer = new byte[6]; + var buffer = new byte[6]; FileHeader fHeader; stream.Seek(0, SeekOrigin.Begin); @@ -62,19 +62,19 @@ public sealed partial class DiskDupe // seek to start of the trackmap stream.Seek(TRACKMAP_OFFSET, SeekOrigin.Begin); - int numTracks = _diskTypes[fHeader.diskType].cyl * _diskTypes[fHeader.diskType].hd; - int trackLen = 512 * _diskTypes[fHeader.diskType].spt; // the length of a single track, in bytes - var trackMap = new TrackInfo[numTracks]; - long[] trackOffsets = new long[numTracks]; + int numTracks = _diskTypes[fHeader.diskType].cyl * _diskTypes[fHeader.diskType].hd; + int trackLen = 512 * _diskTypes[fHeader.diskType].spt; // the length of a single track, in bytes + var trackMap = new TrackInfo[numTracks]; + var trackOffsets = new long[numTracks]; AaruLogging.Debug(MODULE_NAME, - Localization.Identified_image_with_CHS_equals_0_1_2, - _diskTypes[fHeader.diskType].cyl, - _diskTypes[fHeader.diskType].hd, - _diskTypes[fHeader.diskType].spt); + Localization.Identified_image_with_CHS_equals_0_1_2, + _diskTypes[fHeader.diskType].cyl, + _diskTypes[fHeader.diskType].hd, + _diskTypes[fHeader.diskType].spt); // read the trackmap and store the track offsets - for(int i = 0; i < numTracks; i++) + for(var i = 0; i < numTracks; i++) { stream.EnsureRead(buffer, 0, 6); trackMap[i] = Marshal.ByteArrayToStructureLittleEndian(buffer); diff --git a/Aaru.Images/NHDr0/Constants.cs b/Aaru.Images/NHDr0/Constants.cs index a24a8810e..0db7a42fe 100644 --- a/Aaru.Images/NHDr0/Constants.cs +++ b/Aaru.Images/NHDr0/Constants.cs @@ -34,6 +34,5 @@ namespace Aaru.Images; public sealed partial class Nhdr0 { - readonly byte[] _signature = - "T98HDDIMAGE.R0\0"u8.ToArray(); + readonly byte[] _signature = "T98HDDIMAGE.R0\0"u8.ToArray(); } \ No newline at end of file diff --git a/Aaru.Images/NHDr0/Identify.cs b/Aaru.Images/NHDr0/Identify.cs index 7aeabf295..99432bdc5 100644 --- a/Aaru.Images/NHDr0/Identify.cs +++ b/Aaru.Images/NHDr0/Identify.cs @@ -54,7 +54,7 @@ public sealed partial class Nhdr0 if(stream.Length < Marshal.SizeOf
()) return false; - byte[] hdrB = new byte[Marshal.SizeOf
()]; + var hdrB = new byte[Marshal.SizeOf
()]; stream.EnsureRead(hdrB, 0, hdrB.Length); _nhdhdr = Marshal.ByteArrayToStructureLittleEndian
(hdrB); @@ -62,14 +62,14 @@ public sealed partial class Nhdr0 if(!_nhdhdr.szFileID.SequenceEqual(_signature)) return false; AaruLogging.Debug(MODULE_NAME, - "nhdhdr.szFileID = \"{0}\"", - StringHandlers.CToString(_nhdhdr.szFileID, shiftjis)); + "nhdhdr.szFileID = \"{0}\"", + StringHandlers.CToString(_nhdhdr.szFileID, shiftjis)); AaruLogging.Debug(MODULE_NAME, "nhdhdr.reserved1 = {0}", _nhdhdr.reserved1); AaruLogging.Debug(MODULE_NAME, - "nhdhdr.szComment = \"{0}\"", - StringHandlers.CToString(_nhdhdr.szComment, shiftjis)); + "nhdhdr.szComment = \"{0}\"", + StringHandlers.CToString(_nhdhdr.szComment, shiftjis)); AaruLogging.Debug(MODULE_NAME, "nhdhdr.dwHeadSize = {0}", _nhdhdr.dwHeadSize); AaruLogging.Debug(MODULE_NAME, "nhdhdr.dwCylinder = {0}", _nhdhdr.dwCylinder); diff --git a/Aaru.Images/Partimage/Constants.cs b/Aaru.Images/Partimage/Constants.cs index e83f06984..c8d5effd8 100644 --- a/Aaru.Images/Partimage/Constants.cs +++ b/Aaru.Images/Partimage/Constants.cs @@ -38,34 +38,33 @@ namespace Aaru.Images; [SuppressMessage("ReSharper", "UnusedType.Global")] public sealed partial class Partimage { - const int MAX_DESCRIPTION = 4096; - const int MAX_HOSTNAMESIZE = 128; - const int MAX_DEVICENAMELEN = 512; - const int MAX_UNAMEINFOLEN = 65; //SYS_NMLN - const int MBR_SIZE_WHOLE = 512; - const int MAX_DESC_MODEL = 128; - const int MAX_DESC_GEOMETRY = 1024; - const int MAX_DESC_IDENTIFY = 4096; - const int CHECK_FREQUENCY = 65536; - const string MAGIC_BEGIN_LOCALHEADER = "MAGIC-BEGIN-LOCALHEADER"; - const string MAGIC_BEGIN_DATABLOCKS = "MAGIC-BEGIN-DATABLOCKS"; - const string MAGIC_BEGIN_BITMAP = "MAGIC-BEGIN-BITMAP"; - const string MAGIC_BEGIN_MBRBACKUP = "MAGIC-BEGIN-MBRBACKUP"; - const string MAGIC_BEGIN_TAIL = "MAGIC-BEGIN-TAIL"; - const string MAGIC_BEGIN_INFO = "MAGIC-BEGIN-INFO"; - const string MAGIC_BEGIN_EXT000 = "MAGIC-BEGIN-EXT000"; // reserved for future use - const string MAGIC_BEGIN_EXT001 = "MAGIC-BEGIN-EXT001"; // reserved for future use - const string MAGIC_BEGIN_EXT002 = "MAGIC-BEGIN-EXT002"; // reserved for future use - const string MAGIC_BEGIN_EXT003 = "MAGIC-BEGIN-EXT003"; // reserved for future use - const string MAGIC_BEGIN_EXT004 = "MAGIC-BEGIN-EXT004"; // reserved for future use - const string MAGIC_BEGIN_EXT005 = "MAGIC-BEGIN-EXT005"; // reserved for future use - const string MAGIC_BEGIN_EXT006 = "MAGIC-BEGIN-EXT006"; // reserved for future use - const string MAGIC_BEGIN_EXT007 = "MAGIC-BEGIN-EXT007"; // reserved for future use - const string MAGIC_BEGIN_EXT008 = "MAGIC-BEGIN-EXT008"; // reserved for future use - const string MAGIC_BEGIN_EXT009 = "MAGIC-BEGIN-EXT009"; // reserved for future use - const string MAGIC_BEGIN_VOLUME = "PaRtImAgE-VoLuMe"; - const uint MAX_CACHE_SIZE = 16777216; - const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512; - readonly byte[] _partimageMagic = - "PaRtImAgE-VoLuMe\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"u8.ToArray(); + const int MAX_DESCRIPTION = 4096; + const int MAX_HOSTNAMESIZE = 128; + const int MAX_DEVICENAMELEN = 512; + const int MAX_UNAMEINFOLEN = 65; //SYS_NMLN + const int MBR_SIZE_WHOLE = 512; + const int MAX_DESC_MODEL = 128; + const int MAX_DESC_GEOMETRY = 1024; + const int MAX_DESC_IDENTIFY = 4096; + const int CHECK_FREQUENCY = 65536; + const string MAGIC_BEGIN_LOCALHEADER = "MAGIC-BEGIN-LOCALHEADER"; + const string MAGIC_BEGIN_DATABLOCKS = "MAGIC-BEGIN-DATABLOCKS"; + const string MAGIC_BEGIN_BITMAP = "MAGIC-BEGIN-BITMAP"; + const string MAGIC_BEGIN_MBRBACKUP = "MAGIC-BEGIN-MBRBACKUP"; + const string MAGIC_BEGIN_TAIL = "MAGIC-BEGIN-TAIL"; + const string MAGIC_BEGIN_INFO = "MAGIC-BEGIN-INFO"; + const string MAGIC_BEGIN_EXT000 = "MAGIC-BEGIN-EXT000"; // reserved for future use + const string MAGIC_BEGIN_EXT001 = "MAGIC-BEGIN-EXT001"; // reserved for future use + const string MAGIC_BEGIN_EXT002 = "MAGIC-BEGIN-EXT002"; // reserved for future use + const string MAGIC_BEGIN_EXT003 = "MAGIC-BEGIN-EXT003"; // reserved for future use + const string MAGIC_BEGIN_EXT004 = "MAGIC-BEGIN-EXT004"; // reserved for future use + const string MAGIC_BEGIN_EXT005 = "MAGIC-BEGIN-EXT005"; // reserved for future use + const string MAGIC_BEGIN_EXT006 = "MAGIC-BEGIN-EXT006"; // reserved for future use + const string MAGIC_BEGIN_EXT007 = "MAGIC-BEGIN-EXT007"; // reserved for future use + const string MAGIC_BEGIN_EXT008 = "MAGIC-BEGIN-EXT008"; // reserved for future use + const string MAGIC_BEGIN_EXT009 = "MAGIC-BEGIN-EXT009"; // reserved for future use + const string MAGIC_BEGIN_VOLUME = "PaRtImAgE-VoLuMe"; + const uint MAX_CACHE_SIZE = 16777216; + const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512; + readonly byte[] _partimageMagic = "PaRtImAgE-VoLuMe\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"u8.ToArray(); } \ No newline at end of file diff --git a/Aaru.Images/TeleDisk/Helpers.cs b/Aaru.Images/TeleDisk/Helpers.cs index 46777f7f2..347a25b04 100644 --- a/Aaru.Images/TeleDisk/Helpers.cs +++ b/Aaru.Images/TeleDisk/Helpers.cs @@ -42,22 +42,22 @@ public sealed partial class TeleDisk { (ushort cylinder, byte head, byte sector) LbaToChs(ulong lba) { - ushort cylinder = (ushort)(lba / (_imageInfo.Heads * _imageInfo.SectorsPerTrack)); - byte head = (byte)(lba / _imageInfo.SectorsPerTrack % _imageInfo.Heads); - byte sector = (byte)(lba % _imageInfo.SectorsPerTrack + 1); + var cylinder = (ushort)(lba / (_imageInfo.Heads * _imageInfo.SectorsPerTrack)); + var head = (byte)(lba / _imageInfo.SectorsPerTrack % _imageInfo.Heads); + var sector = (byte)(lba % _imageInfo.SectorsPerTrack + 1); return (cylinder, head, sector); } static ushort TeleDiskCrc(ushort crc, byte[] buffer) { - int counter = 0; + var counter = 0; while(counter < buffer.Length) { crc ^= (ushort)((buffer[counter] & 0xFF) << 8); - for(int i = 0; i < 8; i++) + for(var i = 0; i < 8; i++) { if((crc & 0x8000) > 0) crc = (ushort)(crc << 1 ^ TELE_DISK_CRC_POLY); @@ -120,16 +120,16 @@ public sealed partial class TeleDisk break; case DATA_BLOCK_PATTERN: { - int ins = 0; - int outs = 0; + var ins = 0; + var outs = 0; while(ins < encodedData.Length) { - byte[] repeatValue = new byte[2]; + var repeatValue = new byte[2]; - ushort repeatNumber = BitConverter.ToUInt16(encodedData, ins); + var repeatNumber = BitConverter.ToUInt16(encodedData, ins); Array.Copy(encodedData, ins + 2, repeatValue, 0, 2); - byte[] decodedPiece = new byte[repeatNumber * 2]; + var decodedPiece = new byte[repeatNumber * 2]; ArrayHelpers.ArrayFill(decodedPiece, repeatValue); Array.Copy(decodedPiece, 0, decodedData, outs, decodedPiece.Length); ins += 4; @@ -137,27 +137,23 @@ public sealed partial class TeleDisk } AaruLogging.Debug(MODULE_NAME, - Localization.Block_pattern_decoder_Input_data_size_0_bytes, - encodedData.Length); + Localization.Block_pattern_decoder_Input_data_size_0_bytes, + encodedData.Length); + + AaruLogging.Debug(MODULE_NAME, Localization.Block_pattern_decoder_Processed_input_0_bytes, ins); AaruLogging.Debug(MODULE_NAME, - Localization.Block_pattern_decoder_Processed_input_0_bytes, - ins); + Localization.Block_pattern_decoder_Output_data_size_0_bytes, + decodedData.Length); - AaruLogging.Debug(MODULE_NAME, - Localization.Block_pattern_decoder_Output_data_size_0_bytes, - decodedData.Length); - - AaruLogging.Debug(MODULE_NAME, - Localization.Block_pattern_decoder_Processed_Output_0_bytes, - outs); + AaruLogging.Debug(MODULE_NAME, Localization.Block_pattern_decoder_Processed_Output_0_bytes, outs); break; } case DATA_BLOCK_RLE: { - int ins = 0; - int outs = 0; + var ins = 0; + var outs = 0; while(ins < encodedData.Length) { @@ -175,10 +171,10 @@ public sealed partial class TeleDisk else { length = (byte)(encoding * 2); - byte run = encodedData[ins + 1]; - byte[] part = new byte[length]; + byte run = encodedData[ins + 1]; + var part = new byte[length]; Array.Copy(encodedData, ins + 2, part, 0, length); - byte[] piece = new byte[length * run]; + var piece = new byte[length * run]; ArrayHelpers.ArrayFill(piece, part); Array.Copy(piece, 0, decodedData, outs, piece.Length); ins += 2 + length; @@ -186,15 +182,11 @@ public sealed partial class TeleDisk } } - AaruLogging.Debug(MODULE_NAME, - Localization.RLE_decoder_Input_data_size_0_bytes, - encodedData.Length); + AaruLogging.Debug(MODULE_NAME, Localization.RLE_decoder_Input_data_size_0_bytes, encodedData.Length); AaruLogging.Debug(MODULE_NAME, Localization.RLE_decoder_Processed_input_0_bytes, ins); - AaruLogging.Debug(MODULE_NAME, - Localization.RLE_decoder_Output_data_size_0_bytes, - decodedData.Length); + AaruLogging.Debug(MODULE_NAME, Localization.RLE_decoder_Output_data_size_0_bytes, decodedData.Length); AaruLogging.Debug(MODULE_NAME, Localization.RLE_decoder_Processed_Output_0_bytes, outs); @@ -384,9 +376,9 @@ public sealed partial class TeleDisk default: { AaruLogging.Debug(MODULE_NAME, - "Unknown drive type {1} with {0} bytes", - _totalDiskSize, - _header.DriveType); + "Unknown drive type {1} with {0} bytes", + _totalDiskSize, + _header.DriveType); return MediaType.Unknown; } diff --git a/Aaru.Images/Virtual98/Identify.cs b/Aaru.Images/Virtual98/Identify.cs index 57ce08ed0..062365b50 100644 --- a/Aaru.Images/Virtual98/Identify.cs +++ b/Aaru.Images/Virtual98/Identify.cs @@ -54,7 +54,7 @@ public sealed partial class Virtual98 if(stream.Length < Marshal.SizeOf()) return false; - byte[] hdrB = new byte[Marshal.SizeOf()]; + var hdrB = new byte[Marshal.SizeOf()]; stream.EnsureRead(hdrB, 0, hdrB.Length); _v98Hdr = Marshal.ByteArrayToStructureLittleEndian(hdrB); @@ -62,12 +62,10 @@ public sealed partial class Virtual98 if(!_v98Hdr.signature.SequenceEqual(_signature)) return false; AaruLogging.Debug(MODULE_NAME, - "v98hdr.signature = \"{0}\"", - StringHandlers.CToString(_v98Hdr.signature, shiftjis)); + "v98hdr.signature = \"{0}\"", + StringHandlers.CToString(_v98Hdr.signature, shiftjis)); - AaruLogging.Debug(MODULE_NAME, - "v98hdr.comment = \"{0}\"", - StringHandlers.CToString(_v98Hdr.comment, shiftjis)); + AaruLogging.Debug(MODULE_NAME, "v98hdr.comment = \"{0}\"", StringHandlers.CToString(_v98Hdr.comment, shiftjis)); AaruLogging.Debug(MODULE_NAME, "v98hdr.padding = {0}", _v98Hdr.padding); AaruLogging.Debug(MODULE_NAME, "v98hdr.mbsize = {0}", _v98Hdr.mbsize);