[Refactor] Fix indentation issues.

This commit is contained in:
2025-11-24 19:38:40 +00:00
parent 5774885431
commit 8331fba1e4
43 changed files with 1700 additions and 1751 deletions

View File

@@ -63,8 +63,8 @@ public static partial class MediaTypeFromDevice
return MediaType.Unknown;
AaruLogging.Debug(MODULE_NAME,
Localization
.Drive_manufacturer_is_SyQuest_media_has_1961069_blocks_of_512_bytes_setting_media_type_to_SparQ);
Localization
.Drive_manufacturer_is_SyQuest_media_has_1961069_blocks_of_512_bytes_setting_media_type_to_SparQ);
return MediaType.SparQ;
}

View File

@@ -60,56 +60,55 @@ public static partial class MediaTypeFromDevice
if(blocks == 1281856)
{
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650,
mediumType,
blocks,
blockSize);
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650,
mediumType,
blocks,
blockSize);
return MediaType.PD650_WORM;
}
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650,
mediumType,
blocks,
blockSize);
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650,
mediumType,
blocks,
blockSize);
return MediaType.PD650;
}
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc,
mediumType);
Localization.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc,
mediumType);
return MediaType.CD;
case 0x01:
case 0x05:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_ROM,
mediumType);
Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_ROM,
mediumType);
return MediaType.CDROM;
case 0x02:
case 0x06:
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc_Digital_Audio,
mediumType);
Localization.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc_Digital_Audio,
mediumType);
return MediaType.CDDA;
case 0x03:
case 0x07:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_Plus,
mediumType);
Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_Plus,
mediumType);
return MediaType.CDPLUS;
case 0x04:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_Photo_CD,
mediumType);
Localization.SCSI_medium_type_is_0_setting_media_type_to_Photo_CD,
mediumType);
return MediaType.PCD;
case 0x10:
@@ -122,8 +121,8 @@ public static partial class MediaTypeFromDevice
case 0x17:
case 0x18:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_CDR,
mediumType);
Localization.SCSI_medium_type_is_0_setting_media_type_to_CDR,
mediumType);
return MediaType.CDR;
case 0x20:
@@ -136,17 +135,17 @@ public static partial class MediaTypeFromDevice
case 0x27:
case 0x28:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_CDRW,
mediumType);
Localization.SCSI_medium_type_is_0_setting_media_type_to_CDRW,
mediumType);
return MediaType.CDRW;
case 0x40 when isUsb && !opticalDisc:
case 0x41 when isUsb && !opticalDisc:
case 0x42 when isUsb && !opticalDisc:
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_and_device_is_USB_setting_media_type_to_Flash_Drive,
mediumType);
Localization
.SCSI_medium_type_is_0_and_device_is_USB_setting_media_type_to_Flash_Drive,
mediumType);
return MediaType.FlashDrive;
case 0x80:
@@ -156,34 +155,34 @@ public static partial class MediaTypeFromDevice
{
case 0x42:
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO2,
mediumType,
densityCode);
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO2,
mediumType,
densityCode);
return MediaType.LTO2;
case 0x44:
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO3,
mediumType,
densityCode);
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO3,
mediumType,
densityCode);
return MediaType.LTO3;
case 0x46:
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO4,
mediumType,
densityCode);
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO4,
mediumType,
densityCode);
return MediaType.LTO4;
case 0x58:
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO5,
mediumType,
densityCode);
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO5,
mediumType,
densityCode);
return MediaType.LTO5;
}

View File

