Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-05-29 01:41:27 +00:00
Code Issues Projects Releases Wiki Activity

Replace system timer by C++ standard time for timeout of 3 s (#1361)

Browse Source
This commit is contained in:
Uwe Seimet 2023-11-16 12:40:10 +01:00 committed by GitHub
parent bb602040e2
commit a7c71e4fbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cpp/piscsi/piscsi_core.cpp
View File

@ -20,7 +20,6 @@
#include "devices/storage_device.h" #include "devices/storage_device.h"
#include "hal/gpiobus_factory.h" #include "hal/gpiobus_factory.h"
#include "hal/gpiobus.h" #include "hal/gpiobus.h"
#include "hal/systimer.h"
#include "piscsi/piscsi_core.h" #include "piscsi/piscsi_core.h"
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -29,6 +28,7 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#include <chrono>
using namespace std; using namespace std;
using namespace filesystem; using namespace filesystem;
@ -684,21 +684,19 @@ bool Piscsi::ShutDown(AbstractController::piscsi_shutdown_mode shutdown_mode)
bool Piscsi::IsNotBusy() const bool Piscsi::IsNotBusy() const
{ {
// Wait until BSY is released as there is a possibility for the // 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) // initiator to assert it while setting the ID (for up to 3 seconds)
if (bus->GetBSY()) { if (bus->GetBSY()) {
const uint32_t now = SysTimer::GetTimerLow(); const auto now = chrono::steady_clock::now();
while ((chrono::duration_cast<chrono::seconds>(chrono::steady_clock::now() - now).count()) < 3) {
bus->Acquire();
// Wait for 3s if (!bus->GetBSY()) {
while ((SysTimer::GetTimerLow() - now) < 3'000'000) { return true;
bus->Acquire(); }
}
if (!bus->GetBSY()) { return false;
return true; }
}
}
return false; return true;
}
return true;
} }