Change in osmo-bts[master]: gsm_data: check in and use enum lchan_rel_act_kind

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20652 )

Change subject: gsm_data: check in and use enum lchan_rel_act_kind
......................................................................

gsm_data: check in and use enum lchan_rel_act_kind

Change-Id: If7a7e90dda77a1989420e329c5d60805b28360c7
---
M include/osmo-bts/gsm_data.h
M include/osmo-bts/rsl.h
2 files changed, 10 insertions(+), 12 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h
index 3d01d55..c6fe609 100644
--- a/include/osmo-bts/gsm_data.h
+++ b/include/osmo-bts/gsm_data.h
@@ -147,6 +147,15 @@
 	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 @@
 	/* 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 5dfd6cf..4e79de5 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
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20652
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: If7a7e90dda77a1989420e329c5d60805b28360c7
Gerrit-Change-Number: 20652
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201015/da5491f9/attachment.htm>