* DiscImageChef.Devices/Command.cs:

* DiscImageChef.Decoders/ATA/Errors.cs:
	* DiscImageChef/Commands/DeviceInfo.cs:
	* DiscImageChef.Devices/Linux/Command.cs:
	* DiscImageChef.Devices/Device/Commands.cs:
	* DiscImageChef.Devices/Device/AtaCommands.cs:
	* DiscImageChef.Devices/Device/Constructor.cs:
	* DiscImageChef.Devices/Device/AtapiCommands.cs:
	* DiscImageChef.Devices/DiscImageChef.Devices.csproj:
	* DiscImageChef.Decoders/DiscImageChef.Decoders.csproj:
	  Moved ATA register definition to a more common place.

	* DiscImageChef.Decoders/SCSI/Sense.cs:
	  Added information from SAT-4.
This commit is contained in:
2015-11-23 04:26:53 +00:00
parent 257a717c9a
commit 0ebbd87548
14 changed files with 50 additions and 7 deletions

View File

@@ -2,11 +2,11 @@
// The Disc Image Chef // The Disc Image Chef
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// //
// Filename : Structs.cs // Filename : Errors.cs
// Version : 1.0 // Version : 1.0
// Author(s) : Natalia Portillo // Author(s) : Natalia Portillo
// //
// Component : Direct device access // Component : Component
// //
// Revision : $Revision$ // Revision : $Revision$
// Last change by : $Author$ // Last change by : $Author$
@@ -14,7 +14,7 @@
// //
// --[ Description ] ---------------------------------------------------------- // --[ Description ] ----------------------------------------------------------
// //
// Contains enumerations that are common to all operating systems // Description
// //
// --[ License ] -------------------------------------------------------------- // --[ License ] --------------------------------------------------------------
// //
@@ -37,7 +37,7 @@
// //$Id$ // //$Id$
using System; using System;
namespace DiscImageChef.Devices namespace DiscImageChef.Decoders.ATA
{ {
public struct AtaRegistersCHS public struct AtaRegistersCHS
{ {

View File

@@ -1,3 +1,12 @@
2015-11-23 Natalia Portillo <claunia@claunia.com>
* ATA/Errors.cs:
* DiscImageChef.Decoders.csproj:
Moved ATA register definition to a more common place.
* SCSI/Sense.cs:
Added information from SAT-4.
2015-11-23 Natalia Portillo <claunia@claunia.com> 2015-11-23 Natalia Portillo <claunia@claunia.com>
* SCSI/Sense.cs: * SCSI/Sense.cs:

View File

@@ -83,6 +83,7 @@
<Compile Include="SCSI\MMC\Features.cs" /> <Compile Include="SCSI\MMC\Features.cs" />
<Compile Include="SCSI\DiscStructureCapabilities.cs" /> <Compile Include="SCSI\DiscStructureCapabilities.cs" />
<Compile Include="SCSI\Sense.cs" /> <Compile Include="SCSI\Sense.cs" />
<Compile Include="ATA\Errors.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup> <ItemGroup>

View File

@@ -38,6 +38,7 @@
using System; using System;
using System.Text; using System.Text;
using System.Collections.Generic; using System.Collections.Generic;
using DiscImageChef.Decoders.ATA;
namespace DiscImageChef.Decoders.SCSI namespace DiscImageChef.Decoders.SCSI
{ {
@@ -621,9 +622,19 @@ namespace DiscImageChef.Decoders.SCSI
throw new NotImplementedException("Check OSD"); throw new NotImplementedException("Check OSD");
} }
public static void DecodeDescriptor09(byte[] descriptor) public static AtaErrorRegistersLBA48 DecodeDescriptor09(byte[] descriptor)
{ {
throw new NotImplementedException("Check SAT-3"); AtaErrorRegistersLBA48 errorRegisters = new AtaErrorRegistersLBA48();
errorRegisters.error = descriptor[3];
errorRegisters.sectorCount = (ushort)((descriptor[4] << 8) + descriptor[5]);
errorRegisters.lbaLow = (ushort)((descriptor[6] << 8) + descriptor[7]);
errorRegisters.lbaMid = (ushort)((descriptor[8] << 8) + descriptor[9]);
errorRegisters.lbaHigh = (ushort)((descriptor[10] << 8) + descriptor[11]);
errorRegisters.deviceHead = descriptor[12];
errorRegisters.status = descriptor[13];
return errorRegisters;
} }
public static void DecodeDescriptor0B(byte[] descriptor) public static void DecodeDescriptor0B(byte[] descriptor)

View File

@@ -1,3 +1,14 @@
2015-11-23 Natalia Portillo <claunia@claunia.com>
* Command.cs:
* Linux/Command.cs:
* Device/Commands.cs:
* Device/AtaCommands.cs:
* Device/Constructor.cs:
* Device/AtapiCommands.cs:
* DiscImageChef.Devices.csproj:
Moved ATA register definition to a more common place.
2015-11-05 Natalia Portillo <claunia@claunia.com> 2015-11-05 Natalia Portillo <claunia@claunia.com>
* Device/Constructor.cs: * Device/Constructor.cs:

View File

@@ -39,6 +39,7 @@
using System; using System;
using DiscImageChef.Interop; using DiscImageChef.Interop;
using Microsoft.Win32.SafeHandles; using Microsoft.Win32.SafeHandles;
using DiscImageChef.Decoders.ATA;
namespace DiscImageChef.Devices namespace DiscImageChef.Devices
{ {

View File

@@ -37,6 +37,7 @@
// //$Id$ // //$Id$
using System; using System;
using DiscImageChef.Console; using DiscImageChef.Console;
using DiscImageChef.Decoders.ATA;
namespace DiscImageChef.Devices namespace DiscImageChef.Devices
{ {

View File

@@ -37,6 +37,7 @@
// //$Id$ // //$Id$
using System; using System;
using DiscImageChef.Console; using DiscImageChef.Console;
using DiscImageChef.Decoders.ATA;
namespace DiscImageChef.Devices namespace DiscImageChef.Devices
{ {

View File

@@ -36,6 +36,7 @@
// ****************************************************************************/ // ****************************************************************************/
// //$Id$ // //$Id$
using System; using System;
using DiscImageChef.Decoders.ATA;
namespace DiscImageChef.Devices namespace DiscImageChef.Devices
{ {

View File

@@ -38,6 +38,7 @@
using System; using System;
using Microsoft.Win32.SafeHandles; using Microsoft.Win32.SafeHandles;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using DiscImageChef.Decoders.ATA;
namespace DiscImageChef.Devices namespace DiscImageChef.Devices
{ {

View File

@@ -49,7 +49,6 @@
<Compile Include="Device\Destructor.cs" /> <Compile Include="Device\Destructor.cs" />
<Compile Include="Device\Commands.cs" /> <Compile Include="Device\Commands.cs" />
<Compile Include="Device\ScsiCommands.cs" /> <Compile Include="Device\ScsiCommands.cs" />
<Compile Include="Structs.cs" />
<Compile Include="Device\AtaCommands.cs" /> <Compile Include="Device\AtaCommands.cs" />
<Compile Include="Device\AtapiCommands.cs" /> <Compile Include="Device\AtapiCommands.cs" />
</ItemGroup> </ItemGroup>

View File

@@ -39,6 +39,7 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using DiscImageChef.Decoders.ATA;
namespace DiscImageChef.Devices.Linux namespace DiscImageChef.Devices.Linux
{ {

View File

@@ -1,3 +1,8 @@
2015-11-23 Natalia Portillo <claunia@claunia.com>
* Commands/DeviceInfo.cs:
Moved ATA register definition to a more common place.
2015-11-10 Natalia Portillo <claunia@claunia.com> 2015-11-10 Natalia Portillo <claunia@claunia.com>
* Commands/Checksum.cs: * Commands/Checksum.cs:

View File

@@ -40,6 +40,7 @@ using DiscImageChef.Devices;
using System.IO; using System.IO;
using DiscImageChef.Console; using DiscImageChef.Console;
using System.Text; using System.Text;
using DiscImageChef.Decoders.ATA;
namespace DiscImageChef.Commands namespace DiscImageChef.Commands
{ {