Change in osmo-pcu[master]: ms: Set proper initial MCS values setting mode EGPRS_GMSK

[pespin]

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

Change subject: ms: Set proper initial MCS values setting mode EGPRS_GMSK
......................................................................

ms: Set proper initial MCS values setting mode EGPRS_GMSK

Before this patch, shared logic with EGPRS case would allow keeping
MCS>4.

Change-Id: I94cbf0c120fd37deb2dfd077d35b3811c7da0675
---
M src/gprs_ms.c
M tests/ms/MsTest.ok
2 files changed, 15 insertions(+), 2 deletions(-)

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



diff --git a/src/gprs_ms.c b/src/gprs_ms.c
index daa3223..f157d13 100644
--- a/src/gprs_ms.c
+++ b/src/gprs_ms.c
@@ -259,6 +259,19 @@
 		break;
 
 	case EGPRS_GMSK:
+		if (!mcs_is_edge_gmsk(ms->current_cs_ul)) {
+			ms->current_cs_ul = mcs_get_egprs_by_num(
+				ms->bts->initial_mcs_ul);
+			if (!mcs_is_valid(ms->current_cs_ul))
+				ms->current_cs_ul = MCS1;
+		}
+		if (!mcs_is_edge_gmsk(ms->current_cs_dl)) {
+			ms->current_cs_dl = mcs_get_egprs_by_num(
+				ms->bts->initial_mcs_dl);
+			if (!mcs_is_valid(ms->current_cs_dl))
+				ms->current_cs_dl = MCS1;
+		}
+		break;
 	case EGPRS:
 		if (!mcs_is_edge(ms->current_cs_ul)) {
 			ms->current_cs_ul = mcs_get_egprs_by_num(
diff --git a/tests/ms/MsTest.ok b/tests/ms/MsTest.ok
index 11766b8..3e5cdab 100644
--- a/tests/ms/MsTest.ok
+++ b/tests/ms/MsTest.ok
@@ -26,8 +26,8 @@
 2: after mode set    MS DL MCS-1/MCS-9, UL MCS-1/MCS-9, mode EGPRS, <ACTIVE>
 1: after MCS set     MS DL MCS-7/MCS-9, UL MCS-1/MCS-9, mode EGPRS, <IDLE>
 2: after MCS set     MS DL MCS-8/MCS-9, UL MCS-1/MCS-9, mode EGPRS, <ACTIVE>
-1: after mode set    MS DL MCS-7/MCS-9, UL MCS-1/MCS-9, mode EGPRS_GMSK-only, <IDLE>
-2: after mode set    MS DL MCS-8/MCS-9, UL MCS-1/MCS-9, mode EGPRS_GMSK-only, <ACTIVE>
+1: after mode set    MS DL MCS-1/MCS-9, UL MCS-1/MCS-9, mode EGPRS_GMSK-only, <IDLE>
+2: after mode set    MS DL MCS-1/MCS-9, UL MCS-1/MCS-9, mode EGPRS_GMSK-only, <ACTIVE>
 1: after mode set    MS DL CS-4/CS-4, UL CS-1/CS-4, mode GPRS, <IDLE>
 2: after mode set    MS DL CS-4/CS-4, UL CS-1/CS-4, mode GPRS, <ACTIVE>
 === end test_ms_mcs_mode ===

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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I94cbf0c120fd37deb2dfd077d35b3811c7da0675
Gerrit-Change-Number: 22433
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith 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/20210126/8fc81622/attachment.htm>