aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Fixed MOST name inconsistencies.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-20 17:15:26 +00:00
parent 542520f5cd
commit a4650c61aa
428 changed files with 16205 additions and 16320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
DiscImageChef.Tests.Devices/Device.cs
View File

@@ -41,7 +41,7 @@ namespace DiscImageChef.Tests.Devices
while(true)
{
DicConsole.WriteLine("dev.PlatformID = {0}", dev.PlatformID);
DicConsole.WriteLine("dev.PlatformID = {0}", dev.PlatformId);
DicConsole.WriteLine("dev.FileHandle = {0}", dev.FileHandle);
DicConsole.WriteLine("dev.Timeout = {0}", dev.Timeout);
DicConsole.WriteLine("dev.Error = {0}", dev.Error);
@@ -51,25 +51,25 @@ namespace DiscImageChef.Tests.Devices
DicConsole.WriteLine("dev.Model = \"{0}\"", dev.Model);
DicConsole.WriteLine("dev.Revision = \"{0}\"", dev.Revision);
DicConsole.WriteLine("dev.Serial = \"{0}\"", dev.Serial);
DicConsole.WriteLine("dev.SCSIType = {0}", dev.SCSIType);
DicConsole.WriteLine("dev.SCSIType = {0}", dev.ScsiType);
DicConsole.WriteLine("dev.IsRemovable = {0}", dev.IsRemovable);
DicConsole.WriteLine("dev.IsUSB = {0}", dev.IsUSB);
DicConsole.WriteLine("dev.USBVendorID = 0x{0:X4}", dev.USBVendorID);
DicConsole.WriteLine("dev.USBProductID = 0x{0:X4}", dev.USBProductID);
DicConsole.WriteLine("dev.IsUSB = {0}", dev.IsUsb);
DicConsole.WriteLine("dev.USBVendorID = 0x{0:X4}", dev.UsbVendorId);
DicConsole.WriteLine("dev.USBProductID = 0x{0:X4}", dev.UsbProductId);
DicConsole.WriteLine("dev.USBDescriptors.Length = {0}",
dev.USBDescriptors == null ? "null" : dev.USBDescriptors.Length.ToString());
DicConsole.WriteLine("dev.USBManufacturerString = \"{0}\"", dev.USBManufacturerString);
DicConsole.WriteLine("dev.USBProductString = \"{0}\"", dev.USBProductString);
DicConsole.WriteLine("dev.USBSerialString = \"{0}\"", dev.USBSerialString);
dev.UsbDescriptors == null ? "null" : dev.UsbDescriptors.Length.ToString());
DicConsole.WriteLine("dev.USBManufacturerString = \"{0}\"", dev.UsbManufacturerString);
DicConsole.WriteLine("dev.USBProductString = \"{0}\"", dev.UsbProductString);
DicConsole.WriteLine("dev.USBSerialString = \"{0}\"", dev.UsbSerialString);
DicConsole.WriteLine("dev.IsFireWire = {0}", dev.IsFireWire);
DicConsole.WriteLine("dev.FireWireGUID = {0:X16}", dev.FireWireGUID);
DicConsole.WriteLine("dev.FireWireGUID = {0:X16}", dev.FireWireGuid);
DicConsole.WriteLine("dev.FireWireModel = 0x{0:X8}", dev.FireWireModel);
DicConsole.WriteLine("dev.FireWireModelName = \"{0}\"", dev.FireWireModelName);
DicConsole.WriteLine("dev.FireWireVendor = 0x{0:X8}", dev.FireWireVendor);
DicConsole.WriteLine("dev.FireWireVendorName = \"{0}\"", dev.FireWireVendorName);
DicConsole.WriteLine("dev.IsCompactFlash = {0}", dev.IsCompactFlash);
DicConsole.WriteLine("dev.IsPCMCIA = {0}", dev.IsPCMCIA);
DicConsole.WriteLine("dev.CIS.Length = {0}", dev.CIS == null ? "null" : dev.CIS.Length.ToString());
DicConsole.WriteLine("dev.IsPCMCIA = {0}", dev.IsPcmcia);
DicConsole.WriteLine("dev.CIS.Length = {0}", dev.Cis == null ? "null" : dev.Cis.Length.ToString());
DicConsole.WriteLine("Press any key to continue...", devPath);
System.Console.ReadKey();
@@ -101,7 +101,7 @@ namespace DiscImageChef.Tests.Devices
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("USB descriptors:");
if(dev.USBDescriptors != null) PrintHex.PrintHexArray(dev.USBDescriptors, 64);
if(dev.UsbDescriptors != null) PrintHex.PrintHexArray(dev.UsbDescriptors, 64);
DicConsole.WriteLine("Press any key to continue...");
System.Console.ReadKey();
goto menu;
@@ -109,7 +109,7 @@ namespace DiscImageChef.Tests.Devices
System.Console.Clear();
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("PCMCIA CIS:");
if(dev.CIS != null) PrintHex.PrintHexArray(dev.CIS, 64);
if(dev.Cis != null) PrintHex.PrintHexArray(dev.Cis, 64);
DicConsole.WriteLine("Press any key to continue...");
System.Console.ReadKey();
goto menu;

