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

Removed spurious fields on ATA error registers

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-23 02:00:31 +00:00
parent 9249a221fc
commit 01d34e1823
3 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DiscImageChef.Decoders/ATA/Registers.cs
View File

@@ -74,7 +74,6 @@ namespace DiscImageChef.Decoders.ATA
public byte CylinderLow; public byte CylinderLow;
public byte CylinderHigh; public byte CylinderHigh;
public byte DeviceHead; public byte DeviceHead;
public byte Command;
} }
public struct AtaErrorRegistersLba28 public struct AtaErrorRegistersLba28
@@ -86,7 +85,6 @@ namespace DiscImageChef.Decoders.ATA
public byte LbaMid; public byte LbaMid;
public byte LbaHigh; public byte LbaHigh;
public byte DeviceHead; public byte DeviceHead;
public byte Command;
} }
public struct AtaErrorRegistersLba48 public struct AtaErrorRegistersLba48
@@ -98,6 +96,5 @@ namespace DiscImageChef.Decoders.ATA
public ushort LbaMid; public ushort LbaMid;
public ushort LbaHigh; public ushort LbaHigh;
public byte DeviceHead; public byte DeviceHead;
public byte Command;
} }
} }

5
DiscImageChef.Devices/Windows/Command.cs
View File

@@ -186,7 +186,6 @@ namespace DiscImageChef.Devices.Windows
duration = (end - start).TotalMilliseconds; duration = (end - start).TotalMilliseconds;
errorRegisters.Command = aptdBuf.aptd.CurrentTaskFile.Command;
errorRegisters.CylinderHigh = aptdBuf.aptd.CurrentTaskFile.CylinderHigh; errorRegisters.CylinderHigh = aptdBuf.aptd.CurrentTaskFile.CylinderHigh;
errorRegisters.CylinderLow = aptdBuf.aptd.CurrentTaskFile.CylinderLow; errorRegisters.CylinderLow = aptdBuf.aptd.CurrentTaskFile.CylinderLow;
errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead; errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead;
@@ -276,7 +275,6 @@ namespace DiscImageChef.Devices.Windows
duration = (end - start).TotalMilliseconds; duration = (end - start).TotalMilliseconds;
errorRegisters.Command = aptdBuf.aptd.CurrentTaskFile.Command;
errorRegisters.LbaHigh = aptdBuf.aptd.CurrentTaskFile.CylinderHigh; errorRegisters.LbaHigh = aptdBuf.aptd.CurrentTaskFile.CylinderHigh;
errorRegisters.LbaMid = aptdBuf.aptd.CurrentTaskFile.CylinderLow; errorRegisters.LbaMid = aptdBuf.aptd.CurrentTaskFile.CylinderLow;
errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead; errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead;
@@ -382,7 +380,6 @@ namespace DiscImageChef.Devices.Windows
aptdBuf.aptd.CurrentTaskFile.CylinderLow); aptdBuf.aptd.CurrentTaskFile.CylinderLow);
errorRegisters.LbaHigh = (ushort)((aptdBuf.aptd.PreviousTaskFile.CylinderHigh << 8) + errorRegisters.LbaHigh = (ushort)((aptdBuf.aptd.PreviousTaskFile.CylinderHigh << 8) +
aptdBuf.aptd.CurrentTaskFile.CylinderHigh); aptdBuf.aptd.CurrentTaskFile.CylinderHigh);
errorRegisters.Command = aptdBuf.aptd.CurrentTaskFile.Command;
errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead; errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead;
errorRegisters.Error = aptdBuf.aptd.CurrentTaskFile.Error; errorRegisters.Error = aptdBuf.aptd.CurrentTaskFile.Error;
errorRegisters.Status = aptdBuf.aptd.CurrentTaskFile.Status; errorRegisters.Status = aptdBuf.aptd.CurrentTaskFile.Status;
@@ -436,7 +433,6 @@ namespace DiscImageChef.Devices.Windows
duration = (end - start).TotalMilliseconds; duration = (end - start).TotalMilliseconds;
errorRegisters.Command = iptd.CurrentTaskFile.Command;
errorRegisters.CylinderHigh = iptd.CurrentTaskFile.CylinderHigh; errorRegisters.CylinderHigh = iptd.CurrentTaskFile.CylinderHigh;
errorRegisters.CylinderLow = iptd.CurrentTaskFile.CylinderLow; errorRegisters.CylinderLow = iptd.CurrentTaskFile.CylinderLow;
errorRegisters.DeviceHead = iptd.CurrentTaskFile.DeviceHead; errorRegisters.DeviceHead = iptd.CurrentTaskFile.DeviceHead;
@@ -494,7 +490,6 @@ namespace DiscImageChef.Devices.Windows
duration = (end - start).TotalMilliseconds; duration = (end - start).TotalMilliseconds;
errorRegisters.Command = iptd.CurrentTaskFile.Command;
errorRegisters.LbaHigh = iptd.CurrentTaskFile.CylinderHigh; errorRegisters.LbaHigh = iptd.CurrentTaskFile.CylinderHigh;
errorRegisters.LbaMid = iptd.CurrentTaskFile.CylinderLow; errorRegisters.LbaMid = iptd.CurrentTaskFile.CylinderLow;
errorRegisters.DeviceHead = iptd.CurrentTaskFile.DeviceHead; errorRegisters.DeviceHead = iptd.CurrentTaskFile.DeviceHead;

2
DiscImageChef/Commands/DeviceInfo.cs
View File

@@ -176,7 +176,6 @@ namespace DiscImageChef.Commands
errorRegisters.CylinderLow); errorRegisters.CylinderLow);
DicConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}", DicConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}",
errorRegisters.DeviceHead); errorRegisters.DeviceHead);
DicConsole.DebugWriteLine("Device-Info command", "COMMAND = 0x{0:X2}", errorRegisters.Command);
DicConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError); DicConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError);
break; break;
} }
@@ -241,7 +240,6 @@ namespace DiscImageChef.Commands
errorRegisters.CylinderLow); errorRegisters.CylinderLow);
DicConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}", DicConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}",
errorRegisters.DeviceHead); errorRegisters.DeviceHead);
DicConsole.DebugWriteLine("Device-Info command", "COMMAND = 0x{0:X2}", errorRegisters.Command);
DicConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError); DicConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError);
break; break;
} }