jtag/kitprog: switch to command 'adapter serial'

[fw/openocd] / src / jtag / interface.h

diff --git a/src/jtag/interface.h b/src/jtag/interface.h
index 91291dbd1d715ead59b05f0e39649645a188391f..58bfd02b0a4054c6eaea3dfe722f741c656714a0 100644 (file)
--- a/src/jtag/interface.h
+++ b/src/jtag/interface.h
@@ -26,7 +26,8 @@
 #define OPENOCD_JTAG_INTERFACE_H
 
 #include <jtag/jtag.h>
-#include <target/armv7m_trace.h>
+#include <jtag/swim.h>
+#include <target/arm_tpiu_swo.h>
 
 /* @file
  * The "Cable Helper API" is what the cable drivers can use to help
@@ -37,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);
 
@@ -275,7 +273,7 @@ struct adapter_driver {
        int (*speed)(int speed);
 
        /**
-        * Returns JTAG maxium speed for KHz. 0 = RTCK. The function returns
+        * Returns JTAG maximum speed for KHz. 0 = RTCK. The function returns
         *  a failure if it can't support the KHz/RTCK.
         *
         *  WARNING!!!! if RTCK is *slow* then think carefully about
@@ -363,8 +361,8 @@ 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;
+       /* SWIM APIs */
+       const struct swim_driver *swim_ops;
 };
 
 extern const char * const jtag_only[];