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

fix newline \n\r with \r\n

Browse Source
This commit is contained in:
Alexander Couzens
2022-01-24 11:44:35 +01:00
parent 7674b08519
commit 87f8de15b4
38 changed files with 378 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/apps/trace/main.c
View File

@@ -156,7 +156,7 @@ extern int main(void)
print_banner();
board_main_top();
TRACE_INFO("USB init...\n\r");
TRACE_INFO("USB init...\r\n");
SIMtrace_USB_Initialize();
while (USBD_GetState() < USBD_STATE_CONFIGURED) {
@@ -165,7 +165,7 @@ extern int main(void)
#if 0
if (i >= MAX_USB_ITER * 3) {
TRACE_ERROR("Resetting board (USB could "
"not be configured)\n\r");
"not be configured)\r\n");
USBD_Disconnect();
NVIC_SystemReset();
}
@@ -173,17 +173,17 @@ extern int main(void)
i++;
}
TRACE_INFO("calling configure of all configurations...\n\r");
TRACE_INFO("calling configure of all configurations...\r\n");
for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {
if (config_func_ptrs[i].configure)
config_func_ptrs[i].configure();
}
TRACE_INFO("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();
last_simtrace_config = simtrace_config;
TRACE_INFO("entering main loop...\n\r");
TRACE_INFO("entering main loop...\r\n");
while (1) {
WDT_Restart(WDT);
#if TRACE_LEVEL >= TRACE_LEVEL_DEBUG
@@ -201,12 +201,12 @@ extern int main(void)
isUsbConnected = 0;
}
} else if (isUsbConnected == 0) {
TRACE_INFO("USB is now configured\n\r");
TRACE_INFO("USB is now configured\r\n");
isUsbConnected = 1;
}
if (last_simtrace_config != simtrace_config) {
TRACE_INFO("USB config chg %u -> %u\n\r",
TRACE_INFO("USB config chg %u -> %u\r\n",
last_simtrace_config, simtrace_config);
config_func_ptrs[last_simtrace_config].exit();
config_func_ptrs[simtrace_config].init();