From 01d34e182373e794d44657d6785c6035aa9fedc3 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 23 Dec 2017 02:00:31 +0000 Subject: [PATCH] Removed spurious fields on ATA error registers --- DiscImageChef.Decoders/ATA/Registers.cs | 3 --- DiscImageChef.Devices/Windows/Command.cs | 5 ----- DiscImageChef/Commands/DeviceInfo.cs | 2 -- 3 files changed, 10 deletions(-) diff --git a/DiscImageChef.Decoders/ATA/Registers.cs b/DiscImageChef.Decoders/ATA/Registers.cs index 00a7009d..56da0b6c 100644 --- a/DiscImageChef.Decoders/ATA/Registers.cs +++ b/DiscImageChef.Decoders/ATA/Registers.cs @@ -74,7 +74,6 @@ namespace DiscImageChef.Decoders.ATA public byte CylinderLow; public byte CylinderHigh; public byte DeviceHead; - public byte Command; } public struct AtaErrorRegistersLba28 @@ -86,7 +85,6 @@ namespace DiscImageChef.Decoders.ATA public byte LbaMid; public byte LbaHigh; public byte DeviceHead; - public byte Command; } public struct AtaErrorRegistersLba48 @@ -98,6 +96,5 @@ namespace DiscImageChef.Decoders.ATA public ushort LbaMid; public ushort LbaHigh; public byte DeviceHead; - public byte Command; } } \ No newline at end of file diff --git a/DiscImageChef.Devices/Windows/Command.cs b/DiscImageChef.Devices/Windows/Command.cs index 175ae502..b074cfea 100644 --- a/DiscImageChef.Devices/Windows/Command.cs +++ b/DiscImageChef.Devices/Windows/Command.cs @@ -186,7 +186,6 @@ namespace DiscImageChef.Devices.Windows duration = (end - start).TotalMilliseconds; - errorRegisters.Command = aptdBuf.aptd.CurrentTaskFile.Command; errorRegisters.CylinderHigh = aptdBuf.aptd.CurrentTaskFile.CylinderHigh; errorRegisters.CylinderLow = aptdBuf.aptd.CurrentTaskFile.CylinderLow; errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead; @@ -276,7 +275,6 @@ namespace DiscImageChef.Devices.Windows duration = (end - start).TotalMilliseconds; - errorRegisters.Command = aptdBuf.aptd.CurrentTaskFile.Command; errorRegisters.LbaHigh = aptdBuf.aptd.CurrentTaskFile.CylinderHigh; errorRegisters.LbaMid = aptdBuf.aptd.CurrentTaskFile.CylinderLow; errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead; @@ -382,7 +380,6 @@ namespace DiscImageChef.Devices.Windows aptdBuf.aptd.CurrentTaskFile.CylinderLow); errorRegisters.LbaHigh = (ushort)((aptdBuf.aptd.PreviousTaskFile.CylinderHigh << 8) + aptdBuf.aptd.CurrentTaskFile.CylinderHigh); - errorRegisters.Command = aptdBuf.aptd.CurrentTaskFile.Command; errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead; errorRegisters.Error = aptdBuf.aptd.CurrentTaskFile.Error; errorRegisters.Status = aptdBuf.aptd.CurrentTaskFile.Status; @@ -436,7 +433,6 @@ namespace DiscImageChef.Devices.Windows duration = (end - start).TotalMilliseconds; - errorRegisters.Command = iptd.CurrentTaskFile.Command; errorRegisters.CylinderHigh = iptd.CurrentTaskFile.CylinderHigh; errorRegisters.CylinderLow = iptd.CurrentTaskFile.CylinderLow; errorRegisters.DeviceHead = iptd.CurrentTaskFile.DeviceHead; @@ -494,7 +490,6 @@ namespace DiscImageChef.Devices.Windows duration = (end - start).TotalMilliseconds; - errorRegisters.Command = iptd.CurrentTaskFile.Command; errorRegisters.LbaHigh = iptd.CurrentTaskFile.CylinderHigh; errorRegisters.LbaMid = iptd.CurrentTaskFile.CylinderLow; errorRegisters.DeviceHead = iptd.CurrentTaskFile.DeviceHead; diff --git a/DiscImageChef/Commands/DeviceInfo.cs b/DiscImageChef/Commands/DeviceInfo.cs index 70166462..3e66e813 100644 --- a/DiscImageChef/Commands/DeviceInfo.cs +++ b/DiscImageChef/Commands/DeviceInfo.cs @@ -176,7 +176,6 @@ namespace DiscImageChef.Commands errorRegisters.CylinderLow); DicConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead); - DicConsole.DebugWriteLine("Device-Info command", "COMMAND = 0x{0:X2}", errorRegisters.Command); DicConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError); break; } @@ -241,7 +240,6 @@ namespace DiscImageChef.Commands errorRegisters.CylinderLow); DicConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead); - DicConsole.DebugWriteLine("Device-Info command", "COMMAND = 0x{0:X2}", errorRegisters.Command); DicConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError); break; }