[fix] missing parse_version in sg transport layer

diff --git a/src/stlink-sg.c b/src/stlink-sg.c
index 716c7df3b309acba11f6347c6c14cb8145c12df9..ac6a6cf81891de4b42998208cafd8abd9d27ec72 100644 (file)
--- a/src/stlink-sg.c
+++ b/src/stlink-sg.c
@@ -267,6 +267,36 @@ void stlink_stat(stlink_t *stl, char *txt) {
     }
 }
 
+
+static void 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;
+  }
+
+  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;
+}
+
 void _stlink_sg_version(stlink_t *stl) {
     struct stlink_libsg *sl = stl->backend_data;
     D(stl, "\n*** stlink_version ***\n");
@@ -275,6 +305,7 @@ void _stlink_sg_version(stlink_t *stl) {
     stl->q_len = 6;
     sl->q_addr = 0;
     stlink_q(stl);
+    parse_version(stl);
 }
 
 // Get stlink mode:
@@ -783,7 +814,7 @@ stlink_t* stlink_quirk_open(const char *dev_name, const int verbose) {
     stlink_version(sl);
     struct stlink_libsg *sg = sl->backend_data;
 
-    if (sg->st_vid != USB_ST_VID || sg->stlink_pid != USB_STLINK_PID) {
+    if ((sg->st_vid != USB_ST_VID) || (sg->stlink_pid != USB_STLINK_PID)) {
         fprintf(stderr, "Error: the device %s is not a stlink\n",
                 dev_name);
         fprintf(stderr, "       VID: got %04x expect %04x \n",