VTY,CTRL: add pchan dynamic/{osmocom,ipaccess}

We already use "OSMO_DYN" as C name for "fully dynamic" timeslot config,
when working with osmo-bsc.cfg I dearly miss this short name, it is a
pain / has become ridiculous to write 'tch/f_tch/h_sdcch8_pdch'.

Introduce 'dynamic/osmocom' and 'dynamic/ipaccess' as default names for
our dynamic timeslots on VTY and CTRL. The old 'tch/f_tch/h_sdcch8_pdch'
and 'tch/f_pdch' are still supported.

Change-Id: I37719edd867c777d1ce944b8e2f1efffac38f00e

2 files changed, 19 insertions, 7 deletions

diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c
index ab3e6a053..80332ebf8 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -1633,11 +1633,11 @@ const struct osmo_stat_item_desc bts_stat_desc[] = {
 		  "", 60, 0 },
 	[BTS_STAT_CHAN_TCH_F_PDCH_USED] = \
 		{ "chan_tch_f_pdch:used",
-		  "Number of TCH/F_PDCH channels used",
+		  "Number of DYNAMIC/IPACCESS channels used",
 		  "", 60, 0 },
 	[BTS_STAT_CHAN_TCH_F_PDCH_TOTAL] = \
 		{ "chan_tch_f_pdch:total",
-		  "Number of TCH/F_PDCH channels total",
+		  "Number of DYNAMIC/IPACCESS channels total",
 		  "", 60, 0 },
 	[BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_USED] = \
 		{ "chan_ccch_sdcch4_cbch:used",
@@ -1657,11 +1657,11 @@ const struct osmo_stat_item_desc bts_stat_desc[] = {
 		  "", 60, 0 },
 	[BTS_STAT_CHAN_OSMO_DYN_USED] = \
 		{ "chan_osmo_dyn:used",
-		  "Number of TCH/F_TCH/H_SDCCH8_PDCH channels used",
+		  "Number of DYNAMIC/OSMOCOM channels used",
 		  "", 60, 0 },
 	[BTS_STAT_CHAN_OSMO_DYN_TOTAL] = \
 		{ "chan_osmo_dyn:total",
-		  "Number of TCH/F_TCH/H_SDCCH8_PDCH channels total",
+		  "Number of DYNAMIC/OSMOCOM channels total",
 		  "", 60, 0 },
 	[BTS_STAT_T3122] = \
 		{ "T3122",
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 427aad564..afedb220c 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -184,10 +184,14 @@ const struct value_string gsm_pchant_names[] = {
 	{ GSM_PCHAN_TCH_H,	"TCH/H" },
 	{ GSM_PCHAN_SDCCH8_SACCH8C, "SDCCH8" },
 	{ GSM_PCHAN_PDCH,	"PDCH" },
-	{ GSM_PCHAN_TCH_F_PDCH,	"TCH/F_PDCH" },
+	{ GSM_PCHAN_TCH_F_PDCH,	"DYNAMIC/IPACCESS" },
 	{ GSM_PCHAN_UNKNOWN,	"UNKNOWN" },
 	{ GSM_PCHAN_CCCH_SDCCH4_CBCH, "CCCH+SDCCH4+CBCH" },
 	{ GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "SDCCH8+CBCH" },
+	{ GSM_PCHAN_OSMO_DYN, "DYNAMIC/OSMOCOM" },
+	/* make get_string_value() return GSM_PCHAN_TCH_F_PDCH for both "DYNAMIC/IPACCESS" and "TCH/F_PDCH" */
+	{ GSM_PCHAN_TCH_F_PDCH,	"TCH/F_PDCH" },
+	/* make get_string_value() return GSM_PCHAN_OSMO_DYN for both "DYNAMIC/OSMOCOM" and "TCH/F_TCH/H_SDCCH8_PDCH" */
 	{ GSM_PCHAN_OSMO_DYN, "TCH/F_TCH/H_SDCCH8_PDCH" },
 	/* When adding items here, you must also add matching items to gsm_pchant_descs[]! */
 	{ 0,			NULL }
@@ -220,11 +224,19 @@ const struct value_string gsm_pchant_descs[] = {
 	{ GSM_PCHAN_TCH_H,	"2 TCH/H + 2 FACCH/H + 2 SACCH (Comb. II)" },
 	{ GSM_PCHAN_SDCCH8_SACCH8C, "8 SDCCH + 4 SACCH (Comb. VII)" },
 	{ GSM_PCHAN_PDCH,	"Packet Data Channel for GPRS/EDGE" },
-	{ GSM_PCHAN_TCH_F_PDCH,	"Dynamic TCH/F or GPRS PDCH" },
+	{ GSM_PCHAN_TCH_F_PDCH,	"Dynamic TCH/F or GPRS PDCH"
+				" (dynamic/ipaccess is an alias for tch/f_pdch)" },
 	{ GSM_PCHAN_UNKNOWN,	"Unknown / Unsupported channel combination" },
 	{ GSM_PCHAN_CCCH_SDCCH4_CBCH, "FCCH + SCH + BCCH + CCCH + CBCH + 3 SDCCH + 2 SACCH (Comb. V)" },
 	{ GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "7 SDCCH + 4 SACCH + CBCH (Comb. VII)" },
-	{ GSM_PCHAN_OSMO_DYN, "Dynamic TCH/F or TCH/H or SDCCH/8 or GPRS PDCH" },
+	{ GSM_PCHAN_OSMO_DYN,	"Dynamic TCH/F or TCH/H or SDCCH/8 or GPRS PDCH"
+				" (dynamic/osmocom is an alias for tch/f_tch/h_sdcch8_pdch)" },
+	/* These duplicate entries are needed to provide a description for both the DYNAMIC/... aliases and their
+	 * explicit versions 'TCH/F_PDCH' / 'TCH/F_TCH/H_SDCCH8_PDCH', see bts_trx_vty_init() */
+	{ GSM_PCHAN_TCH_F_PDCH,	"Dynamic TCH/F or GPRS PDCH"
+				" (dynamic/ipaccess is an alias for tch/f_pdch)" },
+	{ GSM_PCHAN_OSMO_DYN,	"Dynamic TCH/F or TCH/H or SDCCH/8 or GPRS PDCH"
+				" (dynamic/osmocom is an alias for tch/f_tch/h_sdcch8_pdch)" },
 	{ 0,			NULL }
 };