From 741bb5389a75663f71786772809be922c0973a28 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 3 Oct 2023 17:28:12 +0100 Subject: [PATCH] [Aaru.Devices] Introduced constants for module names Introduces constant fields for respective debug module names, replacing the hardcoded ones. This is done to standardize the naming convention, reduce redundancy and potentially avoid any typos or name mismatches across the project. This change makes the code more maintainable and easier to update in case module names need to be changed. --- Aaru.Devices/Device/AtaCommands/Ata28.cs | 16 +++++----- Aaru.Devices/Device/AtaCommands/Ata48.cs | 14 ++++----- Aaru.Devices/Device/AtaCommands/AtaCHS.cs | 20 ++++++------- Aaru.Devices/Device/AtaCommands/Atapi.cs | 2 +- Aaru.Devices/Device/AtaCommands/Cfa.cs | 6 ++-- Aaru.Devices/Device/AtaCommands/MCPT.cs | 2 +- Aaru.Devices/Device/AtaCommands/Smart.cs | 16 +++++----- Aaru.Devices/Device/MmcCommands/MMC.cs | 20 ++++++------- .../Device/MmcCommands/SecureDigital.cs | 6 ++-- Aaru.Devices/Device/ScsiCommands/Adaptec.cs | 10 +++---- .../Device/ScsiCommands/ArchiveCorp.cs | 5 ++-- Aaru.Devices/Device/ScsiCommands/Certance.cs | 2 +- Aaru.Devices/Device/ScsiCommands/Fujitsu.cs | 2 +- Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs | 2 +- Aaru.Devices/Device/ScsiCommands/HP.cs | 2 +- Aaru.Devices/Device/ScsiCommands/Kreon.cs | 8 ++--- Aaru.Devices/Device/ScsiCommands/MMC.cs | 27 +++++++++-------- Aaru.Devices/Device/ScsiCommands/MediaTek.cs | 2 +- Aaru.Devices/Device/ScsiCommands/MiniDisc.cs | 12 ++++---- Aaru.Devices/Device/ScsiCommands/NEC.cs | 2 +- Aaru.Devices/Device/ScsiCommands/Optical.cs | 2 +- Aaru.Devices/Device/ScsiCommands/Pioneer.cs | 6 ++-- Aaru.Devices/Device/ScsiCommands/Plasmon.cs | 2 +- Aaru.Devices/Device/ScsiCommands/Plextor.cs | 30 +++++++++---------- Aaru.Devices/Device/ScsiCommands/SBC.cs | 16 +++++----- Aaru.Devices/Device/ScsiCommands/SMC.cs | 2 +- Aaru.Devices/Device/ScsiCommands/SPC.cs | 24 +++++++-------- Aaru.Devices/Device/ScsiCommands/SSC.cs | 28 ++++++++--------- Aaru.Devices/Device/ScsiCommands/SyQuest.cs | 4 +-- Aaru.Devices/Device/Variables.cs | 5 ++++ 30 files changed, 151 insertions(+), 144 deletions(-) diff --git a/Aaru.Devices/Device/AtaCommands/Ata28.cs b/Aaru.Devices/Device/AtaCommands/Ata28.cs index 145f7f899..e18ad3c61 100644 --- a/Aaru.Devices/Device/AtaCommands/Ata28.cs +++ b/Aaru.Devices/Device/AtaCommands/Ata28.cs @@ -59,7 +59,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_BUFFER_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_BUFFER_took_0_ms, duration); return sense; } @@ -85,7 +85,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_BUFFER_DMA_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_BUFFER_DMA_took_0_ms, duration); return sense; } @@ -133,7 +133,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_DMA_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_DMA_took_0_ms, duration); return sense; } @@ -171,7 +171,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_MULTIPLE_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_MULTIPLE_took_0_ms, duration); return sense; } @@ -209,7 +209,7 @@ public partial class Device lba += statusRegisters.LbaLow; } - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_NATIVE_MAX_ADDRESS_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_NATIVE_MAX_ADDRESS_took_0_ms, duration); return sense; } @@ -257,7 +257,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_SECTORS_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_SECTORS_took_0_ms, duration); return sense; } @@ -305,7 +305,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_LONG_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_LONG_took_0_ms, duration); return sense; } @@ -336,7 +336,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.SEEK_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SEEK_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/AtaCommands/Ata48.cs b/Aaru.Devices/Device/AtaCommands/Ata48.cs index f68951278..ac8df0b6f 100644 --- a/Aaru.Devices/Device/AtaCommands/Ata48.cs +++ b/Aaru.Devices/Device/AtaCommands/Ata48.cs @@ -72,7 +72,7 @@ public partial class Device statusRegisters.LbaLowPrevious); } - AaruConsole.DebugWriteLine("ATA Device", Localization.GET_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.GET_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration); return sense; } @@ -109,7 +109,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_DMA_EXT_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_DMA_EXT_took_0_ms, duration); return sense; } @@ -142,7 +142,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_LOG_EXT_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_LOG_EXT_took_0_ms, duration); return sense; } @@ -175,7 +175,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_LOG_DMA_EXT_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_LOG_DMA_EXT_took_0_ms, duration); return sense; } @@ -215,7 +215,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_MULTIPLE_EXT_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_MULTIPLE_EXT_took_0_ms, duration); return sense; } @@ -255,7 +255,7 @@ public partial class Device statusRegisters.LbaLowPrevious); } - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration); return sense; } @@ -292,7 +292,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_SECTORS_EXT_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_SECTORS_EXT_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/AtaCommands/AtaCHS.cs b/Aaru.Devices/Device/AtaCommands/AtaCHS.cs index 91dc26c04..85ac0c6d0 100644 --- a/Aaru.Devices/Device/AtaCommands/AtaCHS.cs +++ b/Aaru.Devices/Device/AtaCommands/AtaCHS.cs @@ -83,7 +83,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", "IDENTIFY DEVICE took {0} ms.", duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, "IDENTIFY DEVICE took {0} ms.", duration); return sense; } @@ -133,7 +133,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_DMA_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_DMA_took_0_ms, duration); return sense; } @@ -171,7 +171,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_MULTIPLE_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_MULTIPLE_took_0_ms, duration); return sense; } @@ -221,7 +221,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_SECTORS_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_SECTORS_took_0_ms, duration); return sense; } @@ -271,7 +271,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.READ_LONG_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_LONG_took_0_ms, duration); return sense; } @@ -303,7 +303,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.SEEK_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SEEK_took_0_ms, duration); return sense; } @@ -349,7 +349,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.SET_FEATURES_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SET_FEATURES_took_0_ms, duration); return sense; } @@ -373,7 +373,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.DOOR_LOCK_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.DOOR_LOCK_took_0_ms, duration); return sense; } @@ -397,7 +397,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.DOOR_UNLOCK_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.DOOR_UNLOCK_took_0_ms, duration); return sense; } @@ -421,7 +421,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.MEDIA_EJECT_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.MEDIA_EJECT_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/AtaCommands/Atapi.cs b/Aaru.Devices/Device/AtaCommands/Atapi.cs index 62d615952..492da053a 100644 --- a/Aaru.Devices/Device/AtaCommands/Atapi.cs +++ b/Aaru.Devices/Device/AtaCommands/Atapi.cs @@ -82,7 +82,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.IDENTIFY_PACKET_DEVICE_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.IDENTIFY_PACKET_DEVICE_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/AtaCommands/Cfa.cs b/Aaru.Devices/Device/AtaCommands/Cfa.cs index 763295f67..d675f82c0 100644 --- a/Aaru.Devices/Device/AtaCommands/Cfa.cs +++ b/Aaru.Devices/Device/AtaCommands/Cfa.cs @@ -66,7 +66,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration); return sense; } @@ -99,7 +99,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration); return sense; } @@ -127,7 +127,7 @@ public partial class Device errorCode = statusRegisters.Error; - AaruConsole.DebugWriteLine("ATA Device", Localization.CFA_REQUEST_EXTENDED_ERROR_CODE_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.CFA_REQUEST_EXTENDED_ERROR_CODE_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/AtaCommands/MCPT.cs b/Aaru.Devices/Device/AtaCommands/MCPT.cs index 7d2a5289f..14a3a79bd 100644 --- a/Aaru.Devices/Device/AtaCommands/MCPT.cs +++ b/Aaru.Devices/Device/AtaCommands/MCPT.cs @@ -78,7 +78,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.CHECK_MEDIA_CARD_TYPE_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.CHECK_MEDIA_CARD_TYPE_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/AtaCommands/Smart.cs b/Aaru.Devices/Device/AtaCommands/Smart.cs index f121076f7..9e9d05241 100644 --- a/Aaru.Devices/Device/AtaCommands/Smart.cs +++ b/Aaru.Devices/Device/AtaCommands/Smart.cs @@ -60,7 +60,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.SMART_DISABLE_OPERATIONS_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_DISABLE_OPERATIONS_took_0_ms, duration); return sense; } @@ -89,7 +89,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.SMART_ENABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_ENABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration); return sense; } @@ -117,7 +117,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.SMART_DISABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_DISABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration); return sense; } @@ -144,7 +144,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.SMART_ENABLE_OPERATIONS_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_ENABLE_OPERATIONS_took_0_ms, duration); return sense; } @@ -174,7 +174,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.SMART_EXECUTE_OFF_LINE_IMMEDIATE_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_EXECUTE_OFF_LINE_IMMEDIATE_took_0_ms, duration); return sense; } @@ -203,7 +203,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.SMART_READ_DATA_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_READ_DATA_took_0_ms, duration); return sense; } @@ -234,7 +234,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.SMART_READ_LOG_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_READ_LOG_took_0_ms, duration); return sense; } @@ -261,7 +261,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("ATA Device", Localization.SMART_RETURN_STATUS_took_0_ms, duration); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_RETURN_STATUS_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/MmcCommands/MMC.cs b/Aaru.Devices/Device/MmcCommands/MMC.cs index 7d7f3c13e..20d09fbc6 100644 --- a/Aaru.Devices/Device/MmcCommands/MMC.cs +++ b/Aaru.Devices/Device/MmcCommands/MMC.cs @@ -53,7 +53,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("MMC Device", Localization.SEND_CSD_took_0_ms, duration); + AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SEND_CSD_took_0_ms, duration); return sense; } @@ -74,7 +74,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("MMC Device", Localization.SEND_CID_took_0_ms, duration); + AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SEND_CID_took_0_ms, duration); return sense; } @@ -95,7 +95,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("MMC Device", Localization.SEND_OP_COND_took_0_ms, duration); + AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SEND_OP_COND_took_0_ms, duration); return sense; } @@ -116,7 +116,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("MMC Device", Localization.SEND_EXT_CSD_took_0_ms, duration); + AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SEND_EXT_CSD_took_0_ms, duration); return sense; } @@ -137,7 +137,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("MMC Device", Localization.SET_BLOCKLEN_took_0_ms, duration); + AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SET_BLOCKLEN_took_0_ms, duration); return sense; } @@ -201,7 +201,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("MMC Device", Localization.READ_SINGLE_BLOCK_took_0_ms, duration); + AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.READ_SINGLE_BLOCK_took_0_ms, duration); return sense; } @@ -237,7 +237,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("MMC Device", + AaruConsole.DebugWriteLine(MMC_MODULE_NAME, transferLength > 1 ? Localization.READ_MULTIPLE_BLOCK_took_0_ms : Localization.READ_SINGLE_BLOCK_took_0_ms, duration); @@ -287,7 +287,7 @@ public partial class Device Array.Copy(blockBuffer, 0, buffer, i * blockSize, blockSize); } - AaruConsole.DebugWriteLine("MMC Device", Localization.Multiple_READ_SINGLE_BLOCKs_took_0_ms, duration); + AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.Multiple_READ_SINGLE_BLOCKs_took_0_ms, duration); return sense; } @@ -308,7 +308,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SecureDigital Device", Localization.SEND_STATUS_took_0_ms, duration); + AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SEND_STATUS_took_0_ms, duration); return sense; } @@ -373,7 +373,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SecureDigital Device", Localization.READ_MULTIPLE_BLOCK_took_0_ms, duration); + AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.READ_MULTIPLE_BLOCK_took_0_ms, duration); buffer = commands[1].buffer; response = commands[1].response; diff --git a/Aaru.Devices/Device/MmcCommands/SecureDigital.cs b/Aaru.Devices/Device/MmcCommands/SecureDigital.cs index 01ec1c8f1..0bbb417eb 100644 --- a/Aaru.Devices/Device/MmcCommands/SecureDigital.cs +++ b/Aaru.Devices/Device/MmcCommands/SecureDigital.cs @@ -52,7 +52,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SecureDigital Device", Localization.SD_STATUS_took_0_ms, duration); + AaruConsole.DebugWriteLine(SD_MODULE_NAME, Localization.SD_STATUS_took_0_ms, duration); return sense; } @@ -73,7 +73,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SecureDigital Device", Localization.SD_SEND_OP_COND_took_0_ms, duration); + AaruConsole.DebugWriteLine(SD_MODULE_NAME, Localization.SD_SEND_OP_COND_took_0_ms, duration); return sense; } @@ -94,7 +94,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SecureDigital Device", Localization.SEND_SCR_took_0_ms, duration); + AaruConsole.DebugWriteLine(SD_MODULE_NAME, Localization.SEND_SCR_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/Adaptec.cs b/Aaru.Devices/Device/ScsiCommands/Adaptec.cs index a60feb85d..393cafaa4 100644 --- a/Aaru.Devices/Device/ScsiCommands/Adaptec.cs +++ b/Aaru.Devices/Device/ScsiCommands/Adaptec.cs @@ -75,7 +75,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.ADAPTEC_TRANSLATE_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ADAPTEC_TRANSLATE_took_0_ms, duration); return sense; } @@ -116,7 +116,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.ADAPTEC_SET_ERROR_THRESHOLD_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ADAPTEC_SET_ERROR_THRESHOLD_took_0_ms, duration); return sense; } @@ -154,7 +154,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.ADAPTEC_READ_RESET_USAGE_COUNTER_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ADAPTEC_READ_RESET_USAGE_COUNTER_took_0_ms, duration); return sense; } @@ -179,7 +179,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.ADAPTEC_WRITE_DATA_BUFFER_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ADAPTEC_WRITE_DATA_BUFFER_took_0_ms, duration); return sense; } @@ -202,7 +202,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.ADAPTEC_READ_DATA_BUFFER_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ADAPTEC_READ_DATA_BUFFER_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs b/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs index c6a1e091b..82fc1d51f 100644 --- a/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs +++ b/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs @@ -61,7 +61,8 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.ARCHIVE_CORP_REQUEST_BLOCK_ADDRESS_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ARCHIVE_CORP_REQUEST_BLOCK_ADDRESS_took_0_ms, + duration); return sense; } @@ -100,7 +101,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.ARCHIVE_CORP_SEEK_BLOCK_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ARCHIVE_CORP_SEEK_BLOCK_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/Certance.cs b/Aaru.Devices/Device/ScsiCommands/Certance.cs index d974f729b..c0e07d832 100644 --- a/Aaru.Devices/Device/ScsiCommands/Certance.cs +++ b/Aaru.Devices/Device/ScsiCommands/Certance.cs @@ -74,7 +74,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.CERTANCE_PARK_UNPARK_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.CERTANCE_PARK_UNPARK_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs index e11b89cd0..5c8ed6523 100644 --- a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs +++ b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs @@ -103,7 +103,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.FUJITSU_DISPLAY_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.FUJITSU_DISPLAY_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs b/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs index 047f5af6f..b9a8989f8 100644 --- a/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs +++ b/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs @@ -68,7 +68,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.HL_DT_ST_READ_DVD_RAW_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.HL_DT_ST_READ_DVD_RAW_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/HP.cs b/Aaru.Devices/Device/ScsiCommands/HP.cs index 9bdf6804e..119283bfd 100644 --- a/Aaru.Devices/Device/ScsiCommands/HP.cs +++ b/Aaru.Devices/Device/ScsiCommands/HP.cs @@ -96,7 +96,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.HP_READ_LONG_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.HP_READ_LONG_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/Kreon.cs b/Aaru.Devices/Device/ScsiCommands/Kreon.cs index 57ebe8e40..89f4a588d 100644 --- a/Aaru.Devices/Device/ScsiCommands/Kreon.cs +++ b/Aaru.Devices/Device/ScsiCommands/Kreon.cs @@ -58,7 +58,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.KREON_DEPRECATED_UNLOCK_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.KREON_DEPRECATED_UNLOCK_took_0_ms, duration); return sense; } @@ -110,7 +110,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.KREON_SET_LOCK_STATE_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.KREON_SET_LOCK_STATE_took_0_ms, duration); return sense || Error; } @@ -139,7 +139,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.KREON_GET_FEATURE_LIST_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.KREON_GET_FEATURE_LIST_took_0_ms, duration); if(sense) return true; @@ -237,7 +237,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.KREON_EXTRACT_SS_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.KREON_EXTRACT_SS_took_0_ms, duration); return sense || Error; } diff --git a/Aaru.Devices/Device/ScsiCommands/MMC.cs b/Aaru.Devices/Device/ScsiCommands/MMC.cs index d5a282bdb..8ab39b10d 100644 --- a/Aaru.Devices/Device/ScsiCommands/MMC.cs +++ b/Aaru.Devices/Device/ScsiCommands/MMC.cs @@ -102,7 +102,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization. GET_CONFIGURATION_Starting_Feature_Number_1_Return_Type_2_Sense_3_Last_Error_4_took_0_ms, duration, startingFeatureNumber, rt, sense, LastError); @@ -174,7 +174,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization. READ_DISC_STRUCTURE_Media_Type_1_Address_2_Layer_Number_3_Format_4_AGID_5_Sense_6_Last_Error_7_took_0_ms, duration, mediaType, address, layerNumber, format, agid, sense, LastError); @@ -301,7 +301,7 @@ public partial class Device { Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length); - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization. READ_TOC_PMA_ATIP_took_MSF_1_Format_2_Track_Session_Number_3_Sense_4_LastError_5_0_ms, duration, msf, format, trackSessionNumber, sense, LastError); @@ -318,7 +318,7 @@ public partial class Device duration += tmpDuration; - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization. READ_TOC_PMA_ATIP_took_MSF_1_Format_2_Track_Session_Number_3_Sense_4_LastError_5_0_ms, duration, msf, format, trackSessionNumber, sense, LastError); @@ -368,7 +368,7 @@ public partial class Device buffer = new byte[strctLength]; Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length); - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_DISC_INFORMATION_Data_Type_1_Sense_2_Last_Error_3_took_0_ms, duration, dataType, sense, LastError); @@ -438,7 +438,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization. READ_CD_LBA_1_Block_Size_2_Transfer_Length_3_Expected_Sector_Type_4_DAP_5_Relative_Address_6_Sync_7_Headers_8_User_Data_9_ECC_EDC_10_C2_11_Subchannel_12_Sense_13_Last_Error_14_took_0_ms, duration, lba, blockSize, transferLength, expectedSectorType, dap, relAddr, sync, @@ -507,7 +507,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization. READ_CD_MSF_Start_MSF_1_End_MSF_2_Block_Size_3_Expected_Sector_Type_4_DAP_5_Sync_6_Headers_7_User_Data_8_ECC_EDC_9_C2_10_Subchannel_11_Sense_12_LastError_13_took_0_ms, duration, startMsf, endMsf, blockSize, expectedSectorType, dap, sync, headerCodes, @@ -559,7 +559,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization. PREVENT_ALLOW_MEDIUM_REMOVAL_Persistent_1_Prevent_2_Sense_3_LastError_4_took_0_ms, duration, persistent, prevent, sense, LastError); @@ -643,7 +643,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization. START_STOP_UNIT_Immediate_1_FormatLayer_2_Power_Conditions_3_Change_Format_Layer_4_Load_Eject_5_Start_6_Sense_7_Last_Error_8_took_0_ms, duration, immediate, formatLayer, powerConditions, changeFormatLayer, loadEject, @@ -680,7 +680,8 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_READ_SUB_CHANNEL_MCN_Sense_1_Last_Error_2_took_0_ms, + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, + Localization.READ_READ_SUB_CHANNEL_MCN_Sense_1_Last_Error_2_took_0_ms, duration, sense, LastError); if(!sense && @@ -721,7 +722,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization. READ_READ_SUB_CHANNEL_ISRC_Track_Number_1_Sense_2_Last_Error_3_took_0_ms, duration, trackNumber, sense, LastError); @@ -760,7 +761,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization. SET_CD_SPEED_Rotational_Control_1_Read_Speed_2_Write_Speed_3_Sense_4_Last_Error_5_took_0_ms, duration, rotationalControl, readSpeed, writeSpeed, sense, LastError); @@ -801,7 +802,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_TRACK_INFORMATION_Data_Type_1_Sense_2_Last_Error_3_took_0_ms, duration, type, sense, LastError); diff --git a/Aaru.Devices/Device/ScsiCommands/MediaTek.cs b/Aaru.Devices/Device/ScsiCommands/MediaTek.cs index fb989736d..c99f86e1b 100644 --- a/Aaru.Devices/Device/ScsiCommands/MediaTek.cs +++ b/Aaru.Devices/Device/ScsiCommands/MediaTek.cs @@ -67,7 +67,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MediaTek_READ_DRAM_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MediaTek_READ_DRAM_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs b/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs index 8efca519f..be0edf706 100644 --- a/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs +++ b/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs @@ -63,7 +63,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MINIDISC_READ_DTOC_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_READ_DTOC_took_0_ms, duration); return sense; } @@ -98,7 +98,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MINIDISC_READ_UTOC_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_READ_UTOC_took_0_ms, duration); return sense; } @@ -127,7 +127,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MINIDISC_command_D5h_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_command_D5h_took_0_ms, duration); return sense; } @@ -152,7 +152,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MINIDISC_STOP_PLAY_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_STOP_PLAY_took_0_ms, duration); return sense; } @@ -181,7 +181,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MINIDISC_READ_POSITION_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_READ_POSITION_took_0_ms, duration); return sense; } @@ -210,7 +210,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MINIDISC_GET_TYPE_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_GET_TYPE_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/NEC.cs b/Aaru.Devices/Device/ScsiCommands/NEC.cs index 99bdb76ae..0d7c3f584 100644 --- a/Aaru.Devices/Device/ScsiCommands/NEC.cs +++ b/Aaru.Devices/Device/ScsiCommands/NEC.cs @@ -65,7 +65,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.NEC_READ_CD_DA_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.NEC_READ_CD_DA_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/Optical.cs b/Aaru.Devices/Device/ScsiCommands/Optical.cs index de2e0b147..9d6651819 100644 --- a/Aaru.Devices/Device/ScsiCommands/Optical.cs +++ b/Aaru.Devices/Device/ScsiCommands/Optical.cs @@ -111,7 +111,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MEDIUM_SCAN_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MEDIUM_SCAN_took_0_ms, duration); if(Error) return sense; diff --git a/Aaru.Devices/Device/ScsiCommands/Pioneer.cs b/Aaru.Devices/Device/ScsiCommands/Pioneer.cs index bd785b1a4..025d6f1ab 100644 --- a/Aaru.Devices/Device/ScsiCommands/Pioneer.cs +++ b/Aaru.Devices/Device/ScsiCommands/Pioneer.cs @@ -69,7 +69,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PIONEER_READ_CD_DA_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_DA_took_0_ms, duration); return sense; } @@ -107,7 +107,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PIONEER_READ_CD_DA_MSF_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_DA_MSF_took_0_ms, duration); return sense; } @@ -161,7 +161,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PIONEER_READ_CD_XA_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_XA_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/Plasmon.cs b/Aaru.Devices/Device/ScsiCommands/Plasmon.cs index e923a9df8..c519b8d88 100644 --- a/Aaru.Devices/Device/ScsiCommands/Plasmon.cs +++ b/Aaru.Devices/Device/ScsiCommands/Plasmon.cs @@ -101,7 +101,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLASMON_READ_SECTOR_LOCATION_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLASMON_READ_SECTOR_LOCATION_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/Plextor.cs b/Aaru.Devices/Device/ScsiCommands/Plextor.cs index a40332449..13c1e2b56 100644 --- a/Aaru.Devices/Device/ScsiCommands/Plextor.cs +++ b/Aaru.Devices/Device/ScsiCommands/Plextor.cs @@ -71,7 +71,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization. Plextor_READ_CD_DA_LBA_1_Block_Size_2_Transfer_Length_3_Subchannel_4_Sense_5_Last_Error_6_took_0_ms, duration, lba, blockSize, transferLength, subchannel, sense, LastError); @@ -108,7 +108,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.Plextor_READ_DVD_RAW_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Plextor_READ_DVD_RAW_took_0_ms, duration); return sense; } @@ -133,7 +133,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration); return sense; } @@ -158,7 +158,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration); return sense; } @@ -189,7 +189,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration); return sense; } @@ -221,7 +221,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration); if(sense || Error) return sense; @@ -259,7 +259,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration); if(sense || Error) return sense; @@ -293,7 +293,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_GET_SILENT_MODE_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SILENT_MODE_took_0_ms, duration); return sense; } @@ -320,7 +320,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_GET_GIGAREC_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_GIGAREC_took_0_ms, duration); return sense; } @@ -354,7 +354,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_GET_VARIREC_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_VARIREC_took_0_ms, duration); return sense; } @@ -380,7 +380,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_GET_SECUREC_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SECUREC_took_0_ms, duration); return sense; } @@ -407,7 +407,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_GET_SPEEDREAD_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SPEEDREAD_took_0_ms, duration); return sense; } @@ -434,7 +434,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_GET_SINGLE_SESSION_HIDE_CD_R_took_0_ms, + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SINGLE_SESSION_HIDE_CD_R_took_0_ms, duration); return sense; @@ -469,7 +469,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_GET_BOOK_BITSETTING_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_BOOK_BITSETTING_took_0_ms, duration); return sense; } @@ -496,7 +496,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PLEXTOR_GET_TEST_WRITE_DVD_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_TEST_WRITE_DVD_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/SBC.cs b/Aaru.Devices/Device/ScsiCommands/SBC.cs index a33396979..dd22444a6 100644 --- a/Aaru.Devices/Device/ScsiCommands/SBC.cs +++ b/Aaru.Devices/Device/ScsiCommands/SBC.cs @@ -77,7 +77,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_6_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_6_took_0_ms, duration); return sense; } @@ -140,7 +140,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_10_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_10_took_0_ms, duration); return sense; } @@ -209,7 +209,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_12_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_12_took_0_ms, duration); return sense; } @@ -279,7 +279,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_16_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_16_took_0_ms, duration); return sense; } @@ -325,7 +325,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_LONG_10_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_LONG_10_took_0_ms, duration); return sense; } @@ -372,7 +372,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_LONG_16_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_LONG_16_took_0_ms, duration); return sense; } @@ -398,7 +398,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.SEEK_6_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.SEEK_6_took_0_ms, duration); return sense; } @@ -425,7 +425,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.SEEK_10_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.SEEK_10_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/SMC.cs b/Aaru.Devices/Device/ScsiCommands/SMC.cs index 24d57bac3..3759c24be 100644 --- a/Aaru.Devices/Device/ScsiCommands/SMC.cs +++ b/Aaru.Devices/Device/ScsiCommands/SMC.cs @@ -94,7 +94,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_ATTRIBUTE_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_ATTRIBUTE_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/SPC.cs b/Aaru.Devices/Device/ScsiCommands/SPC.cs index 205f887dd..e229c23d3 100644 --- a/Aaru.Devices/Device/ScsiCommands/SPC.cs +++ b/Aaru.Devices/Device/ScsiCommands/SPC.cs @@ -102,7 +102,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.INQUIRY_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.INQUIRY_took_0_ms, duration); return sense; } @@ -183,7 +183,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.INQUIRY_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.INQUIRY_took_0_ms, duration); return sense; } @@ -209,7 +209,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.TEST_UNIT_READY_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.TEST_UNIT_READY_took_0_ms, duration); return sense; } @@ -282,7 +282,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MODE_SENSE_6_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MODE_SENSE_6_took_0_ms, duration); return sense; } @@ -367,7 +367,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MODE_SENSE_10_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MODE_SENSE_10_took_0_ms, duration); return sense; } @@ -419,7 +419,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.PREVENT_ALLOW_MEDIUM_REMOVAL_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PREVENT_ALLOW_MEDIUM_REMOVAL_took_0_ms, duration); return sense; } @@ -469,7 +469,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_CAPACITY_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_CAPACITY_took_0_ms, duration); return sense; } @@ -525,7 +525,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_CAPACITY_16_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_CAPACITY_16_took_0_ms, duration); return sense; } @@ -570,7 +570,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_MEDIA_SERIAL_NUMBER_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_MEDIA_SERIAL_NUMBER_took_0_ms, duration); return sense; } @@ -703,7 +703,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MODE_SELECT_6_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MODE_SELECT_6_took_0_ms, duration); return sense; } @@ -758,7 +758,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.MODE_SELECT_10_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MODE_SELECT_10_took_0_ms, duration); return sense; } @@ -796,7 +796,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.REQUEST_SENSE_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.REQUEST_SENSE_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/SSC.cs b/Aaru.Devices/Device/ScsiCommands/SSC.cs index 2856c1c22..0ba5e221f 100644 --- a/Aaru.Devices/Device/ScsiCommands/SSC.cs +++ b/Aaru.Devices/Device/ScsiCommands/SSC.cs @@ -95,7 +95,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.LOAD_UNLOAD_6_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.LOAD_UNLOAD_6_took_0_ms, duration); return sense; } @@ -175,7 +175,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.LOCATE_10_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.LOCATE_10_took_0_ms, duration); return sense; } @@ -264,7 +264,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.LOCATE_16_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.LOCATE_16_took_0_ms, duration); return sense; } @@ -334,7 +334,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_6_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_6_took_0_ms, duration); return sense; } @@ -442,7 +442,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_16_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_16_took_0_ms, duration); return sense; } @@ -465,7 +465,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_BLOCK_LIMITS_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_BLOCK_LIMITS_took_0_ms, duration); return sense; } @@ -560,7 +560,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_POSITION_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_POSITION_took_0_ms, duration); return sense; } @@ -631,7 +631,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_REVERSE_6_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_REVERSE_6_took_0_ms, duration); return sense; } @@ -748,7 +748,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.READ_REVERSE_16_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_REVERSE_16_took_0_ms, duration); return sense; } @@ -815,7 +815,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.RECOVER_BUFFERED_DATA_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.RECOVER_BUFFERED_DATA_took_0_ms, duration); return sense; } @@ -882,7 +882,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.REPORT_DENSITY_SUPPORT_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.REPORT_DENSITY_SUPPORT_took_0_ms, duration); return sense; } @@ -915,7 +915,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.REWIND_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.REWIND_took_0_ms, duration); return sense; } @@ -940,7 +940,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.TRACK_SELECT_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.TRACK_SELECT_took_0_ms, duration); return sense; } @@ -970,7 +970,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.SPACE_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.SPACE_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs index 22577795e..8e0fc8373 100644 --- a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs +++ b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs @@ -111,7 +111,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.SYQUEST_READ_6_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.SYQUEST_READ_6_took_0_ms, duration); return sense; } @@ -188,7 +188,7 @@ public partial class Device Error = LastError != 0; - AaruConsole.DebugWriteLine("SCSI Device", Localization.SYQUEST_READ_10_took_0_ms, duration); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.SYQUEST_READ_10_took_0_ms, duration); return sense; } diff --git a/Aaru.Devices/Device/Variables.cs b/Aaru.Devices/Device/Variables.cs index 2c6f6b0f5..049675c2f 100644 --- a/Aaru.Devices/Device/Variables.cs +++ b/Aaru.Devices/Device/Variables.cs @@ -159,4 +159,9 @@ public partial class Device public byte[] Cis { get; private protected set; } private protected string _devicePath; + + const string ATA_MODULE_NAME = "ATA Device"; + const string SCSI_MODULE_NAME = "SCSI Device"; + const string SD_MODULE_NAME = "SecureDigital Device"; + const string MMC_MODULE_NAME = "MultiMediaCard Device"; } \ No newline at end of file