From 93c4c0fcbec1ebcb2ce19b37c39b63f10a91b9e8 Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Sun, 26 Jan 2020 16:30:14 +0100 Subject: [PATCH] adapter: expose HLA interface in struct adapter_driver The transition of STM8/SWIM out of HLA will require a new struct swim_ops in struct adapter_driver. To simplify the development, make the HLA interface temporarily accessible through the struct adapter_driver. This commit will be reverted after the swim rework. Change-Id: I1e4f370cf64641164d7bcaa22f75ac58c9240052 Signed-off-by: Antonio Borneo Reviewed-on: http://openocd.zylin.com/5527 Tested-by: jenkins --- src/jtag/hla/hla_interface.c | 3 +++ src/jtag/interface.h | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c index 6d5cdc5e7..064c268e4 100644 --- a/src/jtag/hla/hla_interface.c +++ b/src/jtag/hla/hla_interface.c @@ -361,4 +361,7 @@ struct adapter_driver hl_adapter_driver = { .poll_trace = &hl_interface_poll_trace, /* no ops for HLA, targets hla_target and stm8 intercept them all */ + + /* FIXME: helper to simplify transition of HLA drivers. To be removed */ + .hla_if = &hl_if, }; diff --git a/src/jtag/interface.h b/src/jtag/interface.h index 39d2d9d88..91291dbd1 100644 --- a/src/jtag/interface.h +++ b/src/jtag/interface.h @@ -37,6 +37,9 @@ */ +/* FIXME: prototype to simplify transition of HLA drivers. To be removed */ +struct hl_interface_s; + /** implementation of wrapper function tap_set_state() */ void tap_set_state_impl(tap_state_t new_state); @@ -359,6 +362,9 @@ struct adapter_driver { /* DAP APIs over SWD transport */ const struct dap_ops *dap_swd_ops; + + /* FIXME: helper to simplify transition of HLA drivers. To be removed */ + struct hl_interface_s *hla_if; }; extern const char * const jtag_only[];