aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2011-10-03 13:21:45 +0200
committerAndreas Eversberg <jolly@eversberg.eu>2011-10-03 13:21:45 +0200
commit715ce1c59967b679fa0d15573e70fa6299960432 (patch)
tree2398098a94a84d700f03a59ae5038e96d3c3edd1
parentaf55442f848c2b3b41a122f9f0bb733feb39a1dd (diff)
Merged with master branchjolly/bb-obsolete
-rw-r--r--src/osmo-bts-bb/Makefile.am4
-rw-r--r--src/osmo-bts-bb/l1_if.c5
-rw-r--r--src/osmo-bts-bb/oml.c16
3 files changed, 23 insertions, 2 deletions
diff --git a/src/osmo-bts-bb/Makefile.am b/src/osmo-bts-bb/Makefile.am
index 5a707d8..a90894c 100644
--- a/src/osmo-bts-bb/Makefile.am
+++ b/src/osmo-bts-bb/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
+AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS)
+LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) -lortp
bin_PROGRAMS = osmobts
diff --git a/src/osmo-bts-bb/l1_if.c b/src/osmo-bts-bb/l1_if.c
index c1149e3..3d8f1c6 100644
--- a/src/osmo-bts-bb/l1_if.c
+++ b/src/osmo-bts-bb/l1_if.c
@@ -234,6 +234,11 @@ int l1if_reset(struct gsm_bts_trx *trx)
return 0;
}
+void bts_model_rtp_rx_cb(struct osmo_rtp_socket *rs, uint8_t *rtp_pl,
+ unsigned int rtp_pl_len)
+{
+}
+
/* Receive incoming data from L1 using L1CTL format */
int l1if_recv(struct osmo_l1ctl *l1ctl, struct msgb *msg)
{
diff --git a/src/osmo-bts-bb/oml.c b/src/osmo-bts-bb/oml.c
index 194ebc7..f119b37 100644
--- a/src/osmo-bts-bb/oml.c
+++ b/src/osmo-bts-bb/oml.c
@@ -280,4 +280,20 @@ int lchan_deactivate_sacch(struct gsm_lchan *lchan)
#endif
}
+int bts_model_rsl_mode_modify(struct gsm_lchan *lchan)
+{
+#if 0
+ struct femtol1_hdl *fl1h = trx_femtol1_hdl(lchan->ts->trx);
+
+ /* channel mode, encryption and/or multirate have changed */
+
+ /* update multi-rate config */
+ tx_confreq_logchpar(lchan, GsmL1_Dir_RxUplink);
+ tx_confreq_logchpar(lchan, GsmL1_Dir_TxDownlink);
+
+ /* FIXME: update encryption */
+#endif
+ return 0;
+}
+