mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Store and use undecoded buffers for ATA IDENTIFY (PACKET) DEVICE, SCSI INQUIRY and SCSI MODE PAGE 2Ah in device reports.
This commit is contained in:
@@ -39,6 +39,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using DiscImageChef.CommonTypes.Enums;
|
using DiscImageChef.CommonTypes.Enums;
|
||||||
using DiscImageChef.Decoders.ATA;
|
using DiscImageChef.Decoders.ATA;
|
||||||
@@ -74,6 +75,18 @@ namespace DiscImageChef.CommonTypes.Metadata
|
|||||||
{
|
{
|
||||||
SCSI = new Scsi(reportV1.SCSI);
|
SCSI = new Scsi(reportV1.SCSI);
|
||||||
Type = DeviceType.SCSI;
|
Type = DeviceType.SCSI;
|
||||||
|
|
||||||
|
if(SCSI.ModeSense?.ModePages?.FirstOrDefault(p => p.page == 0x2A)?.value != null)
|
||||||
|
{
|
||||||
|
if(SCSI.MultiMediaDevice != null)
|
||||||
|
SCSI.MultiMediaDevice.ModeSense2AData =
|
||||||
|
SCSI.ModeSense?.ModePages?.FirstOrDefault(p => p.page == 0x2A)?.value;
|
||||||
|
else if(SCSI.Inquiry?.PeripheralDeviceType == (byte)PeripheralDeviceTypes.MultiMediaDevice)
|
||||||
|
SCSI.MultiMediaDevice = new Mmc
|
||||||
|
{
|
||||||
|
ModeSense2AData = SCSI.ModeSense?.ModePages?.FirstOrDefault(p => p.page == 0x2A)?.value
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(reportV1.ATAPI != null)
|
if(reportV1.ATAPI != null)
|
||||||
@@ -211,8 +224,6 @@ namespace DiscImageChef.CommonTypes.Metadata
|
|||||||
|
|
||||||
public class Ata
|
public class Ata
|
||||||
{
|
{
|
||||||
public Identify.IdentifyDevice? IdentifyDevice;
|
|
||||||
|
|
||||||
public Ata() { }
|
public Ata() { }
|
||||||
|
|
||||||
public Ata(ataType ata)
|
public Ata(ataType ata)
|
||||||
@@ -229,11 +240,7 @@ namespace DiscImageChef.CommonTypes.Metadata
|
|||||||
RemovableMedias.Add(new TestedMedia(ataRemovableMedia, true));
|
RemovableMedias.Add(new TestedMedia(ataRemovableMedia, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Identify != null)
|
if(Identify != null) return;
|
||||||
{
|
|
||||||
IdentifyDevice = Decoders.ATA.Identify.Decode(Identify);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Identify.IdentifyDevice identifyDevice = new Identify.IdentifyDevice();
|
Identify.IdentifyDevice identifyDevice = new Identify.IdentifyDevice();
|
||||||
|
|
||||||
@@ -398,9 +405,11 @@ namespace DiscImageChef.CommonTypes.Metadata
|
|||||||
|
|
||||||
if(ata.WRVSectorCountMode2Specified) identifyDevice.WRVSectorCountMode2 = ata.WRVSectorCountMode2;
|
if(ata.WRVSectorCountMode2Specified) identifyDevice.WRVSectorCountMode2 = ata.WRVSectorCountMode2;
|
||||||
|
|
||||||
IdentifyDevice = identifyDevice;
|
Identify = Decoders.ATA.Identify.Encode(identifyDevice);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Identify.IdentifyDevice? IdentifyDevice => Decoders.ATA.Identify.Decode(Identify);
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
public byte[] Identify { get; set; }
|
public byte[] Identify { get; set; }
|
||||||
@@ -447,8 +456,6 @@ namespace DiscImageChef.CommonTypes.Metadata
|
|||||||
|
|
||||||
public class Scsi
|
public class Scsi
|
||||||
{
|
{
|
||||||
public Inquiry.SCSIInquiry? Inquiry;
|
|
||||||
|
|
||||||
public Scsi() { }
|
public Scsi() { }
|
||||||
|
|
||||||
public Scsi(scsiType scsi)
|
public Scsi(scsiType scsi)
|
||||||
@@ -482,11 +489,7 @@ namespace DiscImageChef.CommonTypes.Metadata
|
|||||||
|
|
||||||
if(scsi.SequentialDevice != null) SequentialDevice = new Ssc(scsi.SequentialDevice);
|
if(scsi.SequentialDevice != null) SequentialDevice = new Ssc(scsi.SequentialDevice);
|
||||||
|
|
||||||
if(InquiryData != null)
|
if(InquiryData != null) return;
|
||||||
{
|
|
||||||
Inquiry = Decoders.SCSI.Inquiry.Decode(InquiryData);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Inquiry.SCSIInquiry inq = new Inquiry.SCSIInquiry();
|
Inquiry.SCSIInquiry inq = new Inquiry.SCSIInquiry();
|
||||||
|
|
||||||
@@ -553,9 +556,11 @@ namespace DiscImageChef.CommonTypes.Metadata
|
|||||||
inq.WBus16 = scsi.Inquiry.WideBus16;
|
inq.WBus16 = scsi.Inquiry.WideBus16;
|
||||||
inq.WBus32 = scsi.Inquiry.WideBus32;
|
inq.WBus32 = scsi.Inquiry.WideBus32;
|
||||||
|
|
||||||
Inquiry = inq;
|
InquiryData = Decoders.SCSI.Inquiry.Encode(inq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Inquiry.SCSIInquiry? Inquiry => Decoders.SCSI.Inquiry.Decode(InquiryData);
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
public byte[] InquiryData { get; set; }
|
public byte[] InquiryData { get; set; }
|
||||||
@@ -672,60 +677,72 @@ namespace DiscImageChef.CommonTypes.Metadata
|
|||||||
public Mmc(mmcType mmc)
|
public Mmc(mmcType mmc)
|
||||||
{
|
{
|
||||||
if(mmc.ModeSense2A != null)
|
if(mmc.ModeSense2A != null)
|
||||||
ModeSense2A = new Modes.ModePage_2A
|
ModeSense2AData = Modes.EncodeModePage_2A(new Modes.ModePage_2A
|
||||||
{
|
{
|
||||||
AccurateCDDA = mmc.ModeSense2A.AccurateCDDA,
|
AccurateCDDA = mmc.ModeSense2A.AccurateCDDA,
|
||||||
BCK = mmc.ModeSense2A.BCK,
|
BCK = mmc.ModeSense2A.BCK,
|
||||||
BufferSize = mmc.ModeSense2A.BufferSize,
|
BufferSize = mmc.ModeSense2A.BufferSize,
|
||||||
BUF = mmc.ModeSense2A.BufferUnderRunProtection,
|
BUF = mmc.ModeSense2A.BufferUnderRunProtection,
|
||||||
Eject = mmc.ModeSense2A.CanEject,
|
Eject = mmc.ModeSense2A.CanEject,
|
||||||
Lock = mmc.ModeSense2A.CanLockMedia,
|
Lock = mmc.ModeSense2A.CanLockMedia,
|
||||||
CDDACommand = mmc.ModeSense2A.CDDACommand,
|
CDDACommand = mmc.ModeSense2A.CDDACommand,
|
||||||
Composite = mmc.ModeSense2A.CompositeAudioVideo,
|
Composite = mmc.ModeSense2A.CompositeAudioVideo,
|
||||||
CMRSupported = (ushort)(mmc.ModeSense2A.CSSandCPPMSupported ? 1 : 0),
|
CMRSupported =
|
||||||
CurrentSpeed = mmc.ModeSense2A.CurrentSpeed,
|
(ushort)(mmc.ModeSense2A.CSSandCPPMSupported
|
||||||
CurrentWriteSpeed = mmc.ModeSense2A.CurrentWriteSpeed,
|
? 1
|
||||||
CurrentWriteSpeedSelected = mmc.ModeSense2A.CurrentWriteSpeedSelected,
|
: 0),
|
||||||
SDP = mmc.ModeSense2A.DeterministicSlotChanger,
|
CurrentSpeed = mmc.ModeSense2A.CurrentSpeed,
|
||||||
DigitalPort1 = mmc.ModeSense2A.DigitalPort1,
|
CurrentWriteSpeed = mmc.ModeSense2A.CurrentWriteSpeed,
|
||||||
DigitalPort2 = mmc.ModeSense2A.DigitalPort2,
|
CurrentWriteSpeedSelected =
|
||||||
LeadInPW = mmc.ModeSense2A.LeadInPW,
|
mmc.ModeSense2A.CurrentWriteSpeedSelected,
|
||||||
LoadingMechanism = mmc.ModeSense2A.LoadingMechanismType,
|
SDP = mmc.ModeSense2A.DeterministicSlotChanger,
|
||||||
LockState = mmc.ModeSense2A.LockStatus,
|
DigitalPort1 = mmc.ModeSense2A.DigitalPort1,
|
||||||
LSBF = mmc.ModeSense2A.LSBF,
|
DigitalPort2 = mmc.ModeSense2A.DigitalPort2,
|
||||||
MaximumSpeed = mmc.ModeSense2A.MaximumSpeed,
|
LeadInPW = mmc.ModeSense2A.LeadInPW,
|
||||||
MaxWriteSpeed = mmc.ModeSense2A.MaximumWriteSpeed,
|
LoadingMechanism =
|
||||||
AudioPlay = mmc.ModeSense2A.PlaysAudio,
|
mmc.ModeSense2A.LoadingMechanismType,
|
||||||
PreventJumper = mmc.ModeSense2A.PreventJumperStatus,
|
LockState = mmc.ModeSense2A.LockStatus,
|
||||||
RCK = mmc.ModeSense2A.RCK,
|
LSBF = mmc.ModeSense2A.LSBF,
|
||||||
ReadBarcode = mmc.ModeSense2A.ReadsBarcode,
|
MaximumSpeed = mmc.ModeSense2A.MaximumSpeed,
|
||||||
SCC = mmc.ModeSense2A.ReadsBothSides,
|
MaxWriteSpeed = mmc.ModeSense2A.MaximumWriteSpeed,
|
||||||
ReadCDR = mmc.ModeSense2A.ReadsCDR,
|
AudioPlay = mmc.ModeSense2A.PlaysAudio,
|
||||||
ReadCDRW = mmc.ModeSense2A.ReadsCDRW,
|
PreventJumper = mmc.ModeSense2A.PreventJumperStatus,
|
||||||
DeinterlaveSubchannel = mmc.ModeSense2A.ReadsDeinterlavedSubchannel,
|
RCK = mmc.ModeSense2A.RCK,
|
||||||
ReadDVDR = mmc.ModeSense2A.ReadsDVDR,
|
ReadBarcode = mmc.ModeSense2A.ReadsBarcode,
|
||||||
ReadDVDRAM = mmc.ModeSense2A.ReadsDVDRAM,
|
SCC = mmc.ModeSense2A.ReadsBothSides,
|
||||||
ReadDVDROM = mmc.ModeSense2A.ReadsDVDROM,
|
ReadCDR = mmc.ModeSense2A.ReadsCDR,
|
||||||
ISRC = mmc.ModeSense2A.ReadsISRC,
|
ReadCDRW = mmc.ModeSense2A.ReadsCDRW,
|
||||||
Mode2Form2 = mmc.ModeSense2A.ReadsMode2Form2,
|
DeinterlaveSubchannel =
|
||||||
Mode2Form1 = mmc.ModeSense2A.ReadsMode2Form1,
|
mmc.ModeSense2A.ReadsDeinterlavedSubchannel,
|
||||||
Method2 = mmc.ModeSense2A.ReadsPacketCDR,
|
ReadDVDR = mmc.ModeSense2A.ReadsDVDR,
|
||||||
Subchannel = mmc.ModeSense2A.ReadsSubchannel,
|
ReadDVDRAM = mmc.ModeSense2A.ReadsDVDRAM,
|
||||||
UPC = mmc.ModeSense2A.ReadsUPC,
|
ReadDVDROM = mmc.ModeSense2A.ReadsDVDROM,
|
||||||
C2Pointer = mmc.ModeSense2A.ReturnsC2Pointers,
|
ISRC = mmc.ModeSense2A.ReadsISRC,
|
||||||
RotationControlSelected = mmc.ModeSense2A.RotationControlSelected,
|
Mode2Form2 = mmc.ModeSense2A.ReadsMode2Form2,
|
||||||
SeparateChannelMute = mmc.ModeSense2A.SeparateChannelMute,
|
Mode2Form1 = mmc.ModeSense2A.ReadsMode2Form1,
|
||||||
SeparateChannelVolume = mmc.ModeSense2A.SeparateChannelVolume,
|
Method2 = mmc.ModeSense2A.ReadsPacketCDR,
|
||||||
SSS = mmc.ModeSense2A.SSS,
|
Subchannel = mmc.ModeSense2A.ReadsSubchannel,
|
||||||
MultiSession = mmc.ModeSense2A.SupportsMultiSession,
|
UPC = mmc.ModeSense2A.ReadsUPC,
|
||||||
SupportedVolumeLevels = mmc.ModeSense2A.SupportedVolumeLevels,
|
C2Pointer = mmc.ModeSense2A.ReturnsC2Pointers,
|
||||||
TestWrite = mmc.ModeSense2A.TestWrite,
|
RotationControlSelected =
|
||||||
WriteCDR = mmc.ModeSense2A.WritesCDR,
|
mmc.ModeSense2A.RotationControlSelected,
|
||||||
WriteCDRW = mmc.ModeSense2A.WritesCDRW,
|
SeparateChannelMute =
|
||||||
WriteDVDR = mmc.ModeSense2A.WritesDVDR,
|
mmc.ModeSense2A.SeparateChannelMute,
|
||||||
WriteDVDRAM = mmc.ModeSense2A.WritesDVDRAM,
|
SeparateChannelVolume =
|
||||||
WriteSpeedPerformanceDescriptors = mmc.ModeSense2A.WriteSpeedPerformanceDescriptors
|
mmc.ModeSense2A.SeparateChannelVolume,
|
||||||
};
|
SSS = mmc.ModeSense2A.SSS,
|
||||||
|
MultiSession = mmc.ModeSense2A.SupportsMultiSession,
|
||||||
|
SupportedVolumeLevels =
|
||||||
|
mmc.ModeSense2A.SupportedVolumeLevels,
|
||||||
|
TestWrite = mmc.ModeSense2A.TestWrite,
|
||||||
|
WriteCDR = mmc.ModeSense2A.WritesCDR,
|
||||||
|
WriteCDRW = mmc.ModeSense2A.WritesCDRW,
|
||||||
|
WriteDVDR = mmc.ModeSense2A.WritesDVDR,
|
||||||
|
WriteDVDRAM = mmc.ModeSense2A.WritesDVDRAM,
|
||||||
|
WriteSpeedPerformanceDescriptors =
|
||||||
|
mmc.ModeSense2A.WriteSpeedPerformanceDescriptors
|
||||||
|
});
|
||||||
|
|
||||||
if(mmc.Features != null) Features = new MmcFeatures(mmc.Features);
|
if(mmc.Features != null) Features = new MmcFeatures(mmc.Features);
|
||||||
|
|
||||||
if(mmc.TestedMedia == null) return;
|
if(mmc.TestedMedia == null) return;
|
||||||
@@ -735,10 +752,11 @@ namespace DiscImageChef.CommonTypes.Metadata
|
|||||||
}
|
}
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
public virtual Modes.ModePage_2A ModeSense2A { get; set; }
|
public virtual Modes.ModePage_2A ModeSense2A => Modes.DecodeModePage_2A(ModeSense2AData);
|
||||||
public virtual MmcFeatures Features { get; set; }
|
public virtual MmcFeatures Features { get; set; }
|
||||||
public virtual List<TestedMedia> TestedMedia { get; set; }
|
public virtual List<TestedMedia> TestedMedia { get; set; }
|
||||||
|
public byte[] ModeSense2AData { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class MmcFeatures
|
public class MmcFeatures
|
||||||
|
|||||||
Reference in New Issue
Block a user