Merged with master branch

This commit is contained in:
Andreas Eversberg 2011-10-03 13:21:45 +02:00
parent af55442f84
commit 715ce1c599
3 changed files with 23 additions and 2 deletions

View File

@ -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

View File

@ -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)
{

View File

@ -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;
}