From: Max <[email protected]>
Move hardware-spicefic files into subdirectory similar to the way it's
done in OsmoBTS to make adding more hardware support easier.
---
src/Makefile.am | 49 +++++++++++++++++++--------------
src/{ => osmo-bts-sysmo}/femtobts.c | 0
src/{ => osmo-bts-sysmo}/femtobts.h | 0
src/{ => osmo-bts-sysmo}/sysmo_l1_fwd.c | 0
src/{ => osmo-bts-sysmo}/sysmo_l1_hw.c | 4 +--
src/{ => osmo-bts-sysmo}/sysmo_l1_if.c | 0
src/{ => osmo-bts-sysmo}/sysmo_l1_if.h | 0
7 files changed, 31 insertions(+), 22 deletions(-)
rename src/{ => osmo-bts-sysmo}/femtobts.c (100%)
rename src/{ => osmo-bts-sysmo}/femtobts.h (100%)
rename src/{ => osmo-bts-sysmo}/sysmo_l1_fwd.c (100%)
rename src/{ => osmo-bts-sysmo}/sysmo_l1_hw.c (97%)
rename src/{ => osmo-bts-sysmo}/sysmo_l1_if.c (100%)
rename src/{ => osmo-bts-sysmo}/sysmo_l1_if.h (100%)
diff --git a/src/Makefile.am b/src/Makefile.am
index 832c3b0..3049744 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,11 +64,6 @@ bin_PROGRAMS = \
noinst_PROGRAMS =
-if ENABLE_SYSMODSP
-noinst_PROGRAMS += \
- osmo-pcu-remote
-endif
-
noinst_HEADERS = \
gprs_debug.h \
csn1.h \
@@ -83,8 +78,6 @@ noinst_HEADERS = \
bitvector.h \
pcu_vty.h \
pcu_vty_functions.h \
- sysmo_l1_if.h \
- femtobts.h \
tbf.h \
bts.h \
poll_controller.h \
@@ -101,30 +94,46 @@ noinst_HEADERS = \
osmo_pcu_SOURCES = pcu_main.cpp
if ENABLE_SYSMODSP
-osmo_pcu_SOURCES += sysmo_l1_if.c \
- sysmo_l1_hw.c \
- femtobts.c
-
-osmo_pcu_remote_SOURCES = pcu_main.cpp \
- sysmo_l1_if.c \
- sysmo_l1_fwd.c \
- femtobts.c
-endif
+AM_CPPFLAGS += -I$(srcdir)/osmo-bts-sysmo
-osmo_pcu_LDADD = \
+EXTRA_DIST = \
+ osmo-bts-sysmo/sysmo_l1_if.c \
+ osmo-bts-sysmo/sysmo_l1_if.h \
+ osmo-bts-sysmo/sysmo_l1_hw.c \
+ osmo-bts-sysmo/femtobts.c \
+ osmo-bts-sysmo/femtobts.h
+
+noinst_HEADERS += \
+ osmo-bts-sysmo/sysmo_l1_if.h \
+ osmo-bts-sysmo/femtobts.h
+
+noinst_PROGRAMS += \
+ osmo-pcu-remote
+
+osmo_pcu_SOURCES += \
+ osmo-bts-sysmo/sysmo_l1_if.c \
+ osmo-bts-sysmo/sysmo_l1_hw.c \
+ osmo-bts-sysmo/femtobts.c
+
+osmo_pcu_remote_SOURCES = \
+ pcu_main.cpp \
+ osmo-bts-sysmo/sysmo_l1_if.c \
+ osmo-bts-sysmo/sysmo_l1_fwd.c \
+ osmo-bts-sysmo/femtobts.c
+
+osmo_pcu_remote_LDADD = \
libgprs.la \
$(LIBOSMOGB_LIBS) \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(COMMON_LA)
+endif
-if ENABLE_SYSMODSP
-osmo_pcu_remote_LDADD = \
+osmo_pcu_LDADD = \
libgprs.la \
$(LIBOSMOGB_LIBS) \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(COMMON_LA)
-endif
#MOSTLYCLEANFILES += testSource testDestination
diff --git a/src/femtobts.c b/src/osmo-bts-sysmo/femtobts.c
similarity index 100%
rename from src/femtobts.c
rename to src/osmo-bts-sysmo/femtobts.c
diff --git a/src/femtobts.h b/src/osmo-bts-sysmo/femtobts.h
similarity index 100%
rename from src/femtobts.h
rename to src/osmo-bts-sysmo/femtobts.h
diff --git a/src/sysmo_l1_fwd.c b/src/osmo-bts-sysmo/sysmo_l1_fwd.c
similarity index 100%
rename from src/sysmo_l1_fwd.c
rename to src/osmo-bts-sysmo/sysmo_l1_fwd.c
diff --git a/src/sysmo_l1_hw.c b/src/osmo-bts-sysmo/sysmo_l1_hw.c
similarity index 97%
rename from src/sysmo_l1_hw.c
rename to src/osmo-bts-sysmo/sysmo_l1_hw.c
index 8351d68..2c019be 100644
--- a/src/sysmo_l1_hw.c
+++ b/src/osmo-bts-sysmo/sysmo_l1_hw.c
@@ -59,8 +59,8 @@
#define DEV_TCH_DSP2ARM_NAME "/dev/msgq/gsml1_tch_dsp2arm"
#define DEV_TCH_ARM2DSP_NAME "/dev/msgq/gsml1_tch_arm2dsp"
-#define DEV_PDTCH_DSP2ARM_NAME "/dev/msgq/gsml1_pdtch_dsp2arm"
-#define DEV_PDTCH_ARM2DSP_NAME "/dev/msgq/gsml1_pdtch_arm2dsp"
+#define DEV_PDTCH_DSP2ARM_NAME "/dev/msgq/gsml1_pdtch_dsp2arm1" //2 -- trx1
+#define DEV_PDTCH_ARM2DSP_NAME "/dev/msgq/gsml1_pdtch_arm2dsp1" //2
#endif
static const char *rd_devnames[] = {
diff --git a/src/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c
similarity index 100%
rename from src/sysmo_l1_if.c
rename to src/osmo-bts-sysmo/sysmo_l1_if.c
diff --git a/src/sysmo_l1_if.h b/src/osmo-bts-sysmo/sysmo_l1_if.h
similarity index 100%
rename from src/sysmo_l1_if.h
rename to src/osmo-bts-sysmo/sysmo_l1_if.h
--
2.5.0
