Removed unused code, renaming

This commit is contained in:
Uwe Seimet 2021-08-24 14:03:07 +02:00
parent 22d24c348f
commit 2a0ef54087
6 changed files with 5 additions and 19 deletions

View File

@ -137,19 +137,6 @@ bool SASIDEV::HasUnit()
return FALSE;
}
//---------------------------------------------------------------------------
//
// Get internal data
//
//---------------------------------------------------------------------------
void SASIDEV::GetCTRL(ctrl_t *buffer)
{
ASSERT(buffer);
// reference the internal structure
*buffer = ctrl;
}
//---------------------------------------------------------------------------
//
// Run

View File

@ -151,8 +151,7 @@ public:
#endif
int GetSCSIID() {return ctrl.m_scsi_id;} // Get the ID
void GetCTRL(ctrl_t *buffer); // Get the internal information
ctrl_t* GetWorkAddr() { return &ctrl; } // Get the internal information address
ctrl_t* GetCtrl() { return &ctrl; } // Get the internal information address
virtual bool IsSASI() const { return true; } // SASI Check
virtual bool IsSCSI() const { return false; } // SCSI check

View File

@ -1155,7 +1155,7 @@ void Disk::AddCommand(SCSIDEV::scsi_command opcode, const char* name, void (Disk
bool Disk::Dispatch(SCSIDEV *controller)
{
ctrl = controller->GetWorkAddr();
ctrl = controller->GetCtrl();
if (commands.count(static_cast<SCSIDEV::scsi_command>(ctrl->cmd[0]))) {
command_t *command = commands[static_cast<SCSIDEV::scsi_command>(ctrl->cmd[0])];

View File

@ -127,7 +127,7 @@ void SCSIDaynaPort::Open(const Filepath& path)
bool SCSIDaynaPort::Dispatch(SCSIDEV *controller)
{
ctrl = controller->GetWorkAddr();
ctrl = controller->GetCtrl();
if (commands.count(static_cast<SCSIDEV::scsi_command>(ctrl->cmd[0]))) {
command_t *command = commands[static_cast<SCSIDEV::scsi_command>(ctrl->cmd[0])];

View File

@ -102,7 +102,7 @@ void SCSIBR::AddCommand(SCSIDEV::scsi_command opcode, const char* name, void (SC
bool SCSIBR::Dispatch(SCSIDEV *controller)
{
ctrl = controller->GetWorkAddr();
ctrl = controller->GetCtrl();
if (commands.count(static_cast<SCSIDEV::scsi_command>(ctrl->cmd[0]))) {
command_t *command = commands[static_cast<SCSIDEV::scsi_command>(ctrl->cmd[0])];

View File

@ -271,7 +271,7 @@ void SCSICD::AddCommand(SCSIDEV::scsi_command opcode, const char* name, void (SC
bool SCSICD::Dispatch(SCSIDEV *controller)
{
ctrl = controller->GetWorkAddr();
ctrl = controller->GetCtrl();
if (commands.count(static_cast<SCSIDEV::scsi_command>(ctrl->cmd[0]))) {
command_t *command = commands[static_cast<SCSIDEV::scsi_command>(ctrl->cmd[0])];