cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

TRX: call trx_loop_sacch_clock from TRX scheduler backend 

this removes the dependency of scheduler.c on loops.h
This commit is contained in:
Harald Welte 2016-01-09 22:39:04 +01:00
parent 2b0e209029
commit 11db925f15
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osmo-bts-trx/scheduler.c
View File

@ -40,7 +40,6 @@
#include "scheduler.h"
#include "scheduler_backend.h"
#include "trx_if.h"
#include "loops.h"
extern void *tall_bts_ctx;
@ -404,7 +403,6 @@ static int rts_data_fn(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
uint8_t chan_nr, link_id;
struct msgb *msg;
struct osmo_phsap_prim *l1sap;
struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);
/* get data for RTS indication */
chan_nr = trx_chan_desc[chan].chan_nr | tn;
@ -420,10 +418,6 @@ static int rts_data_fn(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
"link_id=0x%02x fn=%u ts=%u trx=%u\n", trx_chan_desc[chan].name,
chan_nr, link_id, fn, tn, l1t->trx->nr);
/* send clock information to loops process */
if (L1SAP_IS_LINK_SACCH(link_id))
trx_loop_sacch_clock(l1t, chan_nr, &l1ts->chan_state[chan]);
/* generate prim */
msg = l1sap_msgb_alloc(200);
if (!msg)

6
src/osmo-bts-trx/scheduler_trx.c
View File

@ -127,6 +127,8 @@ ubit_t *tx_data_fn(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
{
struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);
struct gsm_bts_trx_ts *ts = &l1t->trx->ts[tn];
uint8_t link_id = trx_chan_desc[chan].link_id;
uint8_t chan_nr = trx_chan_desc[chan].chan_nr | tn;
struct msgb *msg = NULL; /* make GCC happy */
ubit_t *burst, **bursts_p = &l1ts->chan_state[chan].dl_bursts;
static ubit_t bits[148];
@ -138,6 +140,10 @@ ubit_t *tx_data_fn(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
goto send_burst;
}
/* send clock information to loops process */
if (L1SAP_IS_LINK_SACCH(link_id))
trx_loop_sacch_clock(l1t, chan_nr, &l1ts->chan_state[chan]);
/* get mac block from queue */
msg = _sched_dequeue_prim(l1t, tn, fn, chan);
if (msg)