From a0192b859ba9230c84381cbf065816760da62ba7 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sat, 9 Jan 2016 09:49:09 +0100
Subject: Add new bts_model_ctrl_cmds_install()

This is one step in making the main() functions of different
BTS models more similar, so we can share one code rather than multiple
copies of it.
---
 src/osmo-bts-trx/Makefile.am | 4 ++--
 src/osmo-bts-trx/main.c      | 2 ++
 src/osmo-bts-trx/trx_vty.c   | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/osmo-bts-trx')

diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am
index 024c013f..26bc8e2e 100644
--- a/src/osmo-bts-trx/Makefile.am
+++ b/src/osmo-bts-trx/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(OPENBSC_INCDIR)
-AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(ORTP_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(ORTP_LIBS)
+AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(ORTP_CFLAGS)
+LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) $(ORTP_LIBS)
 
 EXTRA_DIST = trx_if.h l1_if.h scheduler.h gsm0503_parity.h gsm0503_conv.h gsm0503_interleaving.h gsm0503_mapping.h gsm0503_coding.h gsm0503_tables.h loops.h amr.h
 
diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c
index ae85abef..13851095 100644
--- a/src/osmo-bts-trx/main.c
+++ b/src/osmo-bts-trx/main.c
@@ -304,6 +304,8 @@ int main(int argc, char **argv)
 
 	write_pid_file("osmo-bts");
 
+	bts_controlif_setup(bts);
+
 	rc = telnet_init(tall_bts_ctx, NULL, 4241);
 	if (rc < 0) {
 		fprintf(stderr, "Error initializing telnet\n");
diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c
index 43c00f88..5da0c21f 100644
--- a/src/osmo-bts-trx/trx_vty.c
+++ b/src/osmo-bts-trx/trx_vty.c
@@ -419,3 +419,8 @@ int bts_model_vty_init(struct gsm_bts *bts)
 
 	return 0;
 }
+
+int bts_model_ctrl_cmds_install(struct gsm_bts *bts)
+{
+	return 0;
+}
-- 
cgit v1.2.3