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

Use new little endian marshaller on decoders.

Browse Source
This commit is contained in:
Natalia Portillo
2019-02-28 00:04:13 +00:00
parent 0fe8e3c11f
commit 691b51aa1b
5 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
DiscImageChef.Decoders/ATA/Identify.cs
View File

@@ -37,6 +37,7 @@ using System.Runtime.InteropServices;
using System.Text;
using DiscImageChef.Console;
using DiscImageChef.Decoders.SCSI;
using Marshal = DiscImageChef.Helpers.Marshal;
namespace DiscImageChef.Decoders.ATA
{
@@ -1863,10 +1864,7 @@ namespace DiscImageChef.Decoders.ATA
return null;
}
IntPtr ptr = Marshal.AllocHGlobal(512);
Marshal.Copy(IdentifyDeviceResponse, 0, ptr, 512);
IdentifyDevice ATAID = (IdentifyDevice)Marshal.PtrToStructure(ptr, typeof(IdentifyDevice));
Marshal.FreeHGlobal(ptr);
IdentifyDevice ATAID = Marshal.ByteArrayToStructureLittleEndian<IdentifyDevice>(IdentifyDeviceResponse);
ATAID.WWN = DescrambleWWN(ATAID.WWN);
ATAID.WWNExtension = DescrambleWWN(ATAID.WWNExtension);
@@ -1891,10 +1889,10 @@ namespace DiscImageChef.Decoders.ATA
ataId.WWNExtension = DescrambleWWN(ataId.WWNExtension);
byte[] buf = new byte[512];
IntPtr ptr = Marshal.AllocHGlobal(512);
Marshal.StructureToPtr(ataId, ptr, false);
Marshal.Copy(ptr, buf, 0, 512);
Marshal.FreeHGlobal(ptr);
IntPtr ptr = System.Runtime.InteropServices.Marshal.AllocHGlobal(512);
System.Runtime.InteropServices.Marshal.StructureToPtr(ataId, ptr, false);
System.Runtime.InteropServices.Marshal.Copy(ptr, buf, 0, 512);
System.Runtime.InteropServices.Marshal.FreeHGlobal(ptr);
byte[] str = ScrambleATAString(ataId.SerialNumber, 20);
Array.Copy(str, 0, buf, 10 * 2, 20);