Code restyling.

This commit is contained in:
2020-02-29 18:03:35 +00:00
parent 4ea327f0c6
commit f7e173710e
855 changed files with 43605 additions and 38045 deletions

View File

@@ -37,22 +37,22 @@ using System.Runtime.InteropServices;
namespace Aaru.Devices.Windows
{
[StructLayout(LayoutKind.Sequential)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct ScsiPassThroughDirect
{
public ushort Length;
public byte ScsiStatus;
public byte PathId;
public byte TargetId;
public byte Lun;
public byte CdbLength;
public byte SenseInfoLength;
[MarshalAs(UnmanagedType.U1)] public ScsiIoctlDirection DataIn;
public uint DataTransferLength;
public uint TimeOutValue;
public byte ScsiStatus;
public byte PathId;
public byte TargetId;
public byte Lun;
public byte CdbLength;
public byte SenseInfoLength;
[MarshalAs(UnmanagedType.U1)]
public ScsiIoctlDirection DataIn;
public uint DataTransferLength;
public uint TimeOutValue;
public IntPtr DataBuffer;
public uint SenseInfoOffset;
public uint SenseInfoOffset;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
public byte[] Cdb;
@@ -67,115 +67,100 @@ namespace Aaru.Devices.Windows
public byte[] SenseBuf;
}
[StructLayout(LayoutKind.Sequential)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct AtaPassThroughEx
{
/// <summary>
/// Length in bytes of this structure
/// </summary>
/// <summary>Length in bytes of this structure</summary>
public ushort Length;
/// <summary>
/// Indicates transfer direction and kind of operation
/// </summary>
[MarshalAs(UnmanagedType.U2)] public AtaFlags AtaFlags;
/// <summary>Indicates transfer direction and kind of operation</summary>
[MarshalAs(UnmanagedType.U2)]
public AtaFlags AtaFlags;
/// <summary>
/// Indicates IDE port or bus, set by driver
/// </summary>
/// <summary>Indicates IDE port or bus, set by driver</summary>
public byte PathId;
/// <summary>
/// Indicates target device on bus, set by driver
/// </summary>
/// <summary>Indicates target device on bus, set by driver</summary>
public byte TargetId;
/// <summary>
/// Indicates logical unit number of device, set by driver
/// </summary>
/// <summary>Indicates logical unit number of device, set by driver</summary>
public byte Lun;
/// <summary>
/// Reserved
/// </summary>
/// <summary>Reserved</summary>
public byte ReservedAsUchar;
/// <summary>
/// Data transfer length in bytes
/// </summary>
/// <summary>Data transfer length in bytes</summary>
public uint DataTransferLength;
/// <summary>
/// Timeout value in seconds
/// </summary>
/// <summary>Timeout value in seconds</summary>
public uint TimeOutValue;
/// <summary>
/// Reserved
/// </summary>
/// <summary>Reserved</summary>
public uint ReservedAsUlong;
/// <summary>
/// Pointer to data buffer relative to start of this structure
/// </summary>
/// <summary>Pointer to data buffer relative to start of this structure</summary>
public IntPtr DataBufferOffset;
/// <summary>
/// Previous ATA registers, for LBA48
/// </summary>
/// <summary>Previous ATA registers, for LBA48</summary>
public AtaTaskFile PreviousTaskFile;
/// <summary>
/// ATA registers
/// </summary>
/// <summary>ATA registers</summary>
public AtaTaskFile CurrentTaskFile;
}
[StructLayout(LayoutKind.Sequential)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct AtaPassThroughExBuffer
{
public AtaPassThroughEx aptd;
public uint filler;
public uint filler;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 64 * 512)]
public byte[] dataBuffer;
}
[StructLayout(LayoutKind.Explicit)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Explicit), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct AtaTaskFile
{
// Fields for commands sent
[FieldOffset(0)] public byte Features;
[FieldOffset(6)] public byte Command;
[FieldOffset(0)]
public byte Features;
[FieldOffset(6)]
public byte Command;
// Fields on command return
[FieldOffset(0)] public byte Error;
[FieldOffset(6)] public byte Status;
[FieldOffset(0)]
public byte Error;
[FieldOffset(6)]
public byte Status;
// Common fields
[FieldOffset(1)] public byte SectorCount;
[FieldOffset(2)] public byte SectorNumber;
[FieldOffset(3)] public byte CylinderLow;
[FieldOffset(4)] public byte CylinderHigh;
[FieldOffset(5)] public byte DeviceHead;
[FieldOffset(7)] public byte Reserved;
[FieldOffset(1)]
public byte SectorCount;
[FieldOffset(2)]
public byte SectorNumber;
[FieldOffset(3)]
public byte CylinderLow;
[FieldOffset(4)]
public byte CylinderHigh;
[FieldOffset(5)]
public byte DeviceHead;
[FieldOffset(7)]
public byte Reserved;
}
[StructLayout(LayoutKind.Sequential)]
internal struct StoragePropertyQuery
{
[MarshalAs(UnmanagedType.U4)] public StoragePropertyId PropertyId;
[MarshalAs(UnmanagedType.U4)] public StorageQueryType QueryType;
[MarshalAs(UnmanagedType.U4)]
public StoragePropertyId PropertyId;
[MarshalAs(UnmanagedType.U4)]
public StorageQueryType QueryType;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
public byte[] AdditionalParameters;
}
[StructLayout(LayoutKind.Sequential)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct StorageDescriptorHeader
{
public uint Version;
@@ -189,39 +174,34 @@ namespace Aaru.Devices.Windows
public uint Size;
public byte DeviceType;
public byte DeviceTypeModifier;
[MarshalAs(UnmanagedType.U1)] public bool RemovableMedia;
[MarshalAs(UnmanagedType.U1)] public bool CommandQueueing;
public int VendorIdOffset;
public int ProductIdOffset;
public int ProductRevisionOffset;
public int SerialNumberOffset;
[MarshalAs(UnmanagedType.U1)]
public bool RemovableMedia;
[MarshalAs(UnmanagedType.U1)]
public bool CommandQueueing;
public int VendorIdOffset;
public int ProductIdOffset;
public int ProductRevisionOffset;
public int SerialNumberOffset;
public StorageBusType BusType;
public uint RawPropertiesLength;
public byte[] RawDeviceProperties;
public uint RawPropertiesLength;
public byte[] RawDeviceProperties;
}
[StructLayout(LayoutKind.Sequential)]
internal struct IdePassThroughDirect
{
/// <summary>
/// ATA registers
/// </summary>
/// <summary>ATA registers</summary>
public AtaTaskFile CurrentTaskFile;
/// <summary>
/// Size of data buffer
/// </summary>
/// <summary>Size of data buffer</summary>
public uint DataBufferSize;
/// <summary>
/// Data buffer
/// </summary>
/// <summary>Data buffer</summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
public byte[] DataBuffer;
}
[StructLayout(LayoutKind.Sequential)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct StorageDeviceNumber
{
public int deviceType;
@@ -229,75 +209,70 @@ namespace Aaru.Devices.Windows
public int partitionNumber;
}
[StructLayout(LayoutKind.Sequential)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct DeviceInfoData
{
public int cbSize;
public Guid classGuid;
public uint devInst;
public int cbSize;
public Guid classGuid;
public uint devInst;
public IntPtr reserved;
}
[StructLayout(LayoutKind.Sequential)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct DeviceInterfaceData
{
public int cbSize;
public Guid interfaceClassGuid;
public uint flags;
private readonly IntPtr reserved;
public int cbSize;
public Guid interfaceClassGuid;
public uint flags;
readonly IntPtr reserved;
}
[StructLayout(LayoutKind.Sequential)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct UsbSetupPacket
{
public byte bmRequest;
public byte bRequest;
public byte bmRequest;
public byte bRequest;
public short wValue;
public short wIndex;
public short wLength;
}
[StructLayout(LayoutKind.Sequential)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct UsbDescriptorRequest
{
public int ConnectionIndex;
public UsbSetupPacket SetupPacket;
//public byte[] Data;
}
[StructLayout(LayoutKind.Sequential)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct SffdiskQueryDeviceProtocolData
{
public ushort size;
public ushort reserved;
public Guid protocolGuid;
public Guid protocolGuid;
}
[StructLayout(LayoutKind.Sequential)]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal struct SffdiskDeviceCommandData
{
public ushort size;
public ushort reserved;
public ushort size;
public ushort reserved;
public SffdiskDcmd command;
public ushort protocolArgumentSize;
public uint deviceDataBufferSize;
public uint information;
public ushort protocolArgumentSize;
public uint deviceDataBufferSize;
public uint information;
}
[StructLayout(LayoutKind.Sequential)]
internal struct SdCmdDescriptor
{
public byte commandCode;
public SdCommandClass cmdClass;
public byte commandCode;
public SdCommandClass cmdClass;
public SdTransferDirection transferDirection;
public SdTransferType transferType;
public SdResponseType responseType;
public SdTransferType transferType;
public SdResponseType responseType;
}
}