From be93167b26619648103f4d60d5a3bbe6b2730962 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 23 Nov 2015 05:15:37 +0000 Subject: [PATCH] * DiscImageChef.Devices/Device/ScsiCommands.cs: Corrected typo. * DiscImageChef/Commands/DeviceInfo.cs: Decode SCSI sense. --- DiscImageChef.Devices/ChangeLog | 5 +++++ DiscImageChef.Devices/Device/ScsiCommands.cs | 2 +- DiscImageChef/ChangeLog | 5 +++++ DiscImageChef/Commands/DeviceInfo.cs | 7 +------ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/DiscImageChef.Devices/ChangeLog b/DiscImageChef.Devices/ChangeLog index 98fbd2c3..0459bb6c 100644 --- a/DiscImageChef.Devices/ChangeLog +++ b/DiscImageChef.Devices/ChangeLog @@ -1,3 +1,8 @@ +2015-11-23 Natalia Portillo + + * Device/ScsiCommands.cs: + Corrected typo. + 2015-11-23 Natalia Portillo * Command.cs: diff --git a/DiscImageChef.Devices/Device/ScsiCommands.cs b/DiscImageChef.Devices/Device/ScsiCommands.cs index fdb01576..f24d59f8 100644 --- a/DiscImageChef.Devices/Device/ScsiCommands.cs +++ b/DiscImageChef.Devices/Device/ScsiCommands.cs @@ -522,7 +522,7 @@ namespace DiscImageChef.Devices cdb[0] = (byte)ScsiCommands.ReadDiscStructure; cdb[1] = (byte)((byte)mediaType & 0x0F); cdb[2] = (byte)((address & 0xFF000000) >> 24); - cdb[2] = (byte)((address & 0xFF0000) >> 16); + cdb[3] = (byte)((address & 0xFF0000) >> 16); cdb[4] = (byte)((address & 0xFF00) >> 8); cdb[5] = (byte)(address & 0xFF); cdb[6] = layerNumber; diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index 71fbf2b0..163a70e6 100644 --- a/DiscImageChef/ChangeLog +++ b/DiscImageChef/ChangeLog @@ -1,3 +1,8 @@ +2015-11-23 Natalia Portillo + + * Commands/DeviceInfo.cs: + Decode SCSI sense. + 2015-11-23 Natalia Portillo * Commands/DeviceInfo.cs: diff --git a/DiscImageChef/Commands/DeviceInfo.cs b/DiscImageChef/Commands/DeviceInfo.cs index a07d9fb5..ca163cca 100644 --- a/DiscImageChef/Commands/DeviceInfo.cs +++ b/DiscImageChef/Commands/DeviceInfo.cs @@ -169,12 +169,7 @@ namespace DiscImageChef.Commands if (sense) { - DicConsole.ErrorWriteLine("SCSI error. Sense decoding not yet implemented."); - - #if DEBUG - FileStream senseFs = File.Open("sense.bin", FileMode.OpenOrCreate); - senseFs.Write(senseBuf, 0, senseBuf.Length); - #endif + DicConsole.ErrorWriteLine("SCSI error:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); break; }