This commit is contained in:
Uwe Seimet 2021-08-30 12:54:49 +02:00
parent 399c560aa9
commit 2edac296a6
4 changed files with 10 additions and 10 deletions

View File

@ -41,10 +41,10 @@ Disk::Disk(const std::string id) : Device(id), ScsiPrimaryCommands(), ScsiBlockC
AddCommand(SCSIDEV::eCmdWrite6, "Write6", &Disk::Write6);
AddCommand(SCSIDEV::eCmdSeek6, "Seek6", &Disk::Seek6);
AddCommand(SCSIDEV::eCmdInquiry, "Inquiry", &Disk::Inquiry);
AddCommand(SCSIDEV::eCmdModeSelect6, "ModeSelect6", &Disk::ModeSelect);
AddCommand(SCSIDEV::eCmdModeSelect6, "ModeSelect6", &Disk::ModeSelect6);
AddCommand(SCSIDEV::eCmdReserve6, "Reserve6", &Disk::Reserve6);
AddCommand(SCSIDEV::eCmdRelease6, "Release6", &Disk::Release6);
AddCommand(SCSIDEV::eCmdModeSense6, "ModeSense6", &Disk::ModeSense);
AddCommand(SCSIDEV::eCmdModeSense6, "ModeSense6", &Disk::ModeSense6);
AddCommand(SCSIDEV::eCmdStartStop, "StartStopUnit", &Disk::StartStopUnit);
AddCommand(SCSIDEV::eCmdSendDiag, "SendDiagnostic", &Disk::SendDiagnostic);
AddCommand(SCSIDEV::eCmdRemoval, "PreventAllowMediumRemoval", &Disk::PreventAllowMediumRemoval);
@ -393,7 +393,7 @@ void Disk::Inquiry(SASIDEV *controller)
controller->DataIn();
}
void Disk::ModeSelect(SASIDEV *controller)
void Disk::ModeSelect6(SASIDEV *controller)
{
LOGTRACE("MODE SELECT for unsupported page %d", ctrl->buffer[0]);
@ -419,7 +419,7 @@ void Disk::ModeSelect10(SASIDEV *controller)
controller->DataOut();
}
void Disk::ModeSense(SASIDEV *controller)
void Disk::ModeSense6(SASIDEV *controller)
{
ctrl->length = ModeSense(ctrl->cmd, ctrl->buffer);
ASSERT(ctrl->length >= 0);

View File

@ -83,9 +83,9 @@ public:
virtual void TestUnitReady(SASIDEV *) override;
void Inquiry(SASIDEV *) override;
void RequestSense(SASIDEV *) override;
void ModeSelect(SASIDEV *);
void ModeSelect6(SASIDEV *);
void ModeSelect10(SASIDEV *);
void ModeSense(SASIDEV *);
void ModeSense6(SASIDEV *);
void ModeSense10(SASIDEV *);
void Rezero(SASIDEV *);
void FormatUnit(SASIDEV *) override;

View File

@ -36,9 +36,9 @@ public:
// Implemented optional commands
virtual void Verify10(SASIDEV *) = 0;
virtual void Verify16(SASIDEV *) = 0;
virtual void ModeSense(SASIDEV *) = 0;
virtual void ModeSense6(SASIDEV *) = 0;
virtual void ModeSense10(SASIDEV *) = 0;
virtual void ModeSelect(SASIDEV *) = 0;
virtual void ModeSelect6(SASIDEV *) = 0;
virtual void ModeSelect10(SASIDEV *) = 0;
virtual void ReassignBlocks(SASIDEV *) = 0;
virtual void SendDiagnostic(SASIDEV *) = 0;

View File

@ -27,8 +27,8 @@ public:
// Implemented optional commands
virtual void RequestSense(SASIDEV *) = 0;
virtual void ModeSense(SASIDEV *) = 0;
virtual void ModeSense6(SASIDEV *) = 0;
virtual void ModeSense10(SASIDEV *) = 0;
virtual void ModeSelect(SASIDEV *) = 0;
virtual void ModeSelect6(SASIDEV *) = 0;
virtual void ModeSelect10(SASIDEV *) = 0;
};