From cc5889883f0b4660d5173f89543da02014f54b9c Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Thu, 19 Mar 2020 12:12:20 +0100 Subject: [PATCH] Revert "adapter: expose HLA interface in struct adapter_driver" No reason to keep longer this temporary hack. Remove it by reverting the original commit. Change-Id: I5c6dcdb1f4755b7dba4c03a5033913ef8db35e18 Signed-off-by: Antonio Borneo Reviewed-on: http://openocd.zylin.com/5533 Tested-by: jenkins --- src/jtag/hla/hla_interface.c | 3 --- src/jtag/interface.h | 6 ------ 2 files changed, 9 deletions(-) diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c index 064c268e4..6d5cdc5e7 100644 --- a/src/jtag/hla/hla_interface.c +++ b/src/jtag/hla/hla_interface.c @@ -361,7 +361,4 @@ 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 a471aa96d..42598c1ae 100644 --- a/src/jtag/interface.h +++ b/src/jtag/interface.h @@ -38,9 +38,6 @@ */ -/* 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); @@ -366,9 +363,6 @@ struct adapter_driver { /* SWIM APIs */ const struct swim_driver *swim_ops; - - /* FIXME: helper to simplify transition of HLA drivers. To be removed */ - struct hl_interface_s *hla_if; }; extern const char * const jtag_only[];