Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-770-g337db329c
|
From: openocd-gerrit <ope...@us...> - 2024-11-02 21:06:05
|
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 337db329c9c30a58ffa08c01691f12dd95890cbb (commit)
from f4d81cd4d49336f695b8d4b00aa0afdbc6ea22cd (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 337db329c9c30a58ffa08c01691f12dd95890cbb
Author: Marc Schink <de...@za...>
Date: Fri Aug 30 11:06:13 2024 +0200
adapter/bitbang: Use 'bool' data type for blink()
Change-Id: I187f8944ad5fd92f28cbd32e447f9ec1a97e16d6
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8515
Reviewed-by: Antonio Borneo <bor...@gm...>
Tested-by: jenkins
diff --git a/src/jtag/drivers/am335xgpio.c b/src/jtag/drivers/am335xgpio.c
index cfe41c3be..9bb7ea7d1 100644
--- a/src/jtag/drivers/am335xgpio.c
+++ b/src/jtag/drivers/am335xgpio.c
@@ -275,10 +275,10 @@ static int am335xgpio_swdio_read(void)
return get_gpio_value(&adapter_gpio_config[ADAPTER_GPIO_IDX_SWDIO]);
}
-static int am335xgpio_blink(int on)
+static int am335xgpio_blink(bool on)
{
if (is_gpio_config_valid(&adapter_gpio_config[ADAPTER_GPIO_IDX_LED]))
- set_gpio_value(&adapter_gpio_config[ADAPTER_GPIO_IDX_LED], on);
+ set_gpio_value(&adapter_gpio_config[ADAPTER_GPIO_IDX_LED], on ? 1 : 0);
return ERROR_OK;
}
diff --git a/src/jtag/drivers/bcm2835gpio.c b/src/jtag/drivers/bcm2835gpio.c
index b8d91bf38..2c2061dae 100644
--- a/src/jtag/drivers/bcm2835gpio.c
+++ b/src/jtag/drivers/bcm2835gpio.c
@@ -419,10 +419,10 @@ static void bcm2835gpio_munmap(void)
}
}
-static int bcm2835gpio_blink(int on)
+static int bcm2835gpio_blink(bool on)
{
if (is_gpio_config_valid(ADAPTER_GPIO_IDX_LED))
- set_gpio_value(&adapter_gpio_config[ADAPTER_GPIO_IDX_LED], on);
+ set_gpio_value(&adapter_gpio_config[ADAPTER_GPIO_IDX_LED], on ? 1 : 0);
return ERROR_OK;
}
diff --git a/src/jtag/drivers/bitbang.c b/src/jtag/drivers/bitbang.c
index 17e01a233..42234a6f7 100644
--- a/src/jtag/drivers/bitbang.c
+++ b/src/jtag/drivers/bitbang.c
@@ -309,7 +309,7 @@ int bitbang_execute_queue(struct jtag_command *cmd_queue)
retval = ERROR_OK;
if (bitbang_interface->blink) {
- if (bitbang_interface->blink(1) != ERROR_OK)
+ if (bitbang_interface->blink(true) != ERROR_OK)
return ERROR_FAIL;
}
@@ -377,7 +377,7 @@ int bitbang_execute_queue(struct jtag_command *cmd_queue)
cmd = cmd->next;
}
if (bitbang_interface->blink) {
- if (bitbang_interface->blink(0) != ERROR_OK)
+ if (bitbang_interface->blink(false) != ERROR_OK)
return ERROR_FAIL;
}
@@ -396,7 +396,7 @@ static void bitbang_swd_exchange(bool rnw, uint8_t buf[], unsigned int offset, u
{
if (bitbang_interface->blink) {
/* FIXME: we should manage errors */
- bitbang_interface->blink(1);
+ bitbang_interface->blink(true);
}
for (unsigned int i = offset; i < bit_cnt + offset; i++) {
@@ -418,7 +418,7 @@ static void bitbang_swd_exchange(bool rnw, uint8_t buf[], unsigned int offset, u
if (bitbang_interface->blink) {
/* FIXME: we should manage errors */
- bitbang_interface->blink(0);
+ bitbang_interface->blink(false);
}
}
diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h
index dc941796e..82405eb8a 100644
--- a/src/jtag/drivers/bitbang.h
+++ b/src/jtag/drivers/bitbang.h
@@ -45,7 +45,7 @@ struct bitbang_interface {
int (*write)(int tck, int tms, int tdi);
/** Blink led (optional). */
- int (*blink)(int on);
+ int (*blink)(bool on);
/** Sample SWDIO and return the value. */
int (*swdio_read)(void);
diff --git a/src/jtag/drivers/dummy.c b/src/jtag/drivers/dummy.c
index 1b1e57392..4fe598fe3 100644
--- a/src/jtag/drivers/dummy.c
+++ b/src/jtag/drivers/dummy.c
@@ -72,7 +72,7 @@ static int dummy_reset(int trst, int srst)
return ERROR_OK;
}
-static int dummy_led(int on)
+static int dummy_led(bool on)
{
return ERROR_OK;
}
diff --git a/src/jtag/drivers/linuxgpiod.c b/src/jtag/drivers/linuxgpiod.c
index 1926ed9ae..fa14e42d6 100644
--- a/src/jtag/drivers/linuxgpiod.c
+++ b/src/jtag/drivers/linuxgpiod.c
@@ -178,14 +178,14 @@ static int linuxgpiod_swd_write(int swclk, int swdio)
return ERROR_OK;
}
-static int linuxgpiod_blink(int on)
+static int linuxgpiod_blink(bool on)
{
int retval;
if (!is_gpio_config_valid(ADAPTER_GPIO_IDX_LED))
return ERROR_OK;
- retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_LED], on);
+ retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_LED], on ? 1 : 0);
if (retval < 0)
LOG_WARNING("Fail set led");
return retval;
diff --git a/src/jtag/drivers/parport.c b/src/jtag/drivers/parport.c
index d26a51048..d03d3b89c 100644
--- a/src/jtag/drivers/parport.c
+++ b/src/jtag/drivers/parport.c
@@ -183,8 +183,8 @@ static int parport_reset(int trst, int srst)
return ERROR_OK;
}
-/* turn LED on parport adapter on (1) or off (0) */
-static int parport_led(int on)
+/* turn LED on parport adapter on (true) or off (true) */
+static int parport_led(bool on)
{
if (on)
dataport_value |= cable->LED_MASK;
@@ -364,7 +364,7 @@ static int parport_init(void)
return ERROR_FAIL;
if (parport_write(0, 0, 0) != ERROR_OK)
return ERROR_FAIL;
- if (parport_led(1) != ERROR_OK)
+ if (parport_led(true) != ERROR_OK)
return ERROR_FAIL;
bitbang_interface = &parport_bitbang;
@@ -374,7 +374,7 @@ static int parport_init(void)
static int parport_quit(void)
{
- if (parport_led(0) != ERROR_OK)
+ if (parport_led(false) != ERROR_OK)
return ERROR_FAIL;
if (parport_exit) {
diff --git a/src/jtag/drivers/remote_bitbang.c b/src/jtag/drivers/remote_bitbang.c
index edd36f2e6..91a8532b7 100644
--- a/src/jtag/drivers/remote_bitbang.c
+++ b/src/jtag/drivers/remote_bitbang.c
@@ -251,7 +251,7 @@ static int remote_bitbang_sleep(unsigned int microseconds)
return remote_bitbang_flush();
}
-static int remote_bitbang_blink(int on)
+static int remote_bitbang_blink(bool on)
{
char c = on ? 'B' : 'b';
return remote_bitbang_queue(c, FLUSH_SEND_BUF);
-----------------------------------------------------------------------
Summary of changes:
src/jtag/drivers/am335xgpio.c | 4 ++--
src/jtag/drivers/bcm2835gpio.c | 4 ++--
src/jtag/drivers/bitbang.c | 8 ++++----
src/jtag/drivers/bitbang.h | 2 +-
src/jtag/drivers/dummy.c | 2 +-
src/jtag/drivers/linuxgpiod.c | 4 ++--
src/jtag/drivers/parport.c | 8 ++++----
src/jtag/drivers/remote_bitbang.c | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
