[PATCH] osmocom-bb[master]: host/trxcon: share trxcon fsm and talloc ctx via trxcon.h

[Harald Welte]

Review at  https://gerrit.osmocom.org/6739

host/trxcon: share trxcon fsm and talloc ctx via trxcon.h

Change-Id: I9ef558f84a6dc1c9b8fc394c48e108676fa169f8
---
M src/host/trxcon/l1ctl.c
M src/host/trxcon/l1ctl_link.c
M src/host/trxcon/sched_clck.c
M src/host/trxcon/sched_lchan_handlers.c
M src/host/trxcon/trx_if.c
M src/host/trxcon/trxcon.h
6 files changed, 3 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/39/6739/1

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,

-- 
To view, visit https://gerrit.osmocom.org/6739
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ef558f84a6dc1c9b8fc394c48e108676fa169f8
Gerrit-PatchSet: 1
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>