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 DeviceType to CommonTypes.

Browse Source
This commit is contained in:
Natalia Portillo
2018-11-27 00:09:53 +00:00
parent f118287dfb
commit 6a2fc9f76b
23 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,7 @@
<e p="DiscImageChef.CommonTypes" t="IncludeRecursive">
<e p="DiscImageChef.CommonTypes.csproj" t="IncludeRecursive" />
<e p="Enums" t="Include">
<e p="DeviceType.cs" t="Include" />
<e p="Images.cs" t="Include" />
</e>
<e p="Exceptions" t="Include">

1
DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj
View File

@@ -49,6 +49,7 @@
<Compile Include="..\CICMMetadata\dotnet\cicm.cs">
<Link>Metadata/cicm.cs</Link>
</Compile>
<Compile Include="Enums\DeviceType.cs" />
<Compile Include="Enums\Images.cs" />
<Compile Include="Exceptions\Images.cs" />
<Compile Include="Extents\ExtentsByte.cs" />

13
DiscImageChef.CommonTypes/Enums/DeviceType.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace DiscImageChef.CommonTypes.Enums
{
public enum DeviceType
{
Unknown,
ATA,
ATAPI,
SCSI,
SecureDigital,
MMC,
NVMe
}
}

1
DiscImageChef.Core/Devices/Info/DeviceInfo.cs
View File

@@ -32,6 +32,7 @@
using System;
using System.Collections.Generic;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Console;
using DiscImageChef.Decoders.ATA;
using DiscImageChef.Decoders.SCSI;

1
DiscImageChef.Core/Devices/Info/Properties.cs
View File

@@ -31,6 +31,7 @@
// ****************************************************************************/
using System.Collections.Generic;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Decoders.ATA;
using DiscImageChef.Decoders.SCSI;
using DiscImageChef.Decoders.SCSI.SSC;

13
DiscImageChef.Core/Devices/Reader.cs
View File

