adbdevice: Remove set_register_3 duplicate code.

Author: joevt

devices/common/adb/adbapplejack.cpp

@@ -77,9 +77,6 @@ bool AdbAppleJack::get_register_0() {
 }
 
 void AdbAppleJack::set_register_3() {
-    if (this->host_obj->get_input_count() < 2) // ensure we got enough data
-        return;
-
     const uint8_t* in_data = this->host_obj->get_input_buf();
 
     switch (in_data[1]) {

devices/common/adb/adbdevice.cpp

@@ -21,6 +21,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 /** @file Base class for Apple Desktop Bus devices. */
 
+#include <loguru.hpp>
 #include <core/timermanager.h>
 #include <devices/common/adb/adbdevice.h>
 #include <devices/common/adb/adbbus.h>
@@ -92,7 +93,8 @@ void AdbDevice::listen(const uint8_t dev_addr, const uint8_t reg_num) {
             this->set_register_2();
             break;
         case 3:
-            this->set_register_3();
+            if (this->host_obj->get_input_count() >= 2) // ensure we got enough data
+                this->set_register_3();
             break;
         }
     }
@@ -107,6 +109,25 @@ bool AdbDevice::get_register_3() {
     return true;
 }
 
+void AdbDevice::set_register_3() {
+    const uint8_t* in_data = this->host_obj->get_input_buf();
+    uint8_t new_addr = in_data[0] & 0xF;
+
+    switch (in_data[1]) {
+    case 0:
+        this->my_addr = new_addr;
+        this->srq_flag = !!(in_data[0] & 0x20);
+        break;
+    case 0xFE: // move to a new address if there was no collision
+        if (!this->got_collision) {
+            this->my_addr = new_addr;
+        }
+        break;
+    default:
+        LOG_F(WARNING, "ADB Device: unknown handler ID = 0x%X", in_data[1]);
+    }
+}
+
 uint8_t AdbDevice::gen_random_address() {
     return TimerManager::get_instance()->current_time_ns() & 0xF;
 }

devices/common/adb/adbdevice.h

@@ -64,7 +64,7 @@ class AdbDevice : public HWComponent {
     virtual void set_register_0() {}
     virtual void set_register_1() {}
     virtual void set_register_2() {}
-    virtual void set_register_3() {}
+    virtual void set_register_3();
 
     uint8_t exc_event_flag = 0;
     uint8_t srq_flag       = 0;

devices/common/adb/adbkeyboard.cpp

@@ -147,29 +147,17 @@ bool AdbKeyboard::get_register_3() {
 }
 
 void AdbKeyboard::set_register_3() {
-    if (this->host_obj->get_input_count() < 2)    // ensure we got enough data
-        return;
-
     const uint8_t* in_data = this->host_obj->get_input_buf();
 
     switch (in_data[1]) {
-    case 0:
-        this->my_addr  = in_data[0] & 0xF;
-        this->srq_flag = !!(in_data[0] & 0x20);
-        break;
     case 1:
     case 2:
         this->dev_handler_id = in_data[1];
         break;
     case 3:    // extended keyboard protocol isn't supported yet
         break;
-    case 0xFE:    // move to a new address if there was no collision
-        if (!this->got_collision) {
-            this->my_addr = in_data[0] & 0xF;
-        }
-        break;
     default:
-        LOG_F(WARNING, "%s: unknown handler ID = 0x%X", this->name.c_str(), in_data[1]);
+        this->AdbDevice::set_register_3();
     }
 }
 

devices/common/adb/adbmouse.cpp

@@ -142,28 +142,16 @@ bool AdbMouse::get_register_1() {
 }
 
 void AdbMouse::set_register_3() {
-    if (this->host_obj->get_input_count() < 2) // ensure we got enough data
-        return;
-
     const uint8_t*  in_data = this->host_obj->get_input_buf();
 
     switch (in_data[1]) {
-    case 0:
-        this->my_addr  = in_data[0] & 0xF;
-        this->srq_flag = !!(in_data[0] & 0x20);
-        break;
     case 1:
     case 2:
     case 4: // switch over to extended mouse protocol
         this->dev_handler_id = in_data[1];
         break;
-    case 0xFE: // move to a new address if there was no collision
-        if (!this->got_collision) {
-            this->my_addr = in_data[0] & 0xF;
-        }
-        break;
     default:
-        LOG_F(WARNING, "%s: unknown handler ID = 0x%X", this->name.c_str(), in_data[1]);
+        this->AdbDevice::set_register_3();
     }
 }