stlink: stlink_interface_init_target use hex prefix

[fw/openocd] / src / jtag / stlink / stlink_layout.c

diff --git a/src/jtag/stlink/stlink_layout.c b/src/jtag/stlink/stlink_layout.c
index dfcfbf40ba4a43cf5ebe29c714342208273737ca..4ef9b765f159054534cb6eca79e33497d6c24db2 100644 (file)
--- a/src/jtag/stlink/stlink_layout.c
+++ b/src/jtag/stlink/stlink_layout.c
@@ -29,6 +29,7 @@
 
 #include <jtag/stlink/stlink_layout.h>
 #include <jtag/stlink/stlink_tcl.h>
+#include <jtag/stlink/stlink_transport.h>
 #include <jtag/stlink/stlink_interface.h>
 
 #define STLINK_LAYOUT_UNKNOWN  0
@@ -46,7 +47,7 @@ static int stlink_layout_open(struct stlink_interface_s *stlink_if)
        res = stlink_if->layout->api->open(&stlink_if->param, &stlink_if->fd);
 
        if (res != ERROR_OK) {
-               LOG_DEBUG("stlink_layout_open: failed");
+               LOG_DEBUG("failed");
                return res;
        }
 
@@ -64,7 +65,14 @@ static const struct stlink_layout stlink_layouts[] = {
         .type = STLINK_LAYOUT_USB,
         .open = stlink_layout_open,
         .close = stlink_layout_close,
-        .api = &stlink_layout_api,
+        .api = &stlink_usb_layout_api,
+        },
+       {
+        .name = "sg",
+        .type = STLINK_LAYOUT_SG,
+        .open = stlink_layout_open,
+        .close = stlink_layout_close,
+        .api = &stlink_usb_layout_api,
         },
        {.name = NULL, /* END OF TABLE */ },
 };
@@ -79,7 +87,9 @@ int stlink_layout_init(struct stlink_interface_s *stlink_if)
 {
        LOG_DEBUG("stlink_layout_init");
 
-       stlink_if->layout = &stlink_layouts[0];
-
+       if (stlink_if->layout == NULL) {
+               LOG_ERROR("no layout specified");
+               return ERROR_FAIL;
+       }
        return ERROR_OK;
 }