summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2017-07-26 13:50:40 +0600
committerVadim Yanitskiy <axilirator@gmail.com>2017-10-23 22:05:49 +0330
commit139b4d0d330193c0709ae8ad6dc6b5761838c9d4 (patch)
tree4d570e077a64aa4915ed25b992b4cd7b52242746
parentd961073b09e2ce6122c7b09166fef9413c62f2af (diff)
host/trxcon: share trxcon fsm and talloc ctx via trxcon.h
-rw-r--r--src/host/trxcon/l1ctl.c3
-rw-r--r--src/host/trxcon/l1ctl_link.c3
-rw-r--r--src/host/trxcon/sched_clck.c2
-rw-r--r--src/host/trxcon/sched_lchan_handlers.c2
-rw-r--r--src/host/trxcon/trx_if.c3
-rw-r--r--src/host/trxcon/trxcon.h3
6 files changed, 3 insertions, 13 deletions
diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index 7d96396..cbe037a 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 d2ceb17..dfcbecb 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 31f3ef2..efb3f4c 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 fcc4e71..3eec5f1 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 41c378f..f99a616 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 b3d4e3e..17d3408 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,