From f85a173c465bb875359df223cfac81cdd16db5c7 Mon Sep 17 00:00:00 2001
From: Karl Palsson <karlp@tweak.net.au>
Date: Wed, 12 Oct 2011 20:36:43 +0000
Subject: [PATCH] Make stlink_core_id return the core id.

Instead of requiring manual extraction from the q_buf
---
 src/stlink-common.c | 3 ++-
 src/stlink-common.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/stlink-common.c b/src/stlink-common.c
index 53a359b..0aadb3d 100644
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -283,12 +283,13 @@ void stlink_exit_dfu_mode(stlink_t *sl) {
     sl->backend->exit_dfu_mode(sl);
 }
 
-void stlink_core_id(stlink_t *sl) {
+uint32_t stlink_core_id(stlink_t *sl) {
     D(sl, "\n*** stlink_core_id ***\n");
     sl->backend->core_id(sl);
     if (sl->verbose > 2)
         stlink_print_data(sl);
     DD(sl, "core_id = 0x%08x\n", sl->core_id);
+    return sl->core_id;
 }
 
 uint16_t stlink_chip_id(stlink_t *sl) {
diff --git a/src/stlink-common.h b/src/stlink-common.h
index 37de9fc..7c3c0cb 100644
--- a/src/stlink-common.h
+++ b/src/stlink-common.h
@@ -175,7 +175,7 @@ extern "C" {
     void stlink_exit_debug_mode(stlink_t *sl);
     void stlink_exit_dfu_mode(stlink_t *sl);
     void stlink_close(stlink_t *sl);
-    void stlink_core_id(stlink_t *sl);
+    uint32_t stlink_core_id(stlink_t *sl);
     void stlink_reset(stlink_t *sl);
     void stlink_run(stlink_t *sl);
     void stlink_status(stlink_t *sl);
-- 
2.39.5