diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 8b08f36f..c402df72 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -447,13 +447,21 @@ int main(int argc, char **argv) print_welcome(); + osmo_init_logging2(NULL, &log_info); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); return rc; } - osmo_init_logging2(NULL, &log_info); + log_set_print_category_hex(osmo_stderr_target, false); + log_set_print_category(osmo_stderr_target, true); + log_set_print_level(osmo_stderr_target, true); + log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_category_filter(osmo_stderr_target, DLINP, 1, LOGL_DEBUG); + log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG); while (1) { int option_index = 0; diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index 9c9b5ed6..b0fac6c1 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -290,6 +290,8 @@ int main(int argc, char **argv) transp->udp_fd = -1; + print_welcome(); + osmo_init_logging2(NULL, &log_info); rc = osmo_libusb_init(NULL); @@ -298,8 +300,6 @@ int main(int argc, char **argv) goto do_exit; } - print_welcome(); - do { if (transp->udp_fd < 0) { struct usb_interface_match _ifm, *ifm = &_ifm; diff --git a/host/src/simtrace2_usb.c b/host/src/simtrace2_usb.c index 10dc9482..8ebc4f71 100644 --- a/host/src/simtrace2_usb.c +++ b/host/src/simtrace2_usb.c @@ -18,6 +18,8 @@ #include #include +#include +#include #include #include @@ -71,8 +73,11 @@ static int find_devices(void) return num_interfaces; } +static struct log_info log_info = {}; + int main(int argc, char **argv) { + osmo_init_logging2(NULL, &log_info); osmo_libusb_init(NULL); find_devices(); return 0;