Renaming

uweseimet · Feb 3, 2024 · a1d271f · a1d271f
1 parent c8f79ba
commit a1d271f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/cpp/controllers/abstract_controller.h b/cpp/controllers/abstract_controller.h
@@ -140,10 +140,6 @@ class AbstractController : public PhaseHandler
         return ctrl.message;
     }
 
-    bool HasValidLength() const
-    {
-        return ctrl.current_length;
-    }
     auto GetOffset() const
     {
         return ctrl.offset;

diff --git a/cpp/controllers/generic_controller.cpp b/cpp/controllers/generic_controller.cpp
@@ -228,7 +228,7 @@ void GenericController::MsgIn()
 void GenericController::DataIn()
 {
     if (!IsDataIn()) {
-        if (!HasValidLength()) {
+        if (!GetCurrentLength()) {
             Status();
             return;
         }
@@ -251,7 +251,7 @@ void GenericController::DataIn()
 void GenericController::DataOut()
 {
     if (!IsDataOut()) {
-        if (!HasValidLength()) {
+        if (!GetCurrentLength()) {
             Status();
             return;
         }
@@ -340,7 +340,7 @@ void GenericController::Send()
 
     // Continue sending if there are pending data
     if (in_transfer) {
-        assert(HasValidLength());
+        assert(GetCurrentLength());
         assert(!GetOffset());
         return;
     }
@@ -388,7 +388,7 @@ void GenericController::Receive()
         }
     }
 
-    if (HasValidLength()) {
+    if (GetCurrentLength()) {
         UpdateOffsetAndLength();
         return;
     }
@@ -419,7 +419,7 @@ void GenericController::Receive()
 
     // Continue to receive if there are pending data
     if (in_transfer) {
-        assert(HasValidLength());
+        assert(GetCurrentLength());
         assert(!GetOffset());
         return;
     }

diff --git a/cpp/test/abstract_controller_test.cpp b/cpp/test/abstract_controller_test.cpp
@@ -129,24 +129,12 @@ TEST(AbstractControllerTest, TransferSize)
     EXPECT_FALSE(controller.UpdateTransferSize());
 }
 
-TEST(AbstractControllerTest, Length)
-{
-    MockAbstractController controller;
-
-    EXPECT_FALSE(controller.HasValidLength());
-
-    controller.SetCurrentLength(1);
-    EXPECT_EQ(1U, controller.GetCurrentLength());
-    EXPECT_TRUE(controller.HasValidLength());
-}
-
 TEST(AbstractControllerTest, UpdateOffsetAndLength)
 {
     MockAbstractController controller;
 
-    EXPECT_FALSE(controller.HasValidLength());
-
     controller.UpdateOffsetAndLength();
+    EXPECT_EQ(0U, controller.GetOffset());
     EXPECT_EQ(0U, controller.GetCurrentLength());
 }
 

diff --git a/cpp/test/scsi_controller_test.cpp b/cpp/test/scsi_controller_test.cpp
@@ -194,8 +194,8 @@ TEST(ScsiControllerTest, MsgIn)
     EXPECT_CALL(*bus, SetIO(true));
     controller.MsgIn();
     EXPECT_EQ(phase_t::msgin, controller.GetPhase());
-    EXPECT_FALSE(controller.HasValidLength());
     EXPECT_EQ(0, controller.GetOffset());
+    EXPECT_EQ(0U, controller.GetCurrentLength());
 }
 
 TEST(ScsiControllerTest, MsgOut)
@@ -209,8 +209,8 @@ TEST(ScsiControllerTest, MsgOut)
     EXPECT_CALL(*bus, SetIO(false));
     controller.MsgOut();
     EXPECT_EQ(phase_t::msgout, controller.GetPhase());
-    EXPECT_EQ(1U, controller.GetCurrentLength());
     EXPECT_EQ(0, controller.GetOffset());
+    EXPECT_EQ(1U, controller.GetCurrentLength());
 }
 
 TEST(ScsiControllerTest, DataIn)