aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <vyanitskiy@sysmocom.de>2020-10-10 20:38:49 +0700
committerVadim Yanitskiy <vyanitskiy@sysmocom.de>2020-10-15 15:20:10 +0700
commit7b239f40cb4809b63e930522ab37b060536ab2e4 (patch)
tree20af4c20c00b7f2d247b4acb563e62e0ccc5e820
parent1ab64126105a00835f62c7b629f880d10baad66a (diff)
gsm_data: check in and use enum lchan_rel_act_kind
-rw-r--r--include/osmo-bts/gsm_data.h11
-rw-r--r--include/osmo-bts/rsl.h11
2 files changed, 10 insertions, 12 deletions
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h
index 3d01d55c..c6fe6090 100644
--- a/include/osmo-bts/gsm_data.h
+++ b/include/osmo-bts/gsm_data.h
@@ -147,6 +147,15 @@ enum lchan_sapi_state {
LCHAN_SAPI_S_ERROR,
};
+/* What kind of release/activation is done? A silent one for
+ * the PDCH or one triggered through RSL? */
+enum lchan_rel_act_kind {
+ LCHAN_REL_ACT_RSL,
+ LCHAN_REL_ACT_PCU,
+ LCHAN_REL_ACT_OML,
+ LCHAN_REL_ACT_REACT, /* remove once auto-activation hack is removed from opstart_compl() */
+};
+
struct gsm_lchan {
/* The TS that we're part of */
struct gsm_bts_trx_ts *ts;
@@ -269,7 +278,7 @@ struct gsm_lchan {
/* S counter for link loss */
int s;
/* Kind of the release/activation. E.g. RSL or PCU */
- int rel_act_kind;
+ enum lchan_rel_act_kind rel_act_kind;
/* RTP header Marker bit to indicate beginning of speech after pause */
bool rtp_tx_marker;
/* power handling */
diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h
index 5dfd6cfa..4e79de5e 100644
--- a/include/osmo-bts/rsl.h
+++ b/include/osmo-bts/rsl.h
@@ -1,17 +1,6 @@
#ifndef _RSL_H
#define _RSL_H
-/**
- * What kind of release/activation is done? A silent one for
- * the PDCH or one triggered through RSL?
- */
-enum {
- LCHAN_REL_ACT_RSL,
- LCHAN_REL_ACT_PCU,
- LCHAN_REL_ACT_OML,
- LCHAN_REL_ACT_REACT, /* remove once auto-activation hack is removed from opstart_compl() */
-};
-
#define LCHAN_FN_DUMMY 0xFFFFFFFF
#define LCHAN_FN_WAIT 0xFFFFFFFE