[MERGED] openbsc[master]: comments: clarify some dynamic TS comments

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: comments: clarify some dynamic TS comments
......................................................................


comments: clarify some dynamic TS comments

A new type of dynamic channel will be introduced soon, so prepare some comments
to name the dynamic TS kind more specifically.

Change-Id: I51fa8c2ebba507299e55a5cb7e67e48a6c8471f7
---
M openbsc/src/libbsc/abis_rsl.c
M openbsc/src/libbsc/chan_alloc.c
2 files changed, 9 insertions(+), 6 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index 013daec..0455189 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -470,7 +470,7 @@
 	if (rc < 0)
 		return rc;
 
-	/* if channel is in PDCH mode, deactivate PDCH first */
+	/* If a TCH_F/PDCH TS is in PDCH mode, deactivate PDCH first. */
 	if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH
 	    && (lchan->ts->flags & TS_F_PDCH_ACTIVE)) {
 		/* store activation type and handover reference */
@@ -772,7 +772,7 @@
 	 *
 	 * Any state other than LCHAN_S_REL_ERR became LCHAN_S_NONE after above
 	 * do_lchan_free(). Assert this, because that's what ensures a PDCH ACT
-	 * on a dynamic channel in all cases.
+	 * on a TCH/F_PDCH TS in all cases.
 	 *
 	 * If GPRS is disabled, always skip the PDCH ACT.
 	 */
diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c
index f4ed530..27da206 100644
--- a/openbsc/src/libbsc/chan_alloc.c
+++ b/openbsc/src/libbsc/chan_alloc.c
@@ -43,7 +43,7 @@
 			return 0;
 	}
 
-	/* If a dyn PDCH channel is busy changing, it is already taken or not
+	/* If a TCH/F_PDCH TS is busy changing, it is already taken or not
 	 * yet available. */
 	if (ts->pchan == GSM_PCHAN_TCH_F_PDCH) {
 		if (ts->flags & TS_F_PDCH_PENDING_MASK)
@@ -142,9 +142,12 @@
 
 /* Allocate a logical channel.
  *
- * For TCH/F, we may return a dynamic TCH/F_PDCH channel (but prefer a pure
- * TCH/F). If we pick a TCH/F_PDCH time slot, PDCH will be disabled later on;
- * there is no need to check whether PDCH mode is currently active, here.
+ * Dynamic channel types: we always prefer a dedicated TS, and only pick +
+ * switch a dynamic TS if no pure TS of the requested PCHAN is available.
+ *
+ * TCH_F/PDCH: if we pick a PDCH ACT style dynamic TS as TCH/F channel, PDCH
+ * will be disabled in rsl_chan_activate_lchan(); there is no need to check
+ * whether PDCH mode is currently active, here.
  */
 struct gsm_lchan *lchan_alloc(struct gsm_bts *bts, enum gsm_chan_t type,
 			      int allow_bigger)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51fa8c2ebba507299e55a5cb7e67e48a6c8471f7
Gerrit-PatchSet: 4
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>