From: Karl Palsson <karlp@tweak.net.au>
Date: Fri, 7 Oct 2011 19:36:38 +0000 (+0000)
Subject: Fix the missing mode calls.
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=baf9829fd222f00544faf28c525433791df49449;hp=7151f2cb0fdde76afb6564099c1c0c8bbf5adcbe;p=fw%2Fstlink

Fix the missing mode calls.

Start cleaning up the debug output a little
---

diff --git a/src/stlink-common.c b/src/stlink-common.c
index 2411e2a..ab0354f 100644
--- a/src/stlink-common.c
+++ b/src/stlink-common.c
@@ -364,7 +364,21 @@ void stlink_step(stlink_t *sl) {
 
 int stlink_current_mode(stlink_t *sl) {
     D(sl, "\n*** stlink_current_mode ***\n");
-    sl->backend->current_mode(sl);
+    int mode = sl->backend->current_mode(sl);
+    stlink_print_data(sl);
+    switch (mode) {
+        case STLINK_DEV_DFU_MODE:
+            DD(sl, "stlink mode: dfu\n");
+            return mode;
+        case STLINK_DEV_DEBUG_MODE:
+            DD(sl, "stlink mode: debug (jtag or swd)\n");
+            return mode;
+        case STLINK_DEV_MASS_MODE:
+            DD(sl, "stlink mode: mass\n");
+            return mode;
+    }
+    DD(sl, "stlink mode: unknown!\n");
+    return STLINK_DEV_UNKNOWN_MODE;
 }
 
 
diff --git a/src/stlink-sg.c b/src/stlink-sg.c
index 06d55e2..15dc536 100644
--- a/src/stlink-sg.c
+++ b/src/stlink-sg.c
@@ -291,26 +291,6 @@ void stlink_parse_version(stlink_t *stl) {
 
 }
 
-int stlink_mode(stlink_t *stl) {
-    if (stl->q_len <= 0)
-        return STLINK_DEV_UNKNOWN_MODE;
-
-    stlink_print_data(stl);
-
-    switch (stl->q_buf[0]) {
-        case STLINK_DEV_DFU_MODE:
-            DD(stl, "stlink mode: dfu\n");
-            return STLINK_DEV_DFU_MODE;
-        case STLINK_DEV_DEBUG_MODE:
-            DD(stl, "stlink mode: debug (jtag or swd)\n");
-            return STLINK_DEV_DEBUG_MODE;
-        case STLINK_DEV_MASS_MODE:
-            DD(stl, "stlink mode: mass\n");
-            return STLINK_DEV_MASS_MODE;
-    }
-    return STLINK_DEV_UNKNOWN_MODE;
-}
-
 void stlink_stat(stlink_t *stl, char *txt) {
     if (stl->q_len <= 0)
         return;
@@ -346,13 +326,12 @@ void _stlink_sg_version(stlink_t *stl) {
 
 int _stlink_sg_current_mode(stlink_t *stl) {
     struct stlink_libsg *sl = stl->backend_data;
-    D(stl, "\n*** stlink_current_mode ***\n");
     clear_cdb(sl);
     sl->cdb_cmd_blk[0] = STLINK_GET_CURRENT_MODE;
     stl->q_len = 2;
     sl->q_addr = 0;
     stlink_q(stl);
-    return stlink_mode(stl);
+    return stl->q_buf[0];
 }
 
 // Exit the mass mode and enter the swd debug mode.
@@ -788,7 +767,8 @@ stlink_backend_t _stlink_sg_backend = {
     _stlink_sg_read_all_regs,
     _stlink_sg_read_reg,
     _stlink_sg_write_reg,
-    _stlink_sg_step
+    _stlink_sg_step,
+    _stlink_sg_current_mode
 };
 
 stlink_t* stlink_open(const char *dev_name, const int verbose) {
diff --git a/src/stlink-usb.c b/src/stlink-usb.c
index 847b7f9..478f6ac 100644
--- a/src/stlink-usb.c
+++ b/src/stlink-usb.c
@@ -199,12 +199,7 @@ int _stlink_usb_current_mode(stlink_t * sl) {
 
     /* mode = (int)read_uint16(buf, 0); */
     mode = (int) buf[0];
-
-#if 1 /* DEBUG */
-    printf("mode == 0x%x\n", mode);
-#endif /* DEBUG */
-
-
+    DD(sl, "mode == 0x%x\n", mode);
     return mode;
 }
 
@@ -413,7 +408,8 @@ stlink_backend_t _stlink_usb_backend = {
     _stlink_usb_read_all_regs,
     _stlink_usb_read_reg,
     _stlink_usb_write_reg,
-    _stlink_usb_step
+    _stlink_usb_step,
+    _stlink_usb_current_mode
 };
 
 
diff --git a/src/test_usb.c b/src/test_usb.c
index 18b4fe5..e2cba77 100644
--- a/src/test_usb.c
+++ b/src/test_usb.c
@@ -47,6 +47,7 @@ int main(int ac, char** av) {
 
         printf("-- step\n");
         stlink_step(sl);
+        printf("Press enter to go to run mode and exit the debugger\n");
         getchar();
 
         printf("-- run\n");