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

[pespin]

pespin has uploaded this change for review. ( 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.

Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0
---
M src/pcu_l1_if.cpp
M src/pcu_vty.c
2 files changed, 19 insertions(+), 21 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/28/20928/1

diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 4491c4e..4f9eccb 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -643,6 +643,15 @@
 	bts->cs4 = !!(info_ind->flags & PCU_IF_FLAG_CS4);
 	if (!bts->cs1 && !bts->cs2 && !bts->cs3 && !bts->cs4)
 		bts->cs1 = 1;
+	bts->egprs_enabled = !!(info_ind->flags & (PCU_IF_FLAG_MCS1 |
+						   PCU_IF_FLAG_MCS2 |
+						   PCU_IF_FLAG_MCS3 |
+						   PCU_IF_FLAG_MCS4 |
+						   PCU_IF_FLAG_MCS5 |
+						   PCU_IF_FLAG_MCS6 |
+						   PCU_IF_FLAG_MCS7 |
+						   PCU_IF_FLAG_MCS8 |
+						   PCU_IF_FLAG_MCS9));
 	if (info_ind->t3142) { /* if timer values are set */
 		osmo_tdef_set(bts->T_defs_bts, 3142, info_ind->t3142, OSMO_TDEF_S);
 		osmo_tdef_set(bts->T_defs_bts, 3169, info_ind->t3169, OSMO_TDEF_S);
diff --git a/src/pcu_vty.c b/src/pcu_vty.c
index 6dfcdf5..1bd2081 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: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201027/23ba3bbe/attachment.htm>