Removed obsolete methods

This commit is contained in:
Uwe Seimet 2021-08-23 16:13:33 +02:00
parent 514e128619
commit 7a1ab5bdb7
6 changed files with 8 additions and 21 deletions

View File

@ -1969,17 +1969,6 @@ int Disk::ReadDefectData10(const DWORD *cdb, BYTE *buf)
//
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//
// TEST UNIT READY
//
//---------------------------------------------------------------------------
bool Disk::TestUnitReady(const DWORD* /*cdb*/)
{
// Status check
return CheckReady();
}
//---------------------------------------------------------------------------
//
// FORMAT UNIT

View File

@ -227,11 +227,9 @@ public:
void SetBlockCount(DWORD);
bool GetStartAndCount(SASIDEV *, uint64_t&, uint32_t&, bool);
// TODO Try to get rid of these methods
virtual bool TestUnitReady(const DWORD *cdb); // TEST UNIT READY command
// TODO Try to get rid of these methods, which are called by SASIDEV (but should not)
virtual int RequestSense(const DWORD *cdb, BYTE *buf); // REQUEST SENSE command
virtual bool ModeSelect(const DWORD *cdb, const BYTE *buf, int length);// MODE SELECT command
virtual int ModeSense(const DWORD *cdb, BYTE *buf); // MODE SENSE command
bool Format(const DWORD *cdb); // FORMAT UNIT command
virtual bool Dispatch(SCSIDEV *);
@ -250,4 +248,7 @@ protected:
// Internal data
disk_t disk; // Internal disk data
private:
int ModeSense(const DWORD *cdb, BYTE *buf); // MODE SENSE command
};

View File

@ -554,10 +554,9 @@ bool SCSIDaynaPort::EnableInterface(const DWORD *cdb)
return result;
}
bool SCSIDaynaPort::TestUnitReady(const DWORD* /*cdb*/)
void SCSIDaynaPort::TestUnitReady(SASIDEV *controller)
{
// TEST UNIT READY Success
return true;
}
void SCSIDaynaPort::CmdRead6(SASIDEV *controller)

View File

@ -67,8 +67,6 @@ public:
// commands
int Inquiry(const DWORD *cdb, BYTE *buffer) override;
// INQUIRY command
bool TestUnitReady(const DWORD *cdb) override;
// TEST UNIT READY command
int Read(const DWORD *cdb, BYTE *buf, DWORD block) override;
// READ command
bool Write(const DWORD *cdb, const BYTE *buf, DWORD block) override;
@ -86,6 +84,7 @@ public:
void SetMode(const DWORD *cdb, BYTE *buffer);
// Set the mode: whether broadcast traffic is enabled or not
void TestUnitReady(SASIDEV *) override;
void CmdRead6(SASIDEV *);
void CmdWrite6(SASIDEV *);
void CmdRetrieveStatistics(SASIDEV *);

View File

@ -175,10 +175,9 @@ int SCSIBR::Inquiry(const DWORD *cdb, BYTE *buf)
// TEST UNIT READY
//
//---------------------------------------------------------------------------
bool SCSIBR::TestUnitReady(const DWORD* /*cdb*/)
void SCSIBR::TestUnitReady(SASIDEV *controller)
{
// TEST UNIT READY Success
return true;
}
//---------------------------------------------------------------------------

View File

@ -53,9 +53,9 @@ public:
// commands
int Inquiry(const DWORD *cdb, BYTE *buf) override; // INQUIRY command
bool TestUnitReady(const DWORD *cdb) override; // TEST UNIT READY command
int GetMessage10(const DWORD *cdb, BYTE *buf); // GET MESSAGE10 command
bool SendMessage10(const DWORD *cdb, BYTE *buf); // SEND MESSAGE10 command
void TestUnitReady(SASIDEV *) override;
void GetMessage10(SASIDEV *);
void SendMessage10(SASIDEV *);