aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor and code cleanup.

Browse Source
This commit is contained in:
Natalia Portillo
2016-07-28 22:25:26 +01:00
parent c93d469da9
commit a63ba13b6b
199 changed files with 3614 additions and 3744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DiscImageChef.Decoders/SCSI/DiscStructureCapabilities.cs
View File

@@ -30,7 +30,6 @@
// Copyright © 2011-2016 Natalia Portillo
// ****************************************************************************/
using System;
using System.Collections.Generic;
namespace DiscImageChef.Decoders.SCSI

1
DiscImageChef.Decoders/SCSI/EVPD.cs
View File

@@ -31,7 +31,6 @@
// ****************************************************************************/
using System;
using DiscImageChef;
namespace DiscImageChef.Decoders.SCSI
{

2
DiscImageChef.Decoders/SCSI/Enums.cs
View File

@@ -30,8 +30,6 @@
// Copyright © 2011-2016 Natalia Portillo
// ****************************************************************************/
using System;
namespace DiscImageChef.Decoders.SCSI
{
public enum PeripheralQualifiers : byte

4
DiscImageChef.Decoders/SCSI/Inquiry.cs
View File

@@ -448,7 +448,7 @@ namespace DiscImageChef.Decoders.SCSI
if(response.VersionDescriptors != null)
{
foreach(UInt16 VersionDescriptor in response.VersionDescriptors)
foreach(ushort VersionDescriptor in response.VersionDescriptors)
{
switch(VersionDescriptor)
{
@@ -2140,7 +2140,7 @@ namespace DiscImageChef.Decoders.SCSI
/// Array of version descriptors
/// Bytes 58 to 73
/// </summary>
public UInt16[] VersionDescriptors;
public ushort[] VersionDescriptors;
/// <summary>
/// Reserved
/// Bytes 74 to 95

18
DiscImageChef.Decoders/SCSI/MMC/AACS.cs
View File

@@ -58,7 +58,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// Data length
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2
/// Reserved
@@ -82,7 +82,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// Data length
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2
/// Reserved
@@ -106,7 +106,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// Data length
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2
/// Reserved
@@ -130,7 +130,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// Data length
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2
/// Reserved
@@ -154,7 +154,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// Data length
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2
/// Reserved
@@ -178,7 +178,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// Data Length
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2
/// Reserved
@@ -187,7 +187,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// <summary>
/// Byte 3
/// Number of LBA extents the drive can store.
/// if(MaxLBAExtents == 0 && DataLength > 2), 256 extents can be stored
/// if(MaxLBAExtents == 0 &amp;&amp; DataLength > 2), 256 extents can be stored
/// </summary>
public byte MaxLBAExtents;
/// <summary>
@@ -208,12 +208,12 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 8 to 11
/// Start LBA of extent
/// </summary>
public UInt32 StartLBA;
public uint StartLBA;
/// <summary>
/// Bytes 12 to 15
/// Extent length
/// </summary>
public UInt32 LBACount;
public uint LBACount;
}
public static AACSVolumeIdentifier? DecodeAACSVolumeIdentifier(byte[] AACSVIResponse)

2
DiscImageChef.Decoders/SCSI/MMC/CPRM.cs
View File

@@ -58,7 +58,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// Data Length
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2
/// Reserved

36
DiscImageChef.Decoders/SCSI/MMC/DiscInformation.cs
View File

@@ -58,7 +58,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// 32 + OPCTablesNumber*8
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2, bits 7 to 5
/// 000b
@@ -88,17 +88,17 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Byte 9 (MSB) and byte 4 (LSB)
/// Number of sessions
/// </summary>
public UInt16 Sessions;
public ushort Sessions;
/// <summary>
/// Byte 10 (MSB) and byte 5 (LSB)
/// Number of first track in last session
/// </summary>
public UInt16 FirstTrackLastSession;
public ushort FirstTrackLastSession;
/// <summary>
/// Byte 11 (MSB) and byte 6 (LSB)
/// Number of last track in last session
/// </summary>
public UInt16 LastTrackLastSession;
public ushort LastTrackLastSession;
/// <summary>
/// Byte 7, bit 7
/// If set, DiscIdentification is valid
@@ -143,22 +143,22 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 12 to 15
/// Disc identification number from PMA
/// </summary>
public UInt32 DiscIdentification;
public uint DiscIdentification;
/// <summary>
/// Bytes 16 to 19
/// Last Session Lead-in Start Address (MSF for CD, LBA for others)
/// </summary>
public UInt32 LastSessionLeadInStartLBA;
public uint LastSessionLeadInStartLBA;
/// <summary>
/// Bytes 20 to 23
/// Last Possible Lead-out Start Address (MSF for CD, LBA for others)
/// </summary>
public UInt32 LastPossibleLeadOutStartLBA;
public uint LastPossibleLeadOutStartLBA;
/// <summary>
/// Bytes 24 to 31
/// Disc barcode
/// </summary>
public UInt64 DiscBarcode;
public ulong DiscBarcode;
/// <summary>
/// Byte 32
/// Disc application code
@@ -182,7 +182,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// kilobytes/sec this OPC table applies to
/// </summary>
public UInt16 Speed;
public ushort Speed;
/// <summary>
/// Bytes 2 to 7
/// OPC values
@@ -196,7 +196,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// 10
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2, bits 7 to 5
/// 001b
@@ -216,22 +216,22 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 4 to 5
/// Maximum possible number of the tracks on the disc
/// </summary>
public UInt16 MaxTracks;
public ushort MaxTracks;
/// <summary>
/// Bytes 6 to 7
/// Number of the assigned tracks on the disc
/// </summary>
public UInt16 AssignedTracks;
public ushort AssignedTracks;
/// <summary>
/// Bytes 8 to 9
/// Maximum possible number of appendable tracks on the disc
/// </summary>
public UInt16 MaxAppendableTracks;
public ushort MaxAppendableTracks;
/// <summary>
/// Bytes 10 to 11
/// Current number of appendable tracks on the disc
/// </summary>
public UInt16 AppendableTracks;
public ushort AppendableTracks;
}
public struct POWResourcesInformation
@@ -240,7 +240,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// 14
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2, bits 7 to 5
/// 010b
@@ -260,17 +260,17 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 4 to 7
/// Remaining POW replacements
/// </summary>
public UInt32 RemainingPOWReplacements;
public uint RemainingPOWReplacements;
/// <summary>
/// Bytes 8 to 11
/// Remaining POW reallocation map entries
/// </summary>
public UInt32 RemainingPOWReallocation;
public uint RemainingPOWReallocation;
/// <summary>
/// Bytes 12 to 15
/// Number of remaining POW updates
/// </summary>
public UInt32 RemainingPOWUpdates;
public uint RemainingPOWUpdates;
}
public static StandardDiscInformation? Decode000b(byte[] response)

2
DiscImageChef.Decoders/SCSI/MMC/Enums.cs
View File

@@ -30,8 +30,6 @@
// Copyright © 2011-2016 Natalia Portillo
// ****************************************************************************/
using System;
namespace DiscImageChef.Decoders.SCSI.MMC
{
public enum FormatLayerTypeCodes : ushort

8
DiscImageChef.Decoders/SCSI/MMC/Features.cs
View File

@@ -5316,13 +5316,15 @@ namespace DiscImageChef.Decoders.SCSI.MMC
try
{
DateTime fwDate = new DateTime(Int32.Parse(syear), Int32.Parse(smonth),
Int32.Parse(sday), Int32.Parse(shour), Int32.Parse(sminute),
Int32.Parse(ssecond), DateTimeKind.Utc);
DateTime fwDate = new DateTime(int.Parse(syear), int.Parse(smonth),
int.Parse(sday), int.Parse(shour), int.Parse(sminute),
int.Parse(ssecond), DateTimeKind.Utc);
sb.AppendFormat("Drive firmware is dated {0}", fwDate).AppendLine();
}
#pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
catch
#pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
{
}

14
DiscImageChef.Decoders/SCSI/MMC/Hybrid.cs
View File

@@ -58,7 +58,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// Data Length
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2
/// Reserved
@@ -98,7 +98,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 6 to end
/// Recognized format layers
/// </summary>
public UInt16[] FormatLayers;
public ushort[] FormatLayers;
}
public static RecognizedFormatLayers? DecodeFormatLayers(byte[] FormatLayersResponse)
@@ -122,7 +122,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
decoded.Reserved4 = (byte)((FormatLayersResponse[5] & 0x0C) >> 2);
decoded.OnlineFormatLayer = (byte)(FormatLayersResponse[5] & 0x03);
decoded.FormatLayers = new UInt16[(FormatLayersResponse.Length - 6) / 2];
decoded.FormatLayers = new ushort[(FormatLayersResponse.Length - 6) / 2];
for(int i = 0; i < (FormatLayersResponse.Length - 6) / 2; i++)
{
@@ -147,7 +147,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
{
switch(response.FormatLayers[i])
{
case (UInt16)FormatLayerTypeCodes.BDLayer:
case (ushort)FormatLayerTypeCodes.BDLayer:
{
sb.AppendFormat("Layer {0} is of type Blu-ray", i).AppendLine();
if(response.DefaultFormatLayer == i)
@@ -156,7 +156,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
sb.AppendLine("This is the layer actually in use.");
break;
}
case (UInt16)FormatLayerTypeCodes.CDLayer:
case (ushort)FormatLayerTypeCodes.CDLayer:
{
sb.AppendFormat("Layer {0} is of type CD", i).AppendLine();
if(response.DefaultFormatLayer == i)
@@ -165,7 +165,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
sb.AppendLine("This is the layer actually in use.");
break;
}
case (UInt16)FormatLayerTypeCodes.DVDLayer:
case (ushort)FormatLayerTypeCodes.DVDLayer:
{
sb.AppendFormat("Layer {0} is of type DVD", i).AppendLine();
if(response.DefaultFormatLayer == i)
@@ -174,7 +174,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
sb.AppendLine("This is the layer actually in use.");
break;
}
case (UInt16)FormatLayerTypeCodes.HDDVDLayer:
case (ushort)FormatLayerTypeCodes.HDDVDLayer:
{
sb.AppendFormat("Layer {0} is of type HD DVD", i).AppendLine();
if(response.DefaultFormatLayer == i)

2
DiscImageChef.Decoders/SCSI/MMC/WriteProtect.cs
View File

@@ -58,7 +58,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC
/// Bytes 0 to 1
/// Data Length
/// </summary>
public UInt16 DataLength;
public ushort DataLength;
/// <summary>
/// Byte 2
/// Reserved

124
DiscImageChef.Decoders/SCSI/Modes.cs
View File

@@ -233,7 +233,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "15916 flux transitions per radian";
break;
default:
density = String.Format("with unknown density code 0x{0:X2}", (byte)descriptor.Density);
density = string.Format("with unknown density code 0x{0:X2}", (byte)descriptor.Density);
break;
}
@@ -272,7 +272,7 @@ namespace DiscImageChef.Decoders.SCSI
sb.AppendLine("\tDevice uses a write cache but doesn't return until cache is flushed");
break;
default:
sb.AppendFormat("\tUnknown buffered mode code 0x{0:X2}", (byte)header.Value.BufferedMode).AppendLine();
sb.AppendFormat("\tUnknown buffered mode code 0x{0:X2}", header.Value.BufferedMode).AppendLine();
break;
}
@@ -463,7 +463,7 @@ namespace DiscImageChef.Decoders.SCSI
medium = "Exatape 75m";
break;
default:
medium = String.Format("unknown medium type 0x{0:X2}", (byte)header.Value.MediumType);
medium = string.Format("unknown medium type 0x{0:X2}", (byte)header.Value.MediumType);
break;
}
@@ -601,7 +601,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "AIT-3";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -623,7 +623,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-5 WORM";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -636,7 +636,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -649,7 +649,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-2";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -665,7 +665,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DDS-3";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -681,7 +681,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DDS-4";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -694,7 +694,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DAT-72";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -708,7 +708,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-3";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -721,7 +721,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DDS cleaning cartridge";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -735,7 +735,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-4";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -749,7 +749,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-5";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -763,7 +763,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-6";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -777,7 +777,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-7";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -799,7 +799,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-5 in CD emulation mode";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -833,7 +833,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "VXA-1";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -876,7 +876,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "VXA-3";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -914,7 +914,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DLTtape III compressed";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -946,7 +946,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DLTtape IIIxt compressed";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1000,7 +1000,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DLTtape IV at 98250 bpi compressed";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1039,7 +1039,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Super DLTtape I at 133000 bpi compressed";
break;*/
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1052,7 +1052,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Super DLTtape II";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1069,7 +1069,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "VStape I compressed";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1082,7 +1082,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DLTtape S4";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1104,7 +1104,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "EXB-8500 compressed";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1129,7 +1129,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Mammoth";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1154,7 +1154,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Mammoth";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1179,7 +1179,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Mammoth";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1201,7 +1201,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "Mammoth-2";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1214,7 +1214,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DC-2900SL";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1227,7 +1227,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "DC-9250";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1240,7 +1240,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLR-32";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1253,7 +1253,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "MRL1-26GBSL";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1266,7 +1266,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-50";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1279,7 +1279,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-50 SL";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1292,7 +1292,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLR-32 SL";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1305,7 +1305,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLR-5";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1318,7 +1318,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLR-5 SL";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1331,7 +1331,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-7";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1344,7 +1344,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-7 SL";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1357,7 +1357,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-24";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1370,7 +1370,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-24 SL";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1383,7 +1383,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-140";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1396,7 +1396,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-40";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1409,7 +1409,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-60 or SLRtape-75";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1422,7 +1422,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLRtape-100";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
@@ -1435,13 +1435,13 @@ namespace DiscImageChef.Decoders.SCSI
density = "SLR40, SLR60 or SLR100";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
}
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
@@ -1583,7 +1583,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "ANSI X3.200: 356 mm double-sided optical disc with 56350 tracks";
break;
default:
density = String.Format("unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("unknown density code 0x{0:X2}", descriptor.Density);
break;
}
@@ -1787,7 +1787,7 @@ namespace DiscImageChef.Decoders.SCSI
density = "LTO Ultrium-5";
break;
default:
density = String.Format("with unknown density code 0x{0:X2}", descriptor.Density);
density = string.Format("with unknown density code 0x{0:X2}", descriptor.Density);
break;
}
@@ -1811,8 +1811,6 @@ namespace DiscImageChef.Decoders.SCSI
break;
}
#endregion Multimedia device mode header
default:
break;
}
return sb.ToString();
@@ -2244,7 +2242,7 @@ namespace DiscImageChef.Decoders.SCSI
if(page.BusyTimeoutPeriod == 0xFFFF)
sb.AppendLine("\tThere is no limit on the maximum time that is allowed to remain busy");
else
sb.AppendFormat("\tA maximum of {0} ms are allowed to remain busy", (int)page.BusyTimeoutPeriod * 100).AppendLine();
sb.AppendFormat("\tA maximum of {0} ms are allowed to remain busy", page.BusyTimeoutPeriod * 100).AppendLine();
}
if(page.ExtendedSelfTestCompletionTime > 0)
@@ -2372,17 +2370,17 @@ namespace DiscImageChef.Decoders.SCSI
if(page.BufferEmptyRatio > 0)
sb.AppendFormat("\t{0} ratio of buffer that shall be empty prior to attempting a reselection", page.BufferEmptyRatio).AppendLine();
if(page.BusInactivityLimit > 0)
sb.AppendFormat("\t{0} µs maximum permitted to assert BSY without a REQ/ACK handshake", (int)page.BusInactivityLimit * 100).AppendLine();
sb.AppendFormat("\t{0} µs maximum permitted to assert BSY without a REQ/ACK handshake", page.BusInactivityLimit * 100).AppendLine();
if(page.DisconnectTimeLimit > 0)
sb.AppendFormat("\t{0} µs maximum permitted wait after releasing the bus before attempting reselection", (int)page.DisconnectTimeLimit * 100).AppendLine();
sb.AppendFormat("\t{0} µs maximum permitted wait after releasing the bus before attempting reselection", page.DisconnectTimeLimit * 100).AppendLine();
if(page.ConnectTimeLimit > 0)
sb.AppendFormat("\t{0} µs allowed to use the bus before disconnecting, if granted the privilege and not restricted", (int)page.ConnectTimeLimit * 100).AppendLine();
sb.AppendFormat("\t{0} µs allowed to use the bus before disconnecting, if granted the privilege and not restricted", page.ConnectTimeLimit * 100).AppendLine();
if(page.MaxBurstSize > 0)
sb.AppendFormat("\t{0} bytes maximum can be transferred before disconnecting", (int)page.MaxBurstSize * 512).AppendLine();
sb.AppendFormat("\t{0} bytes maximum can be transferred before disconnecting", page.MaxBurstSize * 512).AppendLine();
if(page.FirstBurstSize > 0)
sb.AppendFormat("\t{0} bytes maximum can be transferred for a command along with the disconnect command", (int)page.FirstBurstSize * 512).AppendLine();
sb.AppendFormat("\t{0} bytes maximum can be transferred for a command along with the disconnect command", page.FirstBurstSize * 512).AppendLine();
if(page.DIMM)
if(page.DIMM)
sb.AppendLine("\tTarget shall not transfer data for a command during the same interconnect tenancy");
if(page.EMDP)
sb.AppendLine("\tTarget is allowed to re-order the data transfer");
@@ -3853,7 +3851,7 @@ namespace DiscImageChef.Decoders.SCSI
sb.AppendFormat("\tActive partition: {0}", page.ActivePartition).AppendLine();
sb.AppendFormat("\tWrite buffer shall have a full ratio of {0} before being flushed to medium", page.WriteBufferFullRatio).AppendLine();
sb.AppendFormat("\tRead buffer shall have an empty ratio of {0} before more data is read from medium", page.ReadBufferEmptyRatio).AppendLine();
sb.AppendFormat("\tDrive will delay {0} ms before buffered data is forcefully written to the medium even before buffer is full", (int)page.WriteDelayTime * 100).AppendLine();
sb.AppendFormat("\tDrive will delay {0} ms before buffered data is forcefully written to the medium even before buffer is full", page.WriteDelayTime * 100).AppendLine();
if(page.DBR)
{
sb.AppendLine("\tDrive supports recovering data from buffer");
@@ -6261,7 +6259,7 @@ namespace DiscImageChef.Decoders.SCSI
#region Mode Page 0x1C: Timer & Protect page
/// <summary>
/// Timer & Protect page
/// Timer &amp; Protect page
/// Page code 0x1C
/// 8 bytes in INF-8070
/// </summary>

4
DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs
View File

@@ -88,7 +88,9 @@ namespace DiscImageChef.Decoders.SCSI.SSC
sb.AppendFormat("Device's minimum block size is {0} bytes", decoded.Value.minBlockLen).AppendLine();
if(decoded.Value.granularity > 0)
sb.AppendFormat("Device's needs a block size granularity of 2^{0} ({1}) bytes", decoded.Value.granularity, Math.Pow(2, (double)decoded.Value.granularity)).AppendLine();
#pragma warning disable IDE0004 // Remove Unnecessary Cast
sb.AppendFormat("Device's needs a block size granularity of 2^{0} ({1}) bytes", decoded.Value.granularity, Math.Pow(2, (double)decoded.Value.granularity)).AppendLine();
#pragma warning restore IDE0004 // Remove Unnecessary Cast
}
return sb.ToString();

