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 media images.

Browse Source
This commit is contained in:
Natalia Portillo
2019-02-27 23:57:52 +00:00
parent 45be793491
commit 0fe8e3c11f
54 changed files with 320 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DiscImageChef.DiscImages/CopyQM/Read.cs
View File

@@ -32,11 +32,11 @@
using System;
using System.IO;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Interfaces;
using DiscImageChef.Console;
using DiscImageChef.Helpers;
namespace DiscImageChef.DiscImages
{
@@ -50,11 +50,7 @@ namespace DiscImageChef.DiscImages
byte[] hdr = new byte[133];
stream.Read(hdr, 0, 133);
header = new CopyQmHeader();
IntPtr hdrPtr = Marshal.AllocHGlobal(133);
Marshal.Copy(hdr, 0, hdrPtr, 133);
header = (CopyQmHeader)Marshal.PtrToStructure(hdrPtr, typeof(CopyQmHeader));
Marshal.FreeHGlobal(hdrPtr);
header = Marshal.ByteArrayToStructureLittleEndian<CopyQmHeader>(hdr);
DicConsole.DebugWriteLine("CopyQM plugin", "header.magic = 0x{0:X4}", header.magic);
DicConsole.DebugWriteLine("CopyQM plugin", "header.mark = 0x{0:X2}", header.mark);
@@ -155,8 +151,8 @@ namespace DiscImageChef.DiscImages
imageInfo.SectorSize = header.sectorSize;
imageInfo.MediaType = Geometry.GetMediaType(((ushort)header.totalCylinders, (byte)header.heads,
header.sectorsPerTrack, (uint)header.sectorSize,
MediaEncoding.MFM, false));
header.sectorsPerTrack, (uint)header.sectorSize,
MediaEncoding.MFM, false));
switch(imageInfo.MediaType)
{
@@ -187,8 +183,6 @@ namespace DiscImageChef.DiscImages
return true;
}
public bool? VerifyMediaImage() => calculatedDataCrc == header.crc && headerChecksumOk;
public byte[] ReadSector(ulong sectorAddress) => ReadSectors(sectorAddress, 1);
public byte[] ReadSectors(ulong sectorAddress, uint length)
@@ -206,5 +200,7 @@ namespace DiscImageChef.DiscImages
return buffer;
}
public bool? VerifyMediaImage() => calculatedDataCrc == header.crc && headerChecksumOk;
}
}