@@ -48,8 +48,8 @@ public static partial class MediaTypeFromDevice
if(mediumType != 0x01 && mediumType != 0x02 && mediumType != 0x03 && mediumType != 0x05 && mediumType != 0x07)
{
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_unknown_magneto_optical,
mediumType);
Localization.SCSI_medium_type_is_0_setting_media_type_to_unknown_magneto_optical,
mediumType);
return MediaType.UnknownMO;
}
@@ -62,102 +62,102 @@ public static partial class MediaTypeFromDevice
{
case 248826:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA154,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA154,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_154;
case 429975:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA201_embossed,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA201_embossed,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_201_ROM;
case 446325:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA201,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA201,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_201;
case 694929:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA223,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA223,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_223_512;
case 904995:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA183,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA183,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_183_512;
case 1041500:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO15041,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ISO15041,
mediumType,
blocks,
blockSize);
return MediaType.ISO_15041_512;
case 1128772:
case 1163337:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA184,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA184,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_184_512;
case 1281856:
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650,
mediumType,
blocks,
blockSize);
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650,
mediumType,
blocks,
blockSize);
return MediaType.PD650_WORM;
case 1298496:
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650,
mediumType,
blocks,
blockSize);
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650,
mediumType,
blocks,
blockSize);
return MediaType.PD650;
case 1644581:
case 1647371:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA195,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA195,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_195_512;
case 2244958:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO14517,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ISO14517,
mediumType,
blocks,
blockSize);
return MediaType.ISO_14517_512;
default:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
return MediaType.UnknownMO;
}
@@ -169,100 +169,100 @@ public static partial class MediaTypeFromDevice
{
case 314569:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO10089,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ISO10089,
mediumType,
blocks,
blockSize);
return MediaType.ISO_10089;
case 371371:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA223,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA223,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_223;
case 498526:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA184,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA184,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_183;
case 603466:
case 637041:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA184,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA184,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_184;
case 936921:
case 948770:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA195,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA195,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_195;
case 1244621:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA238,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA238,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_238;
case 1273011:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO14517,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ISO14517,
mediumType,
blocks,
blockSize);
return MediaType.ISO_14517;
case 2319786:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO15286,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ISO15286,
mediumType,
blocks,
blockSize);
return MediaType.ISO_15286_1024;
case 4383356:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA322,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA322,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_322_1k;
case 14476734:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA260,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA260,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_260;
case 24445990:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA260,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA260,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_260_Double;
default:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
return MediaType.UnknownMO;
}
@@ -277,66 +277,66 @@ public static partial class MediaTypeFromDevice
case 320332:
case 321100:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA239,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA239,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_239;
case 605846:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_GigaMO,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_GigaMO,
mediumType,
blocks,
blockSize);
return MediaType.GigaMo;
case 1063146:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_GigaMO2,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_GigaMO2,
mediumType,
blocks,
blockSize);
return MediaType.GigaMo2;
case 1128134:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA280,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA280,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_280;
case 1263472:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO15286,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ISO15286,
mediumType,
blocks,
blockSize);
return MediaType.ISO_15286;
case 2043664:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA322,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA322,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_322_2k;
case 7355716:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA317,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA317,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_317;
default:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
return MediaType.UnknownMO;
}
@@ -348,18 +348,18 @@ public static partial class MediaTypeFromDevice
{
case 1095840:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA322,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ECMA322,
mediumType,
blocks,
blockSize);
return MediaType.ECMA_322;
default:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
return MediaType.UnknownMO;
}
@@ -371,34 +371,34 @@ public static partial class MediaTypeFromDevice
{
case 1834348:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_UDO,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_UDO,
mediumType,
blocks,
blockSize);
return MediaType.UDO;
case 3668759:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_UDO2,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_WORM_UDO2,
mediumType,
blocks,
blockSize);
return MediaType.UDO2_WORM;
case 3669724:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_UDO2,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_UDO2,
mediumType,
blocks,
blockSize);
return MediaType.UDO2;
default:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
return MediaType.UnknownMO;
}
@@ -406,10 +406,10 @@ public static partial class MediaTypeFromDevice
default:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
blockSize);
return MediaType.UnknownMO;
}

File diff suppressed because it is too large Load Diff

View File

@@ -85,10 +85,10 @@ public static partial class MediaTypeFromDevice
if(blockSize == 2048)
{
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MDDATA,
scsiPeripheralType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_MDDATA,
scsiPeripheralType,
blocks,
blockSize);
return MediaType.MDData;
}
@@ -97,45 +97,45 @@ public static partial class MediaTypeFromDevice
{
case 57312:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MD60_MDDATA,
scsiPeripheralType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_MD60_MDDATA,
scsiPeripheralType,
blocks,
blockSize);
return MediaType.MD60;
case 70464:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MD74_MDDATA,
scsiPeripheralType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_MD74_MDDATA,
scsiPeripheralType,
blocks,
blockSize);
return MediaType.MD74;
case 76096:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MD80_MDDATA,
scsiPeripheralType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_MD80_MDDATA,
scsiPeripheralType,
blocks,
blockSize);
return MediaType.MD80;
}
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MD60_MDDATA,
scsiPeripheralType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_MD60_MDDATA,
scsiPeripheralType,
blocks,
blockSize);
return MediaType.MD;
// Host managed zoned block device
case 0x14:
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ZBC_Host_Managed,
scsiPeripheralType,
blocks,
blockSize);
Localization.SCSI_Media_Type_Description_ZBC_Host_Managed,
scsiPeripheralType,
blocks,
blockSize);
return MediaType.Zone_HDD;
}

File diff suppressed because it is too large Load Diff

View File