8
DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs
View File

@@ -166,8 +166,10 @@ namespace DiscImageChef.Decoders.SCSI.SSC
if(descriptor.defaultDensity)
sb.AppendLine("\tThis is the default density on the drive");
sb.AppendFormat("\tDensity has {0} bits per mm, with {1} tracks in a {2} mm width tape",
#pragma warning disable IDE0004 // Remove Unnecessary Cast
descriptor.bpmm, descriptor.tracks, (double)((double)descriptor.width / (double)10)).AppendLine();
sb.AppendFormat("\tDensity maximum capacity is {0} megabytes", descriptor.capacity).AppendLine();
#pragma warning restore IDE0004 // Remove Unnecessary Cast
sb.AppendFormat("\tDensity maximum capacity is {0} megabytes", descriptor.capacity).AppendLine();
sb.AppendFormat("\tDensity description: {0}", descriptor.description).AppendLine();
sb.AppendLine();
}
@@ -256,8 +258,10 @@ namespace DiscImageChef.Decoders.SCSI.SSC
}
sb.AppendFormat("\tMedium has a nominal length of {0} m in a {1} mm width tape",
#pragma warning disable IDE0004 // Remove Unnecessary Cast
descriptor.length, (double)((double)descriptor.width / (double)10)).AppendLine();
sb.AppendFormat("\tMedium description: {0}", descriptor.description).AppendLine();
#pragma warning restore IDE0004 // Remove Unnecessary Cast
sb.AppendFormat("\tMedium description: {0}", descriptor.description).AppendLine();
sb.AppendLine();
}

26
DiscImageChef.Decoders/SCSI/Sense.cs
View File

@@ -396,9 +396,9 @@ namespace DiscImageChef.Decoders.SCSI
if(!sense.HasValue)
return null;
return sense.Value.AddressValid ? String.Format("Error class {0} type {1} happened on block {2}\n",
return sense.Value.AddressValid ? string.Format("Error class {0} type {1} happened on block {2}\n",
sense.Value.ErrorClass, sense.Value.ErrorType, sense.Value.LBA) :
String.Format("Error class {0} type {1}\n", sense.Value.ErrorClass,
string.Format("Error class {0} type {1}\n", sense.Value.ErrorClass,
sense.Value.ErrorType);
}
@@ -499,7 +499,7 @@ namespace DiscImageChef.Decoders.SCSI
/// </summary>
/// <returns>The information value</returns>
/// <param name="descriptor">Descriptor.</param>
public static UInt64 DecodeDescriptor00(byte[] descriptor)
public static ulong DecodeDescriptor00(byte[] descriptor)
{
if(descriptor.Length != 12 || descriptor[0] != 0x00)
return 0;
@@ -523,7 +523,7 @@ namespace DiscImageChef.Decoders.SCSI
/// </summary>
/// <returns>The command-specific information sense data descriptor.</returns>
/// <param name="descriptor">Descriptor.</param>
public static UInt64 DecodeDescriptor01(byte[] descriptor)
public static ulong DecodeDescriptor01(byte[] descriptor)
{
if(descriptor.Length != 12 || descriptor[0] != 0x01)
return 0;
@@ -640,9 +640,9 @@ namespace DiscImageChef.Decoders.SCSI
throw new NotImplementedException("Check SBC-3");
}
public static string PrettifyDescriptor00(UInt64 information)
public static string PrettifyDescriptor00(ulong information)
{
return String.Format("On logical block {0}\n", information);
return string.Format("On logical block {0}\n", information);
}
public static string PrettifyDescriptor00(byte[] descriptor)
@@ -1884,7 +1884,7 @@ namespace DiscImageChef.Decoders.SCSI
case 0x00:
return "RAM FAILURE";
default:
return String.Format("DIAGNOSTIC FAILURE ON COMPONENT {0:X2}h", ASCQ);
return string.Format("DIAGNOSTIC FAILURE ON COMPONENT {0:X2}h", ASCQ);
}
case 0x41:
switch(ASCQ)
@@ -2031,7 +2031,7 @@ namespace DiscImageChef.Decoders.SCSI
}
break;
case 0x4E:
return String.Format("OVERLAPPED COMMANDS ATTEMPTED FOR TASK TAG {0:X2}h", ASCQ);
return string.Format("OVERLAPPED COMMANDS ATTEMPTED FOR TASK TAG {0:X2}h", ASCQ);
case 0x50:
switch(ASCQ)
{
@@ -2566,7 +2566,7 @@ namespace DiscImageChef.Decoders.SCSI
}
break;
case 0x70:
return String.Format("DECOMPRESSION EXCEPTION SHORT ALGORITHM ID OF {0:X2}h", ASCQ);
return string.Format("DECOMPRESSION EXCEPTION SHORT ALGORITHM ID OF {0:X2}h", ASCQ);
case 0x71:
switch(ASCQ)
{
@@ -2684,10 +2684,10 @@ namespace DiscImageChef.Decoders.SCSI
}
return ASC >= 0x80 ? ASCQ >= 0x80 ?
String.Format("VENDOR-SPECIFIC ASC {0:X2}h WITH VENDOR-SPECIFIC ASCQ {1:X2}h", ASC, ASCQ) :
String.Format("VENDOR-SPECIFIC ASC {0:X2}h WITH ASCQ {1:X2}h", ASC, ASCQ) :
ASCQ >= 0x80 ? String.Format("ASC {0:X2}h WITH VENDOR-SPECIFIC ASCQ {1:X2}h", ASC, ASCQ) :
String.Format("ASC {0:X2}h WITH ASCQ {1:X2}h", ASC, ASCQ);
string.Format("VENDOR-SPECIFIC ASC {0:X2}h WITH VENDOR-SPECIFIC ASCQ {1:X2}h", ASC, ASCQ) :
string.Format("VENDOR-SPECIFIC ASC {0:X2}h WITH ASCQ {1:X2}h", ASC, ASCQ) :
ASCQ >= 0x80 ? string.Format("ASC {0:X2}h WITH VENDOR-SPECIFIC ASCQ {1:X2}h", ASC, ASCQ) :
string.Format("ASC {0:X2}h WITH ASCQ {1:X2}h", ASC, ASCQ);
}
}
}

4
DiscImageChef.Decoders/SCSI/Types.cs
View File

@@ -30,8 +30,6 @@
// Copyright © 2011-2016 Natalia Portillo
// ****************************************************************************/
using System;
namespace DiscImageChef.Decoders.SCSI
{
public enum MediumTypes : byte
@@ -827,7 +825,7 @@ namespace DiscImageChef.Decoders.SCSI
/// </summary>
Mammoth = 0x27,
/// <summary>
/// IBM 3490 & 3490E
/// IBM 3490 &amp; 3490E
/// </summary>
IBM3490E = 0x28,
/// <summary>

2
DiscImageChef.Decoders/SCSI/VendorString.cs
View File

@@ -30,8 +30,6 @@
// Copyright © 2011-2016 Natalia Portillo
// ****************************************************************************/
using System;
namespace DiscImageChef.Decoders.SCSI
{
public static class VendorString