From 84df9ab11e4e588cebcb9ba567797b2603466b52 Mon Sep 17 00:00:00 2001 From: Uwe Seimet Date: Sun, 22 Aug 2021 19:33:45 +0200 Subject: [PATCH] Removed duplicate logging --- src/raspberrypi/devices/disk.cpp | 44 ---------------------- src/raspberrypi/devices/scsi_daynaport.cpp | 18 --------- 2 files changed, 62 deletions(-) diff --git a/src/raspberrypi/devices/disk.cpp b/src/raspberrypi/devices/disk.cpp index 2de83fb7..2b6a6aa5 100644 --- a/src/raspberrypi/devices/disk.cpp +++ b/src/raspberrypi/devices/disk.cpp @@ -355,8 +355,6 @@ BOOL DiskTrack::Read(BYTE *buf, int sec) const void Disk::TestUnitReady(SASIDEV *controller) { - LOGDEBUG("%s TEST UNIT READY Command ", __PRETTY_FUNCTION__); - // Command processing on drive bool status = TestUnitReady(ctrl->cmd); if (!status) { @@ -371,8 +369,6 @@ void Disk::TestUnitReady(SASIDEV *controller) void Disk::Rezero(SASIDEV *controller) { - LOGDEBUG( "%s REZERO Command ", __PRETTY_FUNCTION__); - bool status = Rezero(ctrl->cmd); if (!status) { // Failure (Error) @@ -386,8 +382,6 @@ void Disk::Rezero(SASIDEV *controller) void Disk::RequestSense(SASIDEV *controller) { - LOGDEBUG( "%s REQUEST SENSE Command ", __PRETTY_FUNCTION__); - DWORD lun; try { lun = GetLun(); @@ -414,8 +408,6 @@ void Disk::RequestSense(SASIDEV *controller) void Disk::Format(SASIDEV *controller) { - LOGDEBUG( "%s FORMAT UNIT Command ", __PRETTY_FUNCTION__); - // Command processing on drive bool status = Format(ctrl->cmd); if (!status) { @@ -430,8 +422,6 @@ void Disk::Format(SASIDEV *controller) void Disk::ReassignBlocks(SASIDEV *controller) { - LOGDEBUG("%s REASSIGN BLOCKS Command ", __PRETTY_FUNCTION__); - // Command processing on drive bool status = Reassign(ctrl->cmd); if (!status) { @@ -717,8 +707,6 @@ void Disk::Verify(SASIDEV *controller) void Disk::Inquiry(SASIDEV *controller) { - LOGDEBUG("%s INQUIRY Command", __PRETTY_FUNCTION__); - // Find a valid unit // TODO The code below is probably wrong. It results in the same INQUIRY data being // used for all LUNs, even though each LUN has its individual set of INQUIRY data. @@ -755,8 +743,6 @@ void Disk::Inquiry(SASIDEV *controller) void Disk::ModeSelect(SASIDEV *controller) { - LOGDEBUG( "%s MODE SELECT Command", __PRETTY_FUNCTION__); - // Command processing on drive ctrl->length = SelectCheck(ctrl->cmd); if (ctrl->length <= 0) { @@ -771,8 +757,6 @@ void Disk::ModeSelect(SASIDEV *controller) void Disk::ModeSelect10(SASIDEV *controller) { - LOGDEBUG( "%s MODE SELECT10 Command ", __PRETTY_FUNCTION__); - // Command processing on drive ctrl->length = SelectCheck10(ctrl->cmd); if (ctrl->length <= 0) { @@ -787,8 +771,6 @@ void Disk::ModeSelect10(SASIDEV *controller) void Disk::ModeSense(SASIDEV *controller) { - LOGDEBUG( "%s MODE SENSE Command ", __PRETTY_FUNCTION__); - // Command processing on drive ctrl->length = ModeSense(ctrl->cmd, ctrl->buffer); ASSERT(ctrl->length >= 0); @@ -806,8 +788,6 @@ void Disk::ModeSense(SASIDEV *controller) void Disk::ModeSense10(SASIDEV *controller) { - LOGDEBUG( "%s MODE SENSE(10) Command ", __PRETTY_FUNCTION__); - // Command processing on drive ctrl->length = ModeSense10(ctrl->cmd, ctrl->buffer); ASSERT(ctrl->length >= 0); @@ -825,8 +805,6 @@ void Disk::ModeSense10(SASIDEV *controller) void Disk::StartStop(SASIDEV *controller) { - LOGDEBUG( "%s START STOP Command ", __PRETTY_FUNCTION__); - // Command processing on drive bool status = StartStop(ctrl->cmd); if (!status) { @@ -841,8 +819,6 @@ void Disk::StartStop(SASIDEV *controller) void Disk::SendDiagnostic(SASIDEV *controller) { - LOGDEBUG( "%s SEND DIAGNOSTIC Command ", __PRETTY_FUNCTION__); - // Command processing on drive bool status = SendDiag(ctrl->cmd); if (!status) { @@ -857,8 +833,6 @@ void Disk::SendDiagnostic(SASIDEV *controller) void Disk::PreventAllowRemoval(SASIDEV *controller) { - LOGDEBUG( "%s PREVENT/ALLOW MEDIUM REMOVAL Command ", __PRETTY_FUNCTION__); - // Command processing on drive bool status = Removal(ctrl->cmd); if (!status) { @@ -881,8 +855,6 @@ void Disk::SynchronizeCache(SASIDEV *controller) void Disk::ReadDefectData10(SASIDEV *controller) { - LOGDEBUG( "%s READ DEFECT DATA(10) Command ", __PRETTY_FUNCTION__); - // Command processing on drive ctrl->length = ReadDefectData10(ctrl->cmd, ctrl->buffer); ASSERT(ctrl->length >= 0); @@ -2233,8 +2205,6 @@ void Disk::Seek(SASIDEV *controller) //--------------------------------------------------------------------------- void Disk::Seek6(SASIDEV *controller) { - LOGDEBUG( "%s SEEK(6) Command ", __PRETTY_FUNCTION__); - Seek(controller); } @@ -2245,8 +2215,6 @@ void Disk::Seek6(SASIDEV *controller) //--------------------------------------------------------------------------- void Disk::Seek10(SASIDEV *controller) { - LOGDEBUG( "%s SEEK(10) Command ", __PRETTY_FUNCTION__); - Seek(controller); } @@ -2344,8 +2312,6 @@ bool Disk::Removal(const DWORD *cdb) //--------------------------------------------------------------------------- void Disk::ReadCapacity10(SASIDEV *controller) { - LOGDEBUG( "%s READ CAPACITY(10) Command ", __PRETTY_FUNCTION__); - BYTE *buf = ctrl->buffer; ASSERT(buf); @@ -2390,8 +2356,6 @@ void Disk::ReadCapacity10(SASIDEV *controller) void Disk::ReadCapacity16(SASIDEV *controller) { - LOGDEBUG( "%s READ CAPACITY(16) Command ", __PRETTY_FUNCTION__); - BYTE *buf = ctrl->buffer; ASSERT(buf); @@ -2481,8 +2445,6 @@ void Disk::ReportLuns(SASIDEV *controller) //--------------------------------------------------------------------------- void Disk::Reserve6(SASIDEV *controller) { - LOGDEBUG( "%s Reserve(6) Command", __PRETTY_FUNCTION__); - // status phase controller->Status(); } @@ -2499,8 +2461,6 @@ void Disk::Reserve6(SASIDEV *controller) //--------------------------------------------------------------------------- void Disk::Reserve10(SASIDEV *controller) { - LOGDEBUG( "%s Reserve(10) Command", __PRETTY_FUNCTION__); - // status phase controller->Status(); } @@ -2517,8 +2477,6 @@ void Disk::Reserve10(SASIDEV *controller) //--------------------------------------------------------------------------- void Disk::Release6(SASIDEV *controller) { - LOGDEBUG( "%s Release(6) Command", __PRETTY_FUNCTION__); - // status phase controller->Status(); } @@ -2535,8 +2493,6 @@ void Disk::Release6(SASIDEV *controller) //--------------------------------------------------------------------------- void Disk::Release10(SASIDEV *controller) { - LOGDEBUG( "%s Release(10) Command", __PRETTY_FUNCTION__); - // status phase controller->Status(); } diff --git a/src/raspberrypi/devices/scsi_daynaport.cpp b/src/raspberrypi/devices/scsi_daynaport.cpp index 5ef0e6c4..d005bdc2 100644 --- a/src/raspberrypi/devices/scsi_daynaport.cpp +++ b/src/raspberrypi/devices/scsi_daynaport.cpp @@ -413,8 +413,6 @@ int SCSIDaynaPort::RetrieveStats(const DWORD *cdb, BYTE *buffer) // DWORD crc_errors; // DWORD frames_lost; - LOGTRACE("%s RetrieveStats ", __PRETTY_FUNCTION__); - ASSERT(cdb); ASSERT(buffer); @@ -515,16 +513,12 @@ bool SCSIDaynaPort::EnableInterface(const DWORD *cdb) bool SCSIDaynaPort::TestUnitReady(const DWORD* /*cdb*/) { - LOGTRACE("%s", __PRETTY_FUNCTION__); - // TEST UNIT READY Success return true; } void SCSIDaynaPort::CmdRead6(SASIDEV *controller) { - LOGTRACE("%s",__PRETTY_FUNCTION__); - // Get record number and block number DWORD record = ctrl->cmd[1] & 0x1f; record <<= 8; @@ -547,8 +541,6 @@ void SCSIDaynaPort::CmdRead6(SASIDEV *controller) void SCSIDaynaPort::CmdWrite6(SASIDEV *controller) { - LOGTRACE("%s",__PRETTY_FUNCTION__); - // Reallocate buffer (because it is not transfer for each block) if (ctrl->bufsize < DAYNAPORT_BUFFER_SIZE) { free(ctrl->buffer); @@ -586,8 +578,6 @@ void SCSIDaynaPort::CmdWrite6(SASIDEV *controller) void SCSIDaynaPort::CmdRetrieveStats(SASIDEV *controller) { - LOGTRACE("%s",__PRETTY_FUNCTION__); - ctrl->length = RetrieveStats(ctrl->cmd, ctrl->buffer); if (ctrl->length <= 0) { @@ -606,8 +596,6 @@ void SCSIDaynaPort::CmdRetrieveStats(SASIDEV *controller) void SCSIDaynaPort::CmdSetIfaceMode(SASIDEV *controller) { - LOGTRACE("%s",__PRETTY_FUNCTION__); - // Check whether this command is telling us to "Set Interface Mode" or "Set MAC Address" ctrl->length = RetrieveStats(ctrl->cmd, ctrl->buffer); @@ -629,8 +617,6 @@ void SCSIDaynaPort::CmdSetIfaceMode(SASIDEV *controller) void SCSIDaynaPort::CmdSetMcastAddr(SASIDEV *controller) { - LOGTRACE("%s Set Multicast Address Command ", __PRETTY_FUNCTION__); - ctrl->length = (DWORD)ctrl->cmd[4]; // ASSERT(ctrl.length >= 0); @@ -647,8 +633,6 @@ void SCSIDaynaPort::CmdSetMcastAddr(SASIDEV *controller) void SCSIDaynaPort::CmdEnableInterface(SASIDEV *controller) { - LOGTRACE("%s",__PRETTY_FUNCTION__); - bool status = EnableInterface(ctrl->cmd); if (!status) { // Failure (Error) @@ -662,8 +646,6 @@ void SCSIDaynaPort::CmdEnableInterface(SASIDEV *controller) void SCSIDaynaPort::CmdGetEventStatusNotification(SASIDEV *controller) { - LOGTRACE("%s",__PRETTY_FUNCTION__); - // This naive (but legal) implementation avoids constant warnings in the logs controller->Error(ERROR_CODES::sense_key::ILLEGAL_REQUEST, ERROR_CODES::asc::INVALID_FIELD_IN_CDB); }