Skip to content

Commit

Permalink
Rename DECUniquePage to DECSpecialFunctionControlPage
Browse files Browse the repository at this point in the history
Signed-off-by: Klaus Kämpf <[email protected]>
  • Loading branch information
kkaempf committed Jan 17, 2024
1 parent 419b0b6 commit c6de497
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions cpp/devices/scsihd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ void SCSIHD::AddFormatPage(map<int, vector<byte>>& 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<int, vector<byte>>& pages, bool changeable) const
void SCSIHD::AddDECSpecialFunctionControlPage(map<int, vector<byte>>& pages, bool changeable) const
{
vector<byte> buf(25);

Expand All @@ -119,9 +119,9 @@ void SCSIHD::AddDECUniquePage(map<int, vector<byte>>& pages, bool changeable) co

void SCSIHD::AddVendorPage(map<int, vector<byte>>& 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) {
Expand Down
2 changes: 1 addition & 1 deletion cpp/devices/scsihd.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class SCSIHD : public Disk
void ModeSelect(scsi_defs::scsi_command, cdb_t, span<const uint8_t>, int) override;

void AddFormatPage(map<int, vector<byte>>&, bool) const override;
void AddDECUniquePage(map<int, vector<byte>>&, bool) const;
void AddDECSpecialFunctionControlPage(map<int, vector<byte>>&, bool) const;
void AddVendorPage(map<int, vector<byte>>&, int, bool) const override;

private:
Expand Down
2 changes: 1 addition & 1 deletion cpp/test/mocks.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion cpp/test/scsihd_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ TEST(ScsiHdTest, SetUpModePages)
ScsiHdTest_SetUpModePages(pages);
}

TEST(ScsiHdTest, DECUniquePage)
TEST(ScsiHdTest, DECSpecialFunctionControlPage)
{
map<int, vector<byte>> pages;
vector<byte> buf;
Expand Down

0 comments on commit c6de497

Please sign in to comment.