Update default SCSI level

uweseimet · Jan 7, 2025 · ae6cabb · ae6cabb
1 parent 14171db
commit ae6cabb
Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/cpp/base/primary_device.h b/cpp/base/primary_device.h
@@ -187,8 +187,8 @@ class PrimaryDevice : public Device
     ProductData product_data = ProductData(
         { "SCSI2Pi", "", fmt::format("{0:02}{1:1}{2:1}", s2p_major_version, s2p_minor_version, s2p_revision) });
 
-    ScsiLevel level = ScsiLevel::SCSI_2;
-    ScsiLevel response_data_format = ScsiLevel::SCSI_2;
+    ScsiLevel level = ScsiLevel::NONE;
+    ScsiLevel response_data_format = ScsiLevel::SCSI_1_CCS;
 
     SenseKey sense_key = SenseKey::NO_SENSE;
     Asc asc = Asc::NO_ADDITIONAL_SENSE_INFORMATION;

diff --git a/cpp/devices/daynaport.cpp b/cpp/devices/daynaport.cpp
@@ -35,6 +35,7 @@ DaynaPort::DaynaPort(int lun) : PrimaryDevice(SCDP, lun, DAYNAPORT_READ_HEADER_S
 {
     // These data are required by the DaynaPort drivers
     PrimaryDevice::SetProductData( { "Dayna", "SCSI/Link", "1.4a" }, true);
+    SetScsiLevel(ScsiLevel::SCSI_2);
     SupportsParams(true);
     SetReady(true);
 }

diff --git a/cpp/devices/optical_memory.cpp b/cpp/devices/optical_memory.cpp
@@ -24,6 +24,7 @@ OpticalMemory::OpticalMemory(int lun) : Disk(SCMO, lun, true, true, { 512, 1024,
     geometries[2048 * 310352] = { 2048, 310352 };
 
     Disk::SetProductData( { "", "SCSI MO", "" }, true);
+    SetScsiLevel(ScsiLevel::SCSI_2);
     SetProtectable(true);
     SetRemovable(true);
 }

diff --git a/cpp/devices/printer.cpp b/cpp/devices/printer.cpp
@@ -38,6 +38,7 @@ using namespace memory_util;
 Printer::Printer(int lun) : PrimaryDevice(SCLP, lun)
 {
     PrimaryDevice::SetProductData( { "", "SCSI PRINTER", "" }, true);
+    SetScsiLevel(ScsiLevel::SCSI_2);
     SupportsParams(true);
     SetReady(true);
 }

diff --git a/cpp/devices/tape.cpp b/cpp/devices/tape.cpp
@@ -26,6 +26,7 @@ using namespace s2p_util;
 Tape::Tape(int lun) : StorageDevice(SCTP, lun, true, false, { 512, 1024, 2048, 4096, 8192 })
 {
     StorageDevice::SetProductData( { "", "SCSI TAPE", "" }, true);
+    SetScsiLevel(ScsiLevel::SCSI_2);
     SupportsParams(true);
     SetProtectable(true);
     SetRemovable(true);

diff --git a/cpp/test/primary_device_test.cpp b/cpp/test/primary_device_test.cpp
@@ -61,7 +61,7 @@ TEST(PrimaryDeviceTest, SetScsiLevel)
 {
     MockPrimaryDevice device(0);
 
-    EXPECT_EQ(ScsiLevel::SCSI_2, device.GetScsiLevel());
+    EXPECT_EQ(ScsiLevel::NONE, device.GetScsiLevel());
 
     EXPECT_TRUE(device.SetScsiLevel(ScsiLevel::NONE));
     EXPECT_FALSE(device.SetScsiLevel(static_cast<ScsiLevel>(10)));