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
This commit is contained in:
parent
53bdb7f82a
commit
43fedb656b
|
@ -33,9 +33,9 @@ COMMON_LA = $(top_builddir)/CommonLibs/libcommon.la
|
||||||
GSM_LA = $(top_builddir)/GSM/libGSM.la
|
GSM_LA = $(top_builddir)/GSM/libGSM.la
|
||||||
|
|
||||||
if ARCH_ARM
|
if ARCH_ARM
|
||||||
ARCH_LA = $(top_builddir)/Transceiver52M/arm/libarch.la
|
ARCH_LA = $(top_builddir)/Transceiver52M/arch/arm/libarch.la
|
||||||
else
|
else
|
||||||
ARCH_LA = $(top_builddir)/Transceiver52M/x86/libarch.la
|
ARCH_LA = $(top_builddir)/Transceiver52M/arch/x86/libarch.la
|
||||||
endif
|
endif
|
||||||
|
|
||||||
MOSTLYCLEANFILES = *~
|
MOSTLYCLEANFILES = *~
|
||||||
|
|
|
@ -28,8 +28,8 @@
|
||||||
#include "Channelizer.h"
|
#include "Channelizer.h"
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include "common/fft.h"
|
#include "fft.h"
|
||||||
#include "common/convolve.h"
|
#include "convolve.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
static void deinterleave(const float *in, size_t ilen,
|
static void deinterleave(const float *in, size_t ilen,
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include "ChannelizerBase.h"
|
#include "ChannelizerBase.h"
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include "common/fft.h"
|
#include "fft.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
static float sinc(float x)
|
static float sinc(float x)
|
||||||
|
|
|
@ -21,15 +21,10 @@
|
||||||
|
|
||||||
include $(top_srcdir)/Makefile.common
|
include $(top_srcdir)/Makefile.common
|
||||||
|
|
||||||
AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
|
SUBDIRS = arch
|
||||||
AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
|
|
||||||
|
|
||||||
SUBDIRS = common
|
AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common
|
||||||
if ARCH_ARM
|
AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
|
||||||
SUBDIRS += arm
|
|
||||||
else
|
|
||||||
SUBDIRS += x86
|
|
||||||
endif
|
|
||||||
|
|
||||||
if USRP1
|
if USRP1
|
||||||
AM_CPPFLAGS += $(USRP_CFLAGS)
|
AM_CPPFLAGS += $(USRP_CFLAGS)
|
||||||
|
|
|
@ -29,8 +29,8 @@
|
||||||
#include "Synthesis.h"
|
#include "Synthesis.h"
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include "common/fft.h"
|
#include "fft.h"
|
||||||
#include "common/convolve.h"
|
#include "convolve.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
static void interleave(float **in, size_t ilen,
|
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
|
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 = \
|
libarch_la_SOURCES = \
|
||||||
convert.c \
|
convert.c \
|
|
@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libarch.la
|
||||||
noinst_LTLIBRARIES += libarch_sse_3.la
|
noinst_LTLIBRARIES += libarch_sse_3.la
|
||||||
noinst_LTLIBRARIES += libarch_sse_4_1.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
|
# SSE 3 specific code
|
||||||
if HAVE_SSE3
|
if HAVE_SSE3
|
|
@ -199,9 +199,10 @@ AC_CONFIG_FILES([\
|
||||||
CommonLibs/Makefile \
|
CommonLibs/Makefile \
|
||||||
GSM/Makefile \
|
GSM/Makefile \
|
||||||
Transceiver52M/Makefile \
|
Transceiver52M/Makefile \
|
||||||
Transceiver52M/common/Makefile \
|
Transceiver52M/arch/Makefile \
|
||||||
Transceiver52M/arm/Makefile \
|
Transceiver52M/arch/common/Makefile \
|
||||||
Transceiver52M/x86/Makefile \
|
Transceiver52M/arch/arm/Makefile \
|
||||||
|
Transceiver52M/arch/x86/Makefile \
|
||||||
tests/Makefile \
|
tests/Makefile \
|
||||||
tests/CommonLibs/Makefile \
|
tests/CommonLibs/Makefile \
|
||||||
tests/Transceiver52M/Makefile \
|
tests/Transceiver52M/Makefile \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
include $(top_srcdir)/Makefile.common
|
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
|
EXTRA_DIST = convolve_test.ok
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "../../Transceiver52M/common/convolve.h"
|
#include "convolve.h"
|
||||||
|
|
||||||
#define TESTVEC_LEN 1000
|
#define TESTVEC_LEN 1000
|
||||||
#define DO_INIT 1
|
#define DO_INIT 1
|
||||||
|
|
Loading…
Reference in New Issue