[Aaru.CommonTypes] Reformat and cleanup.

This commit is contained in:
2023-10-03 22:48:28 +01:00
parent 68d85349b1
commit 47294b2f62
81 changed files with 4583 additions and 2851 deletions

View File

@@ -47,7 +47,7 @@ public static partial class MediaTypeFromDevice
/// <param name="blocks">Number of blocks in device</param>
/// <returns>The media type</returns>
public static MediaType GetFromAta(string manufacturer, string model, bool removable, bool compactFlash,
bool pcmcia, ulong blocks)
bool pcmcia, ulong blocks)
{
if(!removable)
{

View File

@@ -50,12 +50,13 @@ public static partial class MediaTypeFromDevice
/// <param name="opticalDisc">Is the media an optical disc</param>
/// <returns>Media type</returns>
static MediaType GetFromMmc(string model, byte mediumType, byte densityCode, ulong blocks, uint blockSize,
bool isUsb, bool opticalDisc)
bool isUsb, bool opticalDisc)
{
switch(mediumType)
{
case 0x00:
if(blockSize == 512)
{
if(blocks == 1281856)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
@@ -74,6 +75,7 @@ public static partial class MediaTypeFromDevice
return MediaType.PD650;
}
}
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc,
@@ -144,6 +146,7 @@ public static partial class MediaTypeFromDevice
return MediaType.FlashDrive;
case 0x80:
if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal))
{
switch(densityCode)
{
case 0x42:
@@ -175,6 +178,7 @@ public static partial class MediaTypeFromDevice
return MediaType.LTO5;
}
}
break;
}

View File

@@ -67,15 +67,18 @@ public static partial class MediaTypeFromDevice
return GetFromSbc(vendor, model, mediumType, blocks, blockSize);
// Sequential access device
case 0x01: return GetFromSsc(scsiPeripheralType, vendor, model, mediumType, densityCode, blocks, blockSize);
case 0x01:
return GetFromSsc(scsiPeripheralType, vendor, model, mediumType, densityCode, blocks, blockSize);
// Write-once device
case 0x04:
// Optical device
case 0x07: return GetFromOdc(mediumType, blocks, blockSize);
case 0x07:
return GetFromOdc(mediumType, blocks, blockSize);
// MultiMedia Device
case 0x05: return GetFromMmc(model, mediumType, densityCode, blocks, blockSize, isUsb, opticalDisc);
case 0x05:
return GetFromMmc(model, mediumType, densityCode, blocks, blockSize, isUsb, opticalDisc);
// MD DATA drives
case 0x10 when model.StartsWith("MDM", StringComparison.Ordinal) ||

View File

@@ -49,7 +49,7 @@ public static partial class MediaTypeFromDevice
/// <param name="blockSize">Size of a block in bytes</param>
/// <returns>Media type</returns>
public static MediaType GetFromSsc(byte scsiPeripheralType, string vendor, string model, byte mediumType,
byte densityCode, ulong blocks, uint blockSize)
byte densityCode, ulong blocks, uint blockSize)
{
switch(mediumType)
{
@@ -1073,8 +1073,8 @@ public static partial class MediaTypeFromDevice
return MediaType.Exatape106m;
}
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
@@ -1127,8 +1127,8 @@ public static partial class MediaTypeFromDevice
case 0x88:
case 0x89:
{
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
@@ -1174,8 +1174,8 @@ public static partial class MediaTypeFromDevice
return MediaType.Exatape160mXL;
}
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal))
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SDLT,
@@ -1205,8 +1205,8 @@ public static partial class MediaTypeFromDevice
case 0x92:
case 0x93:
{
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal))
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SDLT,
@@ -1228,8 +1228,8 @@ public static partial class MediaTypeFromDevice
case 0x00:
case 0x4A:
{
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
@@ -1254,8 +1254,8 @@ public static partial class MediaTypeFromDevice
case 0x98:
case 0x99:
{
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) ||
model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal))
{
AaruConsole.DebugWriteLine(MODULE_NAME,