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

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