Remove -sg's private version decoding

Remove duplication of stlink version decoding, and put the decoded version information
into the stlink object itself.

diff --git a/src/stlink-common.c b/src/stlink-common.c
index 707316cc988051daf4bd4085a486870f0084db65..6a9b9383d4cef6f569c27658cf4e14c6feaaf224 100644 (file)
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -356,19 +356,18 @@ void _parse_version(stlink_t *sl, stlink_version_t *slv) {
 
 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);
+    _parse_version(sl, &sl->version);
     
-    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, "st vid         = 0x%04x (expect 0x%04x)\n", sl->version.st_vid, USB_ST_VID);
+    DD(sl, "stlink pid     = 0x%04x\n", sl->version.stlink_pid);
+    DD(sl, "stlink version = 0x%x\n", sl->version.stlink_v);
+    DD(sl, "jtag version   = 0x%x\n", sl->version.jtag_v);
+    DD(sl, "swim version   = 0x%x\n", sl->version.swim_v);
+    if (sl->version.jtag_v == 0) {
         DD(sl, "    notice: the firmware doesn't support a jtag/swd interface\n");
     }
-    if (slv.swim_v == 0) {
+    if (sl->version.swim_v == 0) {
         DD(sl, "    notice: the firmware doesn't support a swim interface\n");
     }
 }

diff --git a/src/stlink-common.h b/src/stlink-common.h
index 9481609f6fc616e03836a4d23c1197f8112ef116..2ac56f2b642c4972778d601be0c089c0647dd493 100644 (file)
--- a/src/stlink-common.h
+++ b/src/stlink-common.h
@@ -179,6 +179,7 @@ extern "C" {
         stm32_addr_t sram_base;
         size_t sram_size;
 
+        struct stlink_version_ version;
     };
 
     // some quick and dirty logging...

diff --git a/src/stlink-sg.c b/src/stlink-sg.c
index b8220de133bf2c26a5f6b92338c87b288bb8e09c..e8dee5db05513dba436bb3414052df6baec0cb7a 100644 (file)
--- a/src/stlink-sg.c
+++ b/src/stlink-sg.c
@@ -268,35 +268,6 @@ 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");
@@ -305,7 +276,6 @@ void _stlink_sg_version(stlink_t *stl) {
     stl->q_len = 6;
     sl->q_addr = 0;
     stlink_q(stl);
-    parse_version(stl);
 }
 
 // Get stlink mode:
@@ -781,7 +751,6 @@ stlink_t* stlink_open(const char *dev_name, const int verbose) {
 
     slsg->sg_fd = sg_fd;
     sl->core_stat = STLINK_CORE_STAT_UNKNOWN;
-    slsg->core_id = 0;
     slsg->q_addr = 0;
     clear_buf(sl);
 
@@ -814,13 +783,13 @@ 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 ((sl->version.st_vid != USB_ST_VID) || (sl->version.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",
-                sg->st_vid, USB_ST_VID);
+                sl->version.st_vid, USB_ST_VID);
         fprintf(stderr, "       PID: got %04x expect %04x \n",
-                sg->stlink_pid, USB_STLINK_PID);
+                sl->version.stlink_pid, USB_STLINK_PID);
         return NULL;
     }
 

diff --git a/src/stlink-sg.h b/src/stlink-sg.h
index 523b7d8836927df90385f94df8ca1613307bd390..b3ab9c00e42c6e3adff1dfd9e0d7e90e88b25cc6 100644 (file)
--- a/src/stlink-sg.h
+++ b/src/stlink-sg.h
@@ -54,13 +54,6 @@ extern "C" {
         // Sense (error information) data
         unsigned char sense_buf[SENSE_BUF_LEN];
 
-        uint32_t st_vid;
-        uint32_t stlink_pid;
-        uint32_t stlink_v;
-        uint32_t jtag_v;
-        uint32_t swim_v;
-        uint32_t core_id;
-
         reg reg;
     };
 #else