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

Some SCSI devices get reset on incorrect commands, so retry up

Browse Source 
to 5 device resets in media info and dumping.
This commit is contained in:
Natalia Portillo
2017-11-26 22:20:31 +00:00
parent e01a060af9
commit e306dc4694
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DiscImageChef.Core/Devices/Dumping/SCSI.cs
View File

@@ -53,9 +53,11 @@ namespace DiscImageChef.Core.Devices.Dumping
byte[] senseBuf = null; byte[] senseBuf = null;
bool sense = false; bool sense = false;
MediaType dskType = MediaType.Unknown; MediaType dskType = MediaType.Unknown;
int resets = 0;
if(dev.IsRemovable) if(dev.IsRemovable)
{ {
deviceGotReset:
sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out double duration); sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out double duration);
if(sense) if(sense)
{ {
@@ -63,6 +65,15 @@ namespace DiscImageChef.Core.Devices.Dumping
if(decSense.HasValue) if(decSense.HasValue)
{ {
dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ); dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
// Just retry, for 5 times
if(decSense.Value.ASC == 0x29)
{
resets++;
if(resets < 5)
goto deviceGotReset;
}
if(decSense.Value.ASC == 0x3A) if(decSense.Value.ASC == 0x3A)
{ {
int leftRetries = 5; int leftRetries = 5;

10
DiscImageChef/Commands/MediaInfo.cs
View File

@@ -112,15 +112,25 @@ namespace DiscImageChef.Commands
MediaType dskType = MediaType.Unknown; MediaType dskType = MediaType.Unknown;
ulong blocks = 0; ulong blocks = 0;
uint blockSize = 0; uint blockSize = 0;
int resets = 0;
if(dev.IsRemovable) if(dev.IsRemovable)
{ {
deviceGotReset:
sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out duration); sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out duration);
if(sense) if(sense)
{ {
Decoders.SCSI.FixedSense? decSense = Decoders.SCSI.Sense.DecodeFixed(senseBuf); Decoders.SCSI.FixedSense? decSense = Decoders.SCSI.Sense.DecodeFixed(senseBuf);
if(decSense.HasValue) if(decSense.HasValue)
{ {
// Just retry, for 5 times
if(decSense.Value.ASC == 0x29)
{
resets++;
if(resets < 5)
goto deviceGotReset;
}
if(decSense.Value.ASC == 0x3A) if(decSense.Value.ASC == 0x3A)
{ {
int leftRetries = 5; int leftRetries = 5;