jtag/hla, jtag/stlink: switch to command 'adapter serial'

[fw/openocd] / src / jtag / hla / hla_interface.h

diff --git a/src/jtag/hla/hla_interface.h b/src/jtag/hla/hla_interface.h
index fcf1d9e228683cd7c99005453bbcad6cc8d2f91c..31d055a3cadd72d56b7f716c860119abd00de68d 100644 (file)
--- a/src/jtag/hla/hla_interface.h
+++ b/src/jtag/hla/hla_interface.h
@@ -16,13 +16,11 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef _HL_INTERFACE
-#define _HL_INTERFACE
+#ifndef OPENOCD_JTAG_HLA_HLA_INTERFACE_H
+#define OPENOCD_JTAG_HLA_HLA_INTERFACE_H
 
 /** */
 struct target;
@@ -31,25 +29,25 @@ enum e_hl_transports;
 /** */
 extern const char *hl_transports[];
 
+#define HLA_MAX_USB_IDS 16
+
 struct hl_interface_param_s {
        /** */
-       char *device_desc;
-       /** */
-       char *serial;
-       /** */
-       uint16_t vid;
-       /** */
-       uint16_t pid;
-       /** */
-       unsigned api;
+       const char *device_desc;
+       /** List of recognised VIDs */
+       uint16_t vid[HLA_MAX_USB_IDS + 1];
+       /** List of recognised PIDs */
+       uint16_t pid[HLA_MAX_USB_IDS + 1];
        /** */
        enum hl_transports transport;
        /** */
        bool connect_under_reset;
-       /** Output file for trace data (if any) */
-       FILE *trace_f;
-       /** Trace module source clock rate */
-       uint32_t trace_source_hz;
+       /** Initial interface clock clock speed */
+       int initial_interface_speed;
+       /** */
+       bool use_stlink_tcp;
+       /** */
+       uint16_t stlink_tcp_port;
 };
 
 struct hl_interface_s {
@@ -58,7 +56,7 @@ struct hl_interface_s {
        /** */
        const struct hl_layout *layout;
        /** */
-       void *fd;
+       void *handle;
 };
 
 /** */
@@ -67,5 +65,6 @@ int hl_interface_open(enum hl_transports tr);
 
 int hl_interface_init_target(struct target *t);
 int hl_interface_init_reset(void);
+int hl_interface_override_target(const char **targetname);
 
-#endif /* _HL_INTERFACE */
+#endif /* OPENOCD_JTAG_HLA_HLA_INTERFACE_H */