Change in osmo-pcu[master]: Restructure sources
diff mbox

Message ID gerrit.1463132314125.I05004ad9032759a5dbfa57290ed1df83e89d5cb8@gerrit.osmocom.org
State New
Headers show

Commit Message

gerrit-no-reply@lists.osmocom.org May 13, 2016, 9:38 a.m. UTC
From Max <msuraev@sysmocom.de>:

Max has uploaded a new change for review.

  https://gerrit.osmocom.org/58

Change subject: Restructure sources
......................................................................

Restructure sources

Move hardware-spicefic files into subdirectory similar to the way it's
done in OsmoBTS to make adding new hardware support easier.

Change-Id: I05004ad9032759a5dbfa57290ed1df83e89d5cb8
Related: SYS#2443
---
M src/Makefile.am
R src/osmo-bts-sysmo/femtobts.c
R src/osmo-bts-sysmo/femtobts.h
R src/osmo-bts-sysmo/sysmo_l1_fwd.c
R src/osmo-bts-sysmo/sysmo_l1_hw.c
R src/osmo-bts-sysmo/sysmo_l1_if.c
R src/osmo-bts-sysmo/sysmo_l1_if.h
7 files changed, 32 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/58/58/1

Comments

gerrit-no-reply@lists.osmocom.org May 14, 2016, 10:20 a.m. UTC | #1
From Holger Freyther <holger@freyther.de>:

Holger Freyther has posted comments on this change.

Change subject: Restructure sources
......................................................................


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/58/1/src/Makefile.am
File src/Makefile.am:

PS1, Line 67: 
Why do you remove this guard?
gerrit-no-reply@lists.osmocom.org May 17, 2016, 8:05 a.m. UTC | #2
From Max <msuraev@sysmocom.de>:

Max has posted comments on this change.

Change subject: Restructure sources
......................................................................


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/58/1/src/Makefile.am
File src/Makefile.am:

PS1, Line 67: 
> Why do you remove this guard?
It's not removed - previously there were several guards, now they are merged into single one: see for osmo-pcu-remote below.
gerrit-no-reply@lists.osmocom.org May 17, 2016, 4:19 p.m. UTC | #3
From Holger Freyther <holger@freyther.de>:

Holger Freyther has posted comments on this change.

Change subject: Restructure sources
......................................................................


Patch Set 1: Code-Review+2

Patch
diff mbox

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 @@ 
 
 noinst_PROGRAMS =
 
-if ENABLE_SYSMODSP
-noinst_PROGRAMS += \
-	osmo-pcu-remote
-endif
-
 noinst_HEADERS = \
 	gprs_debug.h \
 	csn1.h \
@@ -83,8 +78,6 @@ 
 	bitvector.h \
 	pcu_vty.h \
 	pcu_vty_functions.h \
-	sysmo_l1_if.h \
-	femtobts.h \
 	tbf.h \
 	bts.h \
 	poll_controller.h \
@@ -101,14 +94,39 @@ 
 osmo_pcu_SOURCES = pcu_main.cpp
 
 if ENABLE_SYSMODSP
-osmo_pcu_SOURCES += sysmo_l1_if.c \
-	sysmo_l1_hw.c \
-	femtobts.c
+AM_CPPFLAGS += -I$(srcdir)/osmo-bts-sysmo
 
-osmo_pcu_remote_SOURCES = pcu_main.cpp \
-	sysmo_l1_if.c \
-	sysmo_l1_fwd.c \
-	femtobts.c
+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
 
 osmo_pcu_LDADD = \
@@ -117,14 +135,5 @@ 
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(COMMON_LA)
-
-if ENABLE_SYSMODSP
-osmo_pcu_remote_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 100%
rename from src/sysmo_l1_hw.c
rename to src/osmo-bts-sysmo/sysmo_l1_hw.c
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