X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=flash%2Fmain.c;h=d61b22bd06f424978482b83e3ebfe2f07d69cc3b;hb=adaf602a5600ee53836d30f77a636ca380bfddf4;hp=39910b63665ad388c658951ad43bf6db7639571b;hpb=2edd0530a6d3dfc428bedc3d9628093775673389;p=fw%2Fstlink diff --git a/flash/main.c b/flash/main.c index 39910b6..d61b22b 100644 --- a/flash/main.c +++ b/flash/main.c @@ -91,14 +91,14 @@ int main(int ac, char** av) if (o.devname != NULL) /* stlinkv1 */ { sl = stlink_v1_open(50); - sl->verbose = 50; if (sl == NULL) goto on_error; + sl->verbose = 50; } else /* stlinkv2 */ { sl = stlink_open_usb(50); - sl->verbose = 50; if (sl == NULL) goto on_error; + sl->verbose = 50; } if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE) @@ -107,8 +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); - if (o.do_read == 0) /* write */ { err = stlink_fwrite_flash(sl, o.filename, o.addr); @@ -134,8 +132,7 @@ int main(int ac, char** av) on_error: if (sl != NULL) { - stlink_reset(sl); - stlink_run(sl); + stlink_exit_debug_mode(sl); stlink_close(sl); }