* Update to libgpiod 1.4.

Author: smurfix

asyncgpio/libgpiod.py

@@ -36,7 +36,7 @@
 ffi.cdef(
     """
 enum {
-    GPIOD_CTXLESS_EVENT_CB_TIMEOUT,
+    GPIOD_CTXLESS_EVENT_CB_TIMEOUT = 1,
     GPIOD_CTXLESS_EVENT_CB_RISING_EDGE,
     GPIOD_CTXLESS_EVENT_CB_FALLING_EDGE,
 };
@@ -54,17 +54,17 @@
 };
 
 enum {
-    GPIOD_LINE_DIRECTION_INPUT,
+    GPIOD_LINE_DIRECTION_INPUT = 1,
     GPIOD_LINE_DIRECTION_OUTPUT,
 };
 
 enum {
-    GPIOD_LINE_ACTIVE_STATE_HIGH,
+    GPIOD_LINE_ACTIVE_STATE_HIGH = 1,
     GPIOD_LINE_ACTIVE_STATE_LOW,
 };
 
 enum {
-    GPIOD_LINE_REQUEST_DIRECTION_AS_IS,
+    GPIOD_LINE_REQUEST_DIRECTION_AS_IS = 1,
     GPIOD_LINE_REQUEST_DIRECTION_INPUT,
     GPIOD_LINE_REQUEST_DIRECTION_OUTPUT,
     GPIOD_LINE_REQUEST_EVENT_FALLING_EDGE,
@@ -79,7 +79,7 @@
 };
 
 enum {
-    GPIOD_LINE_EVENT_RISING_EDGE,
+    GPIOD_LINE_EVENT_RISING_EDGE = 1,
     GPIOD_LINE_EVENT_FALLING_EDGE,
 };
 
@@ -137,6 +137,8 @@
 
 struct gpiod_line_iter;
 
+struct gpiod_line_bulk;
+
 typedef void (*gpiod_ctxless_set_value_cb)(void *);
 
 typedef int (*gpiod_ctxless_event_handle_cb)(int, unsigned int,
@@ -162,6 +164,9 @@
                 size_t chipname_size,
                 unsigned int *offset);
 
+int gpiod_chip_find_lines(struct gpiod_chip *chip, const char **names,
+                         struct gpiod_line_bulk *bulk) GPIOD_API;
+
 struct gpiod_chip *gpiod_chip_open(const char *path);
 
 struct gpiod_chip *gpiod_chip_open_by_name(const char *name);
@@ -183,6 +188,13 @@
 struct gpiod_line *
 gpiod_chip_get_line(struct gpiod_chip *chip, unsigned int offset);
 
+int gpiod_chip_get_lines(struct gpiod_chip *chip,
+                         unsigned int *offsets, unsigned int num_offsets,
+                         struct gpiod_line_bulk *bulk);
+
+int gpiod_chip_get_all_lines(struct gpiod_chip *chip,
+                             struct gpiod_line_bulk *bulk);
+
 struct gpiod_line *
 gpiod_chip_find_line(struct gpiod_chip *chip, const char *name);
 
@@ -254,6 +266,9 @@
 
 int gpiod_line_set_value(struct gpiod_line *line, int value);
 
+int gpiod_line_set_value_bulk(struct gpiod_line_bulk *bulk,
+                              const int *values);
+
 int gpiod_line_event_wait(struct gpiod_line *line,
                 const struct timespec *timeout);
 
@@ -298,7 +313,7 @@
 )
 
 try:
-    lib = ffi.dlopen("libgpiod.so.1")
+    lib = ffi.dlopen("libgpiod.so.2")
 except OSError:
     lib = ffi.dlopen("c")  # workaround if we're only building docs
 

debian/changelog

@@ -1,3 +1,9 @@
+asyncgpio (0.4.0-1) unstable; urgency=medium
+
+  * Update to libgpiod 1.4.
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Fri, 22 May 2020 21:10:25 +0200
+
 asyncgpio (0.3.0-1) unstable; urgency=medium
 
   * Renamed.

debian/control

@@ -3,15 +3,15 @@ Maintainer: Matthias Urlichs <matthias@urlichs.de>
 Section: python
 Priority: optional
 Build-Depends: dh-python, python3-setuptools, python3-all, debhelper (>= 9),
-  libgpiod-dev,
+  libgpiod-dev (>= 1.4),
   python3-cffi,
 Standards-Version: 3.9.6
 Homepage: https://github.com/M-o-a-T/asyncgpio
 
 Package: python3-asyncgpio
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends},
-  libgpiod1,
+  libgpiod2 (>= 1.4),
   python3-cffi,
   python3-trio,
 Standards-Version: 3.9.6
@@ -22,4 +22,5 @@ Description: GPIO access via Trio and libgpiod
  It is based on libgpiod and its CFFI adapter by Steven P. Goldsmith
  <sgjava@gmail.com>, as downloaded from
  `https://github.com/sgjava/userspaceio.git`__.
-
+ .
+ This version has been updated to libgpiod 1.4.