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

Solved FreeBSD SCSI structure alignment (now works).

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-10 23:16:48 +00:00
parent e2888eaf27
commit 60bc3eb8e5
2 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
DiscImageChef.Devices/FreeBSD/Structs.cs
View File

@@ -182,19 +182,6 @@ namespace DiscImageChef.Devices.FreeBSD
[MarshalAs(UnmanagedType.ByValArray, SizeConst = SSD_FULL_SIZE - 1)] public byte[] sense_buf;
}
struct cdb_t
{
/// <summary>
/// Pointer to the CDB bytes to send
/// </summary>
public int cdb_ptr;
/// <summary>
/// Area for the CDB send
/// </summary>
const int IOCDBLEN = 16;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = IOCDBLEN)] public byte[] cdb_bytes;
}
/// <summary>
/// SCSI I/O Request CCB used for the XPT_SCSI_IO and XPT_CONT_TARGET_IO function codes.
/// </summary>
@@ -224,8 +211,11 @@ namespace DiscImageChef.Devices.FreeBSD
public sbyte sense_resid;
/// <summary>Transfer residual length: 2's comp</summary>
public int resid;
/// <summary>Union for CDB bytes/pointer</summary>
public cdb_t cdb_io;
/// <summary>
/// Area for the CDB send, or pointer to the CDB bytes to send
/// </summary>
const int IOCDBLEN = 16;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = IOCDBLEN)] public byte[] cdb_bytes;
/// <summary>Pointer to the message buffer</summary>
public IntPtr msg_ptr;
/// <summary>Number of bytes for the Message</summary>
@@ -238,19 +228,6 @@ namespace DiscImageChef.Devices.FreeBSD
public uint init_id;
}
struct cdb_t64
{
/// <summary>
/// Pointer to the CDB bytes to send
/// </summary>
public long cdb_ptr;
/// <summary>
/// Area for the CDB send
/// </summary>
const int IOCDBLEN = 16;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = IOCDBLEN)] public byte[] cdb_bytes;
}
/// <summary>
/// SCSI I/O Request CCB used for the XPT_SCSI_IO and XPT_CONT_TARGET_IO function codes.
/// </summary>
@@ -280,8 +257,12 @@ namespace DiscImageChef.Devices.FreeBSD
public sbyte sense_resid;
/// <summary>Transfer residual length: 2's comp</summary>
public int resid;
/// <summary>Union for CDB bytes/pointer</summary>
public cdb_t64 cdb_io;
public uint alignment;
/// <summary>
/// Area for the CDB send, or pointer to the CDB bytes to send
/// </summary>
const int IOCDBLEN = 16;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = IOCDBLEN)] public byte[] cdb_bytes;
/// <summary>Pointer to the message buffer</summary>
public IntPtr msg_ptr;
/// <summary>Number of bytes for the Message</summary>