Change in osmo-bsc[master]: Support SDCCH8 in osmo dyn ts

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24786 )

Change subject: Support SDCCH8 in osmo dyn ts
......................................................................

Support SDCCH8 in osmo dyn ts

This feature signals support to configure Osmocom Dynamic Timeslot type
as SDCCH8, on top of historically supported TCH/H and TCH/F.
The idea is that when unneeded, the TS is configured as PDCH, and as
soon as there's need for an SDCCH and there's none available, the TS is
dynamically reconfigured to SDCCH8. Once all logical channels in the
dynamic TS are released and hence becomes free, the BSC will reconfigure
it to PDCH.

Related: SYS#5309
Depends: libosmocore.git Change-Id Ifc0ca8916bd3e93e5a60a7dd7391d2588fdb5532
Change-Id: I29ac8b90168dba3ac309daeb0b6cfdbbcb8e9172
---
M src/osmo-bsc/gsm_data.c
M src/osmo-bsc/lchan_select.c
M src/osmo-bsc/timeslot_fsm.c
3 files changed, 12 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  neels: Looks good to me, approved
  daniel: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 30590fb..7140ad7 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -792,6 +792,8 @@
 		return GSM_PCHAN_TCH_F;
 	case GSM_LCHAN_TCH_H:
 		return GSM_PCHAN_TCH_H;
+	case GSM_LCHAN_SDCCH:
+		return GSM_PCHAN_SDCCH8_SACCH8C;
 	case GSM_LCHAN_NONE:
 	case GSM_LCHAN_PDTCH:
 		/* TODO: so far lchan->type is NONE in PDCH mode. PDTCH is only
@@ -837,6 +839,7 @@
 		case GSM_PCHAN_TCH_F:
 		case GSM_PCHAN_TCH_H:
 		case GSM_PCHAN_PDCH:
+		case GSM_PCHAN_SDCCH8_SACCH8C:
 			return true;
 		default:
 			return false;
@@ -909,6 +912,7 @@
 		case GSM_LCHAN_TCH_F:
 		case GSM_LCHAN_TCH_H:
 		case GSM_LCHAN_PDTCH:
+		case GSM_LCHAN_SDCCH:
 			return true;
 		default:
 			return false;
diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c
index 5e9d800..efa2ff2 100644
--- a/src/osmo-bsc/lchan_select.c
+++ b/src/osmo-bsc/lchan_select.c
@@ -216,6 +216,12 @@
 			lchan = _lc_find_bts(bts, second, log);
 		if (lchan == NULL)
 			lchan = _lc_find_bts(bts, second_cbch, log);
+		/* No dedicated SDCCH available -- try fully dynamic
+		 * TCH/F_TCH/H_SDCCH8_PDCH if BTS supports it: */
+		if (lchan == NULL && osmo_bts_has_feature(&bts->features, BTS_FEAT_DYN_TS_SDCCH8))
+			lchan = _lc_dyn_find_bts(bts,
+						 GSM_PCHAN_OSMO_DYN,
+						 GSM_PCHAN_SDCCH8_SACCH8C, log);
 		break;
 	case GSM_LCHAN_TCH_F:
 		lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F, log);
diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c
index 2664245..adca31d 100644
--- a/src/osmo-bsc/timeslot_fsm.c
+++ b/src/osmo-bsc/timeslot_fsm.c
@@ -86,6 +86,8 @@
 
 	switch (ts->pchan_on_init) {
 	case GSM_PCHAN_OSMO_DYN:
+		if (lchan->type == GSM_LCHAN_SDCCH)
+			return LCHAN_NEEDS_PCHAN_CHANGE;
 		if (lchan->type == GSM_LCHAN_TCH_H)
 			return LCHAN_NEEDS_PCHAN_CHANGE;
 		/* fall thru */

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I29ac8b90168dba3ac309daeb0b6cfdbbcb8e9172
Gerrit-Change-Number: 24786
Gerrit-PatchSet: 6
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210706/faecd6cb/attachment.htm>