From 549d9bc72cbca3ba352e6b4bcd6e31d9fd9a0bc7 Mon Sep 17 00:00:00 2001
From: Spencer Oliver <spen@spen-soft.co.uk>
Date: Wed, 24 Oct 2012 15:07:11 +0100
Subject: target: add deprecated target name support

This enables us to change the target name without breaking any
target scripts.

Change-Id: I635f961e573264d3dab2560f3a803ef1986ccfde
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/919
Tested-by: jenkins
---
 src/jtag/drivers/Makefile.am  |  2 +-
 src/jtag/drivers/stlink_usb.c | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/jtag/drivers')

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index d1377131..6d232d26 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -98,7 +98,7 @@ endif
 if REMOTE_BITBANG
 DRIVERFILES += remote_bitbang.c
 endif
-if STLINK
+if HLADAPTER
 DRIVERFILES += stlink_usb.c
 endif
 if OSBDM
diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 7e31fe04..2a78f795 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -30,9 +30,9 @@
 /* project specific includes */
 #include <helper/binarybuffer.h>
 #include <jtag/interface.h>
-#include <jtag/stlink/stlink_layout.h>
-#include <jtag/stlink/stlink_transport.h>
-#include <jtag/stlink/stlink_interface.h>
+#include <jtag/hla/hla_layout.h>
+#include <jtag/hla/hla_transport.h>
+#include <jtag/hla/hla_interface.h>
 #include <target/target.h>
 
 #include <target/cortex_m.h>
@@ -82,7 +82,7 @@ struct stlink_usb_handle_s {
 	/** */
 	uint8_t databuf[STLINK_DATA_SIZE];
 	/** */
-	enum stlink_transports transport;
+	enum hl_transports transport;
 	/** */
 	struct stlink_usb_version version;
 	/** */
@@ -597,13 +597,13 @@ static int stlink_usb_init_mode(void *handle)
 
 	/* set selected mode */
 	switch (h->transport) {
-		case STLINK_TRANSPORT_SWD:
+		case HL_TRANSPORT_SWD:
 			emode = STLINK_MODE_DEBUG_SWD;
 			break;
-		case STLINK_TRANSPORT_JTAG:
+		case HL_TRANSPORT_JTAG:
 			emode = STLINK_MODE_DEBUG_JTAG;
 			break;
-		case STLINK_TRANSPORT_SWIM:
+		case HL_TRANSPORT_SWIM:
 			emode = STLINK_MODE_DEBUG_SWIM;
 			break;
 		default:
@@ -1143,7 +1143,7 @@ static int stlink_usb_write_mem32(void *handle, uint32_t addr, uint16_t len,
 }
 
 /** */
-static int stlink_usb_open(struct stlink_interface_param_s *param, void **fd)
+static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
 {
 	int err;
 	struct stlink_usb_handle_s *h;
@@ -1208,12 +1208,12 @@ static int stlink_usb_open(struct stlink_interface_param_s *param, void **fd)
 	err = ERROR_OK;
 
 	switch (h->transport) {
-		case STLINK_TRANSPORT_SWD:
-		case STLINK_TRANSPORT_JTAG:
+		case HL_TRANSPORT_SWD:
+		case HL_TRANSPORT_JTAG:
 			if (h->version.jtag == 0)
 				err = ERROR_FAIL;
 			break;
-		case STLINK_TRANSPORT_SWIM:
+		case HL_TRANSPORT_SWIM:
 			if (h->version.swim == 0)
 				err = ERROR_FAIL;
 			break;
@@ -1263,7 +1263,7 @@ static int stlink_usb_close(void *fd)
 }
 
 /** */
-struct stlink_layout_api_s stlink_usb_layout_api = {
+struct hl_layout_api_s stlink_usb_layout_api = {
 	/** */
 	.open = stlink_usb_open,
 	/** */
-- 
cgit v1.2.3-18-g5258