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
changes/12/7912/1
Pau Espin 5 years ago
parent 53bdb7f82a
commit 43fedb656b
  1. 4
      Makefile.common
  2. 4
      Transceiver52M/Channelizer.cpp
  3. 2
      Transceiver52M/ChannelizerBase.cpp
  4. 11
      Transceiver52M/Makefile.am
  5. 4
      Transceiver52M/Synthesis.cpp
  6. 8
      Transceiver52M/arch/Makefile.am
  7. 2
      Transceiver52M/arch/arm/Makefile.am
  8. 0
      Transceiver52M/arch/arm/convert.c
  9. 0
      Transceiver52M/arch/arm/convert_neon.S
  10. 0
      Transceiver52M/arch/arm/convolve.c
  11. 0
      Transceiver52M/arch/arm/convolve_neon.S
  12. 0
      Transceiver52M/arch/arm/mult.c
  13. 0
      Transceiver52M/arch/arm/mult_neon.S
  14. 0
      Transceiver52M/arch/arm/scale.c
  15. 0
      Transceiver52M/arch/arm/scale_neon.S
  16. 0
      Transceiver52M/arch/common/Makefile.am
  17. 0
      Transceiver52M/arch/common/convert.h
  18. 0
      Transceiver52M/arch/common/convert_base.c
  19. 0
      Transceiver52M/arch/common/convolve.h
  20. 0
      Transceiver52M/arch/common/convolve_base.c
  21. 0
      Transceiver52M/arch/common/fft.c
  22. 0
      Transceiver52M/arch/common/fft.h
  23. 0
      Transceiver52M/arch/common/mult.h
  24. 0
      Transceiver52M/arch/common/scale.h
  25. 2
      Transceiver52M/arch/x86/Makefile.am
  26. 0
      Transceiver52M/arch/x86/convert.c
  27. 0
      Transceiver52M/arch/x86/convert_sse_3.c
  28. 0
      Transceiver52M/arch/x86/convert_sse_3.h
  29. 0
      Transceiver52M/arch/x86/convert_sse_4_1.c
  30. 0
      Transceiver52M/arch/x86/convert_sse_4_1.h
  31. 0
      Transceiver52M/arch/x86/convolve.c
  32. 0
      Transceiver52M/arch/x86/convolve_sse_3.c
  33. 0
      Transceiver52M/arch/x86/convolve_sse_3.h
  34. 7
      configure.ac
  35. 2
      tests/Transceiver52M/Makefile.am
  36. 2
      tests/Transceiver52M/convolve_test.c

@ -33,9 +33,9 @@ COMMON_LA = $(top_builddir)/CommonLibs/libcommon.la
GSM_LA = $(top_builddir)/GSM/libGSM.la
if ARCH_ARM
ARCH_LA = $(top_builddir)/Transceiver52M/arm/libarch.la
ARCH_LA = $(top_builddir)/Transceiver52M/arch/arm/libarch.la
else
ARCH_LA = $(top_builddir)/Transceiver52M/x86/libarch.la
ARCH_LA = $(top_builddir)/Transceiver52M/arch/x86/libarch.la
endif
MOSTLYCLEANFILES = *~

@ -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,

@ -29,7 +29,7 @@
#include "ChannelizerBase.h"
extern "C" {
#include "common/fft.h"
#include "fft.h"
}
static float sinc(float x)

@ -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)

@ -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,

@ -0,0 +1,8 @@
include $(top_srcdir)/Makefile.common
SUBDIRS = common
if ARCH_ARM
SUBDIRS += arm
else
SUBDIRS += x86
endif

@ -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 \

@ -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

@ -199,9 +199,10 @@ AC_CONFIG_FILES([\
CommonLibs/Makefile \
GSM/Makefile \
Transceiver52M/Makefile \
Transceiver52M/common/Makefile \
Transceiver52M/arm/Makefile \
Transceiver52M/x86/Makefile \
Transceiver52M/arch/Makefile \
Transceiver52M/arch/common/Makefile \
Transceiver52M/arch/arm/Makefile \
Transceiver52M/arch/x86/Makefile \
tests/Makefile \
tests/CommonLibs/Makefile \
tests/Transceiver52M/Makefile \

@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.common
AM_CFLAGS = -Wall -I$(top_srcdir)/Transceiver52M $(STD_DEFINES_AND_INCLUDES) -g
AM_CFLAGS = -Wall -I$(top_srcdir)/Transceiver52M -I$(top_srcdir)/Transceiver52M/arch/common $(STD_DEFINES_AND_INCLUDES) -g
EXTRA_DIST = convolve_test.ok

@ -1,7 +1,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "../../Transceiver52M/common/convolve.h"
#include "convolve.h"
#define TESTVEC_LEN 1000
#define DO_INIT 1

Loading…
Cancel
Save