[PATCH]: 5e16466f9b jtag: linuxgpiod: use libgpiod v2 API for gpiod_line_request()

[gerrit]

This is an automated email from Gerrit.

"Antonio Borneo <borneo.anto...@gmail.com>" just uploaded a new patch set to 
Gerrit, which you can find at https://review.openocd.org/c/openocd/+/8207

-- gerrit

commit 5e16466f9b78696fbc44d6c2c0ca069f9aa0c310
Author: Antonio Borneo <borneo.anto...@gmail.com>
Date:   Sun Apr 7 21:15:48 2024 +0200

    jtag: linuxgpiod: use libgpiod v2 API for gpiod_line_request()
    
    Work in progress. Target is to replace v1 gpiod_line_request()
    
    Define and use dummy functions from v2 for v1:
    - gpiod_line_config_new(),
    - gpiod_line_config_free(),
    - gpiod_line_config_add_line_settings(),
    - gpiod_chip_request_lines().
    
    Change-Id: I9e2d3013845c5d12942f5e07c9721fcd151d6840
    Signed-off-by: Antonio Borneo <borneo.anto...@gmail.com>

diff --git a/src/jtag/drivers/linuxgpiod.c b/src/jtag/drivers/linuxgpiod.c
index 21983c97ea..c7c3ae65b7 100644
--- a/src/jtag/drivers/linuxgpiod.c
+++ b/src/jtag/drivers/linuxgpiod.c
@@ -49,6 +49,11 @@ struct gpiod_line_settings {
        int active_low;
 };
 
+struct gpiod_line_config {
+       unsigned int gpio_num;
+       struct gpiod_line_settings *line_settings;
+};
+
 static struct gpiod_line_settings *gpiod_line_settings_new(void)
 {
        static struct gpiod_line_settings my;
@@ -58,6 +63,15 @@ static struct gpiod_line_settings 
*gpiod_line_settings_new(void)
        return &my;
 }
 
+static struct gpiod_line_config *gpiod_line_config_new(void)
+{
+       static struct gpiod_line_config my;
+
+       my = (struct gpiod_line_config) { 0 };
+
+       return &my;
+}
+
 static struct gpiod_request_config *gpiod_request_config_new(void)
 {
        static struct gpiod_request_config my;
@@ -71,6 +85,10 @@ static void gpiod_line_settings_free(struct 
gpiod_line_settings *settings)
 {
 }
 
+static void gpiod_line_config_free(struct gpiod_line_config *config)
+{
+}
+
 static void gpiod_request_config_free(struct gpiod_request_config *config)
 {
 }
@@ -111,6 +129,23 @@ static void gpiod_request_config_set_consumer(struct 
gpiod_request_config *confi
        config->consumer = consumer;
 }
 
+static int gpiod_line_config_add_line_settings(struct gpiod_line_config 
*config,
+       const unsigned int *offsets, size_t num_offsets, struct 
gpiod_line_settings *settings)
+{
+       assert(num_offsets == 1);
+
+       config->gpio_num = *offsets;
+       config->line_settings = settings;
+
+       return 0;
+}
+
+static struct gpiod_line_request *gpiod_chip_request_lines(struct gpiod_chip 
*chip,
+       struct gpiod_request_config *req_cfg, struct gpiod_line_config 
*line_cfg)
+{
+       return NULL;
+}
+
 #ifdef HAVE_LIBGPIOD1_FLAGS_BIAS
 
 static int gpiod_line_settings_set_bias(struct gpiod_line_settings *settings, 
int bias)
@@ -415,9 +450,10 @@ static int helper_get_line(enum adapter_gpio_config_index 
idx)
        }
 
        struct gpiod_line_settings *line_settings = gpiod_line_settings_new();
+       struct gpiod_line_config *line_config = gpiod_line_config_new();
        struct gpiod_request_config *req_cfg = gpiod_request_config_new();
 
-       if (!line_settings || !req_cfg) {
+       if (!line_settings || !line_config || !req_cfg) {
                LOG_ERROR("Cannot configure LinuxGPIOD line for %s", 
adapter_gpio_get_name(idx));
                retval = ERROR_JTAG_INIT_FAILED;
                goto err_out;
@@ -479,6 +515,7 @@ static int helper_get_line(enum adapter_gpio_config_index 
idx)
 
 err_out:
        gpiod_line_settings_free(line_settings);
+       gpiod_line_config_free(line_config);
        gpiod_request_config_free(req_cfg);
 
        return retval;

--