openocd-org/openocd
1
0
Fork 0
mirror of https://github.com/openocd-org/openocd.git synced 2025-10-14 19:48:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

jtag: linuxgpiod: use libgpiod v2 API to set gpio bias

Browse Source 
Define and use dummy functions from v2 for v1:
- gpiod_line_settings_set_bias().

Change-Id: I96d32b6200d3bb6ca7c16e7a18e3860f367b5008
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/8205
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Tested-by: jenkins
This commit is contained in:
Antonio Borneo
2024-04-07 18:25:49 +02:00
parent 78ea8c7fb4
commit 4b311d3b8f
1 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/jtag/drivers/linuxgpiod.c
View File

@@ -35,12 +35,17 @@
#define GPIOD_LINE_DRIVE_OPEN_DRAIN GPIOD_LINE_REQUEST_FLAG_OPEN_DRAIN #define GPIOD_LINE_DRIVE_OPEN_DRAIN GPIOD_LINE_REQUEST_FLAG_OPEN_DRAIN
#define GPIOD_LINE_DRIVE_OPEN_SOURCE GPIOD_LINE_REQUEST_FLAG_OPEN_SOURCE #define GPIOD_LINE_DRIVE_OPEN_SOURCE GPIOD_LINE_REQUEST_FLAG_OPEN_SOURCE
#define GPIOD_LINE_BIAS_DISABLED GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE
#define GPIOD_LINE_BIAS_PULL_UP GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP
#define GPIOD_LINE_BIAS_PULL_DOWN GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN
#define gpiod_request_config gpiod_line_request_config #define gpiod_request_config gpiod_line_request_config
struct gpiod_line_settings { struct gpiod_line_settings {
int direction; int direction;
int value; int value;
int drive; int drive;
int bias;
}; };
static struct gpiod_line_settings *gpiod_line_settings_new(void) static struct gpiod_line_settings *gpiod_line_settings_new(void)
@@ -98,6 +103,30 @@ static void gpiod_request_config_set_consumer(struct gpiod_request_config *confi
config->consumer = consumer; config->consumer = consumer;
} }
#ifdef HAVE_LIBGPIOD1_FLAGS_BIAS
static int gpiod_line_settings_set_bias(struct gpiod_line_settings *settings, int bias)
{
settings->bias = bias;
return 0;
}
#else /* HAVE_LIBGPIOD1_FLAGS_BIAS */
static int gpiod_line_settings_set_bias(struct gpiod_line_settings *settings, int bias)
{
if (bias == GPIOD_LINE_BIAS_DISABLED)
return 0;
LOG_WARNING("linuxgpiod: ignoring request for pull-%s: not supported by gpiod v%s",
(bias == GPIOD_LINE_BIAS_PULL_UP) ? "up" : "down",
gpiod_version_string());
return -1;
}
#endif /* HAVE_LIBGPIOD1_FLAGS_BIAS */
#endif /* HAVE_LIBGPIOD_V1 */ #endif /* HAVE_LIBGPIOD_V1 */
static struct gpiod_chip *gpiod_chip[ADAPTER_GPIO_IDX_NUM] = {}; static struct gpiod_chip *gpiod_chip[ADAPTER_GPIO_IDX_NUM] = {};
@@ -416,25 +445,13 @@ static int helper_get_line(enum adapter_gpio_config_index idx)
switch (adapter_gpio_config[idx].pull) { switch (adapter_gpio_config[idx].pull) {
case ADAPTER_GPIO_PULL_NONE: case ADAPTER_GPIO_PULL_NONE:
#ifdef HAVE_LIBGPIOD1_FLAGS_BIAS gpiod_line_settings_set_bias(line_settings, GPIOD_LINE_BIAS_DISABLED);
flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE;
#endif
break; break;
case ADAPTER_GPIO_PULL_UP: case ADAPTER_GPIO_PULL_UP:
#ifdef HAVE_LIBGPIOD1_FLAGS_BIAS gpiod_line_settings_set_bias(line_settings, GPIOD_LINE_BIAS_PULL_UP);
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",
adapter_gpio_get_name(idx), gpiod_version_string());
#endif
break; break;
case ADAPTER_GPIO_PULL_DOWN: case ADAPTER_GPIO_PULL_DOWN:
#ifdef HAVE_LIBGPIOD1_FLAGS_BIAS gpiod_line_settings_set_bias(line_settings, GPIOD_LINE_BIAS_PULL_DOWN);
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",
adapter_gpio_get_name(idx), gpiod_version_string());
#endif
break; break;
} }
@@ -442,7 +459,7 @@ static int helper_get_line(enum adapter_gpio_config_index idx)
flags |= GPIOD_LINE_REQUEST_FLAG_ACTIVE_LOW; flags |= GPIOD_LINE_REQUEST_FLAG_ACTIVE_LOW;
req_cfg->request_type = line_settings->direction; req_cfg->request_type = line_settings->direction;
req_cfg->flags = flags | line_settings->drive; req_cfg->flags = flags | line_settings->drive | line_settings->bias;
retval = gpiod_line_request(gpiod_line[idx], req_cfg, line_settings->value); retval = gpiod_line_request(gpiod_line[idx], req_cfg, line_settings->value);
if (retval < 0) { if (retval < 0) {