Run TEST UNIT READY, make arbitration optional

PiSCSI · Nov 7, 2023 · cbadc2e · cbadc2e
1 parent 765138d
commit cbadc2e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/cpp/scsidump/phase_executor.cpp b/cpp/scsidump/phase_executor.cpp
@@ -140,6 +140,8 @@ bool PhaseExecutor::Selection() const
 {
 	bus.SetDAT(static_cast<uint8_t>((1 << initiator_id) + (1 << target_id)));
 
+	bus.SetSEL(true);
+
     // Request MESSAGE OUT for IDENTIFY
     bus.SetATN(true);
 

diff --git a/cpp/scsidump/scsi_executor.cpp b/cpp/scsidump/scsi_executor.cpp
@@ -15,6 +15,13 @@ using namespace std;
 using namespace spdlog;
 using namespace scsi_defs;
 
+void ScsiExecutor::TestUnitReady() const
+{
+	vector<uint8_t> cdb(6);
+
+	phase_executor->Execute(scsi_command::eCmdTestUnitReady, cdb, {}, 0);
+}
+
 bool ScsiExecutor::Inquiry(span<uint8_t> buffer)
 {
 	vector<uint8_t> cdb(6);

diff --git a/cpp/scsidump/scsi_executor.h b/cpp/scsidump/scsi_executor.h
@@ -24,6 +24,7 @@ class ScsiExecutor
 	ScsiExecutor(BUS& bus, int id) { phase_executor = make_unique<PhaseExecutor>(bus, id); }
     ~ScsiExecutor() = default;
 
+    void TestUnitReady() const;
     bool Inquiry(span<uint8_t>);
     pair<uint64_t, uint32_t> ReadCapacity();
     bool ReadWrite(span<uint8_t>, uint32_t, uint32_t, int, bool);

diff --git a/cpp/scsidump/scsidump_core.cpp b/cpp/scsidump/scsidump_core.cpp
@@ -483,6 +483,9 @@ bool ScsiDump::GetDeviceInfo(ostream& console)
     	return false;
     }
 
+    // Clear any pending condition, e.g. medium just having being inserted
+    scsi_executor->TestUnitReady();
+
     const auto [capacity, sector_size] = scsi_executor->ReadCapacity();
     if (!capacity || !sector_size) {
     	spdlog::trace("Can't get device capacity");