catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-17 05:38:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

src_simtrace/main: debug/trace logging improvements

Browse Source
This commit is contained in:
Harald Welte
2016-03-20 15:18:18 +01:00
parent 04e37a8481
commit cf1c19abe0
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/src_simtrace/main.c
View File

@@ -3,8 +3,6 @@
* Headers * Headers
*------------------------------------------------------------------------------*/ *------------------------------------------------------------------------------*/
#define TRACE_LEVEL 5
#include "board.h" #include "board.h"
#include "simtrace.h" #include "simtrace.h"
#include "utils.h" #include "utils.h"
@@ -109,28 +107,28 @@ extern int main(void)
"SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\r\n" "SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\r\n"
"=============================================================================\r\n"); "=============================================================================\r\n");
TRACE_INFO("USB init...\n\r"); TRACE_INFO("USB init...\r\n");
while (USBD_GetState() < USBD_STATE_CONFIGURED) { while (USBD_GetState() < USBD_STATE_CONFIGURED) {
if (i >= MAX_USB_ITER * 3) { if (i >= MAX_USB_ITER * 3) {
TRACE_ERROR("Resetting board (USB could " TRACE_ERROR("Resetting board (USB could "
"not be configured)\n"); "not be configured)\r\n");
NVIC_SystemReset(); NVIC_SystemReset();
} }
i++; i++;
} }
TRACE_DEBUG("calling configure of all configurations...\n\r"); TRACE_INFO("calling configure of all configurations...\r\n");
for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]); for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]);
++i) { ++i) {
if (config_func_ptrs[i].configure) if (config_func_ptrs[i].configure)
config_func_ptrs[i].configure(); config_func_ptrs[i].configure();
} }
TRACE_DEBUG("calling init of config %u...\n\r", simtrace_config); TRACE_INFO("calling init of config %u...\r\n", simtrace_config);
config_func_ptrs[simtrace_config].init(); config_func_ptrs[simtrace_config].init();
last_simtrace_config = simtrace_config; last_simtrace_config = simtrace_config;
TRACE_DEBUG("entering main loop...\n\r"); TRACE_INFO("entering main loop...\r\n");
while (1) { while (1) {
#if TRACE_LEVEL >= TRACE_LEVEL_DEBUG #if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
const char rotor[] = { '-', '\\', '|', '/' }; const char rotor[] = { '-', '\\', '|', '/' };
@@ -144,7 +142,7 @@ extern int main(void)
isUsbConnected = 0; isUsbConnected = 0;
} }
} else if (isUsbConnected == 0) { } else if (isUsbConnected == 0) {
TRACE_INFO("USB is now configured\n\r"); TRACE_INFO("USB is now configured\r\n");
LED_Set(LED_NUM_GREEN); LED_Set(LED_NUM_GREEN);
LED_Clear(LED_NUM_RED); LED_Clear(LED_NUM_RED);