Support version decoding on both platforms

diff --git a/src/stlink-common.c b/src/stlink-common.c
index 93b5e766c303f6a22efd43b95a2387c8249c6c25..e3d6631d45ca19fd5c4af486aaa32e147e09eb22 100644 (file)
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -302,9 +302,48 @@ void stlink_status(stlink_t *sl) {
     stlink_core_stat(sl);
 }
 
+/**
+ * Decode the version bits, originally from -sg, verified with usb
+ * @param sl stlink context, assumed to contain valid data in the buffer
+ * @param slv output parsed version object
+ */
+void _parse_version(stlink_t *sl, stlink_version_t *slv) {
+    uint32_t b0 = sl->q_buf[0]; //lsb
+    uint32_t b1 = sl->q_buf[1];
+    uint32_t b2 = sl->q_buf[2];
+    uint32_t b3 = sl->q_buf[3];
+    uint32_t b4 = sl->q_buf[4];
+    uint32_t b5 = sl->q_buf[5]; //msb
+
+    // b0 b1                       || b2 b3  | b4 b5
+    // 4b        | 6b     | 6b     || 2B     | 2B
+    // stlink_v  | jtag_v | swim_v || st_vid | stlink_pid
+
+    slv->stlink_v = (b0 & 0xf0) >> 4;
+    slv->jtag_v = ((b0 & 0x0f) << 2) | ((b1 & 0xc0) >> 6);
+    slv->swim_v = b1 & 0x3f;
+    slv->st_vid = (b3 << 8) | b2;
+    slv->stlink_pid = (b5 << 8) | b4;
+    return;
+}
+
 void stlink_version(stlink_t *sl) {
     D(sl, "*** looking up stlink version\n");
+    stlink_version_t slv;
     sl->backend->version(sl);
+    _parse_version(sl, &slv);
+    
+    DD(sl, "st vid         = 0x%04x (expect 0x%04x)\n", slv.st_vid, USB_ST_VID);
+    DD(sl, "stlink pid     = 0x%04x\n", slv.stlink_pid);
+    DD(sl, "stlink version = 0x%x\n", slv.stlink_v);
+    DD(sl, "jtag version   = 0x%x\n", slv.jtag_v);
+    DD(sl, "swim version   = 0x%x\n", slv.swim_v);
+    if (slv.jtag_v == 0) {
+        DD(sl, "    notice: the firmware doesn't support a jtag/swd interface\n");
+    }
+    if (slv.swim_v == 0) {
+        DD(sl, "    notice: the firmware doesn't support a swim interface\n");
+    }
 }
 
 void stlink_write_mem32(stlink_t *sl, uint32_t addr, uint16_t len) {

diff --git a/src/stlink-common.h b/src/stlink-common.h
index d1ad32dccd833d365c891ad5ef17ed24f98bbb88..b77a89922853a7ea0cdb0f70572c1db0af8bb8ac 100644 (file)
--- a/src/stlink-common.h
+++ b/src/stlink-common.h
@@ -77,6 +77,14 @@ extern "C" {
 
     typedef uint32_t stm32_addr_t;
 
+    typedef struct stlink_version_ {
+        uint32_t stlink_v;
+        uint32_t jtag_v;
+        uint32_t swim_v;
+        uint32_t st_vid;
+        uint32_t stlink_pid;
+    } stlink_version_t;
+
     typedef struct flash_loader {
         stm32_addr_t loader_addr; /* loader sram adddr */
         stm32_addr_t buf_addr; /* buffer sram address */

diff --git a/src/stlink-sg.c b/src/stlink-sg.c
index 86238be22dcf52111ff9ca99f3f3a436ec577511..891d16e1b7c08cbeef6d62100774f0f8fd7e88ef 100644 (file)
--- a/src/stlink-sg.c
+++ b/src/stlink-sg.c
@@ -246,51 +246,6 @@ void stlink_q(stlink_t *sl) {
 
 // TODO thinking, cleanup
 
-void stlink_parse_version(stlink_t *stl) {
-    struct stlink_libsg *sl = stl->backend_data;
-    sl->st_vid = 0;
-    sl->stlink_pid = 0;
-    if (stl->q_len <= 0) {
-        fprintf(stderr, "Error: could not parse the stlink version");
-        return;
-    }
-    stlink_print_data(stl);
-    uint32_t b0 = stl->q_buf[0]; //lsb
-    uint32_t b1 = stl->q_buf[1];
-    uint32_t b2 = stl->q_buf[2];
-    uint32_t b3 = stl->q_buf[3];
-    uint32_t b4 = stl->q_buf[4];
-    uint32_t b5 = stl->q_buf[5]; //msb
-
-    // b0 b1                       || b2 b3  | b4 b5
-    // 4b        | 6b     | 6b     || 2B     | 2B
-    // stlink_v  | jtag_v | swim_v || st_vid | stlink_pid
-
-    sl->stlink_v = (b0 & 0xf0) >> 4;
-    sl->jtag_v = ((b0 & 0x0f) << 2) | ((b1 & 0xc0) >> 6);
-    sl->swim_v = b1 & 0x3f;
-    sl->st_vid = (b3 << 8) | b2;
-    sl->stlink_pid = (b5 << 8) | b4;
-
-    if (stl->verbose < 2)
-        return;
-
-    DD(stl, "st vid         = 0x%04x (expect 0x%04x)\n",
-            sl->st_vid, USB_ST_VID);
-    DD(stl, "stlink pid     = 0x%04x (expect 0x%04x)\n",
-            sl->stlink_pid, USB_STLINK_PID);
-    DD(stl, "stlink version = 0x%x\n", sl->stlink_v);
-    DD(stl, "jtag version   = 0x%x\n", sl->jtag_v);
-    DD(stl, "swim version   = 0x%x\n", sl->swim_v);
-    if (sl->jtag_v == 0)
-        DD(stl,
-            "    notice: the firmware doesn't support a jtag/swd interface\n");
-    if (sl->swim_v == 0)
-        DD(stl,
-            "    notice: the firmware doesn't support a swim interface\n");
-
-}
-
 void stlink_stat(stlink_t *stl, char *txt) {
     if (stl->q_len <= 0)
         return;
@@ -317,7 +272,6 @@ void _stlink_sg_version(stlink_t *stl) {
     stl->q_len = 6;
     sl->q_addr = 0;
     stlink_q(stl);
-    stlink_parse_version(stl);
 }
 
 // Get stlink mode: