REFACTOR: Reformat code.

This commit is contained in:
2017-12-19 20:33:03 +00:00
parent 77edc7c91c
commit e6f6ace80b
704 changed files with 82627 additions and 83641 deletions

View File

@@ -65,11 +65,14 @@ namespace DiscImageChef.Core.Devices
read6 = !dev.Read6(out readBuffer, out senseBuf, 0, blockSize, timeout, out duration);
read10 = !dev.Read10(out readBuffer, out senseBuf, 0, false, true, false, false, 0, blockSize, 0, 1, timeout, out duration);
read10 = !dev.Read10(out readBuffer, out senseBuf, 0, false, true, false, false, 0, blockSize, 0, 1,
timeout, out duration);
read12 = !dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, 0, blockSize, 0, 1, false, timeout, out duration);
read12 = !dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, 0, blockSize, 0, 1, false,
timeout, out duration);
read16 = !dev.Read16(out readBuffer, out senseBuf, 0, false, true, false, 0, blockSize, 0, 1, false, timeout, out duration);
read16 = !dev.Read16(out readBuffer, out senseBuf, 0, false, true, false, 0, blockSize, 0, 1, false,
timeout, out duration);
seek6 = !dev.Seek6(out senseBuf, 0, timeout, out duration);
@@ -83,7 +86,9 @@ namespace DiscImageChef.Core.Devices
if(read6 && !read10 && !read12 && !read16 && blocks > (0x001FFFFF + 1))
{
errorMessage = string.Format("Device only supports SCSI READ (6) but has more than {0} blocks ({1} blocks total)", 0x001FFFFF + 1, blocks);
errorMessage =
string.Format("Device only supports SCSI READ (6) but has more than {0} blocks ({1} blocks total)",
0x001FFFFF + 1, blocks);
return true;
}
@@ -92,7 +97,9 @@ namespace DiscImageChef.Core.Devices
#pragma warning restore IDE0004 // Remove Unnecessary Cast
{
#pragma warning disable IDE0004 // Remove Unnecessary Cast
errorMessage = string.Format("Device only supports SCSI READ (10) but has more than {0} blocks ({1} blocks total)", (long)0xFFFFFFFF + (long)1, blocks);
errorMessage =
string.Format("Device only supports SCSI READ (10) but has more than {0} blocks ({1} blocks total)",
(long)0xFFFFFFFF + (long)1, blocks);
#pragma warning restore IDE0004 // Remove Unnecessary Cast
return true;
}
@@ -124,20 +131,22 @@ namespace DiscImageChef.Core.Devices
}
}*/
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, 0xFFFF, timeout, out duration);
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, 0xFFFF, timeout,
out duration);
if(testSense && !dev.Error)
{
decSense = Decoders.SCSI.Sense.DecodeFixed(senseBuf);
if(decSense.HasValue)
{
if(decSense.Value.SenseKey == Decoders.SCSI.SenseKeys.IllegalRequest &&
decSense.Value.ASC == 0x24 && decSense.Value.ASCQ == 0x00)
decSense.Value.ASC == 0x24 && decSense.Value.ASCQ == 0x00)
{
readRaw = true;
if(decSense.Value.InformationValid && decSense.Value.ILI)
{
longBlockSize = 0xFFFF - (decSense.Value.Information & 0xFFFF);
readLong10 = !dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, (ushort)longBlockSize, timeout, out duration);
readLong10 = !dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0,
(ushort)longBlockSize, timeout, out duration);
}
}
}
@@ -147,15 +156,18 @@ namespace DiscImageChef.Core.Devices
{
if(blockSize == 512)
{
foreach(ushort testSize in new[] {
// Long sector sizes for floppies
514,
// Long sector sizes for SuperDisk
536, 558,
// Long sector sizes for 512-byte magneto-opticals
600, 610, 630 })
foreach(ushort testSize in new[]
{
testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, testSize, timeout, out duration);
// Long sector sizes for floppies
514,
// Long sector sizes for SuperDisk
536, 558,
// Long sector sizes for 512-byte magneto-opticals
600, 610, 630
})
{
testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, testSize, timeout,
out duration);
if(!testSense && !dev.Error)
{
readLong16 = true;
@@ -164,7 +176,8 @@ namespace DiscImageChef.Core.Devices
break;
}
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, testSize, timeout, out duration);
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, testSize,
timeout, out duration);
if(!testSense && !dev.Error)
{
readLong10 = true;
@@ -176,13 +189,16 @@ namespace DiscImageChef.Core.Devices
}
else if(blockSize == 1024)
{
foreach(ushort testSize in new[] {
// Long sector sizes for floppies
1026,
// Long sector sizes for 1024-byte magneto-opticals
1200 })
foreach(ushort testSize in new[]
{
testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, testSize, timeout, out duration);
// Long sector sizes for floppies
1026,
// Long sector sizes for 1024-byte magneto-opticals
1200
})
{
testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, testSize, timeout,
out duration);
if(!testSense && !dev.Error)
{
readLong16 = true;
@@ -191,7 +207,8 @@ namespace DiscImageChef.Core.Devices
break;
}
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, testSize, timeout, out duration);
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, testSize,
timeout, out duration);
if(!testSense && !dev.Error)
{
readLong10 = true;
@@ -203,7 +220,8 @@ namespace DiscImageChef.Core.Devices
}
else if(blockSize == 2048)
{
testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, 2380, timeout, out duration);
testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, 2380, timeout,
out duration);
if(!testSense && !dev.Error)
{
readLong16 = true;
@@ -212,7 +230,8 @@ namespace DiscImageChef.Core.Devices
}
else
{
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, 2380, timeout, out duration);
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, 2380, timeout,
out duration);
if(!testSense && !dev.Error)
{
readLong10 = true;
@@ -223,7 +242,8 @@ namespace DiscImageChef.Core.Devices
}
else if(blockSize == 4096)
{
testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, 4760, timeout, out duration);
testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, 4760, timeout,
out duration);
if(!testSense && !dev.Error)
{
readLong16 = true;
@@ -232,7 +252,8 @@ namespace DiscImageChef.Core.Devices
}
else
{
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, 4760, timeout, out duration);
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, 4760, timeout,
out duration);
if(!testSense && !dev.Error)
{
readLong10 = true;
@@ -243,7 +264,8 @@ namespace DiscImageChef.Core.Devices
}
else if(blockSize == 8192)
{
testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, 9424, timeout, out duration);
testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, 9424, timeout,
out duration);
if(!testSense && !dev.Error)
{
readLong16 = true;
@@ -252,7 +274,8 @@ namespace DiscImageChef.Core.Devices
}
else
{
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, 9424, timeout, out duration);
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, 9424, timeout,
out duration);
if(!testSense && !dev.Error)
{
readLong10 = true;
@@ -265,38 +288,44 @@ namespace DiscImageChef.Core.Devices
if(!readRaw && dev.Manufacturer == "SYQUEST")
{
testSense = dev.SyQuestReadLong10(out readBuffer, out senseBuf, 0, 0xFFFF, timeout, out duration);
testSense = dev.SyQuestReadLong10(out readBuffer, out senseBuf, 0, 0xFFFF, timeout,
out duration);
if(testSense)
{
decSense = Decoders.SCSI.Sense.DecodeFixed(senseBuf);
if(decSense.HasValue)
{
if(decSense.Value.SenseKey == Decoders.SCSI.SenseKeys.IllegalRequest &&
decSense.Value.ASC == 0x24 && decSense.Value.ASCQ == 0x00)
decSense.Value.ASC == 0x24 && decSense.Value.ASCQ == 0x00)
{
readRaw = true;
if(decSense.Value.InformationValid && decSense.Value.ILI)
{
longBlockSize = 0xFFFF - (decSense.Value.Information & 0xFFFF);
syqReadLong10 = !dev.SyQuestReadLong10(out readBuffer, out senseBuf, 0, longBlockSize, timeout, out duration);
syqReadLong10 =
!dev.SyQuestReadLong10(out readBuffer, out senseBuf, 0, longBlockSize,
timeout, out duration);
}
}
else
{
testSense = dev.SyQuestReadLong6(out readBuffer, out senseBuf, 0, 0xFFFF, timeout, out duration);
testSense = dev.SyQuestReadLong6(out readBuffer, out senseBuf, 0, 0xFFFF, timeout,
out duration);
if(testSense)
{
decSense = Decoders.SCSI.Sense.DecodeFixed(senseBuf);
if(decSense.HasValue)
{
if(decSense.Value.SenseKey == Decoders.SCSI.SenseKeys.IllegalRequest &&
decSense.Value.ASC == 0x24 && decSense.Value.ASCQ == 0x00)
decSense.Value.ASC == 0x24 && decSense.Value.ASCQ == 0x00)
{
readRaw = true;
if(decSense.Value.InformationValid && decSense.Value.ILI)
{
longBlockSize = 0xFFFF - (decSense.Value.Information & 0xFFFF);
syqReadLong6 = !dev.SyQuestReadLong6(out readBuffer, out senseBuf, 0, longBlockSize, timeout, out duration);
syqReadLong6 =
!dev.SyQuestReadLong6(out readBuffer, out senseBuf, 0,
longBlockSize, timeout, out duration);
}
}
}
@@ -307,7 +336,8 @@ namespace DiscImageChef.Core.Devices
if(!readRaw && blockSize == 256)
{
testSense = dev.SyQuestReadLong6(out readBuffer, out senseBuf, 0, 262, timeout, out duration);
testSense = dev.SyQuestReadLong6(out readBuffer, out senseBuf, 0, 262, timeout,
out duration);
if(!testSense && !dev.Error)
{
syqReadLong6 = true;
@@ -320,10 +350,12 @@ namespace DiscImageChef.Core.Devices
else
{
if(dev.Manufacturer == "HL-DT-ST")
hldtstReadRaw = !dev.HlDtStReadRawDvd(out readBuffer, out senseBuf, 0, 1, timeout, out duration);
hldtstReadRaw =
!dev.HlDtStReadRawDvd(out readBuffer, out senseBuf, 0, 1, timeout, out duration);
if(dev.Manufacturer == "PLEXTOR")
plextorReadRaw = !dev.PlextorReadRawDvd(out readBuffer, out senseBuf, 0, 1, timeout, out duration);
plextorReadRaw =
!dev.PlextorReadRawDvd(out readBuffer, out senseBuf, 0, 1, timeout, out duration);
if(hldtstReadRaw || plextorReadRaw)
{
@@ -334,7 +366,8 @@ namespace DiscImageChef.Core.Devices
// READ LONG (10) for some DVD drives
if(!readRaw && dev.Manufacturer == "MATSHITA")
{
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, 37856, timeout, out duration);
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, 37856, timeout,
out duration);
if(!testSense && !dev.Error)
{
readLongDvd = true;
@@ -347,27 +380,17 @@ namespace DiscImageChef.Core.Devices
if(readRaw)
{
if(readLong16)
DicConsole.WriteLine("Using SCSI READ LONG (16) command.");
else if(readLong10 || readLongDvd)
DicConsole.WriteLine("Using SCSI READ LONG (10) command.");
else if(syqReadLong10)
DicConsole.WriteLine("Using SyQuest READ LONG (10) command.");
else if(syqReadLong6)
DicConsole.WriteLine("Using SyQuest READ LONG (6) command.");
else if(hldtstReadRaw)
DicConsole.WriteLine("Using HL-DT-ST raw DVD reading.");
else if(plextorReadRaw)
DicConsole.WriteLine("Using Plextor raw DVD reading.");
if(readLong16) DicConsole.WriteLine("Using SCSI READ LONG (16) command.");
else if(readLong10 || readLongDvd) DicConsole.WriteLine("Using SCSI READ LONG (10) command.");
else if(syqReadLong10) DicConsole.WriteLine("Using SyQuest READ LONG (10) command.");
else if(syqReadLong6) DicConsole.WriteLine("Using SyQuest READ LONG (6) command.");
else if(hldtstReadRaw) DicConsole.WriteLine("Using HL-DT-ST raw DVD reading.");
else if(plextorReadRaw) DicConsole.WriteLine("Using Plextor raw DVD reading.");
}
else if(read16)
DicConsole.WriteLine("Using SCSI READ (16) command.");
else if(read12)
DicConsole.WriteLine("Using SCSI READ (12) command.");
else if(read10)
DicConsole.WriteLine("Using SCSI READ (10) command.");
else if(read6)
DicConsole.WriteLine("Using SCSI READ (6) command.");
else if(read16) DicConsole.WriteLine("Using SCSI READ (16) command.");
else if(read12) DicConsole.WriteLine("Using SCSI READ (12) command.");
else if(read10) DicConsole.WriteLine("Using SCSI READ (10) command.");
else if(read6) DicConsole.WriteLine("Using SCSI READ (6) command.");
return false;
}
@@ -396,8 +419,8 @@ namespace DiscImageChef.Core.Devices
// Not all MMC devices support READ CAPACITY, as they have READ TOC
if(dev.SCSIType != Decoders.SCSI.PeripheralDeviceTypes.MultiMediaDevice)
{
errorMessage = string.Format("Unable to get media capacity\n" +
"{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
errorMessage = string.Format("Unable to get media capacity\n" + "{0}",
Decoders.SCSI.Sense.PrettifySense(senseBuf));
return true;
}
@@ -431,31 +454,30 @@ namespace DiscImageChef.Core.Devices
{
if(read16)
{
sense = dev.Read16(out readBuffer, out senseBuf, 0, false, true, false, 0, blockSize, 0, blocksToRead, false, timeout, out duration);
if(dev.Error)
blocksToRead /= 2;
sense = dev.Read16(out readBuffer, out senseBuf, 0, false, true, false, 0, blockSize, 0,
blocksToRead, false, timeout, out duration);
if(dev.Error) blocksToRead /= 2;
}
else if(read12)
{
sense = dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, 0, blockSize, 0, blocksToRead, false, timeout, out duration);
if(dev.Error)
blocksToRead /= 2;
sense = dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, 0, blockSize, 0,
blocksToRead, false, timeout, out duration);
if(dev.Error) blocksToRead /= 2;
}
else if(read10)
{
sense = dev.Read10(out readBuffer, out senseBuf, 0, false, true, false, false, 0, blockSize, 0, (ushort)blocksToRead, timeout, out duration);
if(dev.Error)
blocksToRead /= 2;
sense = dev.Read10(out readBuffer, out senseBuf, 0, false, true, false, false, 0, blockSize, 0,
(ushort)blocksToRead, timeout, out duration);
if(dev.Error) blocksToRead /= 2;
}
else if(read6)
{
sense = dev.Read6(out readBuffer, out senseBuf, 0, blockSize, (byte)blocksToRead, timeout, out duration);
if(dev.Error)
blocksToRead /= 2;
sense = dev.Read6(out readBuffer, out senseBuf, 0, blockSize, (byte)blocksToRead, timeout,
out duration);
if(dev.Error) blocksToRead /= 2;
}
if(!dev.Error || blocksToRead == 1)
break;
if(!dev.Error || blocksToRead == 1) break;
}
if(dev.Error)
@@ -478,37 +500,46 @@ namespace DiscImageChef.Core.Devices
if(readRaw)
{
if(readLong16)
sense = dev.ReadLong16(out buffer, out senseBuf, false, block, longBlockSize, timeout, out duration);
sense = dev.ReadLong16(out buffer, out senseBuf, false, block, longBlockSize, timeout,
out duration);
else if(readLong10)
sense = dev.ReadLong10(out buffer, out senseBuf, false, false, (uint)block, (ushort)longBlockSize, timeout, out duration);
sense = dev.ReadLong10(out buffer, out senseBuf, false, false, (uint)block, (ushort)longBlockSize,
timeout, out duration);
else if(syqReadLong10)
sense = dev.SyQuestReadLong10(out buffer, out senseBuf, (uint)block, longBlockSize, timeout, out duration);
sense = dev.SyQuestReadLong10(out buffer, out senseBuf, (uint)block, longBlockSize, timeout,
out duration);
else if(syqReadLong6)
sense = dev.SyQuestReadLong6(out buffer, out senseBuf, (uint)block, longBlockSize, timeout, out duration);
sense = dev.SyQuestReadLong6(out buffer, out senseBuf, (uint)block, longBlockSize, timeout,
out duration);
else if(hldtstReadRaw)
sense = dev.HlDtStReadRawDvd(out buffer, out senseBuf, (uint)block, longBlockSize, timeout, out duration);
sense = dev.HlDtStReadRawDvd(out buffer, out senseBuf, (uint)block, longBlockSize, timeout,
out duration);
else if(plextorReadRaw)
sense = dev.PlextorReadRawDvd(out buffer, out senseBuf, (uint)block, longBlockSize, timeout, out duration);
else
return true;
sense = dev.PlextorReadRawDvd(out buffer, out senseBuf, (uint)block, longBlockSize, timeout,
out duration);
else return true;
}
else
{
if(read16)
sense = dev.Read16(out buffer, out senseBuf, 0, false, true, false, block, blockSize, 0, count, false, timeout, out duration);
sense = dev.Read16(out buffer, out senseBuf, 0, false, true, false, block, blockSize, 0, count,
false, timeout, out duration);
else if(read12)
sense = dev.Read12(out buffer, out senseBuf, 0, false, false, false, false, (uint)block, blockSize, 0, count, false, timeout, out duration);
sense = dev.Read12(out buffer, out senseBuf, 0, false, false, false, false, (uint)block, blockSize,
0, count, false, timeout, out duration);
else if(read10)
sense = dev.Read10(out buffer, out senseBuf, 0, false, true, false, false, (uint)block, blockSize, 0, (ushort)count, timeout, out duration);
sense = dev.Read10(out buffer, out senseBuf, 0, false, true, false, false, (uint)block, blockSize,
0, (ushort)count, timeout, out duration);
else if(read6)
sense = dev.Read6(out buffer, out senseBuf, (uint)block, blockSize, (byte)count, timeout, out duration);
else
return true;
sense = dev.Read6(out buffer, out senseBuf, (uint)block, blockSize, (byte)count, timeout,
out duration);
else return true;
}
if(sense || dev.Error)
{
DicConsole.DebugWriteLine("SCSI Reader", "READ error:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
DicConsole.DebugWriteLine("SCSI Reader", "READ error:\n{0}",
Decoders.SCSI.Sense.PrettifySense(senseBuf));
return true;
}
@@ -521,12 +552,10 @@ namespace DiscImageChef.Core.Devices
bool sense = true;
duration = 0;
if(seek6)
sense = dev.Seek6(out senseBuf, (uint)block, timeout, out duration);
else if(seek10)
sense = dev.Seek10(out senseBuf, (uint)block, timeout, out duration);
if(seek6) sense = dev.Seek6(out senseBuf, (uint)block, timeout, out duration);
else if(seek10) sense = dev.Seek10(out senseBuf, (uint)block, timeout, out duration);
return sense;
}
}
}
}