diff --git a/MediaTypeFromDevice/FromAta.cs b/MediaTypeFromDevice/FromAta.cs index d09feab71..2a9364fd0 100644 --- a/MediaTypeFromDevice/FromAta.cs +++ b/MediaTypeFromDevice/FromAta.cs @@ -62,7 +62,7 @@ public static partial class MediaTypeFromDevice blocks != 1961069) return MediaType.Unknown; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Drive_manufacturer_is_SyQuest_media_has_1961069_blocks_of_512_bytes_setting_media_type_to_SparQ); diff --git a/MediaTypeFromDevice/FromMmc.cs b/MediaTypeFromDevice/FromMmc.cs index 99815962c..18846bd03 100644 --- a/MediaTypeFromDevice/FromMmc.cs +++ b/MediaTypeFromDevice/FromMmc.cs @@ -58,7 +58,7 @@ public static partial class MediaTypeFromDevice if(blockSize == 512) if(blocks == 1281856) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(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); @@ -67,7 +67,7 @@ public static partial class MediaTypeFromDevice } else { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650, mediumType, blocks, blockSize); @@ -75,20 +75,20 @@ public static partial class MediaTypeFromDevice return MediaType.PD650; } - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc, mediumType); return MediaType.CD; case 0x01: case 0x05: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_ROM, mediumType); return MediaType.CDROM; case 0x02: case 0x06: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc_Digital_Audio, mediumType); @@ -96,13 +96,13 @@ public static partial class MediaTypeFromDevice return MediaType.CDDA; case 0x03: case 0x07: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_Plus, mediumType); return MediaType.CDPLUS; case 0x04: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_medium_type_is_0_setting_media_type_to_Photo_CD, mediumType); @@ -116,7 +116,7 @@ public static partial class MediaTypeFromDevice case 0x16: case 0x17: case 0x18: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_medium_type_is_0_setting_media_type_to_CDR, mediumType); return MediaType.CDR; @@ -129,14 +129,14 @@ public static partial class MediaTypeFromDevice case 0x26: case 0x27: case 0x28: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, 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: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. SCSI_medium_type_is_0_and_device_is_USB_setting_media_type_to_Flash_Drive, mediumType); @@ -147,28 +147,28 @@ public static partial class MediaTypeFromDevice switch(densityCode) { case 0x42: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, 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: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, 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: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, 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: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO5, mediumType, densityCode); diff --git a/MediaTypeFromDevice/FromOdc.cs b/MediaTypeFromDevice/FromOdc.cs index 9bbfb9d0c..39359ac1c 100644 --- a/MediaTypeFromDevice/FromOdc.cs +++ b/MediaTypeFromDevice/FromOdc.cs @@ -51,7 +51,7 @@ public static partial class MediaTypeFromDevice mediumType != 0x05 && mediumType != 0x07) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_medium_type_is_0_setting_media_type_to_unknown_magneto_optical, mediumType); @@ -65,51 +65,51 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 248826: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA154, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA154, mediumType, blocks, blockSize); return MediaType.ECMA_154; case 429975: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA201_embossed, mediumType, blocks, blockSize); return MediaType.ECMA_201_ROM; case 446325: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA201, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA201, mediumType, blocks, blockSize); return MediaType.ECMA_201; case 694929: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA223, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA223, mediumType, blocks, blockSize); return MediaType.ECMA_223_512; case 904995: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA183, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA183, mediumType, blocks, blockSize); return MediaType.ECMA_183_512; case 1041500: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO15041, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO15041, mediumType, blocks, blockSize); return MediaType.ISO_15041_512; case 1128772: case 1163337: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA184, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA184, mediumType, blocks, blockSize); return MediaType.ECMA_184_512; case 1281856: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(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); return MediaType.PD650_WORM; case 1298496: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650, mediumType, blocks, blockSize); @@ -117,17 +117,17 @@ public static partial class MediaTypeFromDevice return MediaType.PD650; case 1644581: case 1647371: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA195, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA195, mediumType, blocks, blockSize); return MediaType.ECMA_195_512; case 2244958: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO14517, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO14517, mediumType, blocks, blockSize); return MediaType.ISO_14517_512; default: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType, blocks, blockSize); @@ -140,64 +140,64 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 314569: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO10089, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO10089, mediumType, blocks, blockSize); return MediaType.ISO_10089; case 371371: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA223, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA223, mediumType, blocks, blockSize); return MediaType.ECMA_223; case 498526: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA184, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA184, mediumType, blocks, blockSize); return MediaType.ECMA_183; case 603466: case 637041: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA184, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA184, mediumType, blocks, blockSize); return MediaType.ECMA_184; case 936921: case 948770: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA195, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA195, mediumType, blocks, blockSize); return MediaType.ECMA_195; case 1244621: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA238, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA238, mediumType, blocks, blockSize); return MediaType.ECMA_238; case 1273011: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO14517, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO14517, mediumType, blocks, blockSize); return MediaType.ISO_14517; case 2319786: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO15286, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO15286, mediumType, blocks, blockSize); return MediaType.ISO_15286_1024; case 4383356: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA322, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA322, mediumType, blocks, blockSize); return MediaType.ECMA_322_1k; case 14476734: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA260, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA260, mediumType, blocks, blockSize); return MediaType.ECMA_260; case 24445990: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA260, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA260, mediumType, blocks, blockSize); return MediaType.ECMA_260_Double; default: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType, blocks, blockSize); @@ -213,42 +213,42 @@ public static partial class MediaTypeFromDevice case 318988: case 320332: case 321100: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA239, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA239, mediumType, blocks, blockSize); return MediaType.ECMA_239; case 605846: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_GigaMO, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_GigaMO, mediumType, blocks, blockSize); return MediaType.GigaMo; case 1063146: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_GigaMO2, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_GigaMO2, mediumType, blocks, blockSize); return MediaType.GigaMo2; case 1128134: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA280, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA280, mediumType, blocks, blockSize); return MediaType.ECMA_280; case 1263472: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO15286, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO15286, mediumType, blocks, blockSize); return MediaType.ISO_15286; case 2043664: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA322, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA322, mediumType, blocks, blockSize); return MediaType.ECMA_322_2k; case 7355716: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA317, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA317, mediumType, blocks, blockSize); return MediaType.ECMA_317; default: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType, blocks, blockSize); @@ -261,12 +261,12 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 1095840: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA322, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA322, mediumType, blocks, blockSize); return MediaType.ECMA_322; default: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType, blocks, blockSize); @@ -279,23 +279,23 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 1834348: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_UDO, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_UDO, mediumType, blocks, blockSize); return MediaType.UDO; case 3668759: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_UDO2, mediumType, blocks, blockSize); return MediaType.UDO2_WORM; case 3669724: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_UDO2, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_UDO2, mediumType, blocks, blockSize); return MediaType.UDO2; default: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType, blocks, blockSize); @@ -304,7 +304,7 @@ public static partial class MediaTypeFromDevice } default: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_Unknown_MO, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown_MO, mediumType, blocks, blockSize); return MediaType.UnknownMO; diff --git a/MediaTypeFromDevice/FromSbc.cs b/MediaTypeFromDevice/FromSbc.cs index 583542b51..1607336dc 100644 --- a/MediaTypeFromDevice/FromSbc.cs +++ b/MediaTypeFromDevice/FromSbc.cs @@ -51,12 +51,12 @@ public static partial class MediaTypeFromDevice switch(mediumType) { case 0x09: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA54, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA54, mediumType, blocks, blockSize); return MediaType.ECMA_54; case 0x0A: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA59, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA59, mediumType, blocks, blockSize); return MediaType.ECMA_59; @@ -64,33 +64,33 @@ public static partial class MediaTypeFromDevice switch(blockSize) { case 256: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA69, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA69, mediumType, blocks, blockSize); return MediaType.ECMA_69_26; case 512: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA69, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA69, mediumType, blocks, blockSize); return MediaType.ECMA_69_15; case 1024: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA69, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA69, mediumType, blocks, blockSize); return MediaType.ECMA_69_8; } - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_Unknown, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown, mediumType, blocks, blockSize); return MediaType.Unknown; case 0x0E: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA66, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA66, mediumType, blocks, blockSize); return MediaType.ECMA_66; case 0x12: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA70, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA70, mediumType, blocks, blockSize); return MediaType.ECMA_70; @@ -98,18 +98,18 @@ public static partial class MediaTypeFromDevice switch(blockSize) { case 256: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA78, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA78, mediumType, blocks, blockSize); return MediaType.ECMA_78; case 512: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA78, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA78, mediumType, blocks, blockSize); return MediaType.ECMA_78_2; } - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_Unknown, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown, mediumType, blocks, blockSize); return MediaType.Unknown; @@ -117,28 +117,28 @@ public static partial class MediaTypeFromDevice switch(blockSize) { case 256: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA99, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA99, mediumType, blocks, blockSize); return MediaType.ECMA_99_26; case 512: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA99, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA99, mediumType, blocks, blockSize); return MediaType.ECMA_99_15; case 1024: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA99, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA99, mediumType, blocks, blockSize); return MediaType.ECMA_99_8; } - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_Unknown, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Unknown, mediumType, blocks, blockSize); return MediaType.Unknown; case 0x1E: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM_MF2DD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2DD, mediumType, blocks, blockSize); return MediaType.DOS_35_DS_DD_9; @@ -146,17 +146,17 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 58620544: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_REV120, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_REV120, mediumType, blocks, blockSize); return MediaType.REV120; case 34185728: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_REV70, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_REV70, mediumType, blocks, blockSize); return MediaType.REV70; case 17090880: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_REV35, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_REV35, mediumType, blocks, blockSize); return MediaType.REV35; @@ -164,12 +164,12 @@ public static partial class MediaTypeFromDevice break; case 0x93: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_PC98_MF2HD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_PC98_MF2HD, mediumType, blocks, blockSize); return MediaType.NEC_35_HD_15; case 0x94: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM_MF2HD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2HD, mediumType, blocks, blockSize); return MediaType.DOS_35_HD; @@ -181,34 +181,34 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 720: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Atari_MD1SD, mediumType, blocks, blockSize); return MediaType.ATARI_525_SD; case 1040: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Atari_MD1DD, mediumType, blocks, blockSize); return MediaType.ATARI_525_DD; case 1898: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM_33FD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_33FD, mediumType, blocks, blockSize); return MediaType.IBM33FD_128; case 2002: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA54, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA54, mediumType, blocks, blockSize); return MediaType.ECMA_54; case 3848: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM_43FD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_43FD, mediumType, blocks, blockSize); return MediaType.IBM43FD_128; case 4004: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA59, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA59, mediumType, blocks, blockSize); return MediaType.ECMA_59; @@ -219,112 +219,112 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 322: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA56, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA56, mediumType, blocks, blockSize); return MediaType.ECMA_66; case 400: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MD1SD, mediumType, blocks, blockSize); return MediaType.ACORN_525_SS_SD_40; case 455: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apple_DOS32, mediumType, blocks, blockSize); return MediaType.Apple32SS; case 560: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apple_DOS33, mediumType, blocks, blockSize); return MediaType.Apple33SS; case 640: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MD1DD, mediumType, blocks, blockSize); return MediaType.ACORN_525_SS_DD_40; case 720: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Atari_MD1DD, mediumType, blocks, blockSize); return MediaType.ATARI_525_DD; case 800: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80, mediumType, blocks, blockSize); return MediaType.ACORN_525_SS_SD_80; case 910: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apple_DOS32_DS, mediumType, blocks, blockSize); return MediaType.Apple32DS; case 1120: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apple_DOS33_DS, mediumType, blocks, blockSize); return MediaType.Apple33DS; case 1121: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM_33FD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_33FD, mediumType, blocks, blockSize); return MediaType.IBM33FD_256; case 1232: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MetaFloppy, mediumType, blocks, blockSize); return MediaType.MetaFloppy_Mod_II; case 1280 when mediumType == 0x01: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80, mediumType, blocks, blockSize); return MediaType.ACORN_525_SS_DD_80; case 1280: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA70, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA70, mediumType, blocks, blockSize); return MediaType.ECMA_70; case 2002: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_DEC_RX02, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DEC_RX02, mediumType, blocks, blockSize); return MediaType.RX02; case 2560: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA78, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA78, mediumType, blocks, blockSize); return MediaType.ECMA_78; case 3848: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM_53FD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_53FD, mediumType, blocks, blockSize); return MediaType.IBM53FD_256; case 4004: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA99, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA99, mediumType, blocks, blockSize); return MediaType.ECMA_99_26; case 39168 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase): case 41004 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase): - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli10, blocks); return MediaType.Bernoulli10; case 46956: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_HF12); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_HF12); return MediaType.HF12; case 78936: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_HF24); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_HF24); return MediaType.HF12; } @@ -334,7 +334,7 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 256: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM_23FD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_23FD, mediumType, blocks, blockSize); return MediaType.IBM23FD; @@ -345,304 +345,304 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 320: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MD1DD_8, mediumType, blocks, blockSize); return MediaType.DOS_525_SS_DD_8; case 360: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MD1DD, mediumType, blocks, blockSize); return MediaType.DOS_525_SS_DD_9; case 610: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM_33FD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_33FD, mediumType, blocks, blockSize); return MediaType.IBM33FD_512; case 630 when mediumType == 0x01: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apricot_MF2DD, mediumType, blocks, blockSize); return MediaType.Apricot_35; case 640 when mediumType == 0x01: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF1DD_8, mediumType, blocks, blockSize); return MediaType.DOS_35_SS_DD_8; case 640: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MD2DD_8, mediumType, blocks, blockSize); return MediaType.DOS_525_DS_DD_8; case 720 when mediumType == 0x01: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF1DD, mediumType, blocks, blockSize); return MediaType.DOS_35_SS_DD_9; case 720: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MD2DD, mediumType, blocks, blockSize); return MediaType.DOS_525_DS_DD_9; case 800: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Apple_MF1DD, mediumType, blocks, blockSize); return MediaType.AppleSonySS; case 1280: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2DD_8, mediumType, blocks, blockSize); return MediaType.DOS_35_DS_DD_8; case 1440: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2DD, mediumType, blocks, blockSize); return MediaType.DOS_35_DS_DD_9; case 1640: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_FDFORMAT_MF2DD, mediumType, blocks, blockSize); return MediaType.FDFORMAT_35_DD; case 1760: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Amiga_MF2DD, mediumType, blocks, blockSize); return MediaType.CBM_AMIGA_35_DD; case 2242: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM_53FD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_53FD, mediumType, blocks, blockSize); return MediaType.IBM53FD_512; case 2332: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA99, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA99, mediumType, blocks, blockSize); return MediaType.ECMA_99_15; case 2400: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MD2HD, mediumType, blocks, blockSize); return MediaType.DOS_525_HD; case 2788: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_FDFORMAT_MD2HD, mediumType, blocks, blockSize); return MediaType.FDFORMAT_525_HD; case 2880: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2HD, mediumType, blocks, blockSize); return MediaType.DOS_35_HD; case 3360: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DMF_MF2HD, mediumType, blocks, blockSize); return MediaType.DMF; case 3444: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_FDFORMAT_MF2HD, mediumType, blocks, blockSize); return MediaType.FDFORMAT_35_HD; case 3520: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Amiga_MF2HD, mediumType, blocks, blockSize); return MediaType.CBM_AMIGA_35_HD; case 5760: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_MF2ED, mediumType, blocks, blockSize); return MediaType.DOS_35_ED; case 40662 when mediumType == 0x20: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Floptical, mediumType, blocks, blockSize); return MediaType.Floptical; case 65536 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal): - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_FD32MB); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_FD32MB); return MediaType.FD32MB; case 78882 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase): - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_PocketZIP); return MediaType.PocketZip; case 86700 when vendor.ToLowerInvariant() == "syquest": - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_SQ400); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ400); return MediaType.SQ400; case 87040 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase): - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli2_44); return MediaType.Bernoulli44; case 173456 when vendor.ToLowerInvariant() == "syquest": - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_SQ800); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ800); return MediaType.SQ800; case 175856 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase): - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli2_90); return MediaType.Bernoulli90; case 196608 when model.ToLowerInvariant().StartsWith("zip", StringComparison.OrdinalIgnoreCase): - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ZIP100); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ZIP100); return MediaType.ZIP100; case 215440 when vendor.ToLowerInvariant() == "syquest": - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_SQ310); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ310); return MediaType.SQ310; case 246528 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal): - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_LS120); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LS120); return MediaType.LS120; case 248826 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA154, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA154, mediumType, blocks, blockSize); return MediaType.ECMA_154; case 262144 when vendor.ToLowerInvariant() == "syquest": - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_EZ135); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_EZ135); return MediaType.EZ135; case 294918 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase): - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli2_150); return MediaType.Bernoulli150; case 390696 when vendor.ToLowerInvariant() == "syquest": - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_SQ2000); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ2000); return MediaType.SQ2000; case 393380 when model.ToLowerInvariant().StartsWith("hifd", StringComparison.Ordinal): - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_HiFD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_HiFD, blocks, blockSize); return MediaType.HiFD; case 429975 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA201_embossed, mediumType, blocks, blockSize); return MediaType.ECMA_201_ROM; case 446325 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA201, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA201, mediumType, blocks, blockSize); return MediaType.ECMA_201; case 450560 when vendor.ToLowerInvariant() == "syquest": - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_EZ230); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_EZ230); return MediaType.EZ230; case 469504 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal): - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_LS240); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LS240); return MediaType.LS240; case 489532 when model.ToLowerInvariant().StartsWith("zip", StringComparison.OrdinalIgnoreCase): - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ZIP250); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ZIP250); return MediaType.ZIP250; case 524288 when vendor.ToLowerInvariant() == "syquest": - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_SQ327); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ327); return MediaType.SQ327; case 694929 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA223, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA223, mediumType, blocks, blockSize); return MediaType.ECMA_223_512; case 904995 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA183, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA183, mediumType, blocks, blockSize); return MediaType.ECMA_183_512; case 1041500 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO15041, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO15041, mediumType, blocks, blockSize); return MediaType.ISO_15041_512; case 1128772 when mediumType is 0x01 or 0x02: case 1163337 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA184, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA184, mediumType, blocks, blockSize); return MediaType.ECMA_184_512; case 1281856 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(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); return MediaType.PD650_WORM; case 1298496 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, 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 1470500 when model.ToLowerInvariant().StartsWith("zip", StringComparison.OrdinalIgnoreCase): - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ZIP250); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ZIP250); return MediaType.ZIP750; case 1644581 when mediumType is 0x01 or 0x02: case 1647371 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA195, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA195, mediumType, blocks, blockSize); return MediaType.ECMA_195_512; case 1961069 when vendor.ToLowerInvariant() == "syquest": - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Drive_manufacturer_is_SyQuest_media_has_1961069_blocks_of_512_bytes_setting_media_type_to_SparQ); return MediaType.SparQ; case 2091050 when model.ToLowerInvariant().StartsWith("jaz", StringComparison.Ordinal): - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_JAZ); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_JAZ); return MediaType.Jaz; case 2244958 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO14517, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO14517, mediumType, blocks, blockSize); return MediaType.ISO_14517_512; case 2929800 when vendor.ToLowerInvariant() == "syquest": - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_SyJet); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SyJet); return MediaType.SyJet; case 3915600 when model.ToLowerInvariant().StartsWith("jaz", StringComparison.Ordinal): - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_JAZ2); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_JAZ2); return MediaType.Jaz2; case 4307184 when vendor.ToLowerInvariant().StartsWith("cws orb", StringComparison.Ordinal): - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_Orb); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Orb); return MediaType.Orb; case 625134256 when model.ToLowerInvariant().StartsWith("rdx", StringComparison.Ordinal): - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_RDX320, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_RDX320, blocks, blockSize); return MediaType.RDX320; @@ -654,103 +654,103 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 800 when mediumType == 0x02: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MF2DD, mediumType, blocks, blockSize); return MediaType.ACORN_35_DS_DD; case 1220: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM_53FD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM_53FD, mediumType, blocks, blockSize); return MediaType.IBM53FD_1024; case 1232 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal): - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LS_PC98_MF2HD); return MediaType.NEC_35_HD_8; case 1232: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Sharp_MF2HD, mediumType, blocks, blockSize); return MediaType.SHARP_35; case 1268: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA69, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA69, mediumType, blocks, blockSize); return MediaType.ECMA_69_8; case 1280: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_PC98_MD2HD, mediumType, blocks, blockSize); return MediaType.NEC_525_HD; case 1316: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA99, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA99, mediumType, blocks, blockSize); return MediaType.ECMA_99_8; case 1600 when mediumType == 0x02: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Acorn_MF2HD, mediumType, blocks, blockSize); return MediaType.ACORN_35_DS_HD; case 314569 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO10089, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO10089, mediumType, blocks, blockSize); return MediaType.ISO_10089; case 371371 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA223, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA223, mediumType, blocks, blockSize); return MediaType.ECMA_223; case 498526 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA183, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA183, mediumType, blocks, blockSize); return MediaType.ECMA_183; case 603466 when mediumType is 0x01 or 0x02: case 637041 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA184, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA184, mediumType, blocks, blockSize); return MediaType.ECMA_184; case 936921 when mediumType is 0x01 or 0x02: case 948770 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA195, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA195, mediumType, blocks, blockSize); return MediaType.ECMA_195; case 1244621 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA238, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA238, mediumType, blocks, blockSize); return MediaType.ECMA_238; case 1273011 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO14517, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO14517, mediumType, blocks, blockSize); return MediaType.ISO_14517; case 2319786 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO15286, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO15286, mediumType, blocks, blockSize); return MediaType.ISO_15286_1024; case 4383356 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA322, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA322, mediumType, blocks, blockSize); return MediaType.ECMA_322_1k; case 14476734 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA260, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA260, mediumType, blocks, blockSize); return MediaType.ECMA_260; case 24445990 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA260, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA260, mediumType, blocks, blockSize); return MediaType.ECMA_260_Double; @@ -763,17 +763,17 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 112311: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_MD60, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MD60, mediumType, blocks, blockSize); return MediaType.MD60; case 138363: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_MD74, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MD74, mediumType, blocks, blockSize); return MediaType.MD74; case 149373: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_MD80, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MD80, mediumType, blocks, blockSize); return MediaType.MD80; @@ -781,42 +781,42 @@ public static partial class MediaTypeFromDevice case 318988 when mediumType is 0x01 or 0x02: case 320332 when mediumType is 0x01 or 0x02: case 321100 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA239, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA239, mediumType, blocks, blockSize); return MediaType.ECMA_239; case 494023: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_HiMD, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_HiMD, mediumType, blocks, blockSize); return MediaType.HiMD; case 605846 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_GigaMO, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_GigaMO, mediumType, blocks, blockSize); return MediaType.GigaMo; case 1063146 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_GigaMO2, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_GigaMO2, mediumType, blocks, blockSize); return MediaType.GigaMo2; case 1128134 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA280, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA280, mediumType, blocks, blockSize); return MediaType.ECMA_280; case 1263472 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ISO15286, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ISO15286, mediumType, blocks, blockSize); return MediaType.ISO_15286; case 2043664 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA322, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA322, mediumType, blocks, blockSize); return MediaType.ECMA_322_2k; case 7355716 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA317, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA317, mediumType, blocks, blockSize); return MediaType.ECMA_317; @@ -829,7 +829,7 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 1095840 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ECMA322, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ECMA322, mediumType, blocks, blockSize); return MediaType.ECMA_322; @@ -842,18 +842,18 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 1834348 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_UDO, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_UDO, mediumType, blocks, blockSize); return MediaType.UDO; case 3668759 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_UDO2, mediumType, blocks, blockSize); return MediaType.UDO2_WORM; case 3669724 when mediumType is 0x01 or 0x02: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_UDO2, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_UDO2, mediumType, blocks, blockSize); return MediaType.UDO2; diff --git a/MediaTypeFromDevice/FromScsi.cs b/MediaTypeFromDevice/FromScsi.cs index 218fccd61..14460aee4 100644 --- a/MediaTypeFromDevice/FromScsi.cs +++ b/MediaTypeFromDevice/FromScsi.cs @@ -39,6 +39,8 @@ namespace Aaru.CommonTypes; public static partial class MediaTypeFromDevice { + const string MODULE_NAME = "Media detection"; + /// Tries to guess, from SCSI information, the media type of a device and/or its inserted media /// The SCSI Peripheral Type as indicated in the INQUIRY response /// The vendor string of the device @@ -80,7 +82,7 @@ public static partial class MediaTypeFromDevice model.StartsWith("MDH", StringComparison.Ordinal): if(blockSize == 2048) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_MDDATA, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MDDATA, scsiPeripheralType, blocks, blockSize); return MediaType.MDData; @@ -89,33 +91,33 @@ public static partial class MediaTypeFromDevice switch(blocks) { case 57312: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MD60_MDDATA, scsiPeripheralType, blocks, blockSize); return MediaType.MD60; case 70464: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MD74_MDDATA, scsiPeripheralType, blocks, blockSize); return MediaType.MD74; case 76096: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MD80_MDDATA, scsiPeripheralType, blocks, blockSize); return MediaType.MD80; } - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_MD60_MDDATA, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_MD60_MDDATA, scsiPeripheralType, blocks, blockSize); return MediaType.MD; // Host managed zoned block device case 0x14: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_ZBC_Host_Managed, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ZBC_Host_Managed, scsiPeripheralType, blocks, blockSize); return MediaType.Zone_HDD; diff --git a/MediaTypeFromDevice/FromSsc.cs b/MediaTypeFromDevice/FromSsc.cs index 44003dc0e..000fbceba 100644 --- a/MediaTypeFromDevice/FromSsc.cs +++ b/MediaTypeFromDevice/FromSsc.cs @@ -34,7 +34,6 @@ using System; using Aaru.Console; -using Aaru.Localization; namespace Aaru.CommonTypes; @@ -58,59 +57,59 @@ public static partial class MediaTypeFromDevice switch(densityCode) { case 0x04: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_QIC11, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_QIC11, mediumType, densityCode); return MediaType.QIC11; case 0x05: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_QIC24, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_QIC24, mediumType, densityCode); return MediaType.QIC24; case 0x09: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM3490, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM3490, mediumType, densityCode); return MediaType.IBM3490; case 0x0F: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_QIC120, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_QIC120, mediumType, densityCode); return MediaType.QIC120; case 0x10: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_QIC150, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_QIC150, mediumType, densityCode); return MediaType.QIC150; case 0x13: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_DDS, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DDS, mediumType, densityCode); return MediaType.DDS1; case 0x24: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_DDS2, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DDS2, mediumType, densityCode); return MediaType.DDS2; case 0x25: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_DDS3, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DDS3, mediumType, densityCode); return MediaType.DDS3; case 0x26: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_DDS4, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DDS4, mediumType, densityCode); return MediaType.DDS4; case 0x28: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_IBM3490E, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM3490E, mediumType, densityCode); return MediaType.IBM3490E; case 0x40: if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO_ult, mediumType, densityCode); @@ -119,7 +118,7 @@ public static partial class MediaTypeFromDevice if(model.ToLowerInvariant().StartsWith("sdz", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_SAIT, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SAIT, mediumType, densityCode); return MediaType.SAIT1; @@ -131,7 +130,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO2_ult, mediumType, densityCode); @@ -145,7 +144,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO2_ult, mediumType, densityCode); @@ -154,7 +153,7 @@ public static partial class MediaTypeFromDevice if(vendor.ToLowerInvariant() == "stk") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T9840A, mediumType, densityCode); @@ -168,7 +167,7 @@ public static partial class MediaTypeFromDevice { if(vendor.ToLowerInvariant() == "stk") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T9940A, mediumType, densityCode); @@ -182,7 +181,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_LTO3, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO3, mediumType, densityCode); return MediaType.LTO3; @@ -190,7 +189,7 @@ public static partial class MediaTypeFromDevice if(vendor.ToLowerInvariant() == "stk") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T9940B, mediumType, densityCode); @@ -204,7 +203,7 @@ public static partial class MediaTypeFromDevice { if(vendor.ToLowerInvariant() == "stk") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T9940C, mediumType, densityCode); @@ -218,7 +217,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_LTO4, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO4, mediumType, densityCode); return MediaType.LTO4; @@ -226,7 +225,7 @@ public static partial class MediaTypeFromDevice if(vendor.ToLowerInvariant() == "stk") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T9840D, mediumType, densityCode); @@ -240,7 +239,7 @@ public static partial class MediaTypeFromDevice { if(vendor.ToLowerInvariant() == "stk") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T10000A, mediumType, densityCode); @@ -254,7 +253,7 @@ public static partial class MediaTypeFromDevice { if(vendor.ToLowerInvariant() == "stk") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T10000B, mediumType, densityCode); @@ -268,7 +267,7 @@ public static partial class MediaTypeFromDevice { if(vendor.ToLowerInvariant() == "stk") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T10000C, mediumType, densityCode); @@ -282,7 +281,7 @@ public static partial class MediaTypeFromDevice { if(vendor.ToLowerInvariant() == "stk") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_T10000D, mediumType, densityCode); @@ -296,7 +295,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_LTO5, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO5, mediumType, densityCode); return MediaType.LTO5; @@ -308,7 +307,7 @@ public static partial class MediaTypeFromDevice // Used by some HP drives for all generations case 0x8C: { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_DDS, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DDS, mediumType, densityCode); return MediaType.DDS1; @@ -324,7 +323,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO3, mediumType, densityCode); @@ -338,7 +337,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO4, mediumType, densityCode); @@ -352,7 +351,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO5, mediumType, densityCode); @@ -373,7 +372,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO_ult, mediumType, densityCode); @@ -385,7 +384,7 @@ public static partial class MediaTypeFromDevice case 0x40: { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_LTO, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO, mediumType, densityCode); return MediaType.LTO; @@ -402,7 +401,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO2_ult, mediumType, densityCode); @@ -414,7 +413,7 @@ public static partial class MediaTypeFromDevice case 0x42: { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_LTO2, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO2, mediumType, densityCode); return MediaType.LTO2; @@ -432,7 +431,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("dat", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DDS3_dat, mediumType, densityCode); @@ -454,7 +453,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("dat", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DDS4_alt, mediumType, densityCode); @@ -476,7 +475,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("dat", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DAT72_dat, mediumType, densityCode); @@ -498,7 +497,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_LTO3, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO3, mediumType, densityCode); return MediaType.LTO3; @@ -519,7 +518,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO3, mediumType, densityCode); @@ -541,7 +540,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_LTO4, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO4, mediumType, densityCode); return MediaType.LTO4; @@ -562,7 +561,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO4, mediumType, densityCode); @@ -584,7 +583,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("dat", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DDS2_dat, mediumType, densityCode); @@ -606,7 +605,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_LTO5, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO5, mediumType, densityCode); return MediaType.LTO5; @@ -627,7 +626,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO5, mediumType, densityCode); @@ -649,7 +648,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO6_ult, mediumType, densityCode); @@ -671,7 +670,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO6_ult, mediumType, densityCode); @@ -693,7 +692,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LTO7_ult, mediumType, densityCode); @@ -715,7 +714,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("ult", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_WORM_LTO7_ult, mediumType, densityCode); @@ -736,7 +735,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_15m, mediumType, densityCode); @@ -745,7 +744,7 @@ public static partial class MediaTypeFromDevice if(vendor.ToLowerInvariant() == "ibm") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM3592, mediumType, densityCode); @@ -754,7 +753,7 @@ public static partial class MediaTypeFromDevice if(model.ToLowerInvariant().StartsWith("vxa", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_VXA, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_VXA, mediumType, densityCode); return MediaType.VXA1; @@ -771,7 +770,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_15m, mediumType, densityCode); @@ -786,7 +785,7 @@ public static partial class MediaTypeFromDevice { if(vendor.ToLowerInvariant() == "ibm") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM3592, mediumType, densityCode); @@ -800,7 +799,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("vxa", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_VXA, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_VXA, mediumType, densityCode); return MediaType.VXA1; @@ -820,7 +819,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_28m, mediumType, densityCode); @@ -829,7 +828,7 @@ public static partial class MediaTypeFromDevice if(vendor.ToLowerInvariant() == "ibm") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM3592, mediumType, densityCode); @@ -843,7 +842,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_CompactTape, mediumType, densityCode); @@ -861,7 +860,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_28m, mediumType, densityCode); @@ -875,7 +874,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_CompactTapeII, mediumType, densityCode); @@ -890,7 +889,7 @@ public static partial class MediaTypeFromDevice { if(vendor.ToLowerInvariant() == "ibm") { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_IBM3592, mediumType, densityCode); @@ -904,7 +903,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("vxa", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_VXA2, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_VXA2, mediumType, densityCode); return MediaType.VXA2; @@ -917,7 +916,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("vxa", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_VXA3, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_VXA3, mediumType, densityCode); return MediaType.VXA3; @@ -937,7 +936,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_54m, mediumType, densityCode); @@ -946,7 +945,7 @@ public static partial class MediaTypeFromDevice if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DLTtapeIII, mediumType, densityCode); @@ -964,7 +963,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_54m, mediumType, densityCode); @@ -982,7 +981,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DLTtapeIII, mediumType, densityCode); @@ -1003,7 +1002,8 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_Exatape_80m, + AaruConsole.DebugWriteLine(MODULE_NAME, + Localization.SCSI_Media_Type_Description_Exatape_80m, mediumType, densityCode); return MediaType.Exatape80m; @@ -1011,7 +1011,7 @@ public static partial class MediaTypeFromDevice if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DLTtapeIIIxt, mediumType, densityCode); @@ -1029,7 +1029,8 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_Exatape_80m, + AaruConsole.DebugWriteLine(MODULE_NAME, + Localization.SCSI_Media_Type_Description_Exatape_80m, mediumType, densityCode); return MediaType.Exatape80m; @@ -1044,7 +1045,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("dlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DLTtapeIIIxt, mediumType, densityCode); @@ -1065,7 +1066,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_106m, mediumType, densityCode); @@ -1076,7 +1077,7 @@ public static partial class MediaTypeFromDevice model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) || model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DLTtapeIV, mediumType, densityCode); @@ -1085,7 +1086,7 @@ public static partial class MediaTypeFromDevice if(model.ToLowerInvariant().StartsWith("stt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Travan5_stt, mediumType, densityCode); @@ -1103,7 +1104,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_106m, mediumType, densityCode); @@ -1130,7 +1131,7 @@ public static partial class MediaTypeFromDevice model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) || model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_DLTtapeIV, mediumType, densityCode); @@ -1144,7 +1145,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("stt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Travan5_stt, mediumType, densityCode); @@ -1166,7 +1167,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_160m, mediumType, densityCode); @@ -1177,7 +1178,7 @@ public static partial class MediaTypeFromDevice model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) || model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_SDLT, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SDLT, mediumType, densityCode); return MediaType.SDLT1; @@ -1190,7 +1191,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_160m, mediumType, densityCode); @@ -1208,7 +1209,7 @@ public static partial class MediaTypeFromDevice model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) || model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_SDLT, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SDLT, mediumType, densityCode); return MediaType.SDLT1; @@ -1231,7 +1232,7 @@ public static partial class MediaTypeFromDevice model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) || model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SDLT2, mediumType, densityCode); @@ -1257,7 +1258,7 @@ public static partial class MediaTypeFromDevice model.ToLowerInvariant().StartsWith("sdlt", StringComparison.Ordinal) || model.ToLowerInvariant().StartsWith("superdlt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_VStape, mediumType, densityCode); @@ -1274,7 +1275,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("stt", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_Travan7, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Travan7, mediumType, densityCode); return MediaType.Travan7; @@ -1288,7 +1289,7 @@ public static partial class MediaTypeFromDevice { case 0x45: // HP Colorado tapes have a different capacity but return same density code at least in Seagate drives - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_Travan4, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Travan4, mediumType, densityCode); return MediaType.Travan4; @@ -1301,7 +1302,7 @@ public static partial class MediaTypeFromDevice switch(densityCode) { case 0x47: - AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_Travan5, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Travan5, mediumType, densityCode); return MediaType.Travan5; @@ -1321,7 +1322,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_22m, mediumType, densityCode); @@ -1347,7 +1348,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_40m, mediumType, densityCode); @@ -1373,7 +1374,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_76m, mediumType, densityCode); @@ -1399,7 +1400,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_112m, mediumType, densityCode); @@ -1422,7 +1423,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_22m_AME, mediumType, densityCode); @@ -1445,7 +1446,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_170m, mediumType, densityCode); @@ -1468,7 +1469,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_125m, mediumType, densityCode); @@ -1491,7 +1492,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_45m, mediumType, densityCode); @@ -1514,7 +1515,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_225m, mediumType, densityCode); @@ -1537,7 +1538,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_150m, mediumType, densityCode); @@ -1560,7 +1561,7 @@ public static partial class MediaTypeFromDevice { if(model.ToLowerInvariant().StartsWith("exb", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Exatape_75m, mediumType, densityCode); diff --git a/Structs/Devices/ATA/Identify.cs b/Structs/Devices/ATA/Identify.cs index 78a7cea89..a45bc36b9 100644 --- a/Structs/Devices/ATA/Identify.cs +++ b/Structs/Devices/ATA/Identify.cs @@ -59,6 +59,8 @@ namespace Aaru.CommonTypes.Structs.Devices.ATA; SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] public static class Identify { + const string MODULE_NAME = "ATA/ATAPI IDENTIFY decoder"; + /// Capabilities flag bits. [Flags] public enum CapabilitiesBit : ushort @@ -1007,7 +1009,7 @@ public static class Identify if(IdentifyDeviceResponse.Length != 512) { - AaruConsole.DebugWriteLine("ATA/ATAPI IDENTIFY decoder", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.IDENTIFY_response_is_different_than_512_bytes_not_decoding); return null; diff --git a/Structs/Devices/SCSI/Inquiry.cs b/Structs/Devices/SCSI/Inquiry.cs index 02039d21c..bcf46de25 100644 --- a/Structs/Devices/SCSI/Inquiry.cs +++ b/Structs/Devices/SCSI/Inquiry.cs @@ -51,6 +51,7 @@ namespace Aaru.CommonTypes.Structs.Devices.SCSI; SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] public struct Inquiry { + const string MODULE_NAME = "SCSI INQUIRY decoder"; /// Peripheral qualifier Byte 0, bits 7 to 5 public byte PeripheralQualifier; /// Peripheral device type Byte 0, bits 4 to 0 @@ -260,7 +261,7 @@ public struct Inquiry if(SCSIInquiryResponse.Length < 36 && SCSIInquiryResponse.Length != 5) { - AaruConsole.DebugWriteLine("SCSI INQUIRY decoder", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.INQUIRY_response_is_0_bytes_less_than_minimum_of_36_bytes, SCSIInquiryResponse.Length); @@ -270,7 +271,7 @@ public struct Inquiry if(SCSIInquiryResponse.Length < SCSIInquiryResponse[4] + 4 && SCSIInquiryResponse.Length != SCSIInquiryResponse[4]) { - AaruConsole.DebugWriteLine("SCSI INQUIRY decoder", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. INQUIRY_response_length_0_bytes_is_different_than_specified_in_length_field, SCSIInquiryResponse.Length, SCSIInquiryResponse[4] + 4);