Move reset/load_param in the open functions, as requested by Karl

diff --git a/flash/main.c b/flash/main.c
index 106e52c2917a9d9605f3103b78136b3ed03aac44..d61b22bd06f424978482b83e3ebfe2f07d69cc3b 100644 (file)
--- a/flash/main.c
+++ b/flash/main.c
@@ -107,9 +107,6 @@ int main(int ac, char** av)
   if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
     stlink_enter_swd_mode(sl);
 
-  stlink_reset(sl);
-  stlink_load_device_params(sl);
-
   if (o.do_read == 0) /* write */
   {
     err = stlink_fwrite_flash(sl, o.filename, o.addr);

diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index 6961cdcce7656cfe1b979448daadfb4494ab6570..6033040a3bcff515608b24cd5e82bd38c0e0c75b 100644 (file)
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -160,8 +160,6 @@ int main(int argc, char** argv) {
                break;
     }
     
-       stlink_reset(sl);
-       stlink_load_device_params(sl);
        printf("Chip ID is %08x, Core ID is  %08x.\n", sl->chip_id, sl->core_id);
 
        sl->verbose=0;

diff --git a/src/stlink-sg.c b/src/stlink-sg.c
index 991bc878b5bb77ccb82ec8fd28bcb6ee73ed4fb6..e45fe48ed04e1258ab3cc8521e61fd2ecf517ce6 100644 (file)
--- a/src/stlink-sg.c
+++ b/src/stlink-sg.c
@@ -985,6 +985,8 @@ stlink_t* stlink_v1_open_inner(const int verbose) {
         return NULL;
     }
 
+    stlink_reset(sl);
+    stlink_load_device_params(sl);
     stlink_version(sl);
     if ((sl->version.st_vid != USB_ST_VID) || (sl->version.stlink_pid != USB_STLINK_PID)) {
         ugly_log(UERROR, LOG_TAG, 

diff --git a/src/stlink-usb.c b/src/stlink-usb.c
index f0a469511d9772c8b7b6955f6b813bb3641b057e..04f0b2cbef665fc0eb102ec6987ab375ad67fcbd 100644 (file)
--- a/src/stlink-usb.c
+++ b/src/stlink-usb.c
@@ -701,6 +701,8 @@ stlink_t* stlink_open_usb(const int verbose) {
       stlink_enter_swd_mode(sl);
     }
 
+    stlink_reset(sl);
+    stlink_load_device_params(sl);
     stlink_version(sl);
 
     error = 0;