<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/20875">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">device: drop unreasonable LIBOSMO{CTRL,VTY}_{CFLAGS,LIBS}<br><br>Neither VTY nor CTRL API is used in device specific code, excluding<br>the 'uhd' where osmo_cpu_sched_vty_apply_localthread() is called.<br><br>Change-Id: I568b443da4b96c005734d749faa22b9c7440f951<br>---<br>M Transceiver52M/device/common/Makefile.am<br>M Transceiver52M/device/ipc/Makefile.am<br>M Transceiver52M/device/ipc/uhdwrap.cpp<br>M Transceiver52M/device/lms/Makefile.am<br>M Transceiver52M/device/uhd/Makefile.am<br>M Transceiver52M/device/usrp1/Makefile.am<br>6 files changed, 7 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/75/20875/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/common/Makefile.am b/Transceiver52M/device/common/Makefile.am</span><br><span>index 3c9324e..4d29e98 100644</span><br><span>--- a/Transceiver52M/device/common/Makefile.am</span><br><span>+++ b/Transceiver52M/device/common/Makefile.am</span><br><span>@@ -1,7 +1,7 @@</span><br><span> include $(top_srcdir)/Makefile.common</span><br><span> </span><br><span> AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES)</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)</span><br><span> </span><br><span> </span><br><span> noinst_HEADERS = radioDevice.h smpl_buf.h</span><br><span>diff --git a/Transceiver52M/device/ipc/Makefile.am b/Transceiver52M/device/ipc/Makefile.am</span><br><span>index e4dc51a..4fe0090 100644</span><br><span>--- a/Transceiver52M/device/ipc/Makefile.am</span><br><span>+++ b/Transceiver52M/device/ipc/Makefile.am</span><br><span>@@ -1,8 +1,8 @@</span><br><span> include $(top_srcdir)/Makefile.common</span><br><span> </span><br><span> AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)</span><br><span> AM_LDFLAGS = -lpthread -lrt</span><br><span> </span><br><span> noinst_HEADERS = IPCDevice.h shm.h ipc_shm.h ipc_chan.h ipc_sock.h</span><br><span>@@ -32,8 +32,7 @@</span><br><span> ipc_driver_test_LDADD = \</span><br><span>         shm.lo \</span><br><span>         $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(LIBOSMOCTRL_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(LIBOSMOVTY_LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+    $(NULL)</span><br><span> ipc_driver_test_CXXFLAGS = $(AM_CXXFLAGS) $(UHD_CFLAGS)</span><br><span> ipc_driver_test_CPPFLAGS  = $(AM_CPPFLAGS) $(UHD_CFLAGS)</span><br><span> ipc_driver_test_CFLAGS  = $(AM_CFLAGS) $(UHD_CFLAGS)</span><br><span>diff --git a/Transceiver52M/device/ipc/uhdwrap.cpp b/Transceiver52M/device/ipc/uhdwrap.cpp</span><br><span>index 130f80a..d7114da 100644</span><br><span>--- a/Transceiver52M/device/ipc/uhdwrap.cpp</span><br><span>+++ b/Transceiver52M/device/ipc/uhdwrap.cpp</span><br><span>@@ -31,7 +31,6 @@</span><br><span> #include "../uhd/UHDDevice.h"</span><br><span> #include "uhdwrap.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "trx_vty.h"</span><br><span> #include "Logger.h"</span><br><span> #include "Threads.h"</span><br><span> #include "Utils.h"</span><br><span>diff --git a/Transceiver52M/device/lms/Makefile.am b/Transceiver52M/device/lms/Makefile.am</span><br><span>index 77fd0e9..6665077 100644</span><br><span>--- a/Transceiver52M/device/lms/Makefile.am</span><br><span>+++ b/Transceiver52M/device/lms/Makefile.am</span><br><span>@@ -1,7 +1,7 @@</span><br><span> include $(top_srcdir)/Makefile.common</span><br><span> </span><br><span> AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LMS_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LMS_CFLAGS)</span><br><span> </span><br><span> noinst_HEADERS = LMSDevice.h</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/uhd/Makefile.am b/Transceiver52M/device/uhd/Makefile.am</span><br><span>index ab63a4a..21df631 100644</span><br><span>--- a/Transceiver52M/device/uhd/Makefile.am</span><br><span>+++ b/Transceiver52M/device/uhd/Makefile.am</span><br><span>@@ -1,7 +1,7 @@</span><br><span> include $(top_srcdir)/Makefile.common</span><br><span> </span><br><span> AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS)</span><br><span> </span><br><span> noinst_HEADERS = UHDDevice.h</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/usrp1/Makefile.am b/Transceiver52M/device/usrp1/Makefile.am</span><br><span>index 24760f7..ba93c7e 100644</span><br><span>--- a/Transceiver52M/device/usrp1/Makefile.am</span><br><span>+++ b/Transceiver52M/device/usrp1/Makefile.am</span><br><span>@@ -1,7 +1,7 @@</span><br><span> include $(top_srcdir)/Makefile.common</span><br><span> </span><br><span> AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(USRP_CFLAGS)</span><br><span> </span><br><span> rev2dir = $(datadir)/usrp/rev2</span><br><span> rev4dir = $(datadir)/usrp/rev4</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/20875">change 20875</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/osmo-trx/+/20875"/><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-Change-Id: I568b443da4b96c005734d749faa22b9c7440f951 </div>
<div style="display:none"> Gerrit-Change-Number: 20875 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>