fixeria submitted this change.

View Change

Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved
trxcon: cosmetic: rename l1ctl_link.[ch] to l1ctl_server.[ch]

Change-Id: I91149087bac6c745253d99deae2e32275b446a39
---
M src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am
M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h
R src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h
M src/host/trxcon/src/Makefile.am
M src/host/trxcon/src/l1ctl.c
R src/host/trxcon/src/l1ctl_server.c
M src/host/trxcon/src/trxcon.c
7 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am
index 4463a1d..3b9b216 100644
--- a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am
+++ b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am
@@ -1,6 +1,6 @@
noinst_HEADERS = \
l1ctl_proto.h \
- l1ctl_link.h \
+ l1ctl_server.h \
l1ctl.h \
l1sched.h \
trx_if.h \
diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h
index 348e5c5..e15d5a2 100644
--- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h
+++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <osmocom/core/msgb.h>

-#include <osmocom/bb/trxcon/l1ctl_link.h>
+#include <osmocom/bb/trxcon/l1ctl_server.h>
#include <osmocom/bb/trxcon/l1ctl_proto.h>

/* Event handlers */
diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h
similarity index 100%
rename from src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h
rename to src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h
diff --git a/src/host/trxcon/src/Makefile.am b/src/host/trxcon/src/Makefile.am
index c97265b..cf1357f 100644
--- a/src/host/trxcon/src/Makefile.am
+++ b/src/host/trxcon/src/Makefile.am
@@ -38,7 +38,7 @@
bin_PROGRAMS = trxcon

trxcon_SOURCES = \
- l1ctl_link.c \
+ l1ctl_server.c \
l1ctl.c \
trx_if.c \
logging.c \
diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c
index ddcc953..66ddac1 100644
--- a/src/host/trxcon/src/l1ctl.c
+++ b/src/host/trxcon/src/l1ctl.c
@@ -37,7 +37,7 @@
#include <osmocom/gsm/protocol/gsm_08_58.h>

#include <osmocom/bb/trxcon/logging.h>
-#include <osmocom/bb/trxcon/l1ctl_link.h>
+#include <osmocom/bb/trxcon/l1ctl_server.h>
#include <osmocom/bb/trxcon/l1ctl_proto.h>

#include <osmocom/bb/trxcon/trx_if.h>
diff --git a/src/host/trxcon/src/l1ctl_link.c b/src/host/trxcon/src/l1ctl_server.c
similarity index 98%
rename from src/host/trxcon/src/l1ctl_link.c
rename to src/host/trxcon/src/l1ctl_server.c
index 93ee6cb..6047bed 100644
--- a/src/host/trxcon/src/l1ctl_link.c
+++ b/src/host/trxcon/src/l1ctl_server.c
@@ -36,7 +36,7 @@
#include <osmocom/core/write_queue.h>

#include <osmocom/bb/trxcon/logging.h>
-#include <osmocom/bb/trxcon/l1ctl_link.h>
+#include <osmocom/bb/trxcon/l1ctl_server.h>

static int l1ctl_client_read_cb(struct osmo_fd *ofd)
{
diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c
index b78f661..09eae9b 100644
--- a/src/host/trxcon/src/trxcon.c
+++ b/src/host/trxcon/src/trxcon.c
@@ -45,7 +45,7 @@
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/logging.h>
#include <osmocom/bb/trxcon/l1ctl.h>
-#include <osmocom/bb/trxcon/l1ctl_link.h>
+#include <osmocom/bb/trxcon/l1ctl_server.h>
#include <osmocom/bb/trxcon/l1ctl_proto.h>
#include <osmocom/bb/trxcon/l1sched.h>


To view, visit change 28670. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I91149087bac6c745253d99deae2e32275b446a39
Gerrit-Change-Number: 28670
Gerrit-PatchSet: 6
Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged