diff options
| author | Vadim Yanitskiy <axilirator@gmail.com> | 2017-07-26 13:50:40 +0600 |
|---|---|---|
| committer | Vadim Yanitskiy <axilirator@gmail.com> | 2017-11-19 17:35:07 +0700 |
| commit | f604869944d594431654332b0bad59a6e7a997e4 (patch) | |
| tree | b5dab16df0452015bcd0e26f471e2216f4ee4f4e | |
| parent | 77b6833146618d119642c1fc61779ca96bf6e99c (diff) | |
host/trxcon: share trxcon fsm and talloc ctx via trxcon.h
Change-Id: I9ef558f84a6dc1c9b8fc394c48e108676fa169f8
| -rw-r--r-- | src/host/trxcon/l1ctl.c | 3 | ||||
| -rw-r--r-- | src/host/trxcon/l1ctl_link.c | 3 | ||||
| -rw-r--r-- | src/host/trxcon/sched_clck.c | 2 | ||||
| -rw-r--r-- | src/host/trxcon/sched_lchan_handlers.c | 2 | ||||
| -rw-r--r-- | src/host/trxcon/trx_if.c | 3 | ||||
| -rw-r--r-- | src/host/trxcon/trxcon.h | 3 |
6 files changed, 3 insertions, 13 deletions
diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 7d96396f..cbe037ad 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -46,9 +46,6 @@ #include "trx_if.h" #include "sched_trx.h" -extern void *tall_trx_ctx; -extern struct osmo_fsm_inst *trxcon_fsm; - static struct msgb *l1ctl_alloc_msg(uint8_t msg_type) { struct l1ctl_hdr *l1h; diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c index d2ceb177..dfcbecb2 100644 --- a/src/host/trxcon/l1ctl_link.c +++ b/src/host/trxcon/l1ctl_link.c @@ -45,9 +45,6 @@ #include "l1ctl_link.h" #include "l1ctl.h" -extern void *tall_trx_ctx; -extern struct osmo_fsm_inst *trxcon_fsm; - static struct osmo_fsm_state l1ctl_fsm_states[] = { [L1CTL_STATE_IDLE] = { .out_state_mask = GEN_MASK(L1CTL_STATE_CONNECTED), diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index 31f3ef2c..efb3f4c9 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -44,8 +44,6 @@ #define MAX_FN_SKEW 50 #define TRX_LOSS_FRAMES 400 -extern struct osmo_fsm_inst *trxcon_fsm; - static void sched_clck_tick(void *data) { struct trx_sched *sched = (struct trx_sched *) data; diff --git a/src/host/trxcon/sched_lchan_handlers.c b/src/host/trxcon/sched_lchan_handlers.c index fcc4e71c..3eec5f18 100644 --- a/src/host/trxcon/sched_lchan_handlers.c +++ b/src/host/trxcon/sched_lchan_handlers.c @@ -46,8 +46,6 @@ #include "trxcon.h" #include "l1ctl.h" -extern struct osmo_fsm_inst *trxcon_fsm; - /* GSM 05.02 Chapter 5.2.3 Normal Burst (NB) */ static const uint8_t nb_training_bits[8][26] = { { diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index 41c378ff..f99a6164 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -45,9 +45,6 @@ #include "logging.h" #include "scheduler.h" -extern void *tall_trx_ctx; -extern struct osmo_fsm_inst *trxcon_fsm; - static struct osmo_fsm_state trx_fsm_states[] = { [TRX_STATE_OFFLINE] = { .out_state_mask = ( diff --git a/src/host/trxcon/trxcon.h b/src/host/trxcon/trxcon.h index b3d4e3e2..17d34089 100644 --- a/src/host/trxcon/trxcon.h +++ b/src/host/trxcon/trxcon.h @@ -2,6 +2,9 @@ #define GEN_MASK(state) (0x01 << state) +extern struct osmo_fsm_inst *trxcon_fsm; +extern void *tall_trx_ctx; + enum trxcon_fsm_states { TRXCON_STATE_IDLE = 0, TRXCON_STATE_MANAGED, |