diff --git a/src/gdbserver/gdb-server.c b/src/gdbserver/gdb-server.c index 7bf3a275f..6e64dd073 100644 --- a/src/gdbserver/gdb-server.c +++ b/src/gdbserver/gdb-server.c @@ -151,7 +151,7 @@ int parse_options(int argc, char** argv, st_state_t *st) { if (optarg) { st->logging_level = atoi(optarg); } else { - st->logging_level = DEFAULT_LOGGING_LEVEL; + st->logging_level = DEBUG_LOGGING_LEVEL; } break; case '1': diff --git a/src/logging.c b/src/logging.c index b5e423a3a..d4fb96b2e 100644 --- a/src/logging.c +++ b/src/logging.c @@ -22,6 +22,10 @@ int ugly_log(int level, const char *tag, const char *format, ...) { if (level > max_level) { return 0; } + + // Flush to maintain order of streams + fflush(stdout); + va_list args; va_start(args, format); time_t mytt = time(NULL); @@ -46,6 +50,7 @@ int ugly_log(int level, const char *tag, const char *format, ...) { break; } vfprintf(stderr, format, args); + fflush(stderr); va_end(args); return 1; } diff --git a/src/usb.c b/src/usb.c index 3e0596f18..66f065ab8 100644 --- a/src/usb.c +++ b/src/usb.c @@ -923,6 +923,9 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[16 // Initialize stlink version (sl->version) stlink_version(sl); + // Set the stlink clock speed (default is 1800kHz) + stlink_set_swdclk(sl, STLINK_SWDCLK_1P8MHZ_DIVISOR); + if (reset) { if( sl->version.stlink_v > 1 ) stlink_jtag_reset(sl, 2); stlink_reset(sl); @@ -931,9 +934,6 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[16 ret = stlink_load_device_params(sl); - // Set the stlink clock speed (default is 1800kHz) - stlink_set_swdclk(sl, STLINK_SWDCLK_1P8MHZ_DIVISOR); - on_libusb_error: if (ret == -1) { stlink_close(sl);