From 5095efc55fc17f1c67abc4b64e715c9c2b4acf58 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Wed, 1 May 2024 13:06:42 -0500
Subject: [PATCH] Pick up support for more than 64 GPIO lines under Portduino

---
 arch/portduino/portduino.ini             |  2 +-
 src/platform/portduino/PortduinoGlue.cpp | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 4857933ec..ef99c7870 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -1,6 +1,6 @@
 ; The Portduino based sim environment on top of any host OS, all hardware will be simulated
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#659e49346aa33008b150dfb206b1817ddabc7132
+platform = https://github.com/meshtastic/platform-native.git#784007630ca43b4811c6637606440588bb5acf39
 framework = arduino
 
 build_src_filter = 
diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp
index d86ac6677..8572f4cf2 100644
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/src/platform/portduino/PortduinoGlue.cpp
@@ -76,7 +76,21 @@ void portduinoCustomInit()
 void portduinoSetup()
 {
     printf("Setting up Meshtastic on Portduino...\n");
-    gpioInit();
+    int max_GPIO = 0;
+    int GPIO_lines[] = {cs,
+                        irq,
+                        busy,
+                        reset,
+                        txen,
+                        rxen,
+                        displayDC,
+                        displayCS,
+                        displayBacklight,
+                        displayBacklightPWMChannel,
+                        displayReset,
+                        touchscreenCS,
+                        touchscreenIRQ,
+                        user};
 
     std::string gpioChipName = "gpiochip";
     settingsStrings[i2cdev] = "";
@@ -245,6 +259,13 @@ void portduinoSetup()
         exit(EXIT_FAILURE);
     }
 
+    for (int i : GPIO_lines) {
+        if (i > max_GPIO)
+            max_GPIO = i;
+    }
+
+    gpioInit(max_GPIO + 1); // Done here so we can inform Portduino how many GPIOs we need.
+
     // Need to bind all the configured GPIO pins so they're not simulated
     if (settingsMap.count(cs) > 0 && settingsMap[cs] != RADIOLIB_NC) {
         if (initGPIOPin(settingsMap[cs], gpioChipName) != ERRNO_OK) {