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

diff --git a/src/jtag/stlink/stlink_layout.c b/src/jtag/stlink/stlink_layout.c
index 4ef9b765f159054534cb6eca79e33497d6c24db2..cd0ba7f571960945d067e1b907c68364d60bf632 100644 (file)
--- 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 905105a0a11a0b9b409487272f9368172cb7f7bc..8d2a98ac169c97da05e880c36c3fb21fc04ccd97 100644 (file)
--- 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 af678187e1b54ef10a9e9eea870b960470362bcd..00031837159a882f03b1ced22462a6d6b2128e50 100644 (file)
--- 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 3eee7d9e9c09011d0a1dc6cb49e30e88d0f8777c..25e696c6a926fc9d8085a0a0c543f4111645382f 100644 (file)
--- 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