Move arch specific fiels to arch subdir

Take the chance to update some includes using files available in that
subdir to have them ina more uniform way.

Change-Id: Ibda3c54fd4dc3f6b845cc373f1a1e6b758c1ea82

32 files changed, 18 insertions, 15 deletions

diff --git a/Transceiver52M/Channelizer.cpp b/Transceiver52M/Channelizer.cpp
index 80eab3e..2d817b0 100644
--- a/Transceiver52M/Channelizer.cpp
+++ b/Transceiver52M/Channelizer.cpp
@@ -28,8 +28,8 @@
 #include "Channelizer.h"
 
 extern "C" {
-#include "common/fft.h"
-#include "common/convolve.h"
+#include "fft.h"
+#include "convolve.h"
 }
 
 static void deinterleave(const float *in, size_t ilen,
diff --git a/Transceiver52M/ChannelizerBase.cpp b/Transceiver52M/ChannelizerBase.cpp
index 9989940..8223dba 100644
--- a/Transceiver52M/ChannelizerBase.cpp
+++ b/Transceiver52M/ChannelizerBase.cpp
@@ -29,7 +29,7 @@
 #include "ChannelizerBase.h"
 
 extern "C" {
-#include "common/fft.h"
+#include "fft.h"
 }
 
 static float sinc(float x)
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index 9424b8e..06b2f26 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -21,15 +21,10 @@
 
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
+SUBDIRS = arch
 
-SUBDIRS = common
-if ARCH_ARM
-SUBDIRS += arm
-else
-SUBDIRS += x86
-endif
+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common
+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
 if USRP1
 AM_CPPFLAGS += $(USRP_CFLAGS)
diff --git a/Transceiver52M/Synthesis.cpp b/Transceiver52M/Synthesis.cpp
index 22481d5..262c638 100644
--- a/Transceiver52M/Synthesis.cpp
+++ b/Transceiver52M/Synthesis.cpp
@@ -29,8 +29,8 @@
 #include "Synthesis.h"
 
 extern "C" {
-#include "common/fft.h"
-#include "common/convolve.h"
+#include "fft.h"
+#include "convolve.h"
 }
 
 static void interleave(float **in, size_t ilen,
diff --git a/Transceiver52M/arch/Makefile.am b/Transceiver52M/arch/Makefile.am
new file mode 100644
index 0000000..14e6c82
--- /dev/null
+++ b/Transceiver52M/arch/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = common
+if ARCH_ARM
+SUBDIRS += arm
+else
+SUBDIRS += x86
+endif
diff --git a/Transceiver52M/arm/Makefile.am b/Transceiver52M/arch/arm/Makefile.am
index 5e423d0..89ffb32 100644
--- a/Transceiver52M/arm/Makefile.am
+++ b/Transceiver52M/arch/arm/Makefile.am
@@ -9,7 +9,7 @@ AM_CCASFLAGS = $(ARCH_FLAGS)
 
 noinst_LTLIBRARIES = libarch.la
 
-libarch_la_LIBADD = $(top_builddir)/Transceiver52M/common/libarch_common.la
+libarch_la_LIBADD = $(top_builddir)/Transceiver52M/arch/common/libarch_common.la
 
 libarch_la_SOURCES = \
 	convert.c \
diff --git a/Transceiver52M/arm/convert.c b/Transceiver52M/arch/arm/convert.c
index c94a3d7..c94a3d7 100644
--- a/Transceiver52M/arm/convert.c
+++ b/Transceiver52M/arch/arm/convert.c
diff --git a/Transceiver52M/arm/convert_neon.S b/Transceiver52M/arch/arm/convert_neon.S
index 842ed9f..842ed9f 100644
--- a/Transceiver52M/arm/convert_neon.S
+++ b/Transceiver52M/arch/arm/convert_neon.S
diff --git a/Transceiver52M/arm/convolve.c b/Transceiver52M/arch/arm/convolve.c
index 912d0c2..912d0c2 100644
--- a/Transceiver52M/arm/convolve.c
+++ b/Transceiver52M/arch/arm/convolve.c
diff --git a/Transceiver52M/arm/convolve_neon.S b/Transceiver52M/arch/arm/convolve_neon.S
index 637d150..637d150 100644
--- a/Transceiver52M/arm/convolve_neon.S
+++ b/Transceiver52M/arch/arm/convolve_neon.S
diff --git a/Transceiver52M/arm/mult.c b/Transceiver52M/arch/arm/mult.c
index 245be50..245be50 100644
--- a/Transceiver52M/arm/mult.c
+++ b/Transceiver52M/arch/arm/mult.c
diff --git a/Transceiver52M/arm/mult_neon.S b/Transceiver52M/arch/arm/mult_neon.S
index 162846e..162846e 100644
--- a/Transceiver52M/arm/mult_neon.S
+++ b/Transceiver52M/arch/arm/mult_neon.S
diff --git a/Transceiver52M/arm/scale.c b/Transceiver52M/arch/arm/scale.c
index 2de13ff..2de13ff 100644
--- a/Transceiver52M/arm/scale.c
+++ b/Transceiver52M/arch/arm/scale.c
diff --git a/Transceiver52M/arm/scale_neon.S b/Transceiver52M/arch/arm/scale_neon.S
index a66fbe5..a66fbe5 100644
--- a/Transceiver52M/arm/scale_neon.S
+++ b/Transceiver52M/arch/arm/scale_neon.S
diff --git a/Transceiver52M/common/Makefile.am b/Transceiver52M/arch/common/Makefile.am
index 6b37906..6b37906 100644
--- a/Transceiver52M/common/Makefile.am
+++ b/Transceiver52M/arch/common/Makefile.am
diff --git a/Transceiver52M/common/convert.h b/Transceiver52M/arch/common/convert.h
index 73402b0..73402b0 100644
--- a/Transceiver52M/common/convert.h
+++ b/Transceiver52M/arch/common/convert.h
diff --git a/Transceiver52M/common/convert_base.c b/Transceiver52M/arch/common/convert_base.c
index 5251fb8..5251fb8 100644
--- a/Transceiver52M/common/convert_base.c
+++ b/Transceiver52M/arch/common/convert_base.c
diff --git a/Transceiver52M/common/convolve.h b/Transceiver52M/arch/common/convolve.h
index 43db577..43db577 100644
--- a/Transceiver52M/common/convolve.h
+++ b/Transceiver52M/arch/common/convolve.h
diff --git a/Transceiver52M/common/convolve_base.c b/Transceiver52M/arch/common/convolve_base.c
index 71453a1..71453a1 100644
--- a/Transceiver52M/common/convolve_base.c
+++ b/Transceiver52M/arch/common/convolve_base.c
diff --git a/Transceiver52M/common/fft.c b/Transceiver52M/arch/common/fft.c
index 18b2de7..18b2de7 100644
--- a/Transceiver52M/common/fft.c
+++ b/Transceiver52M/arch/common/fft.c
diff --git a/Transceiver52M/common/fft.h b/Transceiver52M/arch/common/fft.h
index fb7bede..fb7bede 100644
--- a/Transceiver52M/common/fft.h
+++ b/Transceiver52M/arch/common/fft.h
diff --git a/Transceiver52M/common/mult.h b/Transceiver52M/arch/common/mult.h
index 4d96efb..4d96efb 100644
--- a/Transceiver52M/common/mult.h
+++ b/Transceiver52M/arch/common/mult.h
diff --git a/Transceiver52M/common/scale.h b/Transceiver52M/arch/common/scale.h
index da867e7..da867e7 100644
--- a/Transceiver52M/common/scale.h
+++ b/Transceiver52M/arch/common/scale.h
diff --git a/Transceiver52M/x86/Makefile.am b/Transceiver52M/arch/x86/Makefile.am
index 76c0bd2..f39dde5 100644
--- a/Transceiver52M/x86/Makefile.am
+++ b/Transceiver52M/arch/x86/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libarch.la
 noinst_LTLIBRARIES += libarch_sse_3.la
 noinst_LTLIBRARIES += libarch_sse_4_1.la
 
-libarch_la_LIBADD = $(top_builddir)/Transceiver52M/common/libarch_common.la
+libarch_la_LIBADD = $(top_builddir)/Transceiver52M/arch/common/libarch_common.la
 
 # SSE 3 specific code
 if HAVE_SSE3
diff --git a/Transceiver52M/x86/convert.c b/Transceiver52M/arch/x86/convert.c
index 07cdf59..07cdf59 100644
--- a/Transceiver52M/x86/convert.c
+++ b/Transceiver52M/arch/x86/convert.c
diff --git a/Transceiver52M/x86/convert_sse_3.c b/Transceiver52M/arch/x86/convert_sse_3.c
index 255db67..255db67 100644
--- a/Transceiver52M/x86/convert_sse_3.c
+++ b/Transceiver52M/arch/x86/convert_sse_3.c
diff --git a/Transceiver52M/x86/convert_sse_3.h b/Transceiver52M/arch/x86/convert_sse_3.h
index c2f87d7..c2f87d7 100644
--- a/Transceiver52M/x86/convert_sse_3.h
+++ b/Transceiver52M/arch/x86/convert_sse_3.h
diff --git a/Transceiver52M/x86/convert_sse_4_1.c b/Transceiver52M/arch/x86/convert_sse_4_1.c
index 42a235c..42a235c 100644
--- a/Transceiver52M/x86/convert_sse_4_1.c
+++ b/Transceiver52M/arch/x86/convert_sse_4_1.c
diff --git a/Transceiver52M/x86/convert_sse_4_1.h b/Transceiver52M/arch/x86/convert_sse_4_1.h
index 57a5efb..57a5efb 100644
--- a/Transceiver52M/x86/convert_sse_4_1.h
+++ b/Transceiver52M/arch/x86/convert_sse_4_1.h
diff --git a/Transceiver52M/x86/convolve.c b/Transceiver52M/arch/x86/convolve.c
index eb38f64..eb38f64 100644
--- a/Transceiver52M/x86/convolve.c
+++ b/Transceiver52M/arch/x86/convolve.c
diff --git a/Transceiver52M/x86/convolve_sse_3.c b/Transceiver52M/arch/x86/convolve_sse_3.c
index dbee3cc..dbee3cc 100644
--- a/Transceiver52M/x86/convolve_sse_3.c
+++ b/Transceiver52M/arch/x86/convolve_sse_3.c
diff --git a/Transceiver52M/x86/convolve_sse_3.h b/Transceiver52M/arch/x86/convolve_sse_3.h
index ac30ca5..ac30ca5 100644
--- a/Transceiver52M/x86/convolve_sse_3.h
+++ b/Transceiver52M/arch/x86/convolve_sse_3.h