|
From: openocd-gerrit <ope...@us...> - 2026-04-06 16:27:24
|
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 faab1de8b1129b35f129e81d76b43e9813d0ceef (commit)
from 944fb35b70ad575b8fcd86e53039269bcdc0f366 (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 faab1de8b1129b35f129e81d76b43e9813d0ceef
Author: Samuel Obuch <sam...@es...>
Date: Tue Mar 17 21:44:59 2026 +0100
jtag: adapter: move adapter_driver extern declaration to header file
Prevents sparse warning:
"symbol 'adapter_driver' was not declared. Should it be static?"
Change-Id: I2a650ae09e250373132bdfa18f7b2942b970b98e
Signed-off-by: Samuel Obuch <sam...@es...>
Reviewed-on: https://review.openocd.org/c/openocd/+/9534
Reviewed-by: Antonio Borneo <bor...@gm...>
Tested-by: jenkins
diff --git a/src/jtag/adapter.h b/src/jtag/adapter.h
index d76ea5e32..6e957cbdc 100644
--- a/src/jtag/adapter.h
+++ b/src/jtag/adapter.h
@@ -129,6 +129,8 @@ const char *adapter_gpio_get_name(enum adapter_gpio_config_index idx);
*/
const struct adapter_gpio_config *adapter_gpio_get_config(void);
+extern struct adapter_driver *adapter_driver;
+
#define ADAPTER_GPIO_NOT_SET UINT_MAX
#endif /* OPENOCD_JTAG_ADAPTER_H */
diff --git a/src/jtag/core.c b/src/jtag/core.c
index 3261e6079..941d9f3b4 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -115,8 +115,6 @@ struct jtag_event_callback {
/* callbacks to inform high-level handlers about JTAG state changes */
static struct jtag_event_callback *jtag_event_callbacks;
-extern struct adapter_driver *adapter_driver;
-
void jtag_set_flush_queue_sleep(int ms)
{
jtag_flush_queue_sleep = ms;
diff --git a/src/jtag/swim.c b/src/jtag/swim.c
index 004a9fd4f..43d655c4c 100644
--- a/src/jtag/swim.c
+++ b/src/jtag/swim.c
@@ -12,13 +12,12 @@
#include "config.h"
#endif
+#include "adapter.h"
#include "interface.h"
#include "swim.h"
#include <helper/command.h>
#include <transport/transport.h>
-extern struct adapter_driver *adapter_driver;
-
int swim_system_reset(void)
{
assert(adapter_driver->swim_ops);
diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index 2d286136a..57d2d5929 100644
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -39,6 +39,7 @@
#include <helper/time_support.h>
#include <transport/transport.h>
+#include <jtag/adapter.h>
#include <jtag/interface.h>
#include <jtag/swd.h>
@@ -722,8 +723,6 @@ static const struct command_registration swd_handlers[] = {
static int swd_select(struct command_context *ctx)
{
- /* FIXME: only place where global 'adapter_driver' is still needed */
- extern struct adapter_driver *adapter_driver;
const struct swd_driver *swd = adapter_driver->swd_ops;
int retval;
diff --git a/src/target/arm_dap.c b/src/target/arm_dap.c
index 532f192b7..07b695623 100644
--- a/src/target/arm_dap.c
+++ b/src/target/arm_dap.c
@@ -16,12 +16,11 @@
#include "helper/list.h"
#include "helper/command.h"
#include "transport/transport.h"
+#include "jtag/adapter.h"
#include "jtag/interface.h"
static OOCD_LIST_HEAD(all_dap);
-extern struct adapter_driver *adapter_driver;
-
/* DAP command support */
struct arm_dap_object {
struct list_head lh;
diff --git a/src/target/stm8.c b/src/target/stm8.c
index 3b5d83ff4..d44dd7f08 100644
--- a/src/target/stm8.c
+++ b/src/target/stm8.c
@@ -13,6 +13,7 @@
#include <helper/log.h>
#include "target.h"
#include "target_type.h"
+#include "jtag/adapter.h"
#include "jtag/interface.h"
#include "jtag/jtag.h"
#include "jtag/swim.h"
@@ -33,7 +34,6 @@ static void stm8_enable_watchpoints(struct target *target);
static int stm8_unset_watchpoint(struct target *target,
struct watchpoint *watchpoint);
static int (*adapter_speed)(int speed);
-extern struct adapter_driver *adapter_driver;
static const struct {
unsigned int id;
-----------------------------------------------------------------------
Summary of changes:
src/jtag/adapter.h | 2 ++
src/jtag/core.c | 2 --
src/jtag/swim.c | 3 +--
src/target/adi_v5_swd.c | 3 +--
src/target/arm_dap.c | 3 +--
src/target/stm8.c | 2 +-
6 files changed, 6 insertions(+), 9 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|