10
DiscImageChef.Tests.Devices/Main.cs
View File

@@ -50,7 +50,7 @@ namespace DiscImageChef.Tests.Devices
return;
}
devices = devices.OrderBy(d => d.path).ToArray();
devices = devices.OrderBy(d => d.Path).ToArray();
int item;
string strDev;
@@ -67,9 +67,9 @@ namespace DiscImageChef.Tests.Devices
"----------------", "------------------------", "------------------------",
"----------", "----------", "--------");
for(int i = 0; i < devices.Length; i++)
DicConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", devices[i].path,
devices[i].vendor, devices[i].model, devices[i].serial, devices[i].bus,
devices[i].supported, i + 1);
DicConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", devices[i].Path,
devices[i].Vendor, devices[i].Model, devices[i].Serial, devices[i].Bus,
devices[i].Supported, i + 1);
DicConsole.Write("Please choose which drive to test (0 to exit): ");
strDev = System.Console.ReadLine();
@@ -93,7 +93,7 @@ namespace DiscImageChef.Tests.Devices
continue;
}
Device(devices[item - 1].path);
Device(devices[item - 1].Path);
}
}
}

2
DiscImageChef.Tests.Devices/SCSI/HP.cs
View File

@@ -179,7 +179,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
start:
System.Console.Clear();
bool sense = dev.HPReadLong(out byte[] buffer, out byte[] senseBuffer, relative, address, length, bps,
bool sense = dev.HpReadLong(out byte[] buffer, out byte[] senseBuffer, relative, address, length, bps,
physical, sectorCount, dev.Timeout, out double duration);
menu:

2
DiscImageChef.Tests.Devices/SCSI/Kreon.cs
View File

@@ -130,7 +130,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
start:
System.Console.Clear();
bool sense = dev.KreonExtractSS(out byte[] buffer, out byte[] senseBuffer, dev.Timeout, out double duration,
bool sense = dev.KreonExtractSs(out byte[] buffer, out byte[] senseBuffer, dev.Timeout, out double duration,
requestNumber);
menu:

72
DiscImageChef.Tests.Devices/SCSI/MMC.cs
View File

@@ -707,7 +707,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
DicConsole.WriteLine("Sector type");
DicConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", MmcSectorTypes.AllTypes,
MmcSectorTypes.CDDA, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
MmcSectorTypes.Cdda, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
MmcSectorTypes.Mode2Form1, MmcSectorTypes.Mode2Form2);
DicConsole.Write("Choose?: ");
strDev = System.Console.ReadLine();
@@ -788,7 +788,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
DicConsole.WriteLine("Subchannel mode");
DicConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcSubchannel.None, MmcSubchannel.Raw,
MmcSubchannel.Q16, MmcSubchannel.RW);
MmcSubchannel.Q16, MmcSubchannel.Rw);
DicConsole.Write("Choose?: ");
strDev = System.Console.ReadLine();
if(!System.Enum.TryParse(strDev, true, out subchan))
@@ -1013,7 +1013,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
DicConsole.WriteLine("Sector type");
DicConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", MmcSectorTypes.AllTypes,
MmcSectorTypes.CDDA, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
MmcSectorTypes.Cdda, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
MmcSectorTypes.Mode2Form1, MmcSectorTypes.Mode2Form2);
DicConsole.Write("Choose?: ");
strDev = System.Console.ReadLine();
@@ -1094,7 +1094,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
DicConsole.WriteLine("Subchannel mode");
DicConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcSubchannel.None, MmcSubchannel.Raw,
MmcSubchannel.Q16, MmcSubchannel.RW);
MmcSubchannel.Q16, MmcSubchannel.Rw);
DicConsole.Write("Choose?: ");
strDev = System.Console.ReadLine();
if(!System.Enum.TryParse(strDev, true, out subchan))
@@ -1239,7 +1239,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
DicConsole.WriteLine("Available values: {0} {1} {2}",
MmcDiscInformationDataTypes.DiscInformation,
MmcDiscInformationDataTypes.TrackResources,
MmcDiscInformationDataTypes.POWResources);
MmcDiscInformationDataTypes.PowResources);
DicConsole.Write("Choose?: ");
strDev = System.Console.ReadLine();
if(!System.Enum.TryParse(strDev, true, out info))
@@ -1347,7 +1347,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
static void ReadDiscStructure(string devPath, Device dev)
{
MmcDiscStructureMediaType mediaType = MmcDiscStructureMediaType.DVD;
MmcDiscStructureMediaType mediaType = MmcDiscStructureMediaType.Dvd;
MmcDiscStructureFormat format = MmcDiscStructureFormat.CapabilityList;
uint address = 0;
byte layer = 0;
@@ -1387,21 +1387,21 @@ namespace DiscImageChef.Tests.Devices.SCSI
return;
case 1:
DicConsole.WriteLine("Media type");
DicConsole.WriteLine("Available values: {0} {1}", MmcDiscStructureMediaType.DVD,
MmcDiscStructureMediaType.BD);
DicConsole.WriteLine("Available values: {0} {1}", MmcDiscStructureMediaType.Dvd,
MmcDiscStructureMediaType.Bd);
DicConsole.Write("Choose?: ");
strDev = System.Console.ReadLine();
if(!System.Enum.TryParse(strDev, true, out mediaType))
{
DicConsole.WriteLine("Not a correct media type. Press any key to continue...");
mediaType = MmcDiscStructureMediaType.DVD;
mediaType = MmcDiscStructureMediaType.Dvd;
System.Console.ReadKey();
continue;
}
DicConsole.WriteLine("Format");
DicConsole.WriteLine("Available values:");
if(mediaType == MmcDiscStructureMediaType.DVD)
if(mediaType == MmcDiscStructureMediaType.Dvd)
{
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.PhysicalInformation,
MmcDiscStructureFormat.CopyrightInformation,
@@ -1412,39 +1412,39 @@ namespace DiscImageChef.Tests.Devices.SCSI
MmcDiscStructureFormat.SectorCopyrightInformation,
MmcDiscStructureFormat.MediaIdentifier,
MmcDiscStructureFormat.MediaKeyBlock);
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DVDRAM_DDS,
MmcDiscStructureFormat.DVDRAM_MediumStatus,
MmcDiscStructureFormat.DVDRAM_SpareAreaInformation,
MmcDiscStructureFormat.DVDRAM_RecordingType);
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.LastBorderOutRMD,
MmcDiscStructureFormat.SpecifiedRMD,
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DvdramDds,
MmcDiscStructureFormat.DvdramMediumStatus,
MmcDiscStructureFormat.DvdramSpareAreaInformation,
MmcDiscStructureFormat.DvdramRecordingType);
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.LastBorderOutRmd,
MmcDiscStructureFormat.SpecifiedRmd,
MmcDiscStructureFormat.PreRecordedInfo,
MmcDiscStructureFormat.DVDR_MediaIdentifier);
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DVDR_PhysicalInformation,
MmcDiscStructureFormat.ADIP,
MmcDiscStructureFormat.HDDVD_CopyrightInformation,
MmcDiscStructureFormat.DVD_AACS);
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.HDDVDR_MediumStatus,
MmcDiscStructureFormat.HDDVDR_LastRMD,
MmcDiscStructureFormat.DVDR_LayerCapacity,
MmcDiscStructureFormat.DvdrMediaIdentifier);
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DvdrPhysicalInformation,
MmcDiscStructureFormat.Adip,
MmcDiscStructureFormat.HddvdCopyrightInformation,
MmcDiscStructureFormat.DvdAacs);
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.HddvdrMediumStatus,
MmcDiscStructureFormat.HddvdrLastRmd,
MmcDiscStructureFormat.DvdrLayerCapacity,
MmcDiscStructureFormat.MiddleZoneStart);
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.JumpIntervalSize,
MmcDiscStructureFormat.ManualLayerJumpStartLBA,
MmcDiscStructureFormat.RemapAnchorPoint, MmcDiscStructureFormat.DCB);
MmcDiscStructureFormat.ManualLayerJumpStartLba,
MmcDiscStructureFormat.RemapAnchorPoint, MmcDiscStructureFormat.Dcb);
}
if(mediaType == MmcDiscStructureMediaType.BD)
if(mediaType == MmcDiscStructureMediaType.Bd)
{
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DiscInformation,
MmcDiscStructureFormat.BD_BurstCuttingArea,
MmcDiscStructureFormat.BD_DDS, MmcDiscStructureFormat.CartridgeStatus);
DicConsole.WriteLine("\t{0} {1} {2}", MmcDiscStructureFormat.BD_SpareAreaInformation,
MmcDiscStructureFormat.RawDFL, MmcDiscStructureFormat.PAC);
MmcDiscStructureFormat.BdBurstCuttingArea,
MmcDiscStructureFormat.BdDds, MmcDiscStructureFormat.CartridgeStatus);
DicConsole.WriteLine("\t{0} {1} {2}", MmcDiscStructureFormat.BdSpareAreaInformation,
MmcDiscStructureFormat.RawDfl, MmcDiscStructureFormat.Pac);
}
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AACSVolId,
MmcDiscStructureFormat.AACSMediaSerial, MmcDiscStructureFormat.AACSMediaId,
MmcDiscStructureFormat.AACSMKB);
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AACSDataKeys,
MmcDiscStructureFormat.AACSLBAExtents, MmcDiscStructureFormat.AACSMKBCPRM,
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AacsVolId,
MmcDiscStructureFormat.AacsMediaSerial, MmcDiscStructureFormat.AacsMediaId,
MmcDiscStructureFormat.Aacsmkb);
DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AacsDataKeys,
MmcDiscStructureFormat.AacslbaExtents, MmcDiscStructureFormat.Aacsmkbcprm,
MmcDiscStructureFormat.RecognizedFormatLayers);
DicConsole.WriteLine("\t{0} {1}", MmcDiscStructureFormat.WriteProtectionStatus,
MmcDiscStructureFormat.CapabilityList);

