From 7eb080490ce34e3daf6e0ab10743113acbc5a635 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Sun, 18 Dec 2011 23:35:20 +0100 Subject: [PATCH] Move reset/load_param in the open functions, as requested by Karl --- flash/main.c | 3 --- gdbserver/gdb-server.c | 2 -- src/stlink-sg.c | 2 ++ src/stlink-usb.c | 2 ++ 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flash/main.c b/flash/main.c index 106e52c..d61b22b 100644 --- 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 6961cdc..6033040 100644 --- 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 991bc87..e45fe48 100644 --- 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 f0a4695..04f0b2c 100644 --- 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; -- 2.30.2