@@ -31,6 +31,7 @@
// ****************************************************************************/
using System;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Decoders.ATA;
using DiscImageChef.Devices;
@@ -123,15 +124,11 @@ namespace DiscImageChef.Core.Devices
}
}
internal bool ReadBlock(out byte[] buffer, ulong block, out double duration)
{
return ReadBlocks(out buffer, block, 1, out duration);
}
internal bool ReadBlock(out byte[] buffer, ulong block, out double duration) =>
ReadBlocks(out buffer, block, 1, out duration);
internal bool ReadBlocks(out byte[] buffer, ulong block, out double duration)
{
return ReadBlocks(out buffer, block, BlocksToRead, out duration);
}
internal bool ReadBlocks(out byte[] buffer, ulong block, out double duration) =>
ReadBlocks(out buffer, block, BlocksToRead, out duration);
internal bool ReadBlocks(out byte[] buffer, ulong block, uint count, out double duration)
{

2
DiscImageChef.Core/Devices/ReaderATA.cs
View File

@@ -31,9 +31,9 @@
// ****************************************************************************/
using System;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Console;
using DiscImageChef.Decoders.ATA;
using DiscImageChef.Devices;
namespace DiscImageChef.Core.Devices
{

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

@@ -30,9 +30,9 @@
// Copyright © 2011-2018 Natalia Portillo
// ****************************************************************************/
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Metadata;
using DiscImageChef.Console;
using DiscImageChef.Devices;
namespace DiscImageChef.Core.Devices.Report
{

1
DiscImageChef.Core/Devices/Scanning/SecureDigital.cs
View File

@@ -32,6 +32,7 @@
using System;
using System.Collections.Generic;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Console;
using DiscImageChef.Core.Logging;
using DiscImageChef.Decoders.MMC;

1
DiscImageChef.Core/Logging/MHDDLog.cs
View File

@@ -34,6 +34,7 @@ using System;
using System.Globalization;
using System.IO;
using System.Text;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Devices;
namespace DiscImageChef.Core.Logging

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

@@ -37,6 +37,7 @@ using System.Linq;
using System.Threading;
using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Console;
using DiscImageChef.Core.Media.Detection;
using DiscImageChef.Decoders.CD;

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

@@ -35,6 +35,7 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Interop;
using DiscImageChef.Console;
using DiscImageChef.Decoders.ATA;
@@ -475,7 +476,9 @@ namespace DiscImageChef.Devices
// I have to search for USB disks, floppies and CD-ROMs as separate device types
foreach(string devGuid in new[]
{Usb.GuidDevinterfaceFloppy, Usb.GuidDevinterfaceCdrom, Usb.GuidDevinterfaceDisk})
{
Usb.GuidDevinterfaceFloppy, Usb.GuidDevinterfaceCdrom, Usb.GuidDevinterfaceDisk
})
{
usbDevice = Usb.FindDrivePath(devicePath, devGuid);
if(usbDevice != null) break;

1
DiscImageChef.Devices/Device/Variables.cs
View File

@@ -30,6 +30,7 @@
// Copyright © 2011-2018 Natalia Portillo
// ****************************************************************************/
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Interop;
using DiscImageChef.Decoders.SCSI;

11
DiscImageChef.Devices/Enums.cs
View File

@@ -37,17 +37,6 @@ using System;
namespace DiscImageChef.Devices
{
public enum DeviceType
{
Unknown,
ATA,
ATAPI,
SCSI,
SecureDigital,
MMC,
NVMe
}
#region ATA Commands
/// <summary>
/// All known ATA commands

1
DiscImageChef.Gui/Forms/frmDump.xeto.cs
View File

@@ -39,6 +39,7 @@ using System.Linq;
using System.Text;
using System.Xml.Serialization;
using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Interfaces;
using DiscImageChef.CommonTypes.Metadata;
using DiscImageChef.Core;

1
DiscImageChef.Gui/Forms/frmMain.xeto.cs
View File

@@ -36,6 +36,7 @@ using System.ComponentModel;
using System.IO;
using System.Linq;
using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Interfaces;
using DiscImageChef.CommonTypes.Structs;
using DiscImageChef.Console;

1
DiscImageChef.Gui/Forms/frmMediaScan.xeto.cs
View File

@@ -32,6 +32,7 @@
using System;
using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Core;
using DiscImageChef.Core.Devices.Scanning;
using DiscImageChef.Core.Media.Info;

2
DiscImageChef.Gui/Tabs/tabSdMmcInfo.xeto.cs
View File

@@ -30,7 +30,7 @@
// Copyright © 2011-2018 Natalia Portillo
// ****************************************************************************/
using DiscImageChef.Devices;
using DiscImageChef.CommonTypes.Enums;
using Eto.Forms;
using Eto.Serialization.Xaml;

1
DiscImageChef/Commands/DeviceInfo.cs
View File

@@ -31,6 +31,7 @@
// ****************************************************************************/
using System.Collections.Generic;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Console;
using DiscImageChef.Core;
using DiscImageChef.Decoders.ATA;

1
DiscImageChef/Commands/DeviceReport.cs
View File

@@ -34,6 +34,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Metadata;
using DiscImageChef.Console;
using DiscImageChef.Core;

1
DiscImageChef/Commands/DumpMedia.cs
View File

@@ -37,6 +37,7 @@ using System.Linq;
using System.Text;
using System.Xml.Serialization;
using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Interfaces;
using DiscImageChef.CommonTypes.Metadata;
using DiscImageChef.Console;

1
DiscImageChef/Commands/MediaInfo.cs
View File

@@ -32,6 +32,7 @@
using System;
using System.Collections.Generic;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Console;
using DiscImageChef.Core;
using DiscImageChef.Core.Media.Info;

1
DiscImageChef/Commands/MediaScan.cs
View File

@@ -31,6 +31,7 @@
// ****************************************************************************/
using System;
using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Console;
using DiscImageChef.Core.Devices.Scanning;
using DiscImageChef.Devices;