<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16803">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware: apps/cardem/main.c: Synchronize with apps/trace/main.c<br><br>In the end we want to share most of this, irrespective of the "APP".<br>Let's avoid unnecessary differences.<br><br>Change-Id: Icf063d4ca79edf66ffbe8e87a915deb77dec478a<br>---<br>M firmware/apps/cardem/main.c<br>1 file changed, 4 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c</span><br><span>index f6a5ab5..3476af2 100644</span><br><span>--- a/firmware/apps/cardem/main.c</span><br><span>+++ b/firmware/apps/cardem/main.c</span><br><span>@@ -39,7 +39,7 @@</span><br><span>      void (*exit) (void);</span><br><span>         /* main loop content for given configuration */</span><br><span>      void (*run) (void);</span><br><span style="color: hsl(0, 100%, 40%);">-     /* Interrupt handler for USART1 */</span><br><span style="color: hsl(120, 100%, 40%);">+    /* Interrupt handler for USART0 */</span><br><span>   void (*usart0_irq) (void);</span><br><span>   /* Interrupt handler for USART1 */</span><br><span>   void (*usart1_irq) (void);</span><br><span>@@ -53,6 +53,8 @@</span><br><span>               .init = Sniffer_init,</span><br><span>                .exit = Sniffer_exit,</span><br><span>                .run = Sniffer_run,</span><br><span style="color: hsl(120, 100%, 40%);">+           .usart0_irq = Sniffer_usart0_irq,</span><br><span style="color: hsl(120, 100%, 40%);">+             .usart1_irq = Sniffer_usart1_irq,</span><br><span>    },</span><br><span> #endif</span><br><span> #ifdef HAVE_CCID</span><br><span>@@ -174,8 +176,7 @@</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(120, 100%, 40%);">+   for (i = 1; i < ARRAY_SIZE(config_func_ptrs); i++) {</span><br><span>              if (config_func_ptrs[i].configure)</span><br><span>                   config_func_ptrs[i].configure();</span><br><span>     }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16803">change 16803</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/+/16803"/><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: Icf063d4ca79edf66ffbe8e87a915deb77dec478a </div>
<div style="display:none"> Gerrit-Change-Number: 16803 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>