@@ -800,8 +800,7 @@ public static class Identify
if(IdentifyDeviceResponse.Length != 512)
{
AaruLogging.Debug(MODULE_NAME,
Localization.IDENTIFY_response_is_different_than_512_bytes_not_decoding);
AaruLogging.Debug(MODULE_NAME, Localization.IDENTIFY_response_is_different_than_512_bytes_not_decoding);
return null;
}
@@ -833,8 +832,8 @@ public static class Identify
ataId.WWN = DescrambleWWN(ataId.WWN);
ataId.WWNExtension = DescrambleWWN(ataId.WWNExtension);
byte[] buf = new byte[512];
nint ptr = System.Runtime.InteropServices.Marshal.AllocHGlobal(512);
var buf = new byte[512];
nint ptr = System.Runtime.InteropServices.Marshal.AllocHGlobal(512);
System.Runtime.InteropServices.Marshal.StructureToPtr(ataId, ptr, false);
System.Runtime.InteropServices.Marshal.Copy(ptr, buf, 0, 512);
System.Runtime.InteropServices.Marshal.FreeHGlobal(ptr);
@@ -858,7 +857,7 @@ public static class Identify
static ulong DescrambleWWN(ulong WWN)
{
byte[] qwb = BitConverter.GetBytes(WWN);
byte[] qword = new byte[8];
var qword = new byte[8];
qword[7] = qwb[1];
qword[6] = qwb[0];
@@ -876,7 +875,7 @@ public static class Identify
{
byte[] outbuf = buffer[offset + length - 1] != 0x00 ? new byte[length + 1] : new byte[length];
for(int i = 0; i < length; i += 2)
for(var i = 0; i < length; i += 2)
{
outbuf[i] = buffer[offset + i + 1];
outbuf[i + 1] = buffer[offset + i];
@@ -889,9 +888,9 @@ public static class Identify
static byte[] ScrambleATAString(string str, int length)
{
byte[] buf = new byte[length];
var buf = new byte[length];
for(int i = 0; i < length; i++) buf[i] = 0x20;
for(var i = 0; i < length; i++) buf[i] = 0x20;
if(str is null) return buf;
@@ -899,13 +898,13 @@ public static class Identify
if(bytes.Length % 2 != 0)
{
byte[] tmp = new byte[bytes.Length + 1];
var tmp = new byte[bytes.Length + 1];
tmp[^1] = 0x20;
Array.Copy(bytes, 0, tmp, 0, bytes.Length);
bytes = tmp;
}
for(int i = 0; i < bytes.Length; i += 2)
for(var i = 0; i < bytes.Length; i += 2)
{
buf[i] = bytes[i + 1];
buf[i + 1] = bytes[i];

View File

@@ -38,7 +38,6 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Aaru.Logging;
namespace Aaru.CommonTypes.Structs.Devices.SCSI;
@@ -276,8 +275,8 @@ public struct Inquiry
if(SCSIInquiryResponse.Length < 36 && SCSIInquiryResponse.Length != 5)
{
AaruLogging.Debug(MODULE_NAME,
Localization.INQUIRY_response_is_0_bytes_less_than_minimum_of_36_bytes,
SCSIInquiryResponse.Length);
Localization.INQUIRY_response_is_0_bytes_less_than_minimum_of_36_bytes,
SCSIInquiryResponse.Length);
return null;
}
@@ -286,10 +285,9 @@ public struct Inquiry
SCSIInquiryResponse.Length != SCSIInquiryResponse[4])
{
AaruLogging.Debug(MODULE_NAME,
Localization
.INQUIRY_response_length_0_bytes_is_different_than_specified_in_length_field,
SCSIInquiryResponse.Length,
SCSIInquiryResponse[4] + 4);
Localization.INQUIRY_response_length_0_bytes_is_different_than_specified_in_length_field,
SCSIInquiryResponse.Length,
SCSIInquiryResponse[4] + 4);
return null;
}
@@ -477,7 +475,7 @@ public struct Inquiry
decoded.VersionDescriptors = new ushort[descriptorsNo];
for(int i = 0; i < descriptorsNo; i++)
for(var i = 0; i < descriptorsNo; i++)
decoded.VersionDescriptors[i] = BitConverter.ToUInt16(SCSIInquiryResponse, 58 + i * 2);
}
@@ -528,8 +526,8 @@ public struct Inquiry
Inquiry decoded = inq.Value;
byte[] buffer = new byte[512];
byte length = 0;
var buffer = new byte[512];
byte length = 0;
buffer[0] = (byte)(decoded.PeripheralQualifier << 5);
buffer[0] += decoded.PeripheralDeviceType;
@@ -729,7 +727,7 @@ public struct Inquiry
{
length = (byte)(58 + decoded.VersionDescriptors.Length * 2);
for(int i = 0; i < decoded.VersionDescriptors.Length; i++)
for(var i = 0; i < decoded.VersionDescriptors.Length; i++)
Array.Copy(BitConverter.GetBytes(decoded.VersionDescriptors[i]), 0, buffer, 56 + i * 2, 2);
}
@@ -758,7 +756,7 @@ public struct Inquiry
}
buffer[4] = length;
byte[] dest = new byte[length];
var dest = new byte[length];
Array.Copy(buffer, 0, dest, 0, length);
return dest;