diff --git a/cpp/devices/scsihd.cpp b/cpp/devices/scsihd.cpp index ed3bc153..51384c6a 100644 --- a/cpp/devices/scsihd.cpp +++ b/cpp/devices/scsihd.cpp @@ -97,32 +97,8 @@ void SCSIHD::AddFormatPage(map>& pages, bool changeable) const EnrichFormatPage(pages, changeable, 1 << GetSectorSizeShiftCount()); } -// Page code 37 (25h) - DEC Special Function Control page - -void SCSIHD::AddDECSpecialFunctionControlPage(map>& pages, bool changeable) const -{ - vector buf(25); - - // No changeable area - if (changeable) { - pages[0x25] = buf; - - return; - } - - buf[0] = static_cast (0x25 | 0x80); // page code, high bit set - buf[1] = static_cast (sizeof(buf) - 1); - buf[2] = static_cast (0x01); // drive does not auto-start - - pages[0x25] = buf; -} - void SCSIHD::AddVendorPage(map>& pages, int page, bool changeable) const { - // Page code 0x25: DEC Special Function Control page - if (page == 0x25 || page == 0x3f) { - AddDECSpecialFunctionControlPage(pages, changeable); - } // Page code 48 if (page == 0x30 || page == 0x3f) { AddAppleVendorModePage(pages, changeable); diff --git a/cpp/devices/scsihd.h b/cpp/devices/scsihd.h index cd00191a..95ded11a 100644 --- a/cpp/devices/scsihd.h +++ b/cpp/devices/scsihd.h @@ -40,7 +40,6 @@ public: void ModeSelect(scsi_defs::scsi_command, cdb_t, span, int) override; void AddFormatPage(map>&, bool) const override; - void AddDECSpecialFunctionControlPage(map>&, bool) const; void AddVendorPage(map>&, int, bool) const override; private: diff --git a/cpp/test/mocks.h b/cpp/test/mocks.h index dd3c8268..919afd8d 100644 --- a/cpp/test/mocks.h +++ b/cpp/test/mocks.h @@ -360,7 +360,6 @@ class MockSCSIHD : public SCSIHD //NOSONAR Ignore inheritance hierarchy depth in FRIEND_TEST(ScsiHdTest, FinalizeSetup); FRIEND_TEST(ScsiHdTest, GetProductData); FRIEND_TEST(ScsiHdTest, SetUpModePages); - FRIEND_TEST(ScsiHdTest, DECSpecialFunctionControlPage); FRIEND_TEST(ScsiHdTest, GetSectorSizes); FRIEND_TEST(ScsiHdTest, ModeSelect); FRIEND_TEST(PiscsiExecutorTest, SetSectorSize); diff --git a/cpp/test/scsihd_nec_test.cpp b/cpp/test/scsihd_nec_test.cpp index bbcfed39..6b5cbd7c 100644 --- a/cpp/test/scsihd_nec_test.cpp +++ b/cpp/test/scsihd_nec_test.cpp @@ -18,12 +18,11 @@ using namespace filesystem; void ScsiHdNecTest_SetUpModePages(map>& pages) { - EXPECT_EQ(6, pages.size()) << "Unexpected number of mode pages"; + EXPECT_EQ(5, pages.size()) << "Unexpected number of mode pages"; EXPECT_EQ(12, pages[1].size()); EXPECT_EQ(24, pages[3].size()); EXPECT_EQ(20, pages[4].size()); EXPECT_EQ(12, pages[8].size()); - EXPECT_EQ(25, pages[37].size()); EXPECT_EQ(30, pages[48].size()); } diff --git a/cpp/test/scsihd_test.cpp b/cpp/test/scsihd_test.cpp index 81efae30..693f450b 100644 --- a/cpp/test/scsihd_test.cpp +++ b/cpp/test/scsihd_test.cpp @@ -13,12 +13,11 @@ void ScsiHdTest_SetUpModePages(map>& pages) { - EXPECT_EQ(6, pages.size()) << "Unexpected number of mode pages"; + EXPECT_EQ(5, pages.size()) << "Unexpected number of mode pages"; EXPECT_EQ(12, pages[1].size()); EXPECT_EQ(24, pages[3].size()); EXPECT_EQ(24, pages[4].size()); EXPECT_EQ(12, pages[8].size()); - EXPECT_EQ(25, pages[37].size()); EXPECT_EQ(30, pages[48].size()); } @@ -102,20 +101,6 @@ TEST(ScsiHdTest, SetUpModePages) ScsiHdTest_SetUpModePages(pages); } -TEST(ScsiHdTest, DECSpecialFunctionControlPage) -{ - map> pages; - vector buf; - MockSCSIHD hd(0, false); - - EXPECT_NO_THROW(hd.SetUpModePages(pages, 0x25, false)) << "MODE SENSE(6) DEC unique page is supported"; - EXPECT_NE(pages.end(), pages.find(0x25)); - buf = pages[0x25]; - EXPECT_EQ(static_cast (0x25 | 0x80), buf[0]); - EXPECT_EQ(static_cast (0x17), buf[1]); - EXPECT_EQ(static_cast (0x01), buf[2]); -} - TEST(ScsiHdTest, ModeSelect) { MockSCSIHD hd({ 512 });