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

Code cleanup.

Browse Source
This commit is contained in:
Natalia Portillo
2018-06-22 08:08:38 +01:00
parent 82f474c7e3
commit 88da8fc019
581 changed files with 22423 additions and 20839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DiscImageChef.Devices/Linux/ListDevices.cs
View File

@@ -46,15 +46,16 @@ namespace DiscImageChef.Devices.Linux
/// <returns>List of devices</returns>
internal static DeviceInfo[] GetList()
{
string[] sysdevs = Directory.GetFileSystemEntries(PATH_SYS_DEVBLOCK, "*", SearchOption.TopDirectoryOnly);
string[] sysdevs =
Directory.GetFileSystemEntries(PATH_SYS_DEVBLOCK, "*", SearchOption.TopDirectoryOnly);
DeviceInfo[] devices = new DeviceInfo[sysdevs.Length];
bool hasUdev;
bool hasUdev;
IntPtr udev = IntPtr.Zero;
try
{
udev = Extern.udev_new();
udev = Extern.udev_new();
hasUdev = udev != IntPtr.Zero;
}
catch { hasUdev = false; }
@@ -68,7 +69,7 @@ namespace DiscImageChef.Devices.Linux
IntPtr udevDev =
Extern.udev_device_new_from_subsystem_sysname(udev, "block", Path.GetFileName(sysdevs[i]));
devices[i].Vendor = Extern.udev_device_get_property_value(udevDev, "ID_VENDOR");
devices[i].Model = Extern.udev_device_get_property_value(udevDev, "ID_MODEL");
devices[i].Model = Extern.udev_device_get_property_value(udevDev, "ID_MODEL");
if(!string.IsNullOrEmpty(devices[i].Model)) devices[i].Model = devices[i].Model.Replace('_', ' ');
devices[i].Serial = Extern.udev_device_get_property_value(udevDev, "ID_SCSI_SERIAL");
if(string.IsNullOrEmpty(devices[i].Serial))
@@ -79,7 +80,7 @@ namespace DiscImageChef.Devices.Linux
StreamReader sr;
if(File.Exists(Path.Combine(sysdevs[i], "device/vendor")) && string.IsNullOrEmpty(devices[i].Vendor))
{
sr = new StreamReader(Path.Combine(sysdevs[i], "device/vendor"), Encoding.ASCII);
sr = new StreamReader(Path.Combine(sysdevs[i], "device/vendor"), Encoding.ASCII);
devices[i].Vendor = sr.ReadLine()?.Trim();
}
else if(devices[i].Path.StartsWith("/dev/loop", StringComparison.CurrentCulture))
@@ -88,7 +89,7 @@ namespace DiscImageChef.Devices.Linux
if(File.Exists(Path.Combine(sysdevs[i], "device/model")) &&
(string.IsNullOrEmpty(devices[i].Model) || devices[i].Bus == "ata"))
{
sr = new StreamReader(Path.Combine(sysdevs[i], "device/model"), Encoding.ASCII);
sr = new StreamReader(Path.Combine(sysdevs[i], "device/model"), Encoding.ASCII);
devices[i].Model = sr.ReadLine()?.Trim();
}
else if(devices[i].Path.StartsWith("/dev/loop", StringComparison.CurrentCulture))
@@ -96,7 +97,7 @@ namespace DiscImageChef.Devices.Linux
if(File.Exists(Path.Combine(sysdevs[i], "device/serial")) && string.IsNullOrEmpty(devices[i].Serial))
{
sr = new StreamReader(Path.Combine(sysdevs[i], "device/serial"), Encoding.ASCII);
sr = new StreamReader(Path.Combine(sysdevs[i], "device/serial"), Encoding.ASCII);
devices[i].Serial = sr.ReadLine()?.Trim();
}
@@ -107,7 +108,7 @@ namespace DiscImageChef.Devices.Linux
if(pieces.Length > 1)
{
devices[i].Vendor = pieces[0];
devices[i].Model = devices[i].Model.Substring(pieces[0].Length + 1);
devices[i].Model = devices[i].Model.Substring(pieces[0].Length + 1);
}
}

49
DiscImageChef.Devices/Linux/Structs.cs
View File

@@ -44,28 +44,28 @@ namespace DiscImageChef.Devices.Linux
/// <summary>
/// Always 'S' for SG v3
/// </summary>
public int interface_id; /* [i] 'S' (required) */
public int interface_id; /* [i] 'S' (required) */
public ScsiIoctlDirection dxfer_direction; /* [i] */
public byte cmd_len; /* [i] */
public byte mx_sb_len; /* [i] */
public ushort iovec_count; /* [i] */
public uint dxfer_len; /* [i] */
public IntPtr dxferp; /* [i], [*io] */
public IntPtr cmdp; /* [i], [*i] */
public IntPtr sbp; /* [i], [*o] */
public uint timeout; /* [i] unit: millisecs */
public uint flags; /* [i] */
public int pack_id; /* [i->o] */
public IntPtr usr_ptr; /* [i->o] */
public byte status; /* [o] */
public byte masked_status; /* [o] */
public byte msg_status; /* [o] */
public byte sb_len_wr; /* [o] */
public ushort host_status; /* [o] */
public ushort driver_status; /* [o] */
public int resid; /* [o] */
public uint duration; /* [o] */
public SgInfo info; /* [o] */
public byte cmd_len; /* [i] */
public byte mx_sb_len; /* [i] */
public ushort iovec_count; /* [i] */
public uint dxfer_len; /* [i] */
public IntPtr dxferp; /* [i], [*io] */
public IntPtr cmdp; /* [i], [*i] */
public IntPtr sbp; /* [i], [*o] */
public uint timeout; /* [i] unit: millisecs */
public uint flags; /* [i] */
public int pack_id; /* [i->o] */
public IntPtr usr_ptr; /* [i->o] */
public byte status; /* [o] */
public byte masked_status; /* [o] */
public byte msg_status; /* [o] */
public byte sb_len_wr; /* [o] */
public ushort host_status; /* [o] */
public ushort driver_status; /* [o] */
public int resid; /* [o] */
public uint duration; /* [o] */
public SgInfo info; /* [o] */
}
[StructLayout(LayoutKind.Sequential)]
@@ -85,10 +85,11 @@ namespace DiscImageChef.Devices.Linux
/// <summary>
/// CMD response
/// </summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)] public uint[] response;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
public uint[] response;
public MmcFlags flags;
public uint blksz;
public uint blocks;
public uint blksz;
public uint blocks;
/// <summary>
/// Sleep at least <see cref="postsleep_min_us" /> useconds, and at most
/// <see cref="postsleep_max_us" /> useconds *after* issuing command.Needed for