[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-556-ge035756b2

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  e035756b22f96adc95b791aaa01de7a2c11d7f2e (commit)
      from  74e7fcb2dd96c09f946bc8b0f59bfdf6215d8873 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e035756b22f96adc95b791aaa01de7a2c11d7f2e
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Mar 24 16:17:11 2024 +0100

    jtag: linuxgpiod: fix detection for line request bias
    
    Commit 290eac04b93c ("drivers/linuxgpiod: Migrate to adapter gpio
    commands") introduced an incorrect check to determine if the
    library libgpiod declares the line request flags:
            GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE
            GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP
            GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN
    The names above are declared by the library inside an enum, thus
    cannot be used by the C preprocessor in a #ifdef.
    
    Determine in configure if the version of libgpiod provides the
    line request flags for "bias" and define a C macro.
    Use the new macro in the driver code.
    
    Change-Id: Iaa452230f4753fce4c6e9daa254299cedb7cab7f
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Fixes: 290eac04b93c ("drivers/linuxgpiod: Migrate to adapter gpio commands")
    Reviewed-on: https://review.openocd.org/c/openocd/+/8186
    Tested-by: jenkins
    Reviewed-by: Michael Heimpold <mic...@gm...>

diff --git a/configure.ac b/configure.ac
index fd7b64d15..761384837 100644
--- a/configure.ac
+++ b/configure.ac
@@ -669,7 +669,11 @@ PKG_CHECK_MODULES([LIBFTDI], [libftdi1], [
 	PKG_CHECK_MODULES([LIBFTDI], [libftdi], [use_libftdi=yes], [use_libftdi=no])
 ])
 
-PKG_CHECK_MODULES([LIBGPIOD], [libgpiod < 2.0], [use_libgpiod=yes], [use_libgpiod=no])
+PKG_CHECK_MODULES([LIBGPIOD], [libgpiod < 2.0], [
+	use_libgpiod=yes
+	PKG_CHECK_EXISTS([libgpiod >= 1.5],
+		[AC_DEFINE([HAVE_LIBGPIOD1_FLAGS_BIAS], [1], [define if libgpiod v1 has line request flags bias])])
+], [use_libgpiod=no])
 
 PKG_CHECK_MODULES([LIBJAYLINK], [libjaylink >= 0.2],
 	[use_libjaylink=yes], [use_libjaylink=no])
diff --git a/src/jtag/drivers/linuxgpiod.c b/src/jtag/drivers/linuxgpiod.c
index 942883788..3ca452357 100644
--- a/src/jtag/drivers/linuxgpiod.c
+++ b/src/jtag/drivers/linuxgpiod.c
@@ -320,12 +320,12 @@ static int helper_get_line(enum adapter_gpio_config_index idx)
 
 	switch (adapter_gpio_config[idx].pull) {
 	case ADAPTER_GPIO_PULL_NONE:
-#ifdef GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE
+#ifdef HAVE_LIBGPIOD1_FLAGS_BIAS
 		flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE;
 #endif
 		break;
 	case ADAPTER_GPIO_PULL_UP:
-#ifdef GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP
+#ifdef HAVE_LIBGPIOD1_FLAGS_BIAS
 		flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP;
 #else
 		LOG_WARNING("linuxgpiod: ignoring request for pull-up on %s: not supported by gpiod v%s",
@@ -333,7 +333,7 @@ static int helper_get_line(enum adapter_gpio_config_index idx)
 #endif
 		break;
 	case ADAPTER_GPIO_PULL_DOWN:
-#ifdef GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN
+#ifdef HAVE_LIBGPIOD1_FLAGS_BIAS
 		flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN;
 #else
 		LOG_WARNING("linuxgpiod: ignoring request for pull-down on %s: not supported by gpiod v%s",

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                  | 6 +++++-
 src/jtag/drivers/linuxgpiod.c | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository