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

Implemented device-report command for MMC and SecureDigital devices.

Browse Source
This commit is contained in:
Natalia Portillo
2017-09-28 23:35:52 +01:00
parent a42eb4ea63
commit 1ebac730c2
2 changed files with 114 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
DiscImageChef.Core/Devices/Report/SecureDigital.cs
View File

@@ -38,6 +38,7 @@
using System;
using DiscImageChef.Devices;
using DiscImageChef.Metadata;
using DiscImageChef.Console;
namespace DiscImageChef.Core.Devices.Report
{
@@ -48,7 +49,107 @@ namespace DiscImageChef.Core.Devices.Report
if(report == null)
return;
throw new NotImplementedException("MMC/SD devices not yet supported.");
if(dev.Type == DeviceType.MMC)
report.MultiMediaCard = new mmcsdType();
else if(dev.Type == DeviceType.SecureDigital)
report.SecureDigital = new mmcsdType();
DicConsole.WriteLine("Trying to get CID...");
bool sense = dev.ReadCID(out byte[] cid, out uint[] response, dev.Timeout, out double duration);
if(!sense)
{
DicConsole.WriteLine("CID obtained correctly...");
if(dev.Type == DeviceType.MMC)
{
// Clear serial number and manufacturing date
cid[9] = 0;
cid[10] = 0;
cid[11] = 0;
cid[12] = 0;
cid[13] = 0;
cid[14] = 0;
report.MultiMediaCard.CID = cid;
}
else if(dev.Type == DeviceType.SecureDigital)
{
// Clear serial number and manufacturing date
cid[10] = 0;
cid[11] = 0;
cid[12] = 0;
cid[13] = 0;
cid[14] = 0;
report.SecureDigital.CID = cid;
}
}
else
DicConsole.WriteLine("Could not read CID...");
DicConsole.WriteLine("Trying to get CSD...");
sense = dev.ReadCSD(out byte[] csd, out response, dev.Timeout, out duration);
if(!sense)
{
DicConsole.WriteLine("CSD obtained correctly...");
if(dev.Type == DeviceType.MMC)
report.MultiMediaCard.CSD = csd;
else if(dev.Type == DeviceType.SecureDigital)
report.SecureDigital.CSD = csd;
}
else
DicConsole.WriteLine("Could not read CSD...");
if(dev.Type == DeviceType.MMC)
{
DicConsole.WriteLine("Trying to get OCR...");
sense = dev.ReadOCR(out byte[] ocr, out response, dev.Timeout, out duration);
if(!sense)
{
DicConsole.WriteLine("OCR obtained correctly...");
report.MultiMediaCard.OCR = ocr;
}
else
DicConsole.WriteLine("Could not read OCR...");
DicConsole.WriteLine("Trying to get Extended CSD...");
sense = dev.ReadExtendedCSD(out byte[] ecsd, out response, dev.Timeout, out duration);
if(!sense)
{
DicConsole.WriteLine("Extended CSD obtained correctly...");
report.MultiMediaCard.ExtendedCSD = ecsd;
}
else
DicConsole.WriteLine("Could not read Extended CSD...");
}
else if(dev.Type == DeviceType.SecureDigital)
{
DicConsole.WriteLine("Trying to get OCR...");
sense = dev.ReadSDOCR(out byte[] ocr, out response, dev.Timeout, out duration);
if(!sense)
{
DicConsole.WriteLine("OCR obtained correctly...");
report.MultiMediaCard.OCR = ocr;
}
else
DicConsole.WriteLine("Could not read OCR...");
DicConsole.WriteLine("Trying to get SCR...");
sense = dev.ReadSCR(out byte[] scr, out response, dev.Timeout, out duration);
if(!sense)
{
DicConsole.WriteLine("SCR obtained correctly...");
report.MultiMediaCard.SCR = scr;
}
else
DicConsole.WriteLine("Could not read SCR...");
}
}
}
}

12
DiscImageChef.Metadata/DeviceReport.cs
View File

@@ -48,6 +48,8 @@ namespace DiscImageChef.Metadata
public ataType ATA { get; set; }
public ataType ATAPI { get; set; }
public scsiType SCSI { get; set; }
public mmcsdType MultiMediaCard { get; set; }
public mmcsdType SecureDigital { get; set; }
[XmlIgnore]
public bool CompactFlashSpecified { get; set; }
@@ -1033,5 +1035,15 @@ namespace DiscImageChef.Metadata
[XmlIgnore]
public bool CardCodeSpecified { get; set; }
}
[Serializable]
public class mmcsdType
{
public byte[] CID { get; set; }
public byte[] CSD { get; set; }
public byte[] OCR { get; set; }
public byte[] SCR { get; set; }
public byte[] ExtendedCSD { get; set; }
}
}