From 482c646f713c9abb0b5bdd6df9dab4c83d73a24b Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 27 Dec 2019 17:48:23 +0000 Subject: [PATCH] Save data on device report when not in debug mode. --- .../.idea/contentModel.xml | 2 + DiscImageChef.Core/Devices/Report/ATA.cs | 136 ++--- .../Devices/Report/DeviceReport.cs | 8 +- DiscImageChef.Core/Devices/Report/FireWire.cs | 8 +- DiscImageChef.Core/Devices/Report/MMC.cs | 522 +++++++++--------- DiscImageChef.Core/Devices/Report/PCMCIA.cs | 4 +- DiscImageChef.Core/Devices/Report/SSC.cs | 30 +- DiscImageChef.Core/Devices/Report/Scsi.cs | 248 ++++----- .../Devices/Report/SecureDigital.cs | 18 +- DiscImageChef.Core/Devices/Report/USB.cs | 10 +- DiscImageChef/Commands/DeviceReport.cs | 47 +- 11 files changed, 511 insertions(+), 522 deletions(-) diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml index 664136381..0242efa06 100644 --- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml +++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml @@ -3,8 +3,10 @@ + + diff --git a/DiscImageChef.Core/Devices/Report/ATA.cs b/DiscImageChef.Core/Devices/Report/ATA.cs index cc88958ee..b995e50d9 100644 --- a/DiscImageChef.Core/Devices/Report/ATA.cs +++ b/DiscImageChef.Core/Devices/Report/ATA.cs @@ -51,7 +51,7 @@ namespace DiscImageChef.Core.Devices.Report mediaTest.MediaIsRecognized = true; DicConsole.WriteLine("Querying ATA IDENTIFY..."); - dev.AtaIdentify(out byte[] buffer, out _, dev.Timeout, out _); + _dev.AtaIdentify(out byte[] buffer, out _, _dev.Timeout, out _); mediaTest.IdentifyData = ClearIdentify(buffer); mediaTest.IdentifyDevice = Identify.Decode(buffer); @@ -157,114 +157,114 @@ namespace DiscImageChef.Core.Devices.Report bool sense; DicConsole.WriteLine("Trying READ SECTOR(S) in CHS mode..."); - sense = dev.Read(out byte[] readBuf, out AtaErrorRegistersChs errorChs, false, 0, 0, 1, 1, dev.Timeout, + sense = _dev.Read(out byte[] readBuf, out AtaErrorRegistersChs errorChs, false, 0, 0, 1, 1, _dev.Timeout, out _); mediaTest.SupportsReadSectors = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadSectorsData = readBuf; + mediaTest.ReadSectorsData = readBuf; DicConsole.WriteLine("Trying READ SECTOR(S) RETRY in CHS mode..."); - sense = dev.Read(out readBuf, out errorChs, true, 0, 0, 1, 1, dev.Timeout, out _); + sense = _dev.Read(out readBuf, out errorChs, true, 0, 0, 1, 1, _dev.Timeout, out _); mediaTest.SupportsReadRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadSectorsRetryData = readBuf; + mediaTest.ReadSectorsRetryData = readBuf; DicConsole.WriteLine("Trying READ DMA in CHS mode..."); - sense = dev.ReadDma(out readBuf, out errorChs, false, 0, 0, 1, 1, dev.Timeout, out _); + sense = _dev.ReadDma(out readBuf, out errorChs, false, 0, 0, 1, 1, _dev.Timeout, out _); mediaTest.SupportsReadDma = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadDmaData = readBuf; + mediaTest.ReadDmaData = readBuf; DicConsole.WriteLine("Trying READ DMA RETRY in CHS mode..."); - sense = dev.ReadDma(out readBuf, out errorChs, true, 0, 0, 1, 1, dev.Timeout, out _); + sense = _dev.ReadDma(out readBuf, out errorChs, true, 0, 0, 1, 1, _dev.Timeout, out _); mediaTest.SupportsReadDmaRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadDmaRetryData = readBuf; + mediaTest.ReadDmaRetryData = readBuf; DicConsole.WriteLine("Trying SEEK in CHS mode..."); - sense = dev.Seek(out errorChs, 0, 0, 1, dev.Timeout, out _); + sense = _dev.Seek(out errorChs, 0, 0, 1, _dev.Timeout, out _); mediaTest.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense, errorChs.Status, errorChs.Error); DicConsole.WriteLine("Trying READ SECTOR(S) in LBA mode..."); - sense = dev.Read(out readBuf, out AtaErrorRegistersLba28 errorLba, false, 0, 1, dev.Timeout, out _); + sense = _dev.Read(out readBuf, out AtaErrorRegistersLba28 errorLba, false, 0, 1, _dev.Timeout, out _); mediaTest.SupportsReadLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadLbaData = readBuf; + mediaTest.ReadLbaData = readBuf; DicConsole.WriteLine("Trying READ SECTOR(S) RETRY in LBA mode..."); - sense = dev.Read(out readBuf, out errorLba, true, 0, 1, dev.Timeout, out _); + sense = _dev.Read(out readBuf, out errorLba, true, 0, 1, _dev.Timeout, out _); mediaTest.SupportsReadRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadRetryLbaData = readBuf; + mediaTest.ReadRetryLbaData = readBuf; DicConsole.WriteLine("Trying READ DMA in LBA mode..."); - sense = dev.ReadDma(out readBuf, out errorLba, false, 0, 1, dev.Timeout, out _); + sense = _dev.ReadDma(out readBuf, out errorLba, false, 0, 1, _dev.Timeout, out _); mediaTest.SupportsReadDmaLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadDmaLbaData = readBuf; + mediaTest.ReadDmaLbaData = readBuf; DicConsole.WriteLine("Trying READ DMA RETRY in LBA mode..."); - sense = dev.ReadDma(out readBuf, out errorLba, true, 0, 1, dev.Timeout, out _); + sense = _dev.ReadDma(out readBuf, out errorLba, true, 0, 1, _dev.Timeout, out _); mediaTest.SupportsReadDmaRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadDmaRetryLbaData = readBuf; + mediaTest.ReadDmaRetryLbaData = readBuf; DicConsole.WriteLine("Trying SEEK in LBA mode..."); - sense = dev.Seek(out errorLba, 0, dev.Timeout, out _); + sense = _dev.Seek(out errorLba, 0, _dev.Timeout, out _); mediaTest.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense, errorChs.Status, errorChs.Error); DicConsole.WriteLine("Trying READ SECTOR(S) in LBA48 mode..."); - sense = dev.Read(out readBuf, out AtaErrorRegistersLba48 errorLba48, 0, 1, dev.Timeout, out _); + sense = _dev.Read(out readBuf, out AtaErrorRegistersLba48 errorLba48, 0, 1, _dev.Timeout, out _); mediaTest.SupportsReadLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadLba48Data = readBuf; + mediaTest.ReadLba48Data = readBuf; DicConsole.WriteLine("Trying READ DMA in LBA48 mode..."); - sense = dev.ReadDma(out readBuf, out errorLba48, 0, 1, dev.Timeout, out _); + sense = _dev.ReadDma(out readBuf, out errorLba48, 0, 1, _dev.Timeout, out _); mediaTest.SupportsReadDmaLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadDmaLba48Data = readBuf; + mediaTest.ReadDmaLba48Data = readBuf; // Send SET FEATURES before sending READ LONG commands, retrieve IDENTIFY again and // check if ECC size changed. Sector is set to 1 because without it most drives just return // CORRECTABLE ERROR for this command. - dev.SetFeatures(out _, AtaFeatures.EnableReadLongVendorLength, 0, 0, 1, 0, dev.Timeout, out _); + _dev.SetFeatures(out _, AtaFeatures.EnableReadLongVendorLength, 0, 0, 1, 0, _dev.Timeout, out _); - dev.AtaIdentify(out buffer, out _, dev.Timeout, out _); + _dev.AtaIdentify(out buffer, out _, _dev.Timeout, out _); if(Identify.Decode(buffer).HasValue) { ataId = Identify.Decode(buffer).Value; @@ -277,19 +277,19 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Trying READ LONG in CHS mode..."); - sense = dev.ReadLong(out readBuf, out errorChs, false, 0, 0, 1, mediaTest.LongBlockSize ?? 0, - dev.Timeout, out _); + sense = _dev.ReadLong(out readBuf, out errorChs, false, 0, 0, 1, mediaTest.LongBlockSize ?? 0, + _dev.Timeout, out _); mediaTest.SupportsReadLong = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadLongData = readBuf; + mediaTest.ReadLongData = readBuf; DicConsole.WriteLine("Trying READ LONG RETRY in CHS mode..."); - sense = dev.ReadLong(out readBuf, out errorChs, true, 0, 0, 1, mediaTest.LongBlockSize ?? 0, - dev.Timeout, out _); + sense = _dev.ReadLong(out readBuf, out errorChs, true, 0, 0, 1, mediaTest.LongBlockSize ?? 0, + _dev.Timeout, out _); mediaTest.SupportsReadLongRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) != @@ -297,10 +297,10 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadLongRetryData = readBuf; + mediaTest.ReadLongRetryData = readBuf; DicConsole.WriteLine("Trying READ LONG in LBA mode..."); - sense = dev.ReadLong(out readBuf, out errorLba, false, 0, mediaTest.LongBlockSize ?? 0, dev.Timeout, + sense = _dev.ReadLong(out readBuf, out errorLba, false, 0, mediaTest.LongBlockSize ?? 0, _dev.Timeout, out _); mediaTest.SupportsReadLongLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0 && @@ -308,10 +308,10 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadLongLbaData = readBuf; + mediaTest.ReadLongLbaData = readBuf; DicConsole.WriteLine("Trying READ LONG RETRY in LBA mode..."); - sense = dev.ReadLong(out readBuf, out errorLba, true, 0, mediaTest.LongBlockSize ?? 0, dev.Timeout, + sense = _dev.ReadLong(out readBuf, out errorLba, true, 0, mediaTest.LongBlockSize ?? 0, _dev.Timeout, out _); mediaTest.SupportsReadLongRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0 && @@ -319,7 +319,7 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) mediaTest.ReadLongRetryLbaData = readBuf; + mediaTest.ReadLongRetryLbaData = readBuf; } else mediaTest.MediaIsRecognized = false; @@ -429,104 +429,104 @@ namespace DiscImageChef.Core.Devices.Report bool sense; DicConsole.WriteLine("Trying READ SECTOR(S) in CHS mode..."); - sense = dev.Read(out byte[] readBuf, out AtaErrorRegistersChs errorChs, false, 0, 0, 1, 1, dev.Timeout, + sense = _dev.Read(out byte[] readBuf, out AtaErrorRegistersChs errorChs, false, 0, 0, 1, 1, _dev.Timeout, out _); capabilities.SupportsReadSectors = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) capabilities.ReadSectorsData = readBuf; + capabilities.ReadSectorsData = readBuf; DicConsole.WriteLine("Trying READ SECTOR(S) RETRY in CHS mode..."); - sense = dev.Read(out readBuf, out errorChs, true, 0, 0, 1, 1, dev.Timeout, out _); + sense = _dev.Read(out readBuf, out errorChs, true, 0, 0, 1, 1, _dev.Timeout, out _); capabilities.SupportsReadRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) capabilities.ReadSectorsRetryData = readBuf; + capabilities.ReadSectorsRetryData = readBuf; DicConsole.WriteLine("Trying READ DMA in CHS mode..."); - sense = dev.ReadDma(out readBuf, out errorChs, false, 0, 0, 1, 1, dev.Timeout, out _); + sense = _dev.ReadDma(out readBuf, out errorChs, false, 0, 0, 1, 1, _dev.Timeout, out _); capabilities.SupportsReadDma = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) capabilities.ReadDmaData = readBuf; + capabilities.ReadDmaData = readBuf; DicConsole.WriteLine("Trying READ DMA RETRY in CHS mode..."); - sense = dev.ReadDma(out readBuf, out errorChs, true, 0, 0, 1, 1, dev.Timeout, out _); + sense = _dev.ReadDma(out readBuf, out errorChs, true, 0, 0, 1, 1, _dev.Timeout, out _); capabilities.SupportsReadDmaRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) capabilities.ReadDmaRetryData = readBuf; + capabilities.ReadDmaRetryData = readBuf; DicConsole.WriteLine("Trying SEEK in CHS mode..."); - sense = dev.Seek(out errorChs, 0, 0, 1, dev.Timeout, out _); + sense = _dev.Seek(out errorChs, 0, 0, 1, _dev.Timeout, out _); capabilities.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense, errorChs.Status, errorChs.Error); DicConsole.WriteLine("Trying READ SECTOR(S) in LBA mode..."); - sense = dev.Read(out readBuf, out AtaErrorRegistersLba28 errorLba, false, 0, 1, dev.Timeout, out _); + sense = _dev.Read(out readBuf, out AtaErrorRegistersLba28 errorLba, false, 0, 1, _dev.Timeout, out _); capabilities.SupportsReadLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorLba.Status, errorLba.Error, readBuf.Length); - if(debug) capabilities.ReadLbaData = readBuf; + capabilities.ReadLbaData = readBuf; DicConsole.WriteLine("Trying READ SECTOR(S) RETRY in LBA mode..."); - sense = dev.Read(out readBuf, out errorLba, true, 0, 1, dev.Timeout, out _); + sense = _dev.Read(out readBuf, out errorLba, true, 0, 1, _dev.Timeout, out _); capabilities.SupportsReadRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorLba.Status, errorLba.Error, readBuf.Length); - if(debug) capabilities.ReadRetryLbaData = readBuf; + capabilities.ReadRetryLbaData = readBuf; DicConsole.WriteLine("Trying READ DMA in LBA mode..."); - sense = dev.ReadDma(out readBuf, out errorLba, false, 0, 1, dev.Timeout, out _); + sense = _dev.ReadDma(out readBuf, out errorLba, false, 0, 1, _dev.Timeout, out _); capabilities.SupportsReadDmaLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorLba.Status, errorLba.Error, readBuf.Length); - if(debug) capabilities.ReadDmaLbaData = readBuf; + capabilities.ReadDmaLbaData = readBuf; DicConsole.WriteLine("Trying READ DMA RETRY in LBA mode..."); - sense = dev.ReadDma(out readBuf, out errorLba, true, 0, 1, dev.Timeout, out _); + sense = _dev.ReadDma(out readBuf, out errorLba, true, 0, 1, _dev.Timeout, out _); capabilities.SupportsReadDmaRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorLba.Status, errorLba.Error, readBuf.Length); - if(debug) capabilities.ReadDmaRetryLbaData = readBuf; + capabilities.ReadDmaRetryLbaData = readBuf; DicConsole.WriteLine("Trying SEEK in LBA mode..."); - sense = dev.Seek(out errorLba, 0, dev.Timeout, out _); + sense = _dev.Seek(out errorLba, 0, _dev.Timeout, out _); capabilities.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense, errorLba.Status, errorLba.Error); DicConsole.WriteLine("Trying READ SECTOR(S) in LBA48 mode..."); - sense = dev.Read(out readBuf, out AtaErrorRegistersLba48 errorLba48, 0, 1, dev.Timeout, out _); + sense = _dev.Read(out readBuf, out AtaErrorRegistersLba48 errorLba48, 0, 1, _dev.Timeout, out _); capabilities.SupportsReadLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorLba48.Status, errorLba48.Error, readBuf.Length); - if(debug) capabilities.ReadLba48Data = readBuf; + capabilities.ReadLba48Data = readBuf; DicConsole.WriteLine("Trying READ DMA in LBA48 mode..."); - sense = dev.ReadDma(out readBuf, out errorLba48, 0, 1, dev.Timeout, out _); + sense = _dev.ReadDma(out readBuf, out errorLba48, 0, 1, _dev.Timeout, out _); capabilities.SupportsReadDmaLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorLba48.Status, errorLba48.Error, readBuf.Length); - if(debug) capabilities.ReadDmaLba48Data = readBuf; + capabilities.ReadDmaLba48Data = readBuf; // Send SET FEATURES before sending READ LONG commands, retrieve IDENTIFY again and // check if ECC size changed. Sector is set to 1 because without it most drives just return // CORRECTABLE ERROR for this command. - dev.SetFeatures(out _, AtaFeatures.EnableReadLongVendorLength, 0, 0, 1, 0, dev.Timeout, out _); + _dev.SetFeatures(out _, AtaFeatures.EnableReadLongVendorLength, 0, 0, 1, 0, _dev.Timeout, out _); - dev.AtaIdentify(out byte[] buffer, out _, dev.Timeout, out _); + _dev.AtaIdentify(out byte[] buffer, out _, _dev.Timeout, out _); if(Identify.Decode(buffer).HasValue) { ataId = Identify.Decode(buffer).Value; @@ -539,18 +539,18 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Trying READ LONG in CHS mode..."); - sense = dev.ReadLong(out readBuf, out errorChs, false, 0, 0, 1, capabilities.LongBlockSize ?? 0, - dev.Timeout, out _); + sense = _dev.ReadLong(out readBuf, out errorChs, false, 0, 0, 1, capabilities.LongBlockSize ?? 0, + _dev.Timeout, out _); capabilities.SupportsReadLong = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) capabilities.ReadLongData = readBuf; + capabilities.ReadLongData = readBuf; DicConsole.WriteLine("Trying READ LONG RETRY in CHS mode..."); - sense = dev.ReadLong(out readBuf, out errorChs, true, 0, 0, 1, capabilities.LongBlockSize ?? 0, dev.Timeout, + sense = _dev.ReadLong(out readBuf, out errorChs, true, 0, 0, 1, capabilities.LongBlockSize ?? 0, _dev.Timeout, out _); capabilities.SupportsReadLongRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0 && @@ -558,20 +558,20 @@ namespace DiscImageChef.Core.Devices.Report checkCorrectRead; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorChs.Status, errorChs.Error, readBuf.Length); - if(debug) capabilities.ReadLongRetryData = readBuf; + capabilities.ReadLongRetryData = readBuf; DicConsole.WriteLine("Trying READ LONG in LBA mode..."); - sense = dev.ReadLong(out readBuf, out errorLba, false, 0, capabilities.LongBlockSize ?? 0, dev.Timeout, + sense = _dev.ReadLong(out readBuf, out errorLba, false, 0, capabilities.LongBlockSize ?? 0, _dev.Timeout, out _); capabilities.SupportsReadLongLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorLba.Status, errorLba.Error, readBuf.Length); - if(debug) capabilities.ReadLongLbaData = readBuf; + capabilities.ReadLongLbaData = readBuf; DicConsole.WriteLine("Trying READ LONG RETRY in LBA mode..."); - sense = dev.ReadLong(out readBuf, out errorLba, true, 0, capabilities.LongBlockSize ?? 0, dev.Timeout, + sense = _dev.ReadLong(out readBuf, out errorLba, true, 0, capabilities.LongBlockSize ?? 0, _dev.Timeout, out _); capabilities.SupportsReadLongRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0 && @@ -579,7 +579,7 @@ namespace DiscImageChef.Core.Devices.Report checkCorrectRead; DicConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense, errorLba.Status, errorLba.Error, readBuf.Length); - if(debug) capabilities.ReadLongRetryLbaData = readBuf; + capabilities.ReadLongRetryLbaData = readBuf; return capabilities; } diff --git a/DiscImageChef.Core/Devices/Report/DeviceReport.cs b/DiscImageChef.Core/Devices/Report/DeviceReport.cs index b44b1ec2f..3d0453419 100644 --- a/DiscImageChef.Core/Devices/Report/DeviceReport.cs +++ b/DiscImageChef.Core/Devices/Report/DeviceReport.cs @@ -36,13 +36,11 @@ namespace DiscImageChef.Core.Devices.Report { public partial class DeviceReport { - bool debug; - Device dev; + Device _dev; - public DeviceReport(Device device, bool debug) + public DeviceReport(Device device) { - dev = device; - this.debug = debug; + _dev = device; } } } \ No newline at end of file diff --git a/DiscImageChef.Core/Devices/Report/FireWire.cs b/DiscImageChef.Core/Devices/Report/FireWire.cs index 297dcdf20..a017b422b 100644 --- a/DiscImageChef.Core/Devices/Report/FireWire.cs +++ b/DiscImageChef.Core/Devices/Report/FireWire.cs @@ -45,10 +45,10 @@ namespace DiscImageChef.Core.Devices.Report public FireWire FireWireReport() => new FireWire { - Manufacturer = dev.FireWireVendorName, - Product = dev.FireWireModelName, - ProductID = dev.FireWireModel, - VendorID = dev.FireWireVendor + Manufacturer = _dev.FireWireVendorName, + Product = _dev.FireWireModelName, + ProductID = _dev.FireWireModel, + VendorID = _dev.FireWireVendor }; } } \ No newline at end of file diff --git a/DiscImageChef.Core/Devices/Report/MMC.cs b/DiscImageChef.Core/Devices/Report/MMC.cs index f5208ee3a..9b6c28f6f 100644 --- a/DiscImageChef.Core/Devices/Report/MMC.cs +++ b/DiscImageChef.Core/Devices/Report/MMC.cs @@ -73,7 +73,7 @@ namespace DiscImageChef.Core.Devices.Report public MmcFeatures ReportMmcFeatures() { DicConsole.WriteLine("Querying MMC GET CONFIGURATION..."); - bool sense = dev.GetConfiguration(out byte[] buffer, out _, dev.Timeout, out _); + bool sense = _dev.GetConfiguration(out byte[] buffer, out _, _dev.Timeout, out _); if(sense) return null; @@ -577,10 +577,10 @@ namespace DiscImageChef.Core.Devices.Report var mediaTest = new TestedMedia(); DicConsole.WriteLine("Querying SCSI READ CAPACITY..."); - bool sense = dev.ReadCapacity(out byte[] buffer, out byte[] senseBuffer, dev.Timeout, out _); + bool sense = _dev.ReadCapacity(out byte[] buffer, out byte[] senseBuffer, _dev.Timeout, out _); if(!sense && - !dev.Error) + !_dev.Error) { mediaTest.SupportsReadCapacity = true; @@ -592,10 +592,10 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Querying SCSI READ CAPACITY (16)..."); - sense = dev.ReadCapacity16(out buffer, out buffer, dev.Timeout, out _); + sense = _dev.ReadCapacity16(out buffer, out buffer, _dev.Timeout, out _); if(!sense && - !dev.Error) + !_dev.Error) { mediaTest.SupportsReadCapacity16 = true; byte[] temp = new byte[8]; @@ -609,28 +609,28 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.WriteLine("Querying SCSI MODE SENSE (10)..."); - sense = dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current, 0x3F, - 0x00, dev.Timeout, out _); + sense = _dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current, 0x3F, + 0x00, _dev.Timeout, out _); if(!sense && - !dev.Error) + !_dev.Error) { - decMode = Modes.DecodeMode10(buffer, dev.ScsiType); + decMode = Modes.DecodeMode10(buffer, _dev.ScsiType); + - if(debug) mediaTest.ModeSense10Data = buffer; } DicConsole.WriteLine("Querying SCSI MODE SENSE..."); - sense = dev.ModeSense(out buffer, out senseBuffer, dev.Timeout, out _); + sense = _dev.ModeSense(out buffer, out senseBuffer, _dev.Timeout, out _); if(!sense && - !dev.Error) + !_dev.Error) { if(!decMode.HasValue) - decMode = Modes.DecodeMode6(buffer, dev.ScsiType); + decMode = Modes.DecodeMode6(buffer, _dev.ScsiType); + - if(debug) mediaTest.ModeSense6Data = buffer; } @@ -650,18 +650,18 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.WriteLine("Querying CD TOC..."); mediaTest.CanReadTOC = - !dev.ReadTocPmaAtip(out buffer, out senseBuffer, false, 0, 0, dev.Timeout, out _); + !_dev.ReadTocPmaAtip(out buffer, out senseBuffer, false, 0, 0, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadTOC); - if(debug) + mediaTest.TocData = buffer; DicConsole.WriteLine("Querying CD Full TOC..."); - mediaTest.CanReadFullTOC = !dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _); + mediaTest.CanReadFullTOC = !_dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadFullTOC); - if(debug) + mediaTest.FullTocData = buffer; } @@ -669,17 +669,17 @@ namespace DiscImageChef.Core.Devices.Report mediaType.StartsWith("DDCD-R", StringComparison.Ordinal)) { DicConsole.WriteLine("Querying CD ATIP..."); - mediaTest.CanReadATIP = !dev.ReadAtip(out buffer, out senseBuffer, dev.Timeout, out _); + mediaTest.CanReadATIP = !_dev.ReadAtip(out buffer, out senseBuffer, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadATIP); - if(debug) + mediaTest.AtipData = buffer; DicConsole.WriteLine("Querying CD PMA..."); - mediaTest.CanReadPMA = !dev.ReadPma(out buffer, out senseBuffer, dev.Timeout, out _); + mediaTest.CanReadPMA = !_dev.ReadPma(out buffer, out senseBuffer, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPMA); - if(debug) + mediaTest.PmaData = buffer; } @@ -689,26 +689,26 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Querying DVD PFI..."); - mediaTest.CanReadPFI = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadPFI = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.PhysicalInformation, 0, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPFI); - if(debug) + mediaTest.PfiData = buffer; DicConsole.WriteLine("Querying DVD DMI..."); - mediaTest.CanReadDMI = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadDMI = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DiscManufacturingInformation, 0, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDMI); - if(debug) + mediaTest.DmiData = buffer; } @@ -716,14 +716,14 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Querying DVD CMI..."); - mediaTest.CanReadCMI = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadCMI = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.CopyrightInformation, 0, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCMI); - if(debug) + mediaTest.CmiData = buffer; } @@ -733,26 +733,26 @@ namespace DiscImageChef.Core.Devices.Report case"HD DVD-ROM": DicConsole.WriteLine("Querying DVD BCA..."); - mediaTest.CanReadBCA = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.BurstCuttingArea, 0, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadBCA); - if(debug) + mediaTest.DvdBcaData = buffer; DicConsole.WriteLine("Querying DVD AACS..."); - mediaTest.CanReadAACS = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadAACS = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.DvdAacs, 0, dev.Timeout, + MmcDiscStructureFormat.DvdAacs, 0, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadAACS); - if(debug) + mediaTest.DvdAacsData = buffer; break; @@ -760,14 +760,14 @@ namespace DiscImageChef.Core.Devices.Report case"Nintendo Wii game": DicConsole.WriteLine("Querying DVD BCA..."); - mediaTest.CanReadBCA = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.BurstCuttingArea, 0, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadBCA); - if(debug) + mediaTest.DvdBcaData = buffer; break; @@ -779,14 +779,14 @@ namespace DiscImageChef.Core.Devices.Report case"Nintendo Wii U game": DicConsole.WriteLine("Querying BD BCA..."); - mediaTest.CanReadBCA = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Bd, 0, 0, MmcDiscStructureFormat.BdBurstCuttingArea, 0, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadBCA); - if(debug) + mediaTest.BluBcaData = buffer; break; @@ -794,24 +794,24 @@ namespace DiscImageChef.Core.Devices.Report case"DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)": case"HD DVD-RAM": case"PD-650": - mediaTest.CanReadDDS = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadDDS = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.DvdramDds, 0, dev.Timeout, + MmcDiscStructureFormat.DvdramDds, 0, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDDS); - if(debug) + mediaTest.DvdDdsData = buffer; mediaTest.CanReadSpareAreaInformation = - !dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.DvdramSpareAreaInformation, 0, dev.Timeout, + !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, + MmcDiscStructureFormat.DvdramSpareAreaInformation, 0, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadSpareAreaInformation); - if(debug) + mediaTest.DvdSaiData = buffer; break; @@ -822,24 +822,24 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Querying BD DDS..."); - mediaTest.CanReadDDS = !dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Bd, - 0, 0, MmcDiscStructureFormat.BdDds, 0, dev.Timeout, + mediaTest.CanReadDDS = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Bd, + 0, 0, MmcDiscStructureFormat.BdDds, 0, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDDS); - if(debug) + mediaTest.BluDdsData = buffer; DicConsole.WriteLine("Querying BD SAI..."); mediaTest.CanReadSpareAreaInformation = - !dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Bd, 0, 0, - MmcDiscStructureFormat.BdSpareAreaInformation, 0, dev.Timeout, out _); + !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Bd, 0, 0, + MmcDiscStructureFormat.BdSpareAreaInformation, 0, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadSpareAreaInformation); - if(debug) + mediaTest.BluSaiData = buffer; } @@ -848,14 +848,14 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Querying DVD PRI..."); - mediaTest.CanReadPRI = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadPRI = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.PreRecordedInfo, 0, dev.Timeout, + MmcDiscStructureFormat.PreRecordedInfo, 0, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPRI); - if(debug) + mediaTest.PriData = buffer; } @@ -865,22 +865,22 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Querying DVD Media ID..."); - mediaTest.CanReadMediaID = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadMediaID = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DvdrMediaIdentifier, 0, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadMediaID); DicConsole.WriteLine("Querying DVD Embossed PFI..."); - mediaTest.CanReadRecordablePFI = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadRecordablePFI = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DvdrPhysicalInformation, - 0, dev.Timeout, out _); + 0, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRecordablePFI); - if(debug) + mediaTest.EmbossedPfiData = buffer; } @@ -889,24 +889,24 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Querying DVD ADIP..."); - mediaTest.CanReadADIP = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadADIP = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.Adip, 0, dev.Timeout, out _); + MmcDiscStructureFormat.Adip, 0, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadADIP); - if(debug) + mediaTest.AdipData = buffer; DicConsole.WriteLine("Querying DVD DCB..."); - mediaTest.CanReadDCB = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadDCB = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.Dcb, 0, dev.Timeout, out _); + MmcDiscStructureFormat.Dcb, 0, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDCB); - if(debug) + mediaTest.DcbData = buffer; } @@ -914,14 +914,14 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Querying HD DVD CMI..."); - mediaTest.CanReadHDCMI = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadHDCMI = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.HddvdCopyrightInformation, 0, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadHDCMI); - if(debug) + mediaTest.HdCmiData = buffer; } @@ -929,14 +929,14 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Querying DVD Layer Capacity..."); - mediaTest.CanReadLayerCapacity = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadLayerCapacity = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DvdrLayerCapacity, 0, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadLayerCapacity); - if(debug) + mediaTest.DvdLayerData = buffer; } @@ -949,24 +949,24 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Querying BD Disc Information..."); - mediaTest.CanReadDiscInformation = !dev.ReadDiscStructure(out buffer, out senseBuffer, + mediaTest.CanReadDiscInformation = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Bd, 0, 0, MmcDiscStructureFormat.DiscInformation, 0, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDiscInformation); - if(debug) + mediaTest.BluDiData = buffer; DicConsole.WriteLine("Querying BD PAC..."); - mediaTest.CanReadPAC = !dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Bd, - 0, 0, MmcDiscStructureFormat.Pac, 0, dev.Timeout, out _); + mediaTest.CanReadPAC = !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Bd, + 0, 0, MmcDiscStructureFormat.Pac, 0, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPAC); - if(debug) + mediaTest.BluPacData = buffer; } @@ -974,91 +974,91 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Trying SCSI READ CD scrambled..."); - mediaTest.CanReadCdScrambled = !dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1, + mediaTest.CanReadCdScrambled = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, - MmcSubchannel.None, dev.Timeout, out _); + MmcSubchannel.None, _dev.Timeout, out _); + - if(debug) mediaTest.ReadCdScrambledData = buffer; } if(mediaType.StartsWith("PD-", StringComparison.Ordinal)) { DicConsole.WriteLine("Trying SCSI READ (6)..."); - mediaTest.SupportsRead6 = !dev.Read6(out buffer, out senseBuffer, 16, 512, dev.Timeout, out _); + mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 16, 512, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead6); - if(debug) + mediaTest.Read6Data = buffer; DicConsole.WriteLine("Trying SCSI READ (10)..."); - mediaTest.SupportsRead10 = !dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false, 16, - 512, 0, 1, dev.Timeout, out _); + mediaTest.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false, 16, + 512, 0, 1, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead10); - if(debug) + mediaTest.Read10Data = buffer; DicConsole.WriteLine("Trying SCSI READ (12)..."); - mediaTest.SupportsRead12 = !dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false, 16, - 512, 0, 1, false, dev.Timeout, out _); + mediaTest.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false, 16, + 512, 0, 1, false, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead12); - if(debug) + mediaTest.Read12Data = buffer; DicConsole.WriteLine("Trying SCSI READ (16)..."); - mediaTest.SupportsRead16 = !dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 16, 512, 0, - 1, false, dev.Timeout, out _); + mediaTest.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 16, 512, 0, + 1, false, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead16); - if(debug) + mediaTest.Read16Data = buffer; } else { DicConsole.WriteLine("Trying SCSI READ (6)..."); - mediaTest.SupportsRead6 = !dev.Read6(out buffer, out senseBuffer, 16, 2048, dev.Timeout, out _); + mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 16, 2048, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead6); - if(debug) + mediaTest.Read6Data = buffer; DicConsole.WriteLine("Trying SCSI READ (10)..."); - mediaTest.SupportsRead10 = !dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false, 16, - 2048, 0, 1, dev.Timeout, out _); + mediaTest.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false, 16, + 2048, 0, 1, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead10); - if(debug) + mediaTest.Read10Data = buffer; DicConsole.WriteLine("Trying SCSI READ (12)..."); - mediaTest.SupportsRead12 = !dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false, 16, - 2048, 0, 1, false, dev.Timeout, out _); + mediaTest.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false, 16, + 2048, 0, 1, false, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead12); - if(debug) + mediaTest.Read12Data = buffer; DicConsole.WriteLine("Trying SCSI READ (16)..."); - mediaTest.SupportsRead16 = !dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 16, 2048, 0, - 1, false, dev.Timeout, out _); + mediaTest.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 16, 2048, 0, + 1, false, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead16); - if(debug) + mediaTest.Read16Data = buffer; } @@ -1070,77 +1070,77 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Trying SCSI READ CD..."); - mediaTest.SupportsReadCd = !dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1, + mediaTest.SupportsReadCd = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, - MmcSubchannel.None, dev.Timeout, out _); + MmcSubchannel.None, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCd); - if(debug) + mediaTest.ReadCdFullData = buffer; DicConsole.WriteLine("Trying SCSI READ CD MSF..."); - mediaTest.SupportsReadCdMsf = !dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210, 0x00000211, + mediaTest.SupportsReadCdMsf = !_dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210, 0x00000211, 2352, MmcSectorTypes.Cdda, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, - MmcSubchannel.None, dev.Timeout, out _); + MmcSubchannel.None, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdMsf); - if(debug) + mediaTest.ReadCdMsfFullData = buffer; } else { DicConsole.WriteLine("Trying SCSI READ CD..."); - mediaTest.SupportsReadCd = !dev.ReadCd(out buffer, out senseBuffer, 16, 2048, 1, + mediaTest.SupportsReadCd = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2048, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, - MmcSubchannel.None, dev.Timeout, out _); + MmcSubchannel.None, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCd); - if(debug) + mediaTest.ReadCdData = buffer; DicConsole.WriteLine("Trying SCSI READ CD MSF..."); - mediaTest.SupportsReadCdMsf = !dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210, 0x00000211, + mediaTest.SupportsReadCdMsf = !_dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210, 0x00000211, 2048, MmcSectorTypes.AllTypes, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, - MmcSubchannel.None, dev.Timeout, out _); + MmcSubchannel.None, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdMsf); - if(debug) + mediaTest.ReadCdMsfData = buffer; DicConsole.WriteLine("Trying SCSI READ CD full sector..."); - mediaTest.SupportsReadCdRaw = !dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1, + mediaTest.SupportsReadCdRaw = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, - MmcSubchannel.None, dev.Timeout, out _); + MmcSubchannel.None, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdRaw); - if(debug) + mediaTest.ReadCdFullData = buffer; DicConsole.WriteLine("Trying SCSI READ CD MSF full sector..."); - mediaTest.SupportsReadCdMsfRaw = !dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210, 0x00000211, + mediaTest.SupportsReadCdMsfRaw = !_dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210, 0x00000211, 2352, MmcSectorTypes.AllTypes, false, false, MmcHeaderCodes.AllHeaders, true, true, - MmcErrorField.None, MmcSubchannel.None, dev.Timeout, + MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdMsfRaw); - if(debug) + mediaTest.ReadCdMsfFullData = buffer; } @@ -1152,17 +1152,17 @@ namespace DiscImageChef.Core.Devices.Report for(int i = -150; i < 0; i++) { if(mediaType == "Audio CD") - sense = dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.Cdda, + sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, - MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _); + MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out _); else - sense = dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.AllTypes, + sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, - MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _); + MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", sense); - if(debug) + mediaTest.Track1PregapData = buffer; if(sense) @@ -1181,17 +1181,17 @@ namespace DiscImageChef.Core.Devices.Report }) { if(mediaType == "Audio CD") - sense = dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.Cdda, + sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, - MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _); + MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out _); else - sense = dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.AllTypes, + sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, - MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _); + MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", sense); - if(debug) + mediaTest.LeadInData = buffer; if(sense) @@ -1205,22 +1205,22 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.WriteLine("Trying to read CD Lead-Out..."); if(mediaType == "Audio CD") - mediaTest.CanReadLeadOut = !dev.ReadCd(out buffer, out senseBuffer, + mediaTest.CanReadLeadOut = !_dev.ReadCd(out buffer, out senseBuffer, (uint)(mediaTest.Blocks + 1), 2352, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, - MmcSubchannel.None, dev.Timeout, out _); + MmcSubchannel.None, _dev.Timeout, out _); else - mediaTest.CanReadLeadOut = !dev.ReadCd(out buffer, out senseBuffer, + mediaTest.CanReadLeadOut = !_dev.ReadCd(out buffer, out senseBuffer, (uint)(mediaTest.Blocks + 1), 2352, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, - MmcErrorField.None, MmcSubchannel.None, dev.Timeout, + MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadLeadOut); - if(debug) + mediaTest.LeadOutData = buffer; } @@ -1228,341 +1228,341 @@ namespace DiscImageChef.Core.Devices.Report { DicConsole.WriteLine("Trying to read C2 Pointers..."); - mediaTest.CanReadC2Pointers = !dev.ReadCd(out buffer, out senseBuffer, 0, 2646, 1, + mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 0, 2646, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, - MmcErrorField.C2Pointers, MmcSubchannel.None, dev.Timeout, + MmcErrorField.C2Pointers, MmcSubchannel.None, _dev.Timeout, out _); if(!mediaTest.CanReadC2Pointers == true) - mediaTest.CanReadC2Pointers = !dev.ReadCd(out buffer, out senseBuffer, 0, 2648, 1, + mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 0, 2648, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2PointersAndBlock, MmcSubchannel.None, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadC2Pointers); - if(debug) + mediaTest.C2PointersData = buffer; DicConsole.WriteLine("Trying to read subchannels..."); - mediaTest.CanReadPQSubchannel = !dev.ReadCd(out buffer, out senseBuffer, 0, 2368, 1, + mediaTest.CanReadPQSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 0, 2368, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, - MmcSubchannel.Q16, dev.Timeout, out _); + MmcSubchannel.Q16, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannel); - if(debug) + mediaTest.PQSubchannelData = buffer; - mediaTest.CanReadRWSubchannel = !dev.ReadCd(out buffer, out senseBuffer, 0, 2448, 1, + mediaTest.CanReadRWSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 0, 2448, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, - MmcSubchannel.Raw, dev.Timeout, out _); + MmcSubchannel.Raw, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannel); - if(debug) + mediaTest.RWSubchannelData = buffer; - mediaTest.CanReadCorrectedSubchannel = !dev.ReadCd(out buffer, out senseBuffer, 0, 2448, 1, + mediaTest.CanReadCorrectedSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 0, 2448, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Rw, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannel); - if(debug) + mediaTest.CorrectedSubchannelData = buffer; DicConsole.WriteLine("Trying to read subchannels with C2 Pointers..."); - mediaTest.CanReadPQSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 0, 2662, 1, + mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 0, 2662, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2Pointers, MmcSubchannel.Q16, - dev.Timeout, out _); + _dev.Timeout, out _); if(mediaTest.CanReadPQSubchannelWithC2 == false) - mediaTest.CanReadPQSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 0, 2664, 1, + mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 0, 2664, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2PointersAndBlock, - MmcSubchannel.Q16, dev.Timeout, out _); + MmcSubchannel.Q16, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannelWithC2); - if(debug) + mediaTest.PQSubchannelWithC2Data = buffer; - mediaTest.CanReadRWSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 0, 2712, 1, + mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 0, 2712, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2Pointers, MmcSubchannel.Raw, - dev.Timeout, out _); + _dev.Timeout, out _); if(mediaTest.CanReadRWSubchannelWithC2 == false) - mediaTest.CanReadRWSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 0, 2714, 1, + mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 0, 2714, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2PointersAndBlock, - MmcSubchannel.Raw, dev.Timeout, out _); + MmcSubchannel.Raw, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannelWithC2); - if(debug) + mediaTest.RWSubchannelWithC2Data = buffer; - mediaTest.CanReadCorrectedSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 0, 2712, 1, + mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 0, 2712, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2Pointers, MmcSubchannel.Rw, - dev.Timeout, out _); + _dev.Timeout, out _); if(mediaTest.CanReadCorrectedSubchannelWithC2 == false) - mediaTest.CanReadCorrectedSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 0, 2714, + mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 0, 2714, 1, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2PointersAndBlock, - MmcSubchannel.Rw, dev.Timeout, out _); + MmcSubchannel.Rw, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannelWithC2); - if(debug) + mediaTest.CorrectedSubchannelWithC2Data = buffer; } else if(mediaTest.SupportsReadCdRaw == true) { DicConsole.WriteLine("Trying to read C2 Pointers..."); - mediaTest.CanReadC2Pointers = !dev.ReadCd(out buffer, out senseBuffer, 16, 2646, 1, + mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2646, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, - MmcErrorField.C2Pointers, MmcSubchannel.None, dev.Timeout, + MmcErrorField.C2Pointers, MmcSubchannel.None, _dev.Timeout, out _); if(mediaTest.CanReadC2Pointers == false) - mediaTest.CanReadC2Pointers = !dev.ReadCd(out buffer, out senseBuffer, 16, 2648, 1, + mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2648, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.C2PointersAndBlock, MmcSubchannel.None, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadC2Pointers); - if(debug) + mediaTest.C2PointersData = buffer; DicConsole.WriteLine("Trying to read subchannels..."); - mediaTest.CanReadPQSubchannel = !dev.ReadCd(out buffer, out senseBuffer, 16, 2368, 1, + mediaTest.CanReadPQSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2368, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, - MmcErrorField.None, MmcSubchannel.Q16, dev.Timeout, + MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannel); - if(debug) + mediaTest.PQSubchannelData = buffer; - mediaTest.CanReadRWSubchannel = !dev.ReadCd(out buffer, out senseBuffer, 16, 2448, 1, + mediaTest.CanReadRWSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2448, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, - MmcErrorField.None, MmcSubchannel.Raw, dev.Timeout, + MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannel); - if(debug) + mediaTest.RWSubchannelData = buffer; - mediaTest.CanReadCorrectedSubchannel = !dev.ReadCd(out buffer, out senseBuffer, 16, 2448, 1, + mediaTest.CanReadCorrectedSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2448, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Rw, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannel); - if(debug) + mediaTest.CorrectedSubchannelData = buffer; DicConsole.WriteLine("Trying to read subchannels with C2 Pointers..."); - mediaTest.CanReadPQSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2662, 1, + mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2662, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.C2Pointers, MmcSubchannel.Q16, - dev.Timeout, out _); + _dev.Timeout, out _); if(mediaTest.CanReadPQSubchannelWithC2 == false) - mediaTest.CanReadPQSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2664, 1, + mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2664, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.C2PointersAndBlock, - MmcSubchannel.Q16, dev.Timeout, out _); + MmcSubchannel.Q16, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannelWithC2); - if(debug) + mediaTest.PQSubchannelWithC2Data = buffer; - mediaTest.CanReadRWSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2712, 1, + mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2712, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.C2Pointers, MmcSubchannel.Raw, - dev.Timeout, out _); + _dev.Timeout, out _); if(mediaTest.CanReadRWSubchannelWithC2 == false) - mediaTest.CanReadRWSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2714, 1, + mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2714, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.C2PointersAndBlock, - MmcSubchannel.Raw, dev.Timeout, out _); + MmcSubchannel.Raw, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannelWithC2); - if(debug) + mediaTest.RWSubchannelWithC2Data = buffer; - mediaTest.CanReadCorrectedSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2712, 1, + mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2712, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.C2Pointers, - MmcSubchannel.Rw, dev.Timeout, out _); + MmcSubchannel.Rw, _dev.Timeout, out _); if(mediaTest.CanReadCorrectedSubchannelWithC2 == false) - mediaTest.CanReadCorrectedSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2714, + mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2714, 1, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.C2PointersAndBlock, - MmcSubchannel.Rw, dev.Timeout, out _); + MmcSubchannel.Rw, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannelWithC2); - if(debug) + mediaTest.CorrectedSubchannelWithC2Data = buffer; } else { DicConsole.WriteLine("Trying to read C2 Pointers..."); - mediaTest.CanReadC2Pointers = !dev.ReadCd(out buffer, out senseBuffer, 16, 2342, 1, + mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2342, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, - MmcErrorField.C2Pointers, MmcSubchannel.None, dev.Timeout, + MmcErrorField.C2Pointers, MmcSubchannel.None, _dev.Timeout, out _); if(mediaTest.CanReadC2Pointers == false) - mediaTest.CanReadC2Pointers = !dev.ReadCd(out buffer, out senseBuffer, 16, 2344, 1, + mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2344, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2PointersAndBlock, MmcSubchannel.None, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadC2Pointers); - if(debug) + mediaTest.C2PointersData = buffer; DicConsole.WriteLine("Trying to read subchannels..."); - mediaTest.CanReadPQSubchannel = !dev.ReadCd(out buffer, out senseBuffer, 16, 2064, 1, + mediaTest.CanReadPQSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2064, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, - MmcSubchannel.Q16, dev.Timeout, out _); + MmcSubchannel.Q16, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannel); - if(debug) + mediaTest.PQSubchannelData = buffer; - mediaTest.CanReadRWSubchannel = !dev.ReadCd(out buffer, out senseBuffer, 16, 2144, 1, + mediaTest.CanReadRWSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2144, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, - MmcSubchannel.Raw, dev.Timeout, out _); + MmcSubchannel.Raw, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannel); - if(debug) + mediaTest.RWSubchannelData = buffer; - mediaTest.CanReadCorrectedSubchannel = !dev.ReadCd(out buffer, out senseBuffer, 16, 2144, 1, + mediaTest.CanReadCorrectedSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2144, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Rw, - dev.Timeout, out _); + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannel); - if(debug) + mediaTest.CorrectedSubchannelData = buffer; DicConsole.WriteLine("Trying to read subchannels with C2 Pointers..."); - mediaTest.CanReadPQSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2358, 1, + mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2358, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2Pointers, MmcSubchannel.Q16, - dev.Timeout, out _); + _dev.Timeout, out _); if(mediaTest.CanReadPQSubchannelWithC2 == false) - mediaTest.CanReadPQSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2360, 1, + mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2360, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2PointersAndBlock, - MmcSubchannel.Q16, dev.Timeout, out _); + MmcSubchannel.Q16, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannelWithC2); - if(debug) + mediaTest.PQSubchannelWithC2Data = buffer; - mediaTest.CanReadRWSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2438, 1, + mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2438, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2Pointers, MmcSubchannel.Raw, - dev.Timeout, out _); + _dev.Timeout, out _); if(mediaTest.CanReadRWSubchannelWithC2 == false) - mediaTest.CanReadRWSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2440, 1, + mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2440, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2PointersAndBlock, - MmcSubchannel.Raw, dev.Timeout, out _); + MmcSubchannel.Raw, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannelWithC2); - if(debug) + mediaTest.RWSubchannelWithC2Data = buffer; - mediaTest.CanReadCorrectedSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2438, 1, + mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2438, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2Pointers, MmcSubchannel.Rw, - dev.Timeout, out _); + _dev.Timeout, out _); if(mediaTest.CanReadCorrectedSubchannelWithC2 == false) - mediaTest.CanReadCorrectedSubchannelWithC2 = !dev.ReadCd(out buffer, out senseBuffer, 16, 2440, + mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2440, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.C2PointersAndBlock, - MmcSubchannel.Rw, dev.Timeout, out _); + MmcSubchannel.Rw, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannelWithC2); - if(debug) + mediaTest.CorrectedSubchannelWithC2Data = buffer; } @@ -1571,12 +1571,12 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.WriteLine("Trying Plextor READ CD-DA..."); mediaTest.SupportsPlextorReadCDDA = - !dev.PlextorReadCdDa(out buffer, out senseBuffer, 16, 2352, 1, PlextorSubchannel.None, - dev.Timeout, out _); + !_dev.PlextorReadCdDa(out buffer, out senseBuffer, 16, 2352, 1, PlextorSubchannel.None, + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPlextorReadCDDA); - if(debug) + mediaTest.PlextorReadCddaData = buffer; } @@ -1585,23 +1585,23 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.WriteLine("Trying Pioneer READ CD-DA..."); mediaTest.SupportsPioneerReadCDDA = - !dev.PioneerReadCdDa(out buffer, out senseBuffer, 16, 2352, 1, PioneerSubchannel.None, - dev.Timeout, out _); + !_dev.PioneerReadCdDa(out buffer, out senseBuffer, 16, 2352, 1, PioneerSubchannel.None, + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPioneerReadCDDA); - if(debug) + mediaTest.PioneerReadCddaData = buffer; DicConsole.WriteLine("Trying Pioneer READ CD-DA MSF..."); mediaTest.SupportsPioneerReadCDDAMSF = - !dev.PioneerReadCdDaMsf(out buffer, out senseBuffer, 0x00000210, 0x00000211, 2352, - PioneerSubchannel.None, dev.Timeout, out _); + !_dev.PioneerReadCdDaMsf(out buffer, out senseBuffer, 0x00000210, 0x00000211, 2352, + PioneerSubchannel.None, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPioneerReadCDDAMSF); - if(debug) + mediaTest.PioneerReadCddaMsfData = buffer; } @@ -1610,20 +1610,20 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.WriteLine("Trying NEC READ CD-DA..."); mediaTest.SupportsNECReadCDDA = - !dev.NecReadCdDa(out buffer, out senseBuffer, 16, 1, dev.Timeout, out _); + !_dev.NecReadCdDa(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsNECReadCDDA); - if(debug) + mediaTest.NecReadCddaData = buffer; } } mediaTest.LongBlockSize = mediaTest.BlockSize; DicConsole.WriteLine("Trying SCSI READ LONG (10)..."); - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 16, 0xFFFF, dev.Timeout, out _); + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 16, 0xFFFF, _dev.Timeout, out _); - if(sense && !dev.Error) + if(sense && !_dev.Error) { FixedSense? decSense = Sense.DecodeFixed(senseBuffer); @@ -1644,10 +1644,10 @@ namespace DiscImageChef.Core.Devices.Report mediaTest.LongBlockSize == mediaTest.BlockSize) { // DVDs - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 16, 37856, dev.Timeout, out _); + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 16, 37856, _dev.Timeout, out _); if(!sense && - !dev.Error) + !_dev.Error) { mediaTest.ReadLong10Data = buffer; mediaTest.SupportsReadLong = true; @@ -1660,14 +1660,14 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.WriteLine("Trying Plextor trick to raw read DVDs..."); mediaTest.SupportsPlextorReadRawDVD = - !dev.PlextorReadRawDvd(out buffer, out senseBuffer, 16, 1, dev.Timeout, out _); + !_dev.PlextorReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPlextorReadRawDVD); if(mediaTest.SupportsPlextorReadRawDVD == true) mediaTest.SupportsPlextorReadRawDVD = !ArrayHelpers.ArrayIsNullOrEmpty(buffer); - if(mediaTest.SupportsPlextorReadRawDVD == true && debug) + if(mediaTest.SupportsPlextorReadRawDVD == true) mediaTest.PlextorReadRawDVDData = buffer; } @@ -1677,24 +1677,24 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.WriteLine("Trying HL-DT-ST (aka LG) trick to raw read DVDs..."); mediaTest.SupportsHLDTSTReadRawDVD = - !dev.HlDtStReadRawDvd(out buffer, out senseBuffer, 16, 1, dev.Timeout, out _); + !_dev.HlDtStReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsHLDTSTReadRawDVD); if(mediaTest.SupportsHLDTSTReadRawDVD == true) mediaTest.SupportsHLDTSTReadRawDVD = !ArrayHelpers.ArrayIsNullOrEmpty(buffer); - if(mediaTest.SupportsHLDTSTReadRawDVD == true && debug) + if(mediaTest.SupportsHLDTSTReadRawDVD == true) mediaTest.HLDTSTReadRawDVDData = buffer; // This is for checking multi-session support, and inter-session lead-in/out reading, as Enhanced CD are if(mediaType == "Enhanced CD (aka E-CD, CD-Plus or CD+)") { DicConsole.WriteLine("Querying CD Full TOC..."); - mediaTest.CanReadFullTOC = !dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _); + mediaTest.CanReadFullTOC = !_dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadFullTOC); - if(debug) + mediaTest.FullTocData = buffer; if(mediaTest.CanReadFullTOC == true) @@ -1751,73 +1751,73 @@ namespace DiscImageChef.Core.Devices.Report DicConsole.WriteLine("Trying SCSI READ CD in first session Lead-Out..."); - mediaTest.CanReadingIntersessionLeadOut = !dev.ReadCd(out buffer, out senseBuffer, + mediaTest.CanReadingIntersessionLeadOut = !_dev.ReadCd(out buffer, out senseBuffer, firstSessionLeadOutLba, 2448, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.AllHeaders, true, false, MmcErrorField.None, - MmcSubchannel.Raw, dev.Timeout, out _); + MmcSubchannel.Raw, _dev.Timeout, out _); if(mediaTest.CanReadingIntersessionLeadOut == false) { - mediaTest.CanReadingIntersessionLeadOut = !dev.ReadCd(out buffer, out senseBuffer, + mediaTest.CanReadingIntersessionLeadOut = !_dev.ReadCd(out buffer, out senseBuffer, firstSessionLeadOutLba, 2368, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.AllHeaders, true, false, MmcErrorField.None, - MmcSubchannel.Q16, dev.Timeout, + MmcSubchannel.Q16, _dev.Timeout, out _); if(mediaTest.CanReadingIntersessionLeadOut == false) - mediaTest.CanReadingIntersessionLeadOut = !dev.ReadCd(out buffer, out senseBuffer, + mediaTest.CanReadingIntersessionLeadOut = !_dev.ReadCd(out buffer, out senseBuffer, firstSessionLeadOutLba, 2352, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.AllHeaders, true, false, MmcErrorField.None, - MmcSubchannel.None, dev.Timeout, + MmcSubchannel.None, _dev.Timeout, out _); } DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadingIntersessionLeadOut); - if(debug) + mediaTest.IntersessionLeadOutData = buffer; DicConsole.WriteLine("Trying SCSI READ CD in second session Lead-In..."); - mediaTest.CanReadingIntersessionLeadIn = !dev.ReadCd(out buffer, out senseBuffer, + mediaTest.CanReadingIntersessionLeadIn = !_dev.ReadCd(out buffer, out senseBuffer, secondSessionLeadInLba, 2448, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.AllHeaders, true, false, MmcErrorField.None, - MmcSubchannel.Raw, dev.Timeout, out _); + MmcSubchannel.Raw, _dev.Timeout, out _); if(mediaTest.CanReadingIntersessionLeadIn == false) { - mediaTest.CanReadingIntersessionLeadIn = !dev.ReadCd(out buffer, out senseBuffer, + mediaTest.CanReadingIntersessionLeadIn = !_dev.ReadCd(out buffer, out senseBuffer, secondSessionLeadInLba, 2368, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.AllHeaders, true, false, MmcErrorField.None, - MmcSubchannel.Q16, dev.Timeout, out _); + MmcSubchannel.Q16, _dev.Timeout, out _); if(mediaTest.CanReadingIntersessionLeadIn == false) - mediaTest.CanReadingIntersessionLeadIn = !dev.ReadCd(out buffer, out senseBuffer, + mediaTest.CanReadingIntersessionLeadIn = !_dev.ReadCd(out buffer, out senseBuffer, secondSessionLeadInLba, 2352, 1, MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.AllHeaders, true, false, MmcErrorField.None, - MmcSubchannel.None, dev.Timeout, + MmcSubchannel.None, _dev.Timeout, out _); } DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadingIntersessionLeadIn); - if(debug) + mediaTest.IntersessionLeadInData = buffer; } } diff --git a/DiscImageChef.Core/Devices/Report/PCMCIA.cs b/DiscImageChef.Core/Devices/Report/PCMCIA.cs index 6d2979b52..479d63337 100644 --- a/DiscImageChef.Core/Devices/Report/PCMCIA.cs +++ b/DiscImageChef.Core/Devices/Report/PCMCIA.cs @@ -45,8 +45,8 @@ namespace DiscImageChef.Core.Devices.Report /// public Pcmcia PcmciaReport() { - Pcmcia pcmciaReport = new Pcmcia {CIS = dev.Cis}; - Tuple[] tuples = CIS.GetTuples(dev.Cis); + Pcmcia pcmciaReport = new Pcmcia {CIS = _dev.Cis}; + Tuple[] tuples = CIS.GetTuples(_dev.Cis); if(tuples == null) return pcmciaReport; foreach(Tuple tuple in tuples) diff --git a/DiscImageChef.Core/Devices/Report/SSC.cs b/DiscImageChef.Core/Devices/Report/SSC.cs index a18fecef5..789ee0816 100644 --- a/DiscImageChef.Core/Devices/Report/SSC.cs +++ b/DiscImageChef.Core/Devices/Report/SSC.cs @@ -45,7 +45,7 @@ namespace DiscImageChef.Core.Devices.Report { Ssc report = new Ssc(); DicConsole.WriteLine("Querying SCSI READ BLOCK LIMITS..."); - bool sense = dev.ReadBlockLimits(out byte[] buffer, out byte[] _, dev.Timeout, out _); + bool sense = _dev.ReadBlockLimits(out byte[] buffer, out byte[] _, _dev.Timeout, out _); if(!sense) { BlockLimits.BlockLimitsData? decBl = BlockLimits.Decode(buffer); @@ -60,7 +60,7 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Querying SCSI REPORT DENSITY SUPPORT..."); - sense = dev.ReportDensitySupport(out buffer, out byte[] _, false, false, dev.Timeout, out _); + sense = _dev.ReportDensitySupport(out buffer, out byte[] _, false, false, _dev.Timeout, out _); if(!sense) { DensitySupport.DensitySupportHeader? dsh = DensitySupport.DecodeDensity(buffer); @@ -89,7 +89,7 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Querying SCSI REPORT DENSITY SUPPORT for medium types..."); - sense = dev.ReportDensitySupport(out buffer, out byte[] _, true, false, dev.Timeout, out _); + sense = _dev.ReportDensitySupport(out buffer, out byte[] _, true, false, _dev.Timeout, out _); if(sense) return report; DensitySupport.MediaTypeSupportHeader? mtsh = DensitySupport.DecodeMediumType(buffer); @@ -127,20 +127,20 @@ namespace DiscImageChef.Core.Devices.Report Modes.DecodedMode? decMode = null; DicConsole.WriteLine("Querying SCSI MODE SENSE (10)..."); - bool sense = dev.ModeSense10(out byte[] buffer, out byte[] _, false, true, ScsiModeSensePageControl.Current, - 0x3F, 0x00, dev.Timeout, out _); - if(!sense && !dev.Error) + bool sense = _dev.ModeSense10(out byte[] buffer, out byte[] _, false, true, ScsiModeSensePageControl.Current, + 0x3F, 0x00, _dev.Timeout, out _); + if(!sense && !_dev.Error) { - decMode = Modes.DecodeMode10(buffer, dev.ScsiType); - if(debug) seqTest.ModeSense10Data = buffer; + decMode = Modes.DecodeMode10(buffer, _dev.ScsiType); + seqTest.ModeSense10Data = buffer; } DicConsole.WriteLine("Querying SCSI MODE SENSE..."); - sense = dev.ModeSense(out buffer, out byte[] _, dev.Timeout, out _); - if(!sense && !dev.Error) + sense = _dev.ModeSense(out buffer, out byte[] _, _dev.Timeout, out _); + if(!sense && !_dev.Error) { - if(!decMode.HasValue) decMode = Modes.DecodeMode6(buffer, dev.ScsiType); - if(debug) seqTest.ModeSense6Data = buffer; + if(!decMode.HasValue) decMode = Modes.DecodeMode6(buffer, _dev.ScsiType); + seqTest.ModeSense6Data = buffer; } if(decMode.HasValue) @@ -151,7 +151,7 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Querying SCSI REPORT DENSITY SUPPORT for current media..."); - sense = dev.ReportDensitySupport(out buffer, out byte[] _, false, true, dev.Timeout, out _); + sense = _dev.ReportDensitySupport(out buffer, out byte[] _, false, true, _dev.Timeout, out _); if(!sense) { DensitySupport.DensitySupportHeader? dsh = DensitySupport.DecodeDensity(buffer); @@ -180,7 +180,7 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Querying SCSI REPORT DENSITY SUPPORT for medium types for current media..."); - sense = dev.ReportDensitySupport(out buffer, out byte[] _, true, true, dev.Timeout, out _); + sense = _dev.ReportDensitySupport(out buffer, out byte[] _, true, true, _dev.Timeout, out _); if(!sense) { DensitySupport.MediaTypeSupportHeader? mtsh = DensitySupport.DecodeMediumType(buffer); @@ -211,7 +211,7 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Trying SCSI READ MEDIA SERIAL NUMBER..."); - seqTest.CanReadMediaSerial = !dev.ReadMediaSerialNumber(out buffer, out byte[] _, dev.Timeout, out _); + seqTest.CanReadMediaSerial = !_dev.ReadMediaSerialNumber(out buffer, out byte[] _, _dev.Timeout, out _); return seqTest; } diff --git a/DiscImageChef.Core/Devices/Report/Scsi.cs b/DiscImageChef.Core/Devices/Report/Scsi.cs index 64614c938..33824e265 100644 --- a/DiscImageChef.Core/Devices/Report/Scsi.cs +++ b/DiscImageChef.Core/Devices/Report/Scsi.cs @@ -45,7 +45,7 @@ namespace DiscImageChef.Core.Devices.Report public Scsi ReportScsiInquiry() { DicConsole.WriteLine("Querying SCSI INQUIRY..."); - bool sense = dev.ScsiInquiry(out byte[] buffer, out byte[] senseBuffer); + bool sense = _dev.ScsiInquiry(out byte[] buffer, out byte[] senseBuffer); Scsi report = new Scsi(); @@ -71,7 +71,7 @@ namespace DiscImageChef.Core.Devices.Report public List ReportEvpdPages(string vendor) { DicConsole.WriteLine("Querying list of SCSI EVPDs..."); - bool sense = dev.ScsiInquiry(out byte[] buffer, out _, 0x00); + bool sense = _dev.ScsiInquiry(out byte[] buffer, out _, 0x00); if(sense) return null; @@ -82,7 +82,7 @@ namespace DiscImageChef.Core.Devices.Report foreach(byte page in evpdPages.Where(page => page != 0x80)) { DicConsole.WriteLine("Querying SCSI EVPD {0:X2}h...", page); - sense = dev.ScsiInquiry(out buffer, out _, page); + sense = _dev.ScsiInquiry(out buffer, out _, page); if(sense) continue; byte[] empty; @@ -149,33 +149,33 @@ namespace DiscImageChef.Core.Devices.Report public void ReportScsiModes(ref DeviceReportV2 report, out byte[] cdromMode) { Modes.DecodedMode? decMode = null; - PeripheralDeviceTypes devType = dev.ScsiType; + PeripheralDeviceTypes devType = _dev.ScsiType; byte[] mode10Currentbuffer; byte[] mode10Changeablebuffer; byte[] mode6Currentbuffer; byte[] mode6Changeablebuffer; DicConsole.WriteLine("Querying all mode pages and subpages using SCSI MODE SENSE (10)..."); - bool sense = dev.ModeSense10(out byte[] mode10Buffer, out _, false, true, ScsiModeSensePageControl.Default, - 0x3F, 0xFF, dev.Timeout, out _); - if(sense || dev.Error) + bool sense = _dev.ModeSense10(out byte[] mode10Buffer, out _, false, true, ScsiModeSensePageControl.Default, + 0x3F, 0xFF, _dev.Timeout, out _); + if(sense || _dev.Error) { DicConsole.WriteLine("Querying all mode pages using SCSI MODE SENSE (10)..."); - sense = dev.ModeSense10(out mode10Buffer, out _, false, true, ScsiModeSensePageControl.Default, 0x3F, - 0x00, dev.Timeout, out _); - if(!sense && !dev.Error) + sense = _dev.ModeSense10(out mode10Buffer, out _, false, true, ScsiModeSensePageControl.Default, 0x3F, + 0x00, _dev.Timeout, out _); + if(!sense && !_dev.Error) { report.SCSI.SupportsModeSense10 = true; report.SCSI.SupportsModeSubpages = false; decMode = Modes.DecodeMode10(mode10Buffer, devType); - if(debug) + { - sense = dev.ModeSense10(out mode10Currentbuffer, out _, false, true, - ScsiModeSensePageControl.Current, 0x3F, 0x00, dev.Timeout, out _); - if(!sense && !dev.Error) report.SCSI.ModeSense10CurrentData = mode10Currentbuffer; - sense = dev.ModeSense10(out mode10Changeablebuffer, out _, false, true, - ScsiModeSensePageControl.Changeable, 0x3F, 0x00, dev.Timeout, out _); - if(!sense && !dev.Error) report.SCSI.ModeSense10ChangeableData = mode10Changeablebuffer; + sense = _dev.ModeSense10(out mode10Currentbuffer, out _, false, true, + ScsiModeSensePageControl.Current, 0x3F, 0x00, _dev.Timeout, out _); + if(!sense && !_dev.Error) report.SCSI.ModeSense10CurrentData = mode10Currentbuffer; + sense = _dev.ModeSense10(out mode10Changeablebuffer, out _, false, true, + ScsiModeSensePageControl.Changeable, 0x3F, 0x00, _dev.Timeout, out _); + if(!sense && !_dev.Error) report.SCSI.ModeSense10ChangeableData = mode10Changeablebuffer; } } } @@ -184,62 +184,62 @@ namespace DiscImageChef.Core.Devices.Report report.SCSI.SupportsModeSense10 = true; report.SCSI.SupportsModeSubpages = true; decMode = Modes.DecodeMode10(mode10Buffer, devType); - if(debug) + { - sense = dev.ModeSense10(out mode10Currentbuffer, out _, false, true, - ScsiModeSensePageControl.Current, 0x3F, 0xFF, dev.Timeout, out _); - if(!sense && !dev.Error) report.SCSI.ModeSense10CurrentData = mode10Currentbuffer; - sense = dev.ModeSense10(out mode10Changeablebuffer, out _, false, true, - ScsiModeSensePageControl.Changeable, 0x3F, 0xFF, dev.Timeout, out _); - if(!sense && !dev.Error) report.SCSI.ModeSense10ChangeableData = mode10Changeablebuffer; + sense = _dev.ModeSense10(out mode10Currentbuffer, out _, false, true, + ScsiModeSensePageControl.Current, 0x3F, 0xFF, _dev.Timeout, out _); + if(!sense && !_dev.Error) report.SCSI.ModeSense10CurrentData = mode10Currentbuffer; + sense = _dev.ModeSense10(out mode10Changeablebuffer, out _, false, true, + ScsiModeSensePageControl.Changeable, 0x3F, 0xFF, _dev.Timeout, out _); + if(!sense && !_dev.Error) report.SCSI.ModeSense10ChangeableData = mode10Changeablebuffer; } } DicConsole.WriteLine("Querying all mode pages and subpages using SCSI MODE SENSE (6)..."); - sense = dev.ModeSense6(out byte[] mode6Buffer, out _, false, ScsiModeSensePageControl.Default, 0x3F, 0xFF, - dev.Timeout, out _); - if(sense || dev.Error) + sense = _dev.ModeSense6(out byte[] mode6Buffer, out _, false, ScsiModeSensePageControl.Default, 0x3F, 0xFF, + _dev.Timeout, out _); + if(sense || _dev.Error) { DicConsole.WriteLine("Querying all mode pages using SCSI MODE SENSE (6)..."); - sense = dev.ModeSense6(out mode6Buffer, out _, false, ScsiModeSensePageControl.Default, 0x3F, 0x00, - dev.Timeout, out _); - if(sense || dev.Error) + sense = _dev.ModeSense6(out mode6Buffer, out _, false, ScsiModeSensePageControl.Default, 0x3F, 0x00, + _dev.Timeout, out _); + if(sense || _dev.Error) { DicConsole.WriteLine("Querying SCSI MODE SENSE (6)..."); - sense = dev.ModeSense(out mode6Buffer, out _, dev.Timeout, out _); + sense = _dev.ModeSense(out mode6Buffer, out _, _dev.Timeout, out _); } - else if(debug) + else { - sense = dev.ModeSense6(out mode6Currentbuffer, out _, false, ScsiModeSensePageControl.Current, 0x3F, - 0x00, dev.Timeout, out _); - if(!sense && !dev.Error) report.SCSI.ModeSense6CurrentData = mode6Currentbuffer; - sense = dev.ModeSense6(out mode6Changeablebuffer, out _, false, ScsiModeSensePageControl.Changeable, - 0x3F, 0x00, dev.Timeout, out _); - if(!sense && !dev.Error) report.SCSI.ModeSense6ChangeableData = mode6Changeablebuffer; + sense = _dev.ModeSense6(out mode6Currentbuffer, out _, false, ScsiModeSensePageControl.Current, 0x3F, + 0x00, _dev.Timeout, out _); + if(!sense && !_dev.Error) report.SCSI.ModeSense6CurrentData = mode6Currentbuffer; + sense = _dev.ModeSense6(out mode6Changeablebuffer, out _, false, ScsiModeSensePageControl.Changeable, + 0x3F, 0x00, _dev.Timeout, out _); + if(!sense && !_dev.Error) report.SCSI.ModeSense6ChangeableData = mode6Changeablebuffer; } } else { report.SCSI.SupportsModeSubpages = true; - if(debug) + { - sense = dev.ModeSense6(out mode6Currentbuffer, out _, false, ScsiModeSensePageControl.Current, 0x3F, - 0xFF, dev.Timeout, out _); - if(!sense && !dev.Error) report.SCSI.ModeSense6CurrentData = mode6Currentbuffer; - sense = dev.ModeSense6(out mode6Changeablebuffer, out _, false, ScsiModeSensePageControl.Changeable, - 0x3F, 0xFF, dev.Timeout, out _); - if(!sense && !dev.Error) report.SCSI.ModeSense6ChangeableData = mode6Changeablebuffer; + sense = _dev.ModeSense6(out mode6Currentbuffer, out _, false, ScsiModeSensePageControl.Current, 0x3F, + 0xFF, _dev.Timeout, out _); + if(!sense && !_dev.Error) report.SCSI.ModeSense6CurrentData = mode6Currentbuffer; + sense = _dev.ModeSense6(out mode6Changeablebuffer, out _, false, ScsiModeSensePageControl.Changeable, + 0x3F, 0xFF, _dev.Timeout, out _); + if(!sense && !_dev.Error) report.SCSI.ModeSense6ChangeableData = mode6Changeablebuffer; } } - if(!sense && !dev.Error && !decMode.HasValue) decMode = Modes.DecodeMode6(mode6Buffer, devType); + if(!sense && !_dev.Error && !decMode.HasValue) decMode = Modes.DecodeMode6(mode6Buffer, devType); - report.SCSI.SupportsModeSense6 |= !sense && !dev.Error; + report.SCSI.SupportsModeSense6 |= !sense && !_dev.Error; cdromMode = null; - if(debug && report.SCSI.SupportsModeSense6) report.SCSI.ModeSense6Data = mode6Buffer; - if(debug && report.SCSI.SupportsModeSense10) report.SCSI.ModeSense10Data = mode10Buffer; + if(report.SCSI.SupportsModeSense6) report.SCSI.ModeSense6Data = mode6Buffer; + if(report.SCSI.SupportsModeSense10) report.SCSI.ModeSense10Data = mode10Buffer; if(!decMode.HasValue) return; @@ -273,8 +273,8 @@ namespace DiscImageChef.Core.Devices.Report { TestedMedia mediaTest = new TestedMedia(); DicConsole.WriteLine("Querying SCSI READ CAPACITY..."); - bool sense = dev.ReadCapacity(out byte[] buffer, out byte[] senseBuffer, dev.Timeout, out _); - if(!sense && !dev.Error) + bool sense = _dev.ReadCapacity(out byte[] buffer, out byte[] senseBuffer, _dev.Timeout, out _); + if(!sense && !_dev.Error) { mediaTest.SupportsReadCapacity = true; mediaTest.Blocks = @@ -284,8 +284,8 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Querying SCSI READ CAPACITY (16)..."); - sense = dev.ReadCapacity16(out buffer, out buffer, dev.Timeout, out _); - if(!sense && !dev.Error) + sense = _dev.ReadCapacity16(out buffer, out buffer, _dev.Timeout, out _); + if(!sense && !_dev.Error) { mediaTest.SupportsReadCapacity16 = true; byte[] temp = new byte[8]; @@ -298,20 +298,20 @@ namespace DiscImageChef.Core.Devices.Report Modes.DecodedMode? decMode = null; DicConsole.WriteLine("Querying SCSI MODE SENSE (10)..."); - sense = dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current, 0x3F, - 0x00, dev.Timeout, out _); - if(!sense && !dev.Error) + sense = _dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current, 0x3F, + 0x00, _dev.Timeout, out _); + if(!sense && !_dev.Error) { - decMode = Modes.DecodeMode10(buffer, dev.ScsiType); - if(debug) mediaTest.ModeSense10Data = buffer; + decMode = Modes.DecodeMode10(buffer, _dev.ScsiType); + mediaTest.ModeSense10Data = buffer; } DicConsole.WriteLine("Querying SCSI MODE SENSE..."); - sense = dev.ModeSense(out buffer, out senseBuffer, dev.Timeout, out _); - if(!sense && !dev.Error) + sense = _dev.ModeSense(out buffer, out senseBuffer, _dev.Timeout, out _); + if(!sense && !_dev.Error) { - if(!decMode.HasValue) decMode = Modes.DecodeMode6(buffer, dev.ScsiType); - if(debug) mediaTest.ModeSense6Data = buffer; + if(!decMode.HasValue) decMode = Modes.DecodeMode6(buffer, _dev.ScsiType); + mediaTest.ModeSense6Data = buffer; } if(decMode.HasValue) @@ -322,33 +322,33 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Trying SCSI READ (6)..."); - mediaTest.SupportsRead6 = !dev.Read6(out buffer, out senseBuffer, 0, - mediaTest.BlockSize ?? 512, dev.Timeout, out _); + mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 0, + mediaTest.BlockSize ?? 512, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead6); - if(debug) mediaTest.Read6Data = buffer; + mediaTest.Read6Data = buffer; DicConsole.WriteLine("Trying SCSI READ (10)..."); - mediaTest.SupportsRead10 = !dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false, 0, - mediaTest.BlockSize ?? 512, 0, 1, dev.Timeout, out _); + mediaTest.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false, 0, + mediaTest.BlockSize ?? 512, 0, 1, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead10); - if(debug) mediaTest.Read10Data = buffer; + mediaTest.Read10Data = buffer; DicConsole.WriteLine("Trying SCSI READ (12)..."); - mediaTest.SupportsRead12 = !dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false, 0, - mediaTest.BlockSize ?? 512, 0, 1, false, dev.Timeout, out _); + mediaTest.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false, 0, + mediaTest.BlockSize ?? 512, 0, 1, false, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead12); - if(debug) mediaTest.Read12Data = buffer; + mediaTest.Read12Data = buffer; DicConsole.WriteLine("Trying SCSI READ (16)..."); - mediaTest.SupportsRead16 = !dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 0, - mediaTest.BlockSize ?? 512, 0, 1, false, dev.Timeout, out _); + mediaTest.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 0, + mediaTest.BlockSize ?? 512, 0, 1, false, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead16); - if(debug) mediaTest.Read16Data = buffer; + mediaTest.Read16Data = buffer; mediaTest.LongBlockSize = mediaTest.BlockSize; DicConsole.WriteLine("Trying SCSI READ LONG (10)..."); - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 0xFFFF, dev.Timeout, out _); - if(sense && !dev.Error) + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 0xFFFF, _dev.Timeout, out _); + if(sense && !_dev.Error) { FixedSense? decSense = Sense.DecodeFixed(senseBuffer); if(decSense.HasValue) @@ -374,9 +374,9 @@ namespace DiscImageChef.Core.Devices.Report }) { ushort testSize = (ushort)i; - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, testSize, dev.Timeout, + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, testSize, _dev.Timeout, out _); - if(sense || dev.Error) continue; + if(sense || _dev.Error) continue; mediaTest.SupportsReadLong = true; mediaTest.LongBlockSize = testSize; @@ -392,9 +392,9 @@ namespace DiscImageChef.Core.Devices.Report }) { ushort testSize = (ushort)i; - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, (ushort)i, dev.Timeout, + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, (ushort)i, _dev.Timeout, out _); - if(sense || dev.Error) continue; + if(sense || _dev.Error) continue; mediaTest.SupportsReadLong = true; mediaTest.LongBlockSize = testSize; @@ -402,8 +402,8 @@ namespace DiscImageChef.Core.Devices.Report } else if(mediaTest.BlockSize == 2048) { - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 2380, dev.Timeout, out _); - if(!sense && !dev.Error) + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 2380, _dev.Timeout, out _); + if(!sense && !_dev.Error) { mediaTest.SupportsReadLong = true; mediaTest.LongBlockSize = 2380; @@ -411,8 +411,8 @@ namespace DiscImageChef.Core.Devices.Report } else if(mediaTest.BlockSize == 4096) { - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 4760, dev.Timeout, out _); - if(!sense && !dev.Error) + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 4760, _dev.Timeout, out _); + if(!sense && !_dev.Error) { mediaTest.SupportsReadLong = true; mediaTest.LongBlockSize = 4760; @@ -420,8 +420,8 @@ namespace DiscImageChef.Core.Devices.Report } else if(mediaTest.BlockSize == 8192) { - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 9424, dev.Timeout, out _); - if(!sense && !dev.Error) + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 9424, _dev.Timeout, out _); + if(!sense && !_dev.Error) { mediaTest.SupportsReadLong = true; mediaTest.LongBlockSize = 9424; @@ -429,7 +429,7 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Trying SCSI READ MEDIA SERIAL NUMBER..."); - mediaTest.CanReadMediaSerial = !dev.ReadMediaSerialNumber(out buffer, out senseBuffer, dev.Timeout, out _); + mediaTest.CanReadMediaSerial = !_dev.ReadMediaSerialNumber(out buffer, out senseBuffer, _dev.Timeout, out _); return mediaTest; } @@ -439,8 +439,8 @@ namespace DiscImageChef.Core.Devices.Report TestedMedia capabilities = new TestedMedia {MediaIsRecognized = true}; DicConsole.WriteLine("Querying SCSI READ CAPACITY..."); - bool sense = dev.ReadCapacity(out byte[] buffer, out byte[] senseBuffer, dev.Timeout, out _); - if(!sense && !dev.Error) + bool sense = _dev.ReadCapacity(out byte[] buffer, out byte[] senseBuffer, _dev.Timeout, out _); + if(!sense && !_dev.Error) { capabilities.SupportsReadCapacity = true; capabilities.Blocks = @@ -450,8 +450,8 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Querying SCSI READ CAPACITY (16)..."); - sense = dev.ReadCapacity16(out buffer, out buffer, dev.Timeout, out _); - if(!sense && !dev.Error) + sense = _dev.ReadCapacity16(out buffer, out buffer, _dev.Timeout, out _); + if(!sense && !_dev.Error) { capabilities.SupportsReadCapacity16 = true; byte[] temp = new byte[8]; @@ -464,20 +464,20 @@ namespace DiscImageChef.Core.Devices.Report Modes.DecodedMode? decMode = null; DicConsole.WriteLine("Querying SCSI MODE SENSE (10)..."); - sense = dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current, 0x3F, - 0x00, dev.Timeout, out _); - if(!sense && !dev.Error) + sense = _dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current, 0x3F, + 0x00, _dev.Timeout, out _); + if(!sense && !_dev.Error) { - decMode = Modes.DecodeMode10(buffer, dev.ScsiType); - if(debug) capabilities.ModeSense10Data = buffer; + decMode = Modes.DecodeMode10(buffer, _dev.ScsiType); + capabilities.ModeSense10Data = buffer; } DicConsole.WriteLine("Querying SCSI MODE SENSE..."); - sense = dev.ModeSense(out buffer, out senseBuffer, dev.Timeout, out _); - if(!sense && !dev.Error) + sense = _dev.ModeSense(out buffer, out senseBuffer, _dev.Timeout, out _); + if(!sense && !_dev.Error) { - if(!decMode.HasValue) decMode = Modes.DecodeMode6(buffer, dev.ScsiType); - if(debug) capabilities.ModeSense6Data = buffer; + if(!decMode.HasValue) decMode = Modes.DecodeMode6(buffer, _dev.ScsiType); + capabilities.ModeSense6Data = buffer; } if(decMode.HasValue) @@ -488,33 +488,33 @@ namespace DiscImageChef.Core.Devices.Report } DicConsole.WriteLine("Trying SCSI READ (6)..."); - capabilities.SupportsRead6 = !dev.Read6(out buffer, out senseBuffer, 0, capabilities.BlockSize ?? 512, - dev.Timeout, out _); + capabilities.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 0, capabilities.BlockSize ?? 512, + _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead6); - if(debug) capabilities.Read6Data = buffer; + capabilities.Read6Data = buffer; DicConsole.WriteLine("Trying SCSI READ (10)..."); - capabilities.SupportsRead10 = !dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false, 0, - capabilities.BlockSize ?? 512, 0, 1, dev.Timeout, out _); + capabilities.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false, 0, + capabilities.BlockSize ?? 512, 0, 1, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead10); - if(debug) capabilities.Read10Data = buffer; + capabilities.Read10Data = buffer; DicConsole.WriteLine("Trying SCSI READ (12)..."); - capabilities.SupportsRead12 = !dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false, 0, - capabilities.BlockSize ?? 512, 0, 1, false, dev.Timeout, out _); + capabilities.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false, 0, + capabilities.BlockSize ?? 512, 0, 1, false, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead12); - if(debug) capabilities.Read12Data = buffer; + capabilities.Read12Data = buffer; DicConsole.WriteLine("Trying SCSI READ (16)..."); - capabilities.SupportsRead16 = !dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 0, - capabilities.BlockSize ?? 512, 0, 1, false, dev.Timeout, out _); + capabilities.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 0, + capabilities.BlockSize ?? 512, 0, 1, false, _dev.Timeout, out _); DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead16); - if(debug) capabilities.Read16Data = buffer; + capabilities.Read16Data = buffer; capabilities.LongBlockSize = capabilities.BlockSize; DicConsole.WriteLine("Trying SCSI READ LONG (10)..."); - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 0xFFFF, dev.Timeout, out _); - if(sense && !dev.Error) + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 0xFFFF, _dev.Timeout, out _); + if(sense && !_dev.Error) { FixedSense? decSense = Sense.DecodeFixed(senseBuffer); if(decSense.HasValue) @@ -542,8 +542,8 @@ namespace DiscImageChef.Core.Devices.Report }) { ushort testSize = (ushort)i; - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, (ushort)i, dev.Timeout, out _); - if(sense || dev.Error) continue; + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, (ushort)i, _dev.Timeout, out _); + if(sense || _dev.Error) continue; capabilities.SupportsReadLong = true; capabilities.LongBlockSize = testSize; @@ -559,8 +559,8 @@ namespace DiscImageChef.Core.Devices.Report }) { ushort testSize = (ushort)i; - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, (ushort)i, dev.Timeout, out _); - if(sense || dev.Error) continue; + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, (ushort)i, _dev.Timeout, out _); + if(sense || _dev.Error) continue; capabilities.SupportsReadLong = true; capabilities.LongBlockSize = testSize; @@ -568,24 +568,24 @@ namespace DiscImageChef.Core.Devices.Report } else if(capabilities.BlockSize == 2048) { - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 2380, dev.Timeout, out _); - if(sense || dev.Error) return capabilities; + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 2380, _dev.Timeout, out _); + if(sense || _dev.Error) return capabilities; capabilities.SupportsReadLong = true; capabilities.LongBlockSize = 2380; } else if(capabilities.BlockSize == 4096) { - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 4760, dev.Timeout, out _); - if(sense || dev.Error) return capabilities; + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 4760, _dev.Timeout, out _); + if(sense || _dev.Error) return capabilities; capabilities.SupportsReadLong = true; capabilities.LongBlockSize = 4760; } else if(capabilities.BlockSize == 8192) { - sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 9424, dev.Timeout, out _); - if(sense || dev.Error) return capabilities; + sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 9424, _dev.Timeout, out _); + if(sense || _dev.Error) return capabilities; capabilities.SupportsReadLong = true; capabilities.LongBlockSize = 9424; diff --git a/DiscImageChef.Core/Devices/Report/SecureDigital.cs b/DiscImageChef.Core/Devices/Report/SecureDigital.cs index 68792df79..1d8230d7e 100644 --- a/DiscImageChef.Core/Devices/Report/SecureDigital.cs +++ b/DiscImageChef.Core/Devices/Report/SecureDigital.cs @@ -49,13 +49,13 @@ namespace DiscImageChef.Core.Devices.Report MmcSd report = new MmcSd(); DicConsole.WriteLine("Trying to get CID..."); - bool sense = dev.ReadCid(out byte[] cid, out _, dev.Timeout, out _); + bool sense = _dev.ReadCid(out byte[] cid, out _, _dev.Timeout, out _); if(!sense) { DicConsole.WriteLine("CID obtained correctly..."); - switch(dev.Type) + switch(_dev.Type) { case DeviceType.SecureDigital: // Clear serial number and manufacturing date @@ -81,7 +81,7 @@ namespace DiscImageChef.Core.Devices.Report else DicConsole.WriteLine("Could not read CID..."); DicConsole.WriteLine("Trying to get CSD..."); - sense = dev.ReadCsd(out byte[] csd, out _, dev.Timeout, out _); + sense = _dev.ReadCsd(out byte[] csd, out _, _dev.Timeout, out _); if(!sense) { @@ -93,16 +93,16 @@ namespace DiscImageChef.Core.Devices.Report sense = true; byte[] ocr = null; DicConsole.WriteLine("Trying to get OCR..."); - switch(dev.Type) + switch(_dev.Type) { case DeviceType.MMC: { - sense = dev.ReadOcr(out ocr, out _, dev.Timeout, out _); + sense = _dev.ReadOcr(out ocr, out _, _dev.Timeout, out _); break; } case DeviceType.SecureDigital: { - sense = dev.ReadSdocr(out ocr, out _, dev.Timeout, out _); + sense = _dev.ReadSdocr(out ocr, out _, _dev.Timeout, out _); break; } } @@ -114,12 +114,12 @@ namespace DiscImageChef.Core.Devices.Report } else DicConsole.WriteLine("Could not read OCR..."); - switch(dev.Type) + switch(_dev.Type) { case DeviceType.MMC: { DicConsole.WriteLine("Trying to get Extended CSD..."); - sense = dev.ReadExtendedCsd(out byte[] ecsd, out _, dev.Timeout, out _); + sense = _dev.ReadExtendedCsd(out byte[] ecsd, out _, _dev.Timeout, out _); if(!sense) { @@ -133,7 +133,7 @@ namespace DiscImageChef.Core.Devices.Report case DeviceType.SecureDigital: { DicConsole.WriteLine("Trying to get SCR..."); - sense = dev.ReadScr(out byte[] scr, out _, dev.Timeout, out _); + sense = _dev.ReadScr(out byte[] scr, out _, _dev.Timeout, out _); if(!sense) { diff --git a/DiscImageChef.Core/Devices/Report/USB.cs b/DiscImageChef.Core/Devices/Report/USB.cs index d305a639c..6ebba3f47 100644 --- a/DiscImageChef.Core/Devices/Report/USB.cs +++ b/DiscImageChef.Core/Devices/Report/USB.cs @@ -50,13 +50,13 @@ namespace DiscImageChef.Core.Devices.Report { Usb usbReport = new Usb { - Manufacturer = dev.UsbManufacturerString, - Product = dev.UsbProductString, - ProductID = dev.UsbProductId, - VendorID = dev.UsbVendorId + Manufacturer = _dev.UsbManufacturerString, + Product = _dev.UsbProductString, + ProductID = _dev.UsbProductId, + VendorID = _dev.UsbVendorId }; - if(debug) usbReport.Descriptors = dev.UsbDescriptors; + usbReport.Descriptors = _dev.UsbDescriptors; return usbReport; } diff --git a/DiscImageChef/Commands/DeviceReport.cs b/DiscImageChef/Commands/DeviceReport.cs index 6aa284064..fa8508fd3 100644 --- a/DiscImageChef/Commands/DeviceReport.cs +++ b/DiscImageChef/Commands/DeviceReport.cs @@ -54,9 +54,8 @@ namespace DiscImageChef.Commands { internal class DeviceReportCommand : Command { - string devicePath; - - bool showHelp; + string _devicePath; + bool _showHelp; public DeviceReportCommand() : base("device-report", "Tests the device capabilities and creates an JSON report of them.") => @@ -66,7 +65,7 @@ namespace DiscImageChef.Commands $"{MainClass.AssemblyCopyright}", "", $"usage: DiscImageChef {Name} devicepath", "", Help, { - "help|h|?", "Show this message and exit.", v => showHelp = v != null + "help|h|?", "Show this message and exit.", v => _showHelp = v != null } }; @@ -74,7 +73,7 @@ namespace DiscImageChef.Commands { List extra = Options.Parse(arguments); - if(showHelp) + if(_showHelp) { Options.WriteOptionDescriptions(CommandSet.Out); @@ -105,23 +104,23 @@ namespace DiscImageChef.Commands return(int)ErrorNumber.MissingArgument; } - devicePath = extra[0]; + _devicePath = extra[0]; DicConsole.DebugWriteLine("Device-Report command", "--debug={0}", MainClass.Debug); - DicConsole.DebugWriteLine("Device-Report command", "--device={0}", devicePath); + DicConsole.DebugWriteLine("Device-Report command", "--device={0}", _devicePath); DicConsole.DebugWriteLine("Device-Report command", "--verbose={0}", MainClass.Verbose); - if(devicePath.Length == 2 && - devicePath[1] == ':' && - devicePath[0] != '/' && - char.IsLetter(devicePath[0])) - devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':'; + if(_devicePath.Length == 2 && + _devicePath[1] == ':' && + _devicePath[0] != '/' && + char.IsLetter(_devicePath[0])) + _devicePath = "\\\\.\\" + char.ToUpper(_devicePath[0]) + ':'; Device dev; try { - dev = new Device(devicePath); + dev = new Device(_devicePath); if(dev.IsRemote) Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem, @@ -145,10 +144,7 @@ namespace DiscImageChef.Commands bool isAdmin; - if(dev.IsRemote) - isAdmin = dev.IsRemoteAdmin; - else - isAdmin = DetectOS.IsAdmin; + isAdmin = dev.IsRemote ? dev.IsRemoteAdmin : DetectOS.IsAdmin; if(!isAdmin) { @@ -180,7 +176,7 @@ namespace DiscImageChef.Commands jsonFile = jsonFile.Replace('\\', '_').Replace('/', '_').Replace('?', '_'); - var reporter = new DeviceReport(dev, MainClass.Debug); + var reporter = new DeviceReport(dev); ConsoleKeyInfo pressedKey; @@ -658,8 +654,7 @@ namespace DiscImageChef.Commands tryPioneer |= dev.Manufacturer.ToLowerInvariant() == "pioneer"; tryNec |= dev.Manufacturer.ToLowerInvariant() == "nec"; - if(MainClass.Debug && - !iomegaRev) + if(!iomegaRev) { if(!tryPlextor) { @@ -880,9 +875,7 @@ namespace DiscImageChef.Commands if(!sense) { - if(MainClass.Debug) mediaTest.ReadLong10Data = buffer; - mediaTest.LongBlockSize = i; break; @@ -896,8 +889,7 @@ namespace DiscImageChef.Commands } } - if(MainClass.Debug && - mediaTest.SupportsReadLong == true && + if(mediaTest.SupportsReadLong == true && mediaTest.LongBlockSize != mediaTest.BlockSize) { sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, @@ -1200,8 +1192,7 @@ namespace DiscImageChef.Commands } } - if(MainClass.Debug && - mediaTest.SupportsReadLong == true && + if(mediaTest.SupportsReadLong == true && mediaTest.LongBlockSize != mediaTest.BlockSize) { sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, @@ -1256,9 +1247,7 @@ namespace DiscImageChef.Commands if(!sense) { - if(MainClass.Debug) report.SCSI.ReadCapabilities.ReadLong10Data = buffer; - report.SCSI.ReadCapabilities.LongBlockSize = i; break; @@ -1272,7 +1261,7 @@ namespace DiscImageChef.Commands } } - if(MainClass.Debug && + if( report.SCSI.ReadCapabilities.SupportsReadLong == true && report.SCSI.ReadCapabilities.LongBlockSize != report.SCSI.ReadCapabilities.BlockSize)