<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9964">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make adc2uv common<br><br>when building the trace app for the simtrace board gcc was outputing<br>the following error:<br>libboard/common/source/boardver_adc.c:20:17: warning: 'adc2uv' defined but not used [-Wunused-function]<br> static uint32_t adc2uv(uint16_t adc)<br><br>adc2uv is used by qmod, and defined in two places:<br>in boardver_adc.c and mode_cardemu.c.<br><br>this change will have adc2uv only defined in boardver_adc.c and make<br>available in the header to be used by mode_cardemu.c.<br><br>Change-Id: I8a772638fa8dd02d8bc8b7631de5af5a22647c55<br>---<br>M firmware/libboard/common/include/boardver_adc.h<br>M firmware/libboard/common/source/boardver_adc.c<br>M firmware/libcommon/source/mode_cardemu.c<br>3 files changed, 3 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libboard/common/include/boardver_adc.h b/firmware/libboard/common/include/boardver_adc.h</span><br><span>index 9b01d0a..956c302 100644</span><br><span>--- a/firmware/libboard/common/include/boardver_adc.h</span><br><span>+++ b/firmware/libboard/common/include/boardver_adc.h</span><br><span>@@ -15,3 +15,4 @@</span><br><span> #pragma once</span><br><span> </span><br><span> int get_board_version_adc(void);</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t adc2uv(uint16_t adc);</span><br><span>diff --git a/firmware/libboard/common/source/boardver_adc.c b/firmware/libboard/common/source/boardver_adc.c</span><br><span>index f204aa1..51db929 100644</span><br><span>--- a/firmware/libboard/common/source/boardver_adc.c</span><br><span>+++ b/firmware/libboard/common/source/boardver_adc.c</span><br><span>@@ -15,9 +15,8 @@</span><br><span> #include "board.h"</span><br><span> #include "boardver_adc.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* FIXME: share this with mode_cardemu.c */</span><br><span> #define UV_PER_LSB ((3300 * 1000) / 4096)</span><br><span style="color: hsl(0, 100%, 40%);">-static uint32_t adc2uv(uint16_t adc)</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t adc2uv(uint16_t adc)</span><br><span> {</span><br><span>       uint32_t uv = (uint32_t) adc * UV_PER_LSB;</span><br><span>   return uv;</span><br><span>diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c</span><br><span>index c7362cf..b1d9c7a 100644</span><br><span>--- a/firmware/libcommon/source/mode_cardemu.c</span><br><span>+++ b/firmware/libcommon/source/mode_cardemu.c</span><br><span>@@ -17,6 +17,7 @@</span><br><span>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA</span><br><span>  */</span><br><span> #include "board.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "boardver_adc.h"</span><br><span> #include "simtrace.h"</span><br><span> #include "ringbuffer.h"</span><br><span> #include "card_emu.h"</span><br><span>@@ -296,7 +297,6 @@</span><br><span>     return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define UV_PER_LSB    ((3300 * 1000) / 4096)</span><br><span> #define VCC_UV_THRESH_1V8     1500000</span><br><span> #define VCC_UV_THRESH_3V     2800000</span><br><span> </span><br><span>@@ -316,12 +316,6 @@</span><br><span>   ci->vcc_uv_last = ci->vcc_uv;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint32_t adc2uv(uint16_t adc)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-       uint32_t uv = (uint32_t) adc * UV_PER_LSB;</span><br><span style="color: hsl(0, 100%, 40%);">-      return uv;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void ADC_IrqHandler(void)</span><br><span> {</span><br><span> #ifdef CARDEMU_SECOND_UART</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9964">change 9964</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/9964"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8a772638fa8dd02d8bc8b7631de5af5a22647c55 </div>
<div style="display:none"> Gerrit-Change-Number: 9964 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>