diff --git a/ChangeLog b/ChangeLog index d5df74e52..0efc4273d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-12-30 Natalia Portillo + + * SCSI/Inquiry.cs: + Fixes decoding for devices that follow old 5-byte SCSI + INQUIRY format. + + * SCSI/Sense.cs: + Fixes printing of sense block missing a newline. + 2015-12-14 Natalia Portillo * CD/ATIP.cs: diff --git a/SCSI/Inquiry.cs b/SCSI/Inquiry.cs index 8cd756614..258783cfd 100644 --- a/SCSI/Inquiry.cs +++ b/SCSI/Inquiry.cs @@ -61,9 +61,9 @@ namespace DiscImageChef.Decoders.SCSI if (SCSIInquiryResponse == null) return null; - if (SCSIInquiryResponse.Length < 36) + if (SCSIInquiryResponse.Length < 36 && SCSIInquiryResponse.Length != 5) { - DicConsole.DebugWriteLine("SCSI INQUIRY decoder", "INQUIRY response is less than minimum of 36 bytes, decoded data can be incorrect, not decoding."); + DicConsole.DebugWriteLine("SCSI INQUIRY decoder", "INQUIRY response is {0} bytes, less than minimum of 36 bytes, decoded data can be incorrect, not decoding.", SCSIInquiryResponse.Length); return null; } diff --git a/SCSI/Sense.cs b/SCSI/Sense.cs index 02ba3cb1a..2be7c39e6 100644 --- a/SCSI/Sense.cs +++ b/SCSI/Sense.cs @@ -425,7 +425,7 @@ namespace DiscImageChef.Decoders.SCSI if (decoded.ILI) sb.AppendLine("Incorrect length indicator"); if (decoded.InformationValid) - sb.AppendFormat("On logical block {0}", decoded.Information); + sb.AppendFormat("On logical block {0}", decoded.Information).AppendLine(); if (decoded.AdditionalLength < 6) return sb.ToString();