Remove -sg's private version decoding

[fw/stlink] / src / stlink-common.c

diff --git a/src/stlink-common.c b/src/stlink-common.c
index 0aadb3d4891c7de73b76058398c6ebad0b938b46..6a9b9383d4cef6f569c27658cf4e14c6feaaf224 100644 (file)
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -258,7 +258,6 @@ static void disable_flash_read_protection(stlink_t *sl) {
 void stlink_close(stlink_t *sl) {
     D(sl, "\n*** stlink_close ***\n");
     sl->backend->close(sl);
-
     free(sl);
 }
 
@@ -299,10 +298,24 @@ uint16_t stlink_chip_id(stlink_t *sl) {
     return chip_id;
 }
 
+/**
+ * Cortex m3 tech ref manual, CPUID register description
+ * @param sl stlink context
+ * @param cpuid pointer to the result object
+ */
+void stlink_cpu_id(stlink_t *sl, cortex_m3_cpuid_t *cpuid) {
+    stlink_read_mem32(sl, CM3_REG_CPUID, 4);
+    uint32_t raw = read_uint32(sl->q_buf, 0);
+    cpuid->implementer_id = (raw >> 24) & 0x7f;
+    cpuid->variant = (raw >> 20) & 0xf;
+    cpuid->part = (raw >> 4) & 0xfff;
+    cpuid->revision = raw & 0xf;
+    return;
+}
+
 void stlink_reset(stlink_t *sl) {
     D(sl, "\n*** stlink_reset ***\n");
     sl->backend->reset(sl);
-
 }
 
 void stlink_run(stlink_t *sl) {
@@ -343,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");
     }
 }