2
DiscImageChef.Tests.Devices/SCSI/Plextor.cs
View File

@@ -1225,7 +1225,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
{
start:
System.Console.Clear();
bool sense = dev.PlextorReadEepromCDR(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
bool sense = dev.PlextorReadEepromCdr(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
out double duration);
menu:

4
DiscImageChef.Tests.Devices/SCSI/SPC.cs
View File

@@ -464,7 +464,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("MODE SENSE (6) decoded response:");
if(buffer != null)
DicConsole.WriteLine("{0}", Decoders.SCSI.Modes.PrettifyModeHeader6(buffer, dev.SCSIType));
DicConsole.WriteLine("{0}", Decoders.SCSI.Modes.PrettifyModeHeader6(buffer, dev.ScsiType));
DicConsole.WriteLine("Press any key to continue...");
System.Console.ReadKey();
System.Console.Clear();
@@ -655,7 +655,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
DicConsole.WriteLine("Device: {0}", devPath);
DicConsole.WriteLine("MODE SENSE (10) decoded response:");
if(buffer != null)
DicConsole.WriteLine("{0}", Decoders.SCSI.Modes.PrettifyModeHeader10(buffer, dev.SCSIType));
DicConsole.WriteLine("{0}", Decoders.SCSI.Modes.PrettifyModeHeader10(buffer, dev.ScsiType));
DicConsole.WriteLine("Press any key to continue...");
System.Console.ReadKey();
System.Console.Clear();

10
DiscImageChef.Tests.Devices/SecureDigital/MultiMediaCard.cs
View File

@@ -258,7 +258,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
{
start:
System.Console.Clear();
bool sense = dev.ReadOCR(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
bool sense = dev.ReadOcr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
menu:
DicConsole.WriteLine("Device: {0}", devPath);
@@ -340,7 +340,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
{
start:
System.Console.Clear();
bool sense = dev.ReadSDStatus(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
bool sense = dev.ReadSdStatus(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
menu:
DicConsole.WriteLine("Device: {0}", devPath);
@@ -411,7 +411,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
{
start:
System.Console.Clear();
bool sense = dev.ReadCID(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
bool sense = dev.ReadCid(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
menu:
DicConsole.WriteLine("Device: {0}", devPath);
@@ -493,7 +493,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
{
start:
System.Console.Clear();
bool sense = dev.ReadCSD(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
bool sense = dev.ReadCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
menu:
DicConsole.WriteLine("Device: {0}", devPath);
@@ -575,7 +575,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
{
start:
System.Console.Clear();
bool sense = dev.ReadExtendedCSD(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
bool sense = dev.ReadExtendedCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
menu:
DicConsole.WriteLine("Device: {0}", devPath);

10
DiscImageChef.Tests.Devices/SecureDigital/SecureDigital.cs
View File

@@ -258,7 +258,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
{
start:
System.Console.Clear();
bool sense = dev.ReadSDOCR(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
bool sense = dev.ReadSdocr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
menu:
DicConsole.WriteLine("Device: {0}", devPath);
@@ -340,7 +340,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
{
start:
System.Console.Clear();
bool sense = dev.ReadSDStatus(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
bool sense = dev.ReadSdStatus(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
menu:
DicConsole.WriteLine("Device: {0}", devPath);
@@ -411,7 +411,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
{
start:
System.Console.Clear();
bool sense = dev.ReadCID(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
bool sense = dev.ReadCid(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
menu:
DicConsole.WriteLine("Device: {0}", devPath);
@@ -493,7 +493,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
{
start:
System.Console.Clear();
bool sense = dev.ReadCSD(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
bool sense = dev.ReadCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
menu:
DicConsole.WriteLine("Device: {0}", devPath);
@@ -575,7 +575,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
{
start:
System.Console.Clear();
bool sense = dev.ReadSCR(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
bool sense = dev.ReadScr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
menu:
DicConsole.WriteLine("Device: {0}", devPath);