<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16802">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware: move printing of welcome banner to common function print_banner()<br><br>This unifies the printing of the welcome banner, and it also ensures<br>that all modes print all information (serial number, reset cause).<br><br>Furthermore the APP and BOARD #defines from the make environment are<br>also printed.<br><br>Change-Id: I7e6bc05cee4b9ec0fd9a05dc90ce0b26a5763e5a<br>---<br>M firmware/Makefile<br>M firmware/apps/cardem/main.c<br>M firmware/apps/trace/main.c<br>M firmware/apps/triple_play/main.c<br>A firmware/libcommon/include/main_common.h<br>A firmware/libcommon/source/main_common.c<br>6 files changed, 64 insertions(+), 60 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/02/16802/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/Makefile b/firmware/Makefile</span><br><span>index bd634aa..5c7aa92 100644</span><br><span>--- a/firmware/Makefile</span><br><span>+++ b/firmware/Makefile</span><br><span>@@ -99,7 +99,8 @@</span><br><span> C_LIBUSB = USBDescriptors.c USBRequests.c USBD.c USBDCallbacks.c USBDDriver.c USBDDriverCallbacks.c</span><br><span> C_LIBUSB_RT = dfu.c dfu_runtime.c</span><br><span> C_LIBUSB_DFU = dfu.c dfu_desc.c dfu_driver.c</span><br><span style="color: hsl(0, 100%, 40%);">-C_LIBCOMMON = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c</span><br><span style="color: hsl(120, 100%, 40%);">+C_LIBCOMMON = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ main_common.c</span><br><span> </span><br><span> C_BOARD = $(notdir $(wildcard libboard/common/source/*.c))</span><br><span> C_BOARD += $(notdir $(wildcard libboard/$(BOARD)/source/*.c))</span><br><span>diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c</span><br><span>index 2f7bcd5..f6a5ab5 100644</span><br><span>--- a/firmware/apps/cardem/main.c</span><br><span>+++ b/firmware/apps/cardem/main.c</span><br><span>@@ -24,10 +24,9 @@</span><br><span> #include "board.h"</span><br><span> #include "simtrace.h"</span><br><span> #include "utils.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "main_common.h"</span><br><span> #include <osmocom/core/timer.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned int g_unique_id[4];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*------------------------------------------------------------------------------</span><br><span> * Internal variables</span><br><span> *------------------------------------------------------------------------------*/</span><br><span>@@ -154,34 +153,7 @@</span><br><span> </span><br><span> PIO_InitializeInterrupts(0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- EEFC_ReadUniqueID(g_unique_id);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("\n\r\n\r"</span><br><span style="color: hsl(0, 100%, 40%);">- "=============================================================================\n\r"</span><br><span style="color: hsl(0, 100%, 40%);">- "SIMtrace2 firmware " GIT_VERSION "\n\r"</span><br><span style="color: hsl(0, 100%, 40%);">- "(C) 2010-2019 by Harald Welte, 2018-2019 by Kevin Redon\n\r"</span><br><span style="color: hsl(0, 100%, 40%);">- "=============================================================================\n\r");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",</span><br><span style="color: hsl(0, 100%, 40%);">- g_unique_id[0], g_unique_id[1],</span><br><span style="color: hsl(0, 100%, 40%);">- g_unique_id[2], g_unique_id[3]);</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;</span><br><span style="color: hsl(0, 100%, 40%);">- static const char* reset_causes[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- "general reset (first power-up reset)",</span><br><span style="color: hsl(0, 100%, 40%);">- "backup reset (return from backup mode)",</span><br><span style="color: hsl(0, 100%, 40%);">- "watchdog reset (watchdog fault occurred)",</span><br><span style="color: hsl(0, 100%, 40%);">- "software reset (processor reset required by the software)",</span><br><span style="color: hsl(0, 100%, 40%);">- "user reset (NRST pin detected low)",</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- if (reset_cause < ARRAY_SIZE(reset_causes)) {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ print_banner();</span><br><span> board_main_top();</span><br><span> </span><br><span> TRACE_INFO("USB init...\n\r");</span><br><span>diff --git a/firmware/apps/trace/main.c b/firmware/apps/trace/main.c</span><br><span>index 97455fb..08d6120 100644</span><br><span>--- a/firmware/apps/trace/main.c</span><br><span>+++ b/firmware/apps/trace/main.c</span><br><span>@@ -24,10 +24,9 @@</span><br><span> #include "board.h"</span><br><span> #include "simtrace.h"</span><br><span> #include "utils.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "main_common.h"</span><br><span> #include "osmocom/core/timer.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned int g_unique_id[4];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*------------------------------------------------------------------------------</span><br><span> * Internal variables</span><br><span> *------------------------------------------------------------------------------*/</span><br><span>@@ -158,20 +157,7 @@</span><br><span> </span><br><span> PIO_InitializeInterrupts(0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- EEFC_ReadUniqueID(g_unique_id);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("\n\r\n\r"</span><br><span style="color: hsl(0, 100%, 40%);">- "=============================================================================\n\r"</span><br><span style="color: hsl(0, 100%, 40%);">- "SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r"</span><br><span style="color: hsl(0, 100%, 40%);">- "=============================================================================\n\r");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",</span><br><span style="color: hsl(0, 100%, 40%);">- g_unique_id[0], g_unique_id[1],</span><br><span style="color: hsl(0, 100%, 40%);">- g_unique_id[2], g_unique_id[3]);</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("USB configuration used: %d\n\r", simtrace_config);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ print_banner();</span><br><span> board_main_top();</span><br><span> </span><br><span> TRACE_INFO("USB init...\n\r");</span><br><span>diff --git a/firmware/apps/triple_play/main.c b/firmware/apps/triple_play/main.c</span><br><span>index b81abdd..d22687e 100644</span><br><span>--- a/firmware/apps/triple_play/main.c</span><br><span>+++ b/firmware/apps/triple_play/main.c</span><br><span>@@ -26,8 +26,6 @@</span><br><span> #include "req_ctx.h"</span><br><span> #include <osmocom/core/timer.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned int g_unique_id[4];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*------------------------------------------------------------------------------</span><br><span> * Internal variables</span><br><span> *------------------------------------------------------------------------------*/</span><br><span>@@ -149,17 +147,7 @@</span><br><span> </span><br><span> PIO_InitializeInterrupts(0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- EEFC_ReadUniqueID(g_unique_id);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("\r\n\r\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "=============================================================================\r\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "SIMtrace2 firmware " GIT_REVISION " (C) 2010-2017 by Harald Welte\r\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "=============================================================================\r\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\r\n",</span><br><span style="color: hsl(0, 100%, 40%);">- g_unique_id[0], g_unique_id[1],</span><br><span style="color: hsl(0, 100%, 40%);">- g_unique_id[2], g_unique_id[3]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ print_banner();</span><br><span> board_main_top();</span><br><span> </span><br><span> TRACE_INFO("USB init...\r\n");</span><br><span>diff --git a/firmware/libcommon/include/main_common.h b/firmware/libcommon/include/main_common.h</span><br><span>new file mode 100644</span><br><span>index 0000000..ce19f81</span><br><span>--- /dev/null</span><br><span>+++ b/firmware/libcommon/include/main_common.h</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void print_banner(void);</span><br><span>diff --git a/firmware/libcommon/source/main_common.c b/firmware/libcommon/source/main_common.c</span><br><span>new file mode 100644</span><br><span>index 0000000..3314595</span><br><span>--- /dev/null</span><br><span>+++ b/firmware/libcommon/source/main_common.c</span><br><span>@@ -0,0 +1,54 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* SIMtrace 2 firmware common main helpers</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2015-2019 by Harald Welte <hwelte@hmw-consulting.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 2 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program; if not, write to the Free Software</span><br><span style="color: hsl(120, 100%, 40%);">+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "board.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "utils.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void print_banner(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\n\r\n\r"</span><br><span style="color: hsl(120, 100%, 40%);">+ "=============================================================================\n\r"</span><br><span style="color: hsl(120, 100%, 40%);">+ "SIMtrace2 firmware " GIT_VERSION ", BOARD=" BOARD ", APP=" APPLICATION "\n\r"</span><br><span style="color: hsl(120, 100%, 40%);">+ "(C) 2010-2019 by Harald Welte, 2018-2019 by Kevin Redon\n\r"</span><br><span style="color: hsl(120, 100%, 40%);">+ "=============================================================================\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)</span><br><span style="color: hsl(120, 100%, 40%);">+ /* print chip-unique ID */</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int unique_id[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ EEFC_ReadUniqueID(unique_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r",</span><br><span style="color: hsl(120, 100%, 40%);">+ unique_id[0], unique_id[1], unique_id[2], unique_id[3]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* print reset cause */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos;</span><br><span style="color: hsl(120, 100%, 40%);">+ static const char* reset_causes[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "general reset (first power-up reset)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "backup reset (return from backup mode)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "watchdog reset (watchdog fault occurred)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "software reset (processor reset required by the software)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "user reset (NRST pin detected low)",</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (reset_cause < ARRAY_SIZE(reset_causes)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16802">change 16802</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/simtrace2/+/16802"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7e6bc05cee4b9ec0fd9a05dc90ce0b26a5763e5a </div>
<div style="display:none"> Gerrit-Change-Number: 16802 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>