aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2021-10-06 17:44:19 +0200
committerpespin <pespin@sysmocom.de>2021-10-07 10:26:24 +0000
commit77e014f0612960c1b2cf04401a726362cae962c4 (patch)
tree9f2c43fc35b9a8513d3cf559eb76093a1069a74f
parentc97a7f51e1b15d40e39df4b7d07b3c6534540186 (diff)
Introduce gsm_lchan_init() function helper
Let's move lchan specific struct stuff into lchan.c Change-Id: I9cb96707c63b8b7d76591d25fe906f02e34bb76b
-rw-r--r--include/osmo-bts/gsm_data.h1
-rw-r--r--src/common/bts_trx.c9
-rw-r--r--src/common/lchan.c11
3 files changed, 13 insertions, 8 deletions
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h
index fe2862de..b73df5f6 100644
--- a/include/osmo-bts/gsm_data.h
+++ b/include/osmo-bts/gsm_data.h
@@ -556,6 +556,7 @@ const char *gsm_pchan_name(enum gsm_phys_chan_config c);
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);
+void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr);
void gsm_lchan_name_update(struct gsm_lchan *lchan);
const char *gsm_lchans_name(enum gsm_lchan_state s);
diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c
index 127e7977..7ef5b52a 100644
--- a/src/common/bts_trx.c
+++ b/src/common/bts_trx.c
@@ -59,14 +59,7 @@ static void gsm_bts_trx_ts_init_lchan(struct gsm_bts_trx_ts *ts)
for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) {
struct gsm_lchan *lchan = &ts->lchan[ln];
-
- lchan->ts = ts;
- lchan->nr = ln;
- lchan->type = GSM_LCHAN_NONE;
- gsm_lchan_name_update(lchan);
-
- INIT_LLIST_HEAD(&lchan->sapi_cmds);
- INIT_LLIST_HEAD(&lchan->dl_tch_queue);
+ gsm_lchan_init(lchan, ts, ln);
}
}
diff --git a/src/common/lchan.c b/src/common/lchan.c
index dcec0a31..3b99fc50 100644
--- a/src/common/lchan.c
+++ b/src/common/lchan.c
@@ -25,6 +25,17 @@
#include <osmo-bts/bts.h>
#include <osmo-bts/rsl.h>
+void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr)
+{
+ lchan->ts = ts;
+ lchan->nr = lchan_nr;
+ lchan->type = GSM_LCHAN_NONE;
+ gsm_lchan_name_update(lchan);
+
+ INIT_LLIST_HEAD(&lchan->sapi_cmds);
+ INIT_LLIST_HEAD(&lchan->dl_tch_queue);
+}
+
void early_rr_ia_delay_cb(void *data)
{
struct gsm_lchan *lchan = data;