From a047d87196e829b927b4dc5281981d011fb4c586 Mon Sep 17 00:00:00 2001
From: Spencer Oliver <spen@spen-soft.co.uk>
Date: Mon, 15 Oct 2012 12:34:46 +0100
Subject: [PATCH] stlink: use common layout

Even though the stlinkv1 and stlinkv2 use different usb classes they share
the same layout scheme.

Merge the two into a common layout, thus enabling us to support other
adapter layouts.

Change-Id: I7d02c44a7f94ebc7f2cb5428b02ee40294fb430d
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/918
Tested-by: jenkins
---
 src/jtag/stlink/stlink_layout.c | 14 +-------------
 src/jtag/stlink/stlink_layout.h |  2 --
 tcl/interface/stlink-v1.cfg     |  2 +-
 tcl/interface/stlink-v2.cfg     |  2 +-
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/jtag/stlink/stlink_layout.c b/src/jtag/stlink/stlink_layout.c
index 4ef9b765f..cd0ba7f57 100644
--- a/src/jtag/stlink/stlink_layout.c
+++ b/src/jtag/stlink/stlink_layout.c
@@ -32,10 +32,6 @@
 #include <jtag/stlink/stlink_transport.h>
 #include <jtag/stlink/stlink_interface.h>
 
-#define STLINK_LAYOUT_UNKNOWN	0
-#define STLINK_LAYOUT_SG	1
-#define STLINK_LAYOUT_USB	2
-
 static int stlink_layout_open(struct stlink_interface_s *stlink_if)
 {
 	int res;
@@ -61,15 +57,7 @@ static int stlink_layout_close(struct stlink_interface_s *stlink_if)
 
 static const struct stlink_layout stlink_layouts[] = {
 	{
-	 .name = "usb",
-	 .type = STLINK_LAYOUT_USB,
-	 .open = stlink_layout_open,
-	 .close = stlink_layout_close,
-	 .api = &stlink_usb_layout_api,
-	 },
-	{
-	 .name = "sg",
-	 .type = STLINK_LAYOUT_SG,
+	 .name = "stlink",
 	 .open = stlink_layout_open,
 	 .close = stlink_layout_close,
 	 .api = &stlink_usb_layout_api,
diff --git a/src/jtag/stlink/stlink_layout.h b/src/jtag/stlink/stlink_layout.h
index 905105a0a..8d2a98ac1 100644
--- a/src/jtag/stlink/stlink_layout.h
+++ b/src/jtag/stlink/stlink_layout.h
@@ -75,8 +75,6 @@ struct stlink_layout {
 	/** */
 	char *name;
 	/** */
-	int type;
-	/** */
 	int (*open) (struct stlink_interface_s *stlink_if);
 	/** */
 	int (*close) (struct stlink_interface_s *stlink_if);
diff --git a/tcl/interface/stlink-v1.cfg b/tcl/interface/stlink-v1.cfg
index af678187e..000318371 100644
--- a/tcl/interface/stlink-v1.cfg
+++ b/tcl/interface/stlink-v1.cfg
@@ -3,7 +3,7 @@
 #
 
 interface stlink
-stlink_layout sg
+stlink_layout stlink
 stlink_device_desc "ST-LINK/V1"
 stlink_vid_pid 0x0483 0x3744
 
diff --git a/tcl/interface/stlink-v2.cfg b/tcl/interface/stlink-v2.cfg
index 3eee7d9e9..25e696c6a 100644
--- a/tcl/interface/stlink-v2.cfg
+++ b/tcl/interface/stlink-v2.cfg
@@ -3,7 +3,7 @@
 #
 
 interface stlink
-stlink_layout usb
+stlink_layout stlink
 stlink_device_desc "ST-LINK/V2"
 stlink_vid_pid 0x0483 0x3748