Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC

[laforge]

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

Change subject: Enable egprs support through PCUIF from BTS/BSC
......................................................................

Enable egprs support through PCUIF from BTS/BSC

This VTY command was added due to EGPRS being introduced later as an
experimental feature. It's no longer needed and causes more problems
than goodness (since people sometimes forgets to enable it).

Let's rather simply enable EGPRS support based on what BTS/BSC requests
over PCUIF.

Related: OS#4544
Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0
---
M src/pcu_l1_if.cpp
M src/pcu_vty.c
2 files changed, 14 insertions(+), 22 deletions(-)

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



diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 4f96567..127029b 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -623,12 +623,15 @@
 	}
 	bts_set_max_cs(bts, bts->vty.max_cs_dl, bts->vty.max_cs_ul); /* recalc max CS values */
 
+	bts->egprs_enabled = false;
 	bts->mcs_mask = 0;
 	for (i = 0; i < 9; i++) {
 		uint8_t allowed = !!(info_ind->flags & (PCU_IF_FLAG_MCS1 << i));
 		bts->mcs_mask |= allowed << i;
-		if (allowed)
+		if (allowed) {
+			bts->egprs_enabled = true;
 			LOGP(DL1IF, LOGL_DEBUG, " Use MCS%d\n", i + 1);
+		}
 	}
 	bts_set_max_mcs(bts, bts->vty.max_mcs_dl, bts->vty.max_mcs_ul); /* recalc max MCS values */
 
diff --git a/src/pcu_vty.c b/src/pcu_vty.c
index bd83544..5e5dfbe 100644
--- a/src/pcu_vty.c
+++ b/src/pcu_vty.c
@@ -108,9 +108,6 @@
 	unsigned int i;
 
 	vty_out(vty, "pcu%s", VTY_NEWLINE);
-	if (bts->egprs_enabled)
-		vty_out(vty, " egprs only%s", VTY_NEWLINE);
-
 	vty_out(vty, " flow-control-interval %d%s", bts->fc_interval,
 		VTY_NEWLINE);
 	if (bts->fc_bvc_bucket_size)
@@ -273,29 +270,21 @@
 
 #define EGPRS_STR "EGPRS configuration\n"
 
-DEFUN_USRATTR(cfg_pcu_egprs,
-	      cfg_pcu_egprs_cmd,
-	      X(PCU_VTY_ATTR_NEW_TBF),
-	      "egprs only",
-	      EGPRS_STR "Use EGPRS and disable plain GPRS\n")
+DEFUN_DEPRECATED(cfg_pcu_egprs,
+		 cfg_pcu_egprs_cmd,
+		 "egprs only",
+		 EGPRS_STR "Use EGPRS and disable plain GPRS\n")
 {
-	struct gprs_rlcmac_bts *bts = bts_main_data();
-
-	bts->egprs_enabled = true;
-
+	vty_out (vty, "'egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE);
 	return CMD_SUCCESS;
 }
 
-DEFUN_USRATTR(cfg_pcu_no_egprs,
-	      cfg_pcu_no_egprs_cmd,
-	      X(PCU_VTY_ATTR_NEW_TBF),
-	      "no egprs",
-	      NO_STR EGPRS_STR)
+DEFUN_DEPRECATED(cfg_pcu_no_egprs,
+		 cfg_pcu_no_egprs_cmd,
+		 "no egprs",
+		 NO_STR EGPRS_STR)
 {
-	struct gprs_rlcmac_bts *bts = bts_main_data();
-
-	bts->egprs_enabled = false;
-
+	vty_out (vty, "'no egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE);
 	return CMD_SUCCESS;
 }
 

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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0
Gerrit-Change-Number: 20928
Gerrit-PatchSet: 7
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201106/7c970673/attachment.htm>