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 <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5527
Tested-by: jenkins

diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index 6d5cdc5e7018f3527385808ec585da4a571d1931..064c268e4170e9b2c7c47eea48d8d9fc2cd43105 100644 (file)
--- 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 39d2d9d88ea0d46d83626ed85c0a244e1900938a..91291dbd1d715ead59b05f0e39649645a188391f 100644 (file)
--- 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[];