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

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

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

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

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

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

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