<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13831">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;">Move smpl_buf out of uhd dir to re-use it in other devices<br><br>Change-Id: I39ac8435072cff8d4dac786b31ff4af9b61a77fe<br>---<br>M Transceiver52M/device/Makefile.am<br>R Transceiver52M/device/smpl_buf.cpp<br>R Transceiver52M/device/smpl_buf.h<br>M Transceiver52M/device/uhd/Makefile.am<br>4 files changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/Makefile.am b/Transceiver52M/device/Makefile.am</span><br><span>index 1a2d077..e653a9e 100644</span><br><span>--- a/Transceiver52M/device/Makefile.am</span><br><span>+++ b/Transceiver52M/device/Makefile.am</span><br><span>@@ -1,6 +1,6 @@</span><br><span> include $(top_srcdir)/Makefile.common</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = radioDevice.h</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = radioDevice.h smpl_buf.h</span><br><span> </span><br><span> SUBDIRS =</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/uhd/smpl_buf.cpp b/Transceiver52M/device/smpl_buf.cpp</span><br><span>similarity index 100%</span><br><span>rename from Transceiver52M/device/uhd/smpl_buf.cpp</span><br><span>rename to Transceiver52M/device/smpl_buf.cpp</span><br><span>diff --git a/Transceiver52M/device/uhd/smpl_buf.h b/Transceiver52M/device/smpl_buf.h</span><br><span>similarity index 100%</span><br><span>rename from Transceiver52M/device/uhd/smpl_buf.h</span><br><span>rename to Transceiver52M/device/smpl_buf.h</span><br><span>diff --git a/Transceiver52M/device/uhd/Makefile.am b/Transceiver52M/device/uhd/Makefile.am</span><br><span>index 4fcc0d7..11b380e 100644</span><br><span>--- a/Transceiver52M/device/uhd/Makefile.am</span><br><span>+++ b/Transceiver52M/device/uhd/Makefile.am</span><br><span>@@ -3,8 +3,8 @@</span><br><span> AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..</span><br><span> AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = UHDDevice.h smpl_buf.h</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = UHDDevice.h</span><br><span> </span><br><span> noinst_LTLIBRARIES = libdevice.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-libdevice_la_SOURCES = UHDDevice.cpp smpl_buf.cpp</span><br><span style="color: hsl(120, 100%, 40%);">+libdevice_la_SOURCES = UHDDevice.cpp ../smpl_buf.cpp</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13831">change 13831</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/13831"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I39ac8435072cff8d4dac786b31ff4af9b61a77fe </div>
<div style="display:none"> Gerrit-Change-Number: 13831 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: tnt <tnt@246tNt.com> </div>