26 Jan
2016
26 Jan
'16
7:27 p.m.
From: Max <msuraev(a)sysmocom.de>
This small patchset enables future hardware support by restructuring sources and
cleaning up few bits here and there.
Max (3):
Cleanup build
Rename define for direct hw access
Restructure sources
.gitignore | 2 ++
configure.ac | 2 +-
src/Makefile.am | 51 +++++++++++++++++++--------------
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
src/osmobts_sock.cpp | 2 +-
src/pcu_l1_if.cpp | 6 ++--
11 files changed, 39 insertions(+), 28 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%)
--
2.5.0
26 Jan
26 Jan
7:27 p.m.
New subject: [PATCH 1/3] Cleanup build
From: Max <msuraev(a)sysmocom.de>
Ignore cross-compilation bild byproducts.
Enable subdir-objects to increase compatibility with newer automake.
---
.gitignore | 2 ++
configure.ac | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 6cc9aa5..439f591 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@ depcomp
install-sh
missing
libtool
+arm*linux*libtool
+compile
ltmain.sh
core
diff --git a/configure.ac b/configure.ac
index 5274022..7a97954 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([osmo-pcu],
m4_esyscmd([./git-version-gen .tarball-version]),
[osmocom-net-gprs(a)lists.osmocom.org])
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
AC_CONFIG_TESTDIR(tests)
dnl kernel style compile messages
--
2.5.0
1 Feb
1 Feb
3:04 p.m.
New subject: [PATCH 1/3] Cleanup build
30.01.2016 10:01, Holger Freyther пишет:
Yes, that would work too.
Tried it - got "archives ready for distribution" message. Is there some
particular
result I should be looking for after running "make distcheck"?
cheers,
Max.
On 26 Jan
2016, at 19:27, suraev(a)alumni.ntnu.no wrote:
libtool
+arm*linux*libtool
*libtool then? -AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
have you tried make distcheck?
26 Jan
26 Jan
7:27 p.m.
New subject: [PATCH 2/3] Rename define for direct hw access
From: Max <msuraev(a)sysmocom.de>
---
src/Makefile.am | 2 +-
src/osmobts_sock.cpp | 2 +-
src/pcu_l1_if.cpp | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6428bef..832c3b0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGB_CFLAGS)
$(LIBOSMOGSM_CFLAGS)
if ENABLE_SYSMODSP
-AM_CPPFLAGS += -DENABLE_SYSMODSP
+AM_CPPFLAGS += -DENABLE_DIRECT_PHY
endif
AM_CXXFLAGS = -Wall -ldl -pthread
diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp
index b42f042..21a404f 100644
--- a/src/osmobts_sock.cpp
+++ b/src/osmobts_sock.cpp
@@ -100,7 +100,7 @@ static void pcu_sock_close(struct pcu_sock_state *state, int lost)
/* disable all slots, kick all TBFs */
for (trx = 0; trx < 8; trx++) {
-#ifdef ENABLE_SYSMODSP
+#ifdef ENABLE_DIRECT_PHY
if (bts->trx[trx].fl1h) {
l1if_close_pdch(bts->trx[trx].fl1h);
bts->trx[trx].fl1h = NULL;
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 9d7dbee..a19b957 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -124,7 +124,7 @@ static int pcu_tx_data_req(uint8_t trx, uint8_t ts, uint8_t sapi,
void pcu_l1if_tx_pdtch(msgb *msg, uint8_t trx, uint8_t ts, uint16_t arfcn,
uint32_t fn, uint8_t block_nr)
{
-#ifdef ENABLE_SYSMODSP
+#ifdef ENABLE_DIRECT_PHY
struct gprs_rlcmac_bts *bts = bts_main_data();
if (bts->trx[trx].fl1h)
@@ -430,7 +430,7 @@ bssgp_failed:
bts->trx[trx].arfcn = info_ind->trx[trx].arfcn;
if ((info_ind->flags & PCU_IF_FLAG_SYSMO)
&& info_ind->trx[trx].hlayer1) {
-#ifdef ENABLE_SYSMODSP
+#ifdef ENABLE_DIRECT_PHY
LOGP(DL1IF, LOGL_DEBUG, " TRX %d hlayer1=%x\n", trx,
info_ind->trx[trx].hlayer1);
if (!bts->trx[trx].fl1h)
@@ -455,7 +455,7 @@ bssgp_failed:
if ((info_ind->trx[trx].pdch_mask & (1 << ts))) {
/* FIXME: activate dynamically at RLCMAC */
if (!pdch->is_enabled()) {
-#ifdef ENABLE_SYSMODSP
+#ifdef ENABLE_DIRECT_PHY
if ((info_ind->flags &
PCU_IF_FLAG_SYSMO))
l1if_connect_pdch(
--
2.5.0
7:27 p.m.
New subject: [PATCH 3/3] Restructure sources
From: Max <msuraev(a)sysmocom.de>
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
9:24 p.m.
New subject: [PATCH 3/3] Restructure sources
On 26 Jan 2016, at 19:27, suraev(a)alumni.ntnu.no wrote:
Dear Max,
#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
as this is about restructuring the sourcecode I would have not expected
such a modification. Does this file exist on a single trx system?
holger
27 Jan
27 Jan
10:40 a.m.
New subject: [PATCH 3/3] Restructure sources
Oops, my bad - I've accidentally committed part of another development work which
does not belong in here. Please disregard this particular change.
I've double-checked all the patches and the rest seems fine - only those defines were
mistakenly committed.
cheers,
Max.
3023
days inactive
3029
days old
7 comments
3 participants
participants (3)
-
Holger Freyther -
Max (☭) -
suraev＠alumni.ntnu.no