X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstlink-common.c;h=a3170074e402c3ea939ef684c1a097152d17d83b;hb=371b100cb08289f7507c5fb2b245ebc63c403411;hp=e3d6631d45ca19fd5c4af486aaa32e147e09eb22;hpb=d12da44c747ef42e0b4d6c5944103fec3e3681d3;p=fw%2Fstlink

diff --git a/src/stlink-common.c b/src/stlink-common.c
index e3d6631..a317007 100644
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -285,6 +285,13 @@ void stlink_core_id(stlink_t *sl) {
     DD(sl, "core_id = 0x%08x\n", sl->core_id);
 }
 
+uint16_t stlink_chip_id(stlink_t *sl) {
+    stlink_read_mem32(sl, 0xE0042000, 4);
+    uint32_t chip_id = sl->q_buf[0] | (sl->q_buf[1] << 8) | (sl->q_buf[2] << 16) |
+            (sl->q_buf[3] << 24);
+    return chip_id;
+}
+
 void stlink_reset(stlink_t *sl) {
     D(sl, "\n*** stlink_reset ***\n");
     sl->backend->reset(sl);
@@ -404,18 +411,16 @@ void stlink_step(stlink_t *sl) {
 }
 
 int stlink_current_mode(stlink_t *sl) {
-    D(sl, "\n*** stlink_current_mode ***\n");
     int mode = sl->backend->current_mode(sl);
-    stlink_print_data(sl);
     switch (mode) {
         case STLINK_DEV_DFU_MODE:
-            DD(sl, "stlink mode: dfu\n");
+            DD(sl, "stlink current mode: dfu\n");
             return mode;
         case STLINK_DEV_DEBUG_MODE:
-            DD(sl, "stlink mode: debug (jtag or swd)\n");
+            DD(sl, "stlink current mode: debug (jtag or swd)\n");
             return mode;
         case STLINK_DEV_MASS_MODE:
-            DD(sl, "stlink mode: mass\n");
+            DD(sl, "stlink current mode: mass\n");
             return mode;
     }
     DD(sl, "stlink mode: unknown!\n");