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

Move ATAPI device reporting to non-static class and its UI to CLI.

Browse Source
This commit is contained in:
Natalia Portillo
2018-11-25 19:17:21 +00:00
parent 8269b7a235
commit bba98c2abf
5 changed files with 15 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DiscImageChef/Commands/DeviceReport.cs
View File

@@ -137,13 +137,15 @@ namespace DiscImageChef.Commands
if(dev.IsPcmcia) report.PCMCIA = reporter.PcmciaReport();
byte[] buffer;
switch(dev.Type)
{
case DeviceType.ATA:
{
DicConsole.WriteLine("Querying ATA IDENTIFY...");
dev.AtaIdentify(out byte[] buffer, out _, dev.Timeout, out _);
dev.AtaIdentify(out buffer, out _, dev.Timeout, out _);
if(!Identify.Decode(buffer).HasValue) break;
@@ -225,6 +227,18 @@ namespace DiscImageChef.Commands
case DeviceType.NVMe:
throw new NotImplementedException("NVMe devices not yet supported.");
case DeviceType.ATAPI:
DicConsole.WriteLine("Querying ATAPI IDENTIFY...");
dev.AtapiIdentify(out buffer, out _, dev.Timeout, out _);
if(!Identify.Decode(buffer).HasValue) return;
Identify.IdentifyDevice? atapiIdNullable = Identify.Decode(buffer);
if(atapiIdNullable != null) report.ATAPI = new CommonTypes.Metadata.Ata {IdentifyDevice = atapiIdNullable};
if(options.Debug) report.ATAPI.Identify = buffer;
goto case DeviceType.SCSI;
case DeviceType.SCSI:
General.Report(dev, ref report, options.Debug, ref removable);
break;