Fixed GpioD initialisation

Pi4J · Feb 22, 2024 · 6aac9d0 · 6aac9d0
1 parent b5603db
commit 6aac9d0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 664 deletions.
diff --git a/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/internal/GpioD.java b/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/internal/GpioD.java
@@ -367,17 +367,6 @@ static Long chipIterNextNoClose(long chipIterPtr) {
 
     private static native Long c_gpiod_chip_iter_next_noclose(long chipIterPtr);
 
-    static long lineIterNew(long chipPtr) {
-        Long ptr = gpiod_line_iter_new(chipPtr);
-        if (ptr == null)
-            throw new GpioDException("gpiod_line_iter_new failed!");
-        return ptr;
-    }
-
-    private static native Long gpiod_line_iter_new(long chipPtr);
-
-    private static native Long gpiod_line_iter_next(long lineIterPtr);
-
     static long lineEventGetTimespec(long lineEventPtr) {
         return c_gpiod_line_event_get_timespec(lineEventPtr);
     }

diff --git a/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/internal/GpioDContext.java b/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/internal/GpioDContext.java
@@ -50,7 +50,11 @@ public synchronized void initialize() {
                 break;
             }
         } finally {
-            GpioD.chipIterFree(chipIterPtr);
+            if (found != null) {
+                GpioD.chipIterFreeNoClose(chipIterPtr);
+            } else {
+                GpioD.chipIterFree(chipIterPtr);
+            }
         }
 
         if (found == null)