Move device specific files to device subdir
Change-Id: Ib42fef14bf4c7b779f44d99711a35c18b32a4c21
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index 06b2f26..26f7510 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -21,17 +21,11 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = arch
+SUBDIRS = arch device
-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common -I${srcdir}/device
AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-if USRP1
-AM_CPPFLAGS += $(USRP_CFLAGS)
-else
-AM_CPPFLAGS += $(UHD_CFLAGS)
-endif
-
rev2dir = $(datadir)/usrp/rev2
rev4dir = $(datadir)/usrp/rev4
@@ -42,7 +36,7 @@
README \
README.Talgorithm
-noinst_LTLIBRARIES = libtransceiver.la
+noinst_LTLIBRARIES = libtransceiver_common.la
COMMON_SOURCES = \
radioInterface.cpp \
@@ -56,33 +50,28 @@
Channelizer.cpp \
Synthesis.cpp
-libtransceiver_la_SOURCES = \
+libtransceiver_common_la_SOURCES = \
$(COMMON_SOURCES) \
Resampler.cpp \
radioInterfaceResamp.cpp \
radioInterfaceMulti.cpp
-bin_PROGRAMS = osmo-trx
-
noinst_HEADERS = \
Complex.h \
radioInterface.h \
radioVector.h \
radioClock.h \
- radioDevice.h \
radioBuffer.h \
sigProcLib.h \
signalVector.h \
Transceiver.h \
- USRPDevice.h \
Resampler.h \
ChannelizerBase.h \
Channelizer.h \
Synthesis.h
-osmo_trx_SOURCES = osmo-trx.cpp
-osmo_trx_LDADD = \
- libtransceiver.la \
+COMMON_LDADD = \
+ libtransceiver_common.la \
$(ARCH_LA) \
$(GSM_LA) \
$(COMMON_LA) \
@@ -91,10 +80,19 @@
$(LIBOSMOCTRL_LIBS) \
$(LIBOSMOVTY_LIBS)
+bin_PROGRAMS = osmo-trx
+osmo_trx_SOURCES = osmo-trx.cpp
+
if USRP1
-libtransceiver_la_SOURCES += USRPDevice.cpp
-osmo_trx_LDADD += $(USRP_LIBS)
+osmo_trx_LDADD = \
+ $(COMMON_LDADD) \
+ $(USRP_LIBS) \
+ $(builddir)/device/usrp1/libdevice.la
+osmo_trx_CPPFLAGS = $(AM_CPPFLAGS) $(USRP_CFLAGS)
else
-libtransceiver_la_SOURCES += UHDDevice.cpp
-osmo_trx_LDADD += $(UHD_LIBS)
+osmo_trx_LDADD = \
+ $(COMMON_LDADD) \
+ $(UHD_LIBS) \
+ $(builddir)/device/uhd/libdevice.la
+osmo_trx_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS)
endif
diff --git a/Transceiver52M/device/Makefile.am b/Transceiver52M/device/Makefile.am
new file mode 100644
index 0000000..8575328
--- /dev/null
+++ b/Transceiver52M/device/Makefile.am
@@ -0,0 +1,11 @@
+include $(top_srcdir)/Makefile.common
+
+noinst_HEADERS = radioDevice.h
+
+SUBDIRS =
+
+if USRP1
+SUBDIRS += usrp1
+else
+SUBDIRS += uhd
+endif
diff --git a/Transceiver52M/radioDevice.h b/Transceiver52M/device/radioDevice.h
similarity index 100%
rename from Transceiver52M/radioDevice.h
rename to Transceiver52M/device/radioDevice.h
diff --git a/Transceiver52M/device/uhd/Makefile.am b/Transceiver52M/device/uhd/Makefile.am
new file mode 100644
index 0000000..bb34d2f
--- /dev/null
+++ b/Transceiver52M/device/uhd/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS)
+
+noinst_LTLIBRARIES = libdevice.la
+
+libdevice_la_SOURCES = UHDDevice.cpp
diff --git a/Transceiver52M/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp
similarity index 100%
rename from Transceiver52M/UHDDevice.cpp
rename to Transceiver52M/device/uhd/UHDDevice.cpp
diff --git a/Transceiver52M/device/usrp1/Makefile.am b/Transceiver52M/device/usrp1/Makefile.am
new file mode 100644
index 0000000..d99874a
--- /dev/null
+++ b/Transceiver52M/device/usrp1/Makefile.am
@@ -0,0 +1,10 @@
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS)
+
+noinst_HEADERS = USRPDevice.h
+
+noinst_LTLIBRARIES = libdevice.la
+
+libdevice_la_SOURCES = USRPDevice.cpp
diff --git a/Transceiver52M/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp
similarity index 100%
rename from Transceiver52M/USRPDevice.cpp
rename to Transceiver52M/device/usrp1/USRPDevice.cpp
diff --git a/Transceiver52M/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h
similarity index 100%
rename from Transceiver52M/USRPDevice.h
rename to Transceiver52M/device/usrp1/USRPDevice.h
diff --git a/configure.ac b/configure.ac
index 125f41e..ee8077c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,6 +203,9 @@
Transceiver52M/arch/common/Makefile \
Transceiver52M/arch/arm/Makefile \
Transceiver52M/arch/x86/Makefile \
+ Transceiver52M/device/Makefile \
+ Transceiver52M/device/uhd/Makefile \
+ Transceiver52M/device/usrp1/Makefile \
tests/Makefile \
tests/CommonLibs/Makefile \
tests/Transceiver52M/Makefile \