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 MediaTypeFromSCSI to MediaTypeFromDevice.

Browse Source
This commit is contained in:
Natalia Portillo
2020-01-31 23:13:11 +00:00
parent 9fa8b52217
commit b175aeb79f
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/.idea.DiscImageChef/.idea/contentModel.xml generated
View File

@@ -168,7 +168,7 @@
<e p="Version.cs" t="Include" /> <e p="Version.cs" t="Include" />
</e> </e>
<e p="MediaType.cs" t="Include" /> <e p="MediaType.cs" t="Include" />
<e p="MediaTypeFromSCSI.cs" t="Include" /> <e p="MediaTypeFromDevice.cs" t="Include" />
<e p="Metadata" t="Include"> <e p="Metadata" t="Include">
<e p="CdOffset.cs" t="Include" /> <e p="CdOffset.cs" t="Include" />
<e p="DeviceReport.cs" t="Include" /> <e p="DeviceReport.cs" t="Include" />

2
DiscImageChef.CommonTypes

Submodule DiscImageChef.CommonTypes updated: 2a616293fa...a53bcbc3b9

4
DiscImageChef.Core/Devices/Dumping/SBC.cs
View File

@@ -169,8 +169,8 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
if(dskType == MediaType.Unknown) if(dskType == MediaType.Unknown)
dskType = MediaTypeFromScsi.Get((byte)_dev.ScsiType, _dev.Manufacturer, _dev.Model, scsiMediumType, dskType = MediaTypeFromDevice.GetFromScsi((byte)_dev.ScsiType, _dev.Manufacturer, _dev.Model,
scsiDensityCode, blocks, blockSize); scsiMediumType, scsiDensityCode, blocks, blockSize);
switch(dskType) switch(dskType)
{ {

4
DiscImageChef.Core/Devices/Dumping/SSC.cs
View File

@@ -310,8 +310,8 @@ namespace DiscImageChef.Core.Devices.Dumping
blockSize = 1; blockSize = 1;
if(dskType == MediaType.Unknown) if(dskType == MediaType.Unknown)
dskType = MediaTypeFromScsi.Get((byte)_dev.ScsiType, _dev.Manufacturer, _dev.Model, scsiMediumTypeTape, dskType = MediaTypeFromDevice.GetFromScsi((byte)_dev.ScsiType, _dev.Manufacturer, _dev.Model,
scsiDensityCodeTape, blocks, blockSize); scsiMediumTypeTape, scsiDensityCodeTape, blocks, blockSize);
if(dskType == MediaType.Unknown) if(dskType == MediaType.Unknown)
dskType = MediaType.UnknownTape; dskType = MediaType.UnknownTape;

8
DiscImageChef.Core/Media/Info/ScsiInfo.cs
View File

@@ -48,7 +48,7 @@ using DiscImageChef.Decoders.Xbox;
using DiscImageChef.Devices; using DiscImageChef.Devices;
using DeviceInfo = DiscImageChef.Core.Devices.Info.DeviceInfo; using DeviceInfo = DiscImageChef.Core.Devices.Info.DeviceInfo;
using DMI = DiscImageChef.Decoders.Xbox.DMI; using DMI = DiscImageChef.Decoders.Xbox.DMI;
using Inquiry = DiscImageChef.Decoders.SCSI.Inquiry; using Inquiry = DiscImageChef.CommonTypes.Structs.Devices.SCSI.Inquiry;
namespace DiscImageChef.Core.Media.Info namespace DiscImageChef.Core.Media.Info
{ {
@@ -1291,7 +1291,7 @@ namespace DiscImageChef.Core.Media.Info
if(!sense) if(!sense)
{ {
var inq = CommonTypes.Structs.Devices.SCSI.Inquiry.Decode(inqBuffer); Inquiry? inq = Inquiry.Decode(inqBuffer);
if(inq.HasValue && if(inq.HasValue &&
inq.Value.KreonPresent) inq.Value.KreonPresent)
@@ -1429,8 +1429,8 @@ namespace DiscImageChef.Core.Media.Info
#endregion Xbox #endregion Xbox
case MediaType.Unknown: case MediaType.Unknown:
MediaType = MediaTypeFromScsi.Get((byte)dev.ScsiType, dev.Manufacturer, dev.Model, scsiMediumType, MediaType = MediaTypeFromDevice.GetFromScsi((byte)dev.ScsiType, dev.Manufacturer, dev.Model,
scsiDensityCode, Blocks, BlockSize); scsiMediumType, scsiDensityCode, Blocks, BlockSize);
break; break;
} }

2
DiscImageChef.Devices/Device/Constructor.cs
View File

@@ -808,7 +808,7 @@ namespace DiscImageChef.Devices
Error = false; Error = false;
} }
if((scsiSense && (IsUsb || IsFireWire)) || if((scsiSense && !(IsUsb || IsFireWire)) ||
Manufacturer == "ATA") Manufacturer == "ATA")
{ {
bool ataSense = AtaIdentify(out ataBuf, out _); bool ataSense = AtaIdentify(out ataBuf, out _);

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

@@ -988,7 +988,7 @@ namespace DiscImageChef.DiscImages
imageInfo.DriveFirmwareRevision = imageInfo.DriveFirmwareRevision =
StringHandlers.CToString(scsiInq.Value.ProductRevisionLevel).Trim(); StringHandlers.CToString(scsiInq.Value.ProductRevisionLevel).Trim();
imageInfo.MediaType = MediaTypeFromScsi.Get((byte)devType, imageInfo.DriveManufacturer, imageInfo.MediaType = MediaTypeFromDevice.GetFromScsi((byte)devType, imageInfo.DriveManufacturer,
imageInfo.DriveModel, mediumType, densityCode, imageInfo.DriveModel, mediumType, densityCode,
imageInfo.Sectors, imageInfo.SectorSize); imageInfo.Sectors, imageInfo.SectorSize);
} }