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

[VAMOS] gsm_data: rework and rename gsm_lchan_name_compute() 

Change-Id: Id5cc40db04a654d94f5f75d4aad45439d66528cc
Related: SYS#4895, OS#4941
This commit is contained in:
Vadim Yanitskiy 2021-05-27 18:21:21 +02:00 committed by laforge
parent 5d888e5064
commit bcdbb6c556
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmo-bts/gsm_data.h
View File

@ -512,7 +512,7 @@ enum gsm_phys_chan_config gsm_pchan_parse(const char *name);
const char *gsm_lchant_name(enum gsm_chan_t c);
char *gsm_ts_name(const struct gsm_bts_trx_ts *ts);
char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts);
char *gsm_lchan_name_compute(const struct gsm_lchan *lchan);
void gsm_lchan_name_update(struct gsm_lchan *lchan);
const char *gsm_lchans_name(enum gsm_lchan_state s);
static inline char *gsm_lchan_name(const struct gsm_lchan *lchan)

4
src/common/bts_trx.c
View File

@ -96,15 +96,13 @@ struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts)
for (l = 0; l < TS_MAX_LCHAN; l++) {
struct gsm_lchan *lchan;
char *name;
lchan = &ts->lchan[l];
lchan->ts = ts;
lchan->nr = l;
lchan->type = GSM_LCHAN_NONE;
gsm_lchan_name_update(lchan);
name = gsm_lchan_name_compute(lchan);
lchan->name = talloc_strdup(trx, name);
INIT_LLIST_HEAD(&lchan->sapi_cmds);
INIT_LLIST_HEAD(&lchan->dl_tch_queue);
}

15
src/common/gsm_data.c
View File

@ -165,14 +165,17 @@ char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts)
return ts2str;
}
char *gsm_lchan_name_compute(const struct gsm_lchan *lchan)
void gsm_lchan_name_update(struct gsm_lchan *lchan)
{
struct gsm_bts_trx_ts *ts = lchan->ts;
const struct gsm_bts_trx_ts *ts = lchan->ts;
const struct gsm_bts_trx *trx = ts->trx;
char *name;
snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d,ts=%d,ss=%d)",
ts->trx->bts->nr, ts->trx->nr, ts->nr, lchan->nr);
return ts2str;
name = talloc_asprintf(trx, "(bts=%u,trx=%u,ts=%u,ss=%u)",
trx->bts->nr, trx->nr, ts->nr, lchan->nr);
if (lchan->name != NULL)
talloc_free(lchan->name);
lchan->name = name;
}
/* See Table 10.5.25 of GSM04.08 */