diff --git a/DiscImageChef.Decoders/ChangeLog b/DiscImageChef.Decoders/ChangeLog index c0cea1da..38475b23 100644 --- a/DiscImageChef.Decoders/ChangeLog +++ b/DiscImageChef.Decoders/ChangeLog @@ -1,3 +1,9 @@ +2015-11-01 Natalia Portillo + + * SCSI/MMC/Features.cs: + Reword Feature 0105h. + Correct handling of feature 010Ch. + 2015-11-01 Natalia Portillo * SCSI/MMC/Features.cs: diff --git a/DiscImageChef.Decoders/SCSI/MMC/Features.cs b/DiscImageChef.Decoders/SCSI/MMC/Features.cs index 7030521c..27a4fc2c 100644 --- a/DiscImageChef.Decoders/SCSI/MMC/Features.cs +++ b/DiscImageChef.Decoders/SCSI/MMC/Features.cs @@ -5174,7 +5174,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC Feature_0105 ftr = feature.Value; StringBuilder sb = new StringBuilder(); - sb.AppendLine("MMC Timeout:"); + sb.AppendLine("Drive supports Timeout & Protect mode page 1Dh"); if (ftr.Group3) { @@ -5258,7 +5258,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC if (ftr.DCBs != null) { foreach (uint DCB in ftr.DCBs) - sb.AppendFormat("Drive supports DCB {0}", DCB).AppendLine(); + sb.AppendFormat("Drive supports DCB {0:X8}h", DCB).AppendLine(); } return sb.ToString(); @@ -5321,13 +5321,11 @@ namespace DiscImageChef.Decoders.SCSI.MMC try { - DateTime fwDate = TimeZoneInfo.ConvertTimeToUtc(new DateTime(Int32.Parse(syear), - Int32.Parse(smonth), Int32.Parse(sday), - Int32.Parse(shour), Int32.Parse(sminute), - Int32.Parse(ssecond), DateTimeKind.Local), - TimeZoneInfo.FindSystemTimeZoneById("GMT Standard Time")); + DateTime fwDate = new DateTime(Int32.Parse(syear), Int32.Parse(smonth), + Int32.Parse(sday), Int32.Parse(shour), Int32.Parse(sminute), + Int32.Parse(ssecond), DateTimeKind.Utc); - sb.AppendFormat("Drive firmware is dated {0}", fwDate); + sb.AppendFormat("Drive firmware is dated {0}", fwDate).AppendLine(); } catch { diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index 57d00288..907b8686 100644 --- a/DiscImageChef/ChangeLog +++ b/DiscImageChef/ChangeLog @@ -1,3 +1,8 @@ +2015-11-01 Natalia Portillo + + * Commands/DeviceInfo.cs: + Typo in debug output. + 2015-11-01 Natalia Portillo * Commands/DeviceInfo.cs: diff --git a/DiscImageChef/Commands/DeviceInfo.cs b/DiscImageChef/Commands/DeviceInfo.cs index 3a734d1e..81febe9d 100644 --- a/DiscImageChef/Commands/DeviceInfo.cs +++ b/DiscImageChef/Commands/DeviceInfo.cs @@ -459,13 +459,13 @@ namespace DiscImageChef.Commands Decoders.SCSI.MMC.Features.SeparatedFeatures ftr = Decoders.SCSI.MMC.Features.Separate(confBuf); DicConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION length is {0} bytes", ftr.DataLength); - DicConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION current profile is 0x{0:X4} bytes", ftr.CurrentProfile); + DicConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION current profile is {0:X4}h", ftr.CurrentProfile); if (ftr.Descriptors != null) { DicConsole.WriteLine("SCSI MMC GET CONFIGURATION Features:"); foreach (Decoders.SCSI.MMC.Features.FeatureDescriptor desc in ftr.Descriptors) { - DicConsole.DebugWriteLine("Device-Info command", "Feature 0x{0:X4}", desc.Code); + DicConsole.DebugWriteLine("Device-Info command", "Feature {0:X4}h", desc.Code); switch (desc.Code) {