From 753a614f3c4a88b298c4c0376e03bf5a1a46851d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Mon, 15 Jan 2024 18:56:25 +0100 Subject: [PATCH] Rename DECUniquePage to DECSpecialFunctionControlPage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Klaus Kämpf --- cpp/devices/scsihd.cpp | 8 ++++---- cpp/devices/scsihd.h | 2 +- cpp/test/mocks.h | 2 +- cpp/test/scsihd_test.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cpp/devices/scsihd.cpp b/cpp/devices/scsihd.cpp index 6a2a8634..ed3bc153 100644 --- a/cpp/devices/scsihd.cpp +++ b/cpp/devices/scsihd.cpp @@ -97,9 +97,9 @@ void SCSIHD::AddFormatPage(map>& pages, bool changeable) const EnrichFormatPage(pages, changeable, 1 << GetSectorSizeShiftCount()); } -// Page code 37 (25h) - DEC Unique Page +// Page code 37 (25h) - DEC Special Function Control page -void SCSIHD::AddDECUniquePage(map>& pages, bool changeable) const +void SCSIHD::AddDECSpecialFunctionControlPage(map>& pages, bool changeable) const { vector buf(25); @@ -119,9 +119,9 @@ void SCSIHD::AddDECUniquePage(map>& pages, bool changeable) co void SCSIHD::AddVendorPage(map>& pages, int page, bool changeable) const { - // Page code 0x25: DEC unique + // Page code 0x25: DEC Special Function Control page if (page == 0x25 || page == 0x3f) { - AddDECUniquePage(pages, changeable); + AddDECSpecialFunctionControlPage(pages, changeable); } // Page code 48 if (page == 0x30 || page == 0x3f) { diff --git a/cpp/devices/scsihd.h b/cpp/devices/scsihd.h index 8f5c5121..cd00191a 100644 --- a/cpp/devices/scsihd.h +++ b/cpp/devices/scsihd.h @@ -40,7 +40,7 @@ public: void ModeSelect(scsi_defs::scsi_command, cdb_t, span, int) override; void AddFormatPage(map>&, bool) const override; - void AddDECUniquePage(map>&, bool) const; + 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 103a911d..dd3c8268 100644 --- a/cpp/test/mocks.h +++ b/cpp/test/mocks.h @@ -360,7 +360,7 @@ 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, DECUniquePage); + FRIEND_TEST(ScsiHdTest, DECSpecialFunctionControlPage); FRIEND_TEST(ScsiHdTest, GetSectorSizes); FRIEND_TEST(ScsiHdTest, ModeSelect); FRIEND_TEST(PiscsiExecutorTest, SetSectorSize); diff --git a/cpp/test/scsihd_test.cpp b/cpp/test/scsihd_test.cpp index 921b9f63..81efae30 100644 --- a/cpp/test/scsihd_test.cpp +++ b/cpp/test/scsihd_test.cpp @@ -102,7 +102,7 @@ TEST(ScsiHdTest, SetUpModePages) ScsiHdTest_SetUpModePages(pages); } -TEST(ScsiHdTest, DECUniquePage) +TEST(ScsiHdTest, DECSpecialFunctionControlPage) { map> pages; vector buf;