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

Remove DiscImageChef.CommonTypes dependence on DiscImageChef.Decoders.

Browse Source
This commit is contained in:
Natalia Portillo
2020-01-11 20:55:54 +00:00
parent 53f92aa111
commit 6b1033317a
40 changed files with 1640 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscImageChef.DiscImages/ZZZRawImage/Read.cs
View File

@@ -40,12 +40,14 @@ using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Exceptions;
using DiscImageChef.CommonTypes.Interfaces;
using DiscImageChef.CommonTypes.Structs;
using DiscImageChef.CommonTypes.Structs.Devices.SCSI;
using DiscImageChef.Console;
using DiscImageChef.Decoders.CD;
using DiscImageChef.Decoders.DVD;
using DiscImageChef.Decoders.SCSI;
using Schemas;
using DMI = DiscImageChef.Decoders.Xbox.DMI;
using Inquiry = DiscImageChef.CommonTypes.Structs.Devices.SCSI.Inquiry;
using Session = DiscImageChef.CommonTypes.Structs.Session;
using TrackType = DiscImageChef.CommonTypes.Enums.TrackType;
@@ -781,7 +783,7 @@ namespace DiscImageChef.DiscImages
if (mediaTags.ContainsKey(MediaTagType.SCSI_INQUIRY))
{
var devType = PeripheralDeviceTypes.DirectAccess;
Inquiry.SCSIInquiry? scsiInq = null;
Inquiry? scsiInq = null;
if (mediaTags.TryGetValue(MediaTagType.SCSI_INQUIRY, out var inq))
{
scsiInq = Inquiry.Decode(inq);
@@ -858,7 +860,7 @@ namespace DiscImageChef.DiscImages
// It's ATA, check tags
if (mediaTags.TryGetValue(MediaTagType.ATA_IDENTIFY, out var identifyBuf))
{
var ataId = Decoders.ATA.Identify.Decode(identifyBuf);
var ataId = CommonTypes.Structs.Devices.ATA.Identify.Decode(identifyBuf);
if (ataId.HasValue)
{
imageInfo.MediaType = (ushort) ataId.Value.GeneralConfiguration == 0x848A