From e1e10618370a04d3cbf71a29c704c591dd1d279c Mon Sep 17 00:00:00 2001
From: Uwe Seimet <Uwe.Seimet@seimet.de>
Date: Sun, 22 Aug 2021 21:25:09 +0200
Subject: [PATCH] Removed unused code

---
 src/raspberrypi/devices/scsi_daynaport.cpp   | 21 ++++----------------
 src/raspberrypi/devices/scsi_daynaport.h     |  5 -----
 src/raspberrypi/devices/scsi_host_bridge.cpp |  1 -
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/raspberrypi/devices/scsi_daynaport.cpp b/src/raspberrypi/devices/scsi_daynaport.cpp
index d005bdc2..0920435a 100644
--- a/src/raspberrypi/devices/scsi_daynaport.cpp
+++ b/src/raspberrypi/devices/scsi_daynaport.cpp
@@ -35,11 +35,6 @@
 //	DaynaPort SCSI Link Ethernet Adapter
 //
 //===========================================================================
-const char* SCSIDaynaPort::m_vendor_name = "DAYNA   ";
-const char* SCSIDaynaPort::m_device_name = "SCSI/Link       ";
-const char* SCSIDaynaPort::m_revision = "1.4a";
-const char* SCSIDaynaPort::m_firmware_version = "01.00.00";
-
 const BYTE SCSIDaynaPort::m_bcast_addr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 const BYTE SCSIDaynaPort::m_apple_talk_addr[6] = { 0x09, 0x00, 0x07, 0xff, 0xff, 0xff };
 
@@ -199,7 +194,6 @@ int SCSIDaynaPort::Inquiry(const DWORD *cdb, BYTE *buffer)
 //---------------------------------------------------------------------------
 int SCSIDaynaPort::Read(const DWORD *cdb, BYTE *buf, DWORD block)
 {
-	WORD requested_length = 0;
 	int rx_packet_size = 0;
 	BOOL send_message_to_host;
 	scsi_resp_read_t *response = (scsi_resp_read_t*)buf;
@@ -216,7 +210,7 @@ int SCSIDaynaPort::Read(const DWORD *cdb, BYTE *buf, DWORD block)
 		LOGERROR("Received unexpected cdb command: %02X. Expected 0x08", (unsigned int)command->operation_code);
 	}
 
-	requested_length = (WORD)command->transfer_length;
+	WORD requested_length = (WORD)command->transfer_length;
 	LOGTRACE("%s Read maximum length %d, (%04X)", __PRETTY_FUNCTION__, (unsigned int)requested_length, (unsigned int)requested_length);
 
 
@@ -362,12 +356,10 @@ int SCSIDaynaPort::WriteCheck(DWORD block)
 //---------------------------------------------------------------------------
 bool SCSIDaynaPort::Write(const DWORD *cdb, const BYTE *buf, DWORD block)
 {
-	BYTE data_format;
-	WORD data_length;
 	// const scsi_cmd_daynaport_write_t* command = (const scsi_cmd_daynaport_write_t*)cdb;
 
-	data_format = cdb[5];
-	data_length = (WORD)cdb[4] + ((WORD)cdb[3] << 8);
+	BYTE data_format = cdb[5];
+	WORD data_length = (WORD)cdb[4] + ((WORD)cdb[3] << 8);
 
 	// if(data_format != command->format){
 	// 	LOGDEBUG("%s CDB: %02X %02X %02X %02X %02X %02X", __PRETTY_FUNCTION__, (unsigned int)cdb[0], (unsigned int)cdb[1], (unsigned int)cdb[2], (unsigned int)cdb[3], (unsigned int)cdb[4], (unsigned int)cdb[5] );
@@ -398,7 +390,6 @@ bool SCSIDaynaPort::Write(const DWORD *cdb, const BYTE *buf, DWORD block)
 	}
 }
 	
-
 //---------------------------------------------------------------------------
 //
 //	RetrieveStats
@@ -476,7 +467,6 @@ int SCSIDaynaPort::RetrieveStats(const DWORD *cdb, BYTE *buffer)
 	// response->frame_alignment_errors = 0;
 
 	// //  Success
-	// disk.code = DISK_NOERROR;
 	// return sizeof(scsi_resp_link_stats_t);
 }
 
@@ -579,7 +569,6 @@ void SCSIDaynaPort::CmdWrite6(SASIDEV *controller)
 void SCSIDaynaPort::CmdRetrieveStats(SASIDEV *controller)
 {
 	ctrl->length = RetrieveStats(ctrl->cmd, ctrl->buffer);
-
 	if (ctrl->length <= 0) {
 		// Failure (Error)
 		controller->Error();
@@ -618,8 +607,6 @@ void SCSIDaynaPort::CmdSetIfaceMode(SASIDEV *controller)
 void SCSIDaynaPort::CmdSetMcastAddr(SASIDEV *controller)
 {
 	ctrl->length = (DWORD)ctrl->cmd[4];
-
-	// ASSERT(ctrl.length >= 0);
 	if (ctrl->length == 0) {
 		LOGWARN("%s Not supported SetMcastAddr Command %02X", __PRETTY_FUNCTION__, (WORD)ctrl->cmd[2]);
 
@@ -659,7 +646,7 @@ void SCSIDaynaPort::SetMode(const DWORD *cdb, BYTE *buffer)
 {
 	LOGTRACE("%s Setting mode", __PRETTY_FUNCTION__);
 
-	for(size_t i=0; i<sizeof(6); i++)
+	for(size_t i = 0; i < sizeof(6); i++)
 	{
 		LOGTRACE("%s %d: %02X",__PRETTY_FUNCTION__, (unsigned int)i,(WORD)cdb[i]);
 	}	
diff --git a/src/raspberrypi/devices/scsi_daynaport.h b/src/raspberrypi/devices/scsi_daynaport.h
index 6d890ff2..795d8083 100644
--- a/src/raspberrypi/devices/scsi_daynaport.h
+++ b/src/raspberrypi/devices/scsi_daynaport.h
@@ -161,11 +161,6 @@ private:
 		DWORD frames_lost;
 	} scsi_resp_link_stats_t;
 
-	static const char* m_vendor_name;
-	static const char* m_device_name;
-	static const char* m_revision;
-	static const char* m_firmware_version;
-
 	scsi_resp_link_stats_t m_scsi_link_stats = {
 		.mac_address = { 0x00, 0x80, 0x19, 0x10, 0x98, 0xE3 },//MAC address of @PotatoFi's DayanPort
 		.frame_alignment_errors = 0,
diff --git a/src/raspberrypi/devices/scsi_host_bridge.cpp b/src/raspberrypi/devices/scsi_host_bridge.cpp
index 750296c0..9cad95d8 100644
--- a/src/raspberrypi/devices/scsi_host_bridge.cpp
+++ b/src/raspberrypi/devices/scsi_host_bridge.cpp
@@ -141,7 +141,6 @@ int SCSIBR::Inquiry(const DWORD *cdb, BYTE *buf)
 	}
 
 	//  Success
-	SetStatusCode(STATUS_NOERROR);
 	return size;
 }