<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9842">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add more USB configuration checks and error messages<br><br>Change-Id: I20f8018cd5087254dfbfad40b73803390aa84183<br>---<br>M firmware/apps/trace/main.c<br>1 file changed, 64 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/42/9842/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/apps/trace/main.c b/firmware/apps/trace/main.c</span><br><span>index aabaa41..54b4242 100644</span><br><span>--- a/firmware/apps/trace/main.c</span><br><span>+++ b/firmware/apps/trace/main.c</span><br><span>@@ -1,4 +1,22 @@</span><br><span style="color: hsl(0, 100%, 40%);">-// FIXME: Copyright license here</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2010-2017 by Harald Welte <hwelte@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018 by Kevin Redon <kredon@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</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 Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 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 Affero 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 Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> /*------------------------------------------------------------------------------</span><br><span> * Headers</span><br><span> *------------------------------------------------------------------------------*/</span><br><span>@@ -84,6 +102,9 @@</span><br><span> void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)</span><br><span> {</span><br><span> TRACE_INFO_WP("cfgChanged%d ", cfgnum);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cfgnum >= sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_FATAL_WP("no functions defined for configuration %d\n\r", cfgnum);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> simtrace_config = cfgnum;</span><br><span> }</span><br><span> </span><br><span>@@ -144,10 +165,13 @@</span><br><span> g_unique_id[2], g_unique_id[3]);</span><br><span> TRACE_INFO("Reset Cause: 0x%x\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("cfg %d\n\r", simtrace_config);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> board_main_top();</span><br><span> </span><br><span> TRACE_INFO("USB init...\n\r");</span><br><span> SIMtrace_USB_Initialize();</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO_WP("USBD_Inited\n\r");</span><br><span> </span><br><span> while (USBD_GetState() < USBD_STATE_CONFIGURED) {</span><br><span> WDT_Restart(WDT);</span><br><span>@@ -164,14 +188,26 @@</span><br><span> }</span><br><span> </span><br><span> TRACE_INFO("calling configure of all configurations...\n\r");</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- ++i) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (config_func_ptrs[i].configure)</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 1; i < sizeof(config_func_ptrs) / sizeof(config_func_ptrs[0]); ++i) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (config_func_ptrs[i].configure) {</span><br><span> config_func_ptrs[i].configure();</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_WARNING("no configure function defined for configuration %d\n\r", i);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("cfg %d\n\r", simtrace_config);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> TRACE_INFO("calling init of config %u...\n\r", simtrace_config);</span><br><span style="color: hsl(0, 100%, 40%);">- config_func_ptrs[simtrace_config].init();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (simtrace_config >= sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_ERROR("no functions defined for configuration %d\n\r", simtrace_config);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (config_func_ptrs[simtrace_config].init) {</span><br><span style="color: hsl(120, 100%, 40%);">+ config_func_ptrs[simtrace_config].init();</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_ERROR("no init function defined for configuration %d\n\r", simtrace_config);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> last_simtrace_config = simtrace_config;</span><br><span> </span><br><span> TRACE_INFO("entering main loop...\n\r");</span><br><span>@@ -199,11 +235,31 @@</span><br><span> if (last_simtrace_config != simtrace_config) {</span><br><span> TRACE_INFO("USB config chg %u -> %u\n\r",</span><br><span> last_simtrace_config, simtrace_config);</span><br><span style="color: hsl(0, 100%, 40%);">- config_func_ptrs[last_simtrace_config].exit();</span><br><span style="color: hsl(0, 100%, 40%);">- config_func_ptrs[simtrace_config].init();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (last_simtrace_config < sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (config_func_ptrs[last_simtrace_config].exit) {</span><br><span style="color: hsl(120, 100%, 40%);">+ config_func_ptrs[last_simtrace_config].exit();</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_WARNING("exit not defined for configuration %d\n\r", last_simtrace_config);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_ERROR("no functions defined for configuration %d\n\r", last_simtrace_config);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (simtrace_config < sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0])) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (config_func_ptrs[simtrace_config].init) {</span><br><span style="color: hsl(120, 100%, 40%);">+ config_func_ptrs[simtrace_config].init();</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_WARNING("init not defined for configuration %d\n\r", simtrace_config);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_FATAL("no functions defined for configuration %d\n\r", simtrace_config);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> last_simtrace_config = simtrace_config;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- config_func_ptrs[simtrace_config].run();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (config_func_ptrs[simtrace_config].run) {</span><br><span style="color: hsl(120, 100%, 40%);">+ config_func_ptrs[simtrace_config].run();</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_ERROR("run not defined for configuration %d\n\r", simtrace_config);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9842">change 9842</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/9842"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I20f8018cd5087254dfbfad40b73803390aa84183 </div>
<div style="display:none"> Gerrit-Change-Number: 9842 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>