From a453d7f52c80ea6887714b2415c1cac8f138806e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 25 May 2024 12:37:55 +0200
Subject: [PATCH] Iterate through uint array

---
 src/detect/ScanI2C.cpp        |  2 +-
 src/detect/ScanI2C.h          |  2 +-
 src/detect/ScanI2CTwoWire.cpp | 21 +++++++++++++++------
 src/detect/ScanI2CTwoWire.h   |  2 +-
 src/input/kbI2cBase.cpp       |  5 +++--
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/detect/ScanI2C.cpp b/src/detect/ScanI2C.cpp
index 03b93e068..73bdf973b 100644
--- a/src/detect/ScanI2C.cpp
+++ b/src/detect/ScanI2C.cpp
@@ -6,7 +6,7 @@ const ScanI2C::FoundDevice ScanI2C::DEVICE_NONE = ScanI2C::FoundDevice(ScanI2C::
 ScanI2C::ScanI2C() = default;
 
 void ScanI2C::scanPort(ScanI2C::I2CPort port) {}
-void ScanI2C::scanPort(ScanI2C::I2CPort port, uint8_t *address) {}
+void ScanI2C::scanPort(ScanI2C::I2CPort port, uint8_t *address, uint8_t asize) {}
 
 void ScanI2C::setSuppressScreen()
 {
diff --git a/src/detect/ScanI2C.h b/src/detect/ScanI2C.h
index 5c75a9dee..711e8bee5 100644
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -88,7 +88,7 @@ class ScanI2C
     ScanI2C();
 
     virtual void scanPort(ScanI2C::I2CPort);
-    virtual void scanPort(ScanI2C::I2CPort, uint8_t *);
+    virtual void scanPort(ScanI2C::I2CPort, uint8_t *, uint8_t);
 
     /*
      * A bit of a hack, this tells the scanner not to tell later systems there is a screen to avoid enabling it.
diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp
index 95e273b85..b04590509 100644
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -14,6 +14,15 @@
 #define XPOWERS_AXP192_AXP2101_ADDRESS 0x34
 #endif
 
+bool in_array(uint8_t *array, int size, uint8_t lookfor)
+{
+    int i;
+    for (i = 0; i < size; i++)
+        if (lookfor == array[i])
+            return true;
+    return false;
+}
+
 ScanI2C::FoundDevice ScanI2CTwoWire::find(ScanI2C::DeviceType type) const
 {
     concurrency::LockGuard guard((concurrency::Lock *)&lock);
@@ -135,7 +144,7 @@ uint16_t ScanI2CTwoWire::getRegisterValue(const ScanI2CTwoWire::RegisterLocation
         type = T;                                                                                                                \
         break;
 
-void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address)
+void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 {
     concurrency::LockGuard guard((concurrency::Lock *)&lock);
 
@@ -163,10 +172,10 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address)
 #endif
 
     for (addr.address = 1; addr.address < 127; addr.address++) {
-        // Skip the address if it is not requested on a partial scan
-        if (address != nullptr && *address != addr.address) {
-            continue;
-        }
+        if (asize != 0)
+            if (in_array(address, asize, addr.address))
+                continue;
+
         i2cBus->beginTransmission(addr.address);
 #ifdef ARCH_PORTDUINO
         if (i2cBus->read() != -1)
@@ -373,7 +382,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address)
 
 void ScanI2CTwoWire::scanPort(I2CPort port)
 {
-    scanPort(port, nullptr);
+    scanPort(port, nullptr, 0);
 }
 
 TwoWire *ScanI2CTwoWire::fetchI2CBus(ScanI2C::DeviceAddress address) const
diff --git a/src/detect/ScanI2CTwoWire.h b/src/detect/ScanI2CTwoWire.h
index 332afbf64..82b48f6b4 100644
--- a/src/detect/ScanI2CTwoWire.h
+++ b/src/detect/ScanI2CTwoWire.h
@@ -16,7 +16,7 @@ class ScanI2CTwoWire : public ScanI2C
   public:
     void scanPort(ScanI2C::I2CPort) override;
 
-    void scanPort(ScanI2C::I2CPort, uint8_t *) override;
+    void scanPort(ScanI2C::I2CPort, uint8_t *, uint8_t) override;
 
     ScanI2C::FoundDevice find(ScanI2C::DeviceType) const override;
 
diff --git a/src/input/kbI2cBase.cpp b/src/input/kbI2cBase.cpp
index 135de1716..ce22edb93 100644
--- a/src/input/kbI2cBase.cpp
+++ b/src/input/kbI2cBase.cpp
@@ -34,10 +34,11 @@ int32_t KbI2cBase::runOnce()
         // Input device is not detected. Rescan now.
         auto i2cScanner = std::unique_ptr<ScanI2CTwoWire>(new ScanI2CTwoWire());
         uint8_t i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR};
+        uint8_t i2caddr_asize = 3;
 #if defined(I2C_SDA1)
-        i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1, i2caddr_scan);
+        i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1, i2caddr_scan, i2caddr_asize);
 #endif
-        i2cScanner->scanPort(ScanI2C::I2CPort::WIRE, i2caddr_scan);
+        i2cScanner->scanPort(ScanI2C::I2CPort::WIRE, i2caddr_scan, i2caddr_asize);
         auto kb_info = i2cScanner->firstKeyboard();
 
         if (kb_info.type != ScanI2C::DeviceType::NONE) {