Macintosh-HW
/
RASCSI
mirror of https://github.com/akuker/RASCSI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use standard C++ timer for long timeout in piscsi core

This commit is contained in:
Uwe Seimet 2023-11-20 10:15:21 +01:00
parent abc5c4b9ac
commit cfcc47d5e4
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpp/piscsi/piscsi_core.cpp
View File

@ -603,7 +603,7 @@ void Piscsi::Process()
#endif
// Only process the SCSI command if the bus is not busy and no other device responded
if (IsNotBusy() && bus->GetSEL()) {
if (WaitForNotBusy() && bus->GetSEL()) {
scoped_lock<mutex> lock(execution_locker);
// Process command on the responsible controller based on the current initiator and target ID
@ -681,15 +681,13 @@ bool Piscsi::ShutDown(AbstractController::piscsi_shutdown_mode shutdown_mode)
return false;
}
bool Piscsi::IsNotBusy() const
bool Piscsi::WaitForNotBusy() const
{
// Wait until BSY is released as there is a possibility for the
// initiator to assert it while setting the ID (for up to 3 seconds)
// Wait 3 s for BSY to be released, signalling the end of the ARBITRATION phase
if (bus->GetBSY()) {
const auto now = chrono::steady_clock::now();
while ((chrono::duration_cast<chrono::seconds>(chrono::steady_clock::now() - now).count()) < 3) {
bus->Acquire();
if (!bus->GetBSY()) {
return true;
}

2
cpp/piscsi/piscsi_core.h
View File

@ -46,7 +46,7 @@ private:
static void TerminationHandler(int);
string ParseArguments(span<char *>, PbCommand&, int&, string&);
void Process();
bool IsNotBusy() const;
bool WaitForNotBusy() const;
bool ShutDown(AbstractController::piscsi_shutdown_mode);
bool ShutDown(const CommandContext&, const string&);