Rename osmo dyn ts enums to contain SDCCH8

They will gain support to be activated as SDCCH/8 soon too.

Related: SYS#5309
Depends: libosmocore.git I56dcfe4d17899630b17f80145c3ced72f1e91e68
Change-Id: Ia617d20fc52f09dbab8f4516c06fa1efac08e898

16 files changed, 52 insertions, 52 deletions

diff --git a/doc/manuals/abis/rsl.adoc b/doc/manuals/abis/rsl.adoc
index b4c2609f..6d8cd36c 100644
--- a/doc/manuals/abis/rsl.adoc
+++ b/doc/manuals/abis/rsl.adoc
@@ -123,7 +123,7 @@ Specific additions and limitations apply, see the linked sections.
 ==== Channel Activation
 
 When used on a timeslot using the non-standard channel combination
-'NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH' as configured by OML, the regular
+'NM_CHANC_OSMO_DYN' as configured by OML, the regular
 RSL channel activation procedures can not only be used for activation
 of circuit-switched channels, but also for activation of a PDCH.
 
@@ -417,7 +417,7 @@ include::dyn_ts_ipa_style2.msc[]
 ==== Osmocom Style Dynamic Channels
 
 This method is in use when OML uses
-'NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH' (0x90) for the given time-slot.
+'NM_CHANC_OSMO_DYN' (0x90) for the given time-slot.
 
 The activation of PDCH is performed by using the regular 'RSL CHANNEL ACTIVATE'
 procedure according to <<CHANNEL_ACTIVATION>>, with these modifications:
diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c
index f533fb9e..a6b0d7e5 100644
--- a/src/common/gsm_data.c
+++ b/src/common/gsm_data.c
@@ -52,7 +52,7 @@ const struct value_string gsm_pchant_names[13] = {
 	{ GSM_PCHAN_UNKNOWN,	"UNKNOWN" },
 	{ GSM_PCHAN_CCCH_SDCCH4_CBCH, "CCCH+SDCCH4+CBCH" },
 	{ GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "SDCCH8+CBCH" },
-	{ GSM_PCHAN_TCH_F_TCH_H_PDCH, "TCH/F_TCH/H_PDCH" },
+	{ GSM_PCHAN_OSMO_DYN, "TCH/F_TCH/H_SDCCH8_PDCH" },
 	{ 0,			NULL }
 };
 
@@ -69,7 +69,7 @@ const struct value_string gsm_pchant_descs[13] = {
 	{ 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_TCH_F_TCH_H_PDCH, "Dynamic TCH/F or TCH/H or GPRS PDCH" },
+	{ GSM_PCHAN_OSMO_DYN, "Dynamic TCH/F or TCH/H or SDCCH/8 or GPRS PDCH" },
 	{ 0,			NULL }
 };
 
@@ -115,7 +115,7 @@ char *gsm_ts_name(const struct gsm_bts_trx_ts *ts)
 char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts)
 {
 	switch (ts->pchan) {
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		if (ts->dyn.pchan_is == ts->dyn.pchan_want)
 			snprintf(ts2str, sizeof(ts2str),
 				 "(" GSM_TS_NAME_FMT ",pchan=%s as %s)",
@@ -176,7 +176,7 @@ static uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
 {
 	uint8_t cbits, chan_nr;
 
-	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);
+	OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);
 	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);
 
 	switch (pchan) {
@@ -243,7 +243,7 @@ uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan)
 	uint8_t chan_nr;
 
 	switch (lchan->ts->pchan) {
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		/* Return chan_nr reflecting the current TS pchan, either a standard TCH kind, or the
 		 * nonstandard value reflecting PDCH for Osmocom style dyn TS. */
 		chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, lchan->ts->dyn.pchan_is);
@@ -269,7 +269,7 @@ uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan)
 uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan,
 				   enum gsm_phys_chan_config as_pchan)
 {
-	if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH
+	if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN
 	    && as_pchan == GSM_PCHAN_PDCH)
 		return RSL_CHAN_OSMO_PDCH | (lchan->ts->nr & ~RSL_CHAN_NR_MASK);
 	return gsm_pchan2chan_nr(as_pchan, lchan->ts->nr, lchan->nr);
@@ -347,7 +347,7 @@ struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr,
 		if (ts->pchan != GSM_PCHAN_TCH_F &&
 		    ts->pchan != GSM_PCHAN_PDCH &&
 		    ts->pchan != GSM_PCHAN_TCH_F_PDCH &&
-		    ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)
+		    ts->pchan != GSM_PCHAN_OSMO_DYN)
 			ok = false;
 		break;
 	case ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(0):
@@ -360,7 +360,7 @@ struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr,
 	case ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(1):
 		lch_idx = cbits & 0x1;	/* TCH/H */
 		if (ts->pchan != GSM_PCHAN_TCH_H &&
-		    ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)
+		    ts->pchan != GSM_PCHAN_OSMO_DYN)
 			ok = false;
 		break;
 	case ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(0):
@@ -397,7 +397,7 @@ struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr,
 		break;
 	case ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH:
 		lch_idx = 0;
-		if (ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)
+		if (ts->pchan != GSM_PCHAN_OSMO_DYN)
 			ok = false;
 		break;
 	default:
@@ -421,7 +421,7 @@ static const uint8_t subslots_per_pchan[] = {
 	[GSM_PCHAN_CCCH_SDCCH4_CBCH] = 4,
 	[GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 8,
 	/*
-	 * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_TCH_F_TCH_H_PDCH should not be
+	 * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_OSMO_DYN should not be
 	 * part of this, those TS are handled according to their dynamic state.
 	 */
 };
@@ -430,7 +430,7 @@ static const uint8_t subslots_per_pchan[] = {
 enum gsm_phys_chan_config ts_pchan(const struct gsm_bts_trx_ts *ts)
 {
 	switch (ts->pchan) {
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		return ts->dyn.pchan_is;
 	case GSM_PCHAN_TCH_F_PDCH:
 		if (ts->flags & TS_F_PDCH_ACTIVE)
diff --git a/src/common/lchan.c b/src/common/lchan.c
index 9e98166d..5a3f539a 100644
--- a/src/common/lchan.c
+++ b/src/common/lchan.c
@@ -40,7 +40,7 @@ bool ts_is_pdch(const struct gsm_bts_trx_ts *ts)
 	case GSM_PCHAN_TCH_F_PDCH:
 		return (ts->flags & TS_F_PDCH_ACTIVE)
 		       && !(ts->flags & TS_F_PDCH_PENDING_MASK);
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		return ts->dyn.pchan_is == GSM_PCHAN_PDCH
 		       && ts->dyn.pchan_want == ts->dyn.pchan_is;
 	default:
diff --git a/src/common/oml.c b/src/common/oml.c
index aeded8bf..819b033a 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -802,7 +802,7 @@ static int handle_chan_comb(struct gsm_bts_trx_ts *ts, const uint8_t comb)
 						    : GSM_PCHAN_TCH_F;
 
 	/* Osmocom RSL CHAN ACT style dyn TS */
-	if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {
+	if (pchan == GSM_PCHAN_OSMO_DYN) {
 		pchan = ts->dyn.pchan_is;
 
 		/* If the dyn TS doesn't have a pchan yet, do nothing. */
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index f40dd42a..41a5ffc5 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -99,7 +99,7 @@ static bool ts_should_be_pdch(const struct gsm_bts_trx_ts *ts)
 			return !(ts->flags & TS_F_PDCH_DEACT_PENDING);
 		else
 			return (ts->flags & TS_F_PDCH_ACT_PENDING);
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		/*
 		 * When we're busy de-/activating the PDCH, we first set
 		 * ts->dyn.pchan_want, tell the PCU about it and wait for a
@@ -867,7 +867,7 @@ static int pcu_rx_act_req(struct gsm_bts *bts,
 		     gsm_lchant_name(lchan->type));
 		return -EINVAL;
 	}
-	if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH &&
+	if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN &&
 	    lchan->ts->dyn.pchan_is != GSM_PCHAN_PDCH) {
 		LOGP(DPCU, LOGL_ERROR,
 		     "%s request, but lchan in dyn TS is not configured as PDCH in lower layers (is %s)\n",
diff --git a/src/common/rsl.c b/src/common/rsl.c
index 010b9d3a..8043f989 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1132,7 +1132,7 @@ int rsl_tx_rf_rel_ack(struct gsm_lchan *lchan)
 
 	case LCHAN_REL_ACT_PCU:
 		switch (lchan->ts->pchan) {
-		case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+		case GSM_PCHAN_OSMO_DYN:
 			if (lchan->ts->dyn.pchan_is != GSM_PCHAN_PDCH) {
 				LOGP(DRSL, LOGL_ERROR, "%s (ss=%d) PDCH release: not in PDCH mode\n",
 				     gsm_ts_and_pchan_name(lchan->ts), lchan->nr);
@@ -1140,7 +1140,7 @@ int rsl_tx_rf_rel_ack(struct gsm_lchan *lchan)
 			}
 			if (lchan->ts->dyn.pchan_want != GSM_PCHAN_PDCH) {
 				/* Continue to ack the release below. (This is a non-standard rel ack invented
-				 * specifically for GSM_PCHAN_TCH_F_TCH_H_PDCH). */
+				 * specifically for GSM_PCHAN_OSMO_DYN). */
 				/* remember the fact that the TS is now released */
 				lchan->ts->dyn.pchan_is = GSM_PCHAN_NONE;
 				send_rel_ack = true;
@@ -1502,7 +1502,7 @@ static int rsl_rx_chan_activ(struct msgb *msg)
 		return rsl_tx_chan_act_nack(lchan, RSL_ERR_EQUIPMENT_FAIL);
 	}
 
-	if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {
+	if (ts->pchan == GSM_PCHAN_OSMO_DYN) {
 		ts->dyn.pchan_want = dyn_pchan_from_chan_nr(dch->chan_nr);
 		DEBUGP(DRSL, "%s rx chan activ\n", gsm_ts_and_pchan_name(ts));
 
@@ -1711,7 +1711,7 @@ static int rsl_rx_chan_activ(struct msgb *msg)
 		  gsm48_chan_mode_name(lchan->tch_mode));
 
 	/* Connecting PDCH on dyn TS goes via PCU instead. */
-	if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH
+	if (ts->pchan == GSM_PCHAN_OSMO_DYN
 	    && ts->dyn.pchan_want == GSM_PCHAN_PDCH) {
 		/*
 		 * We ack the activation to the BSC right away, regardless of
@@ -1851,7 +1851,7 @@ static int rsl_rx_rf_chan_rel(struct gsm_lchan *lchan, uint8_t chan_nr)
 	lchan->rel_act_kind = LCHAN_REL_ACT_RSL;
 
 	/* Dynamic channel in PDCH mode is released via PCU */
-	if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH
+	if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN
 	    && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH) {
 		rc = dyn_ts_pdch_release(lchan);
 		if (rc == 1) {
@@ -3032,7 +3032,7 @@ void cb_ts_disconnected(struct gsm_bts_trx_ts *ts)
 	switch (ts->pchan) {
 	case GSM_PCHAN_TCH_F_PDCH:
 		return ipacc_dyn_pdch_ts_disconnected(ts);
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		return osmo_dyn_ts_disconnected(ts);
 	default:
 		return;
@@ -3130,7 +3130,7 @@ void cb_ts_connected(struct gsm_bts_trx_ts *ts, int rc)
 	switch (ts->pchan) {
 	case GSM_PCHAN_TCH_F_PDCH:
 		return ipacc_dyn_pdch_ts_connected(ts, rc);
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		return osmo_dyn_ts_connected(ts, rc);
 	default:
 		return;
diff --git a/src/common/vty.c b/src/common/vty.c
index 10e1748b..3065a90a 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1541,7 +1541,7 @@ DEFUN(show_ts,
 static void vty_out_dyn_ts_status(struct vty *vty, const struct gsm_bts_trx_ts *ts)
 {
 	switch (ts->pchan) {
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		if (ts->dyn.pchan_is == ts->dyn.pchan_want)
 			vty_out(vty, " as %s",
 				gsm_pchan_name(ts->dyn.pchan_is));
@@ -1690,7 +1690,7 @@ static void lchan_dump_full_vty(struct vty *vty, const struct gsm_lchan *lchan)
 		lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE);
 	/* show dyn TS details, if applicable */
 	switch (lchan->ts->pchan) {
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		vty_out(vty, "  Osmocom Dyn TS:");
 		vty_out_dyn_ts_status(vty, lchan->ts);
 		vty_out(vty, VTY_NEWLINE);
diff --git a/src/osmo-bts-lc15/l1_if.c b/src/osmo-bts-lc15/l1_if.c
index b7c24c08..02c8646e 100644
--- a/src/osmo-bts-lc15/l1_if.c
+++ b/src/osmo-bts-lc15/l1_if.c
@@ -682,7 +682,7 @@ static enum gsm_phys_chan_config pick_pchan(struct gsm_bts_trx_ts *ts)
 		if (ts->flags & TS_F_PDCH_ACTIVE)
 			return GSM_PCHAN_PDCH;
 		return GSM_PCHAN_TCH_F;
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		return ts->dyn.pchan_is;
 	default:
 		return ts->pchan;
@@ -696,7 +696,7 @@ static uint8_t chan_nr_by_sapi(struct gsm_bts_trx_ts *ts,
 	uint8_t cbits = 0;
 	enum gsm_phys_chan_config pchan = pick_pchan(ts);
 	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);
-	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);
+	OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);
 
 	switch (sapi) {
 	case GsmL1_Sapi_Bcch:
diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c
index acce1d42..b4945be0 100644
--- a/src/osmo-bts-lc15/oml.c
+++ b/src/osmo-bts-lc15/oml.c
@@ -93,7 +93,7 @@ static const enum GsmL1_LogChComb_t pchan_to_logChComb[_GSM_PCHAN_MAX] = {
 	[GSM_PCHAN_PDCH]		= GsmL1_LogChComb_XIII,
 	[GSM_PCHAN_UNKNOWN]		= GsmL1_LogChComb_0,
 	/*
-	 * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_TCH_F_TCH_H_PDCH should not be
+	 * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_OSMO_DYN should not be
 	 * part of this, only "real" pchan values will be looked up here.
 	 * See the callers of ts_connect_as().
 	 */
@@ -525,7 +525,7 @@ static int ts_connect_as(struct gsm_bts_trx_ts *ts,
 	GsmL1_MphConnectReq_t *cr;
 
 	if (pchan == GSM_PCHAN_TCH_F_PDCH
-	    || pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {
+	    || pchan == GSM_PCHAN_OSMO_DYN) {
 		LOGP(DL1C, LOGL_ERROR,
 		     "%s Requested TS connect as %s,"
 		     " expected a specific pchan instead\n",
@@ -545,7 +545,7 @@ static int ts_opstart(struct gsm_bts_trx_ts *ts)
 {
 	enum gsm_phys_chan_config pchan = ts->pchan;
 	switch (pchan) {
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		ts->dyn.pchan_is = ts->dyn.pchan_want = GSM_PCHAN_NONE;
 		/* First connect as NONE, until first RSL CHAN ACT. */
 		pchan = GSM_PCHAN_NONE;
@@ -580,7 +580,7 @@ GsmL1_SubCh_t lchan_to_GsmL1_SubCh_t(const struct gsm_lchan *lchan)
 {
 	enum gsm_phys_chan_config pchan = lchan->ts->pchan;
 
-	if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH)
+	if (pchan == GSM_PCHAN_OSMO_DYN)
 		pchan = lchan->ts->dyn.pchan_want;
 
 	switch (pchan) {
@@ -599,7 +599,7 @@ GsmL1_SubCh_t lchan_to_GsmL1_SubCh_t(const struct gsm_lchan *lchan)
 	case GSM_PCHAN_PDCH:
 	case GSM_PCHAN_UNKNOWN:
 	default:
-	/* case GSM_PCHAN_TCH_F_TCH_H_PDCH: is caught above */
+	/* case GSM_PCHAN_OSMO_DYN: is caught above */
 		return GsmL1_SubCh_NA;
 	}
 
diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c
index 475edd21..2cefc3b0 100644
--- a/src/osmo-bts-oc2g/l1_if.c
+++ b/src/osmo-bts-oc2g/l1_if.c
@@ -735,7 +735,7 @@ static enum gsm_phys_chan_config pick_pchan(struct gsm_bts_trx_ts *ts)
 		if (ts->flags & TS_F_PDCH_ACTIVE)
 			return GSM_PCHAN_PDCH;
 		return GSM_PCHAN_TCH_F;
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		return ts->dyn.pchan_is;
 	default:
 		return ts->pchan;
@@ -749,7 +749,7 @@ static uint8_t chan_nr_by_sapi(struct gsm_bts_trx_ts *ts,
 	uint8_t cbits = 0;
 	enum gsm_phys_chan_config pchan = pick_pchan(ts);
 	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);
-	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);
+	OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);
 
 	switch (sapi) {
 	case GsmL1_Sapi_Bcch:
diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c
index 5646cfba..9791ab8b 100644
--- a/src/osmo-bts-oc2g/oml.c
+++ b/src/osmo-bts-oc2g/oml.c
@@ -93,7 +93,7 @@ static const enum GsmL1_LogChComb_t pchan_to_logChComb[_GSM_PCHAN_MAX] = {
 	[GSM_PCHAN_PDCH]		= GsmL1_LogChComb_XIII,
 	[GSM_PCHAN_UNKNOWN]		= GsmL1_LogChComb_0,
 	/*
-	 * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_TCH_F_TCH_H_PDCH should not be
+	 * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_OSMO_DYN should not be
 	 * part of this, only "real" pchan values will be looked up here.
 	 * See the callers of ts_connect_as().
 	 */
@@ -540,7 +540,7 @@ static int ts_connect_as(struct gsm_bts_trx_ts *ts,
 	GsmL1_MphConnectReq_t *cr;
 
 	if (pchan == GSM_PCHAN_TCH_F_PDCH
-	    || pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {
+	    || pchan == GSM_PCHAN_OSMO_DYN) {
 		LOGP(DL1C, LOGL_ERROR,
 		     "%s Requested TS connect as %s,"
 		     " expected a specific pchan instead\n",
@@ -560,7 +560,7 @@ static int ts_opstart(struct gsm_bts_trx_ts *ts)
 {
 	enum gsm_phys_chan_config pchan = ts->pchan;
 	switch (pchan) {
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		ts->dyn.pchan_is = ts->dyn.pchan_want = GSM_PCHAN_NONE;
 		/* First connect as NONE, until first RSL CHAN ACT. */
 		pchan = GSM_PCHAN_NONE;
@@ -595,7 +595,7 @@ GsmL1_SubCh_t lchan_to_GsmL1_SubCh_t(const struct gsm_lchan *lchan)
 {
 	enum gsm_phys_chan_config pchan = lchan->ts->pchan;
 
-	if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH)
+	if (pchan == GSM_PCHAN_OSMO_DYN)
 		pchan = lchan->ts->dyn.pchan_want;
 
 	switch (pchan) {
@@ -614,7 +614,7 @@ GsmL1_SubCh_t lchan_to_GsmL1_SubCh_t(const struct gsm_lchan *lchan)
 	case GSM_PCHAN_PDCH:
 	case GSM_PCHAN_UNKNOWN:
 	default:
-	/* case GSM_PCHAN_TCH_F_TCH_H_PDCH: is caught above */
+	/* case GSM_PCHAN_OSMO_DYN: is caught above */
 		return GsmL1_SubCh_NA;
 	}
 
diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index f69a535c..294a65ec 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -329,7 +329,7 @@ static enum gsm_phys_chan_config pick_pchan(struct gsm_bts_trx_ts *ts)
 		if (ts->flags & TS_F_PDCH_ACTIVE)
 			return GSM_PCHAN_PDCH;
 		return GSM_PCHAN_TCH_F;
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		return ts->dyn.pchan_is;
 	default:
 		return ts->pchan;
@@ -344,7 +344,7 @@ static uint8_t chan_nr_by_sapi(struct gsm_bts_trx_ts *ts,
 	enum gsm_phys_chan_config pchan = pick_pchan(ts);
 
 	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);
-	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);
+	OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);
 
 	switch (sapi) {
 	case cOCTVC1_GSM_SAPI_ENUM_BCCH:
diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c
index acd43e4d..5b48b2e6 100644
--- a/src/osmo-bts-octphy/l1_oml.c
+++ b/src/osmo-bts-octphy/l1_oml.c
@@ -1832,7 +1832,7 @@ void bts_model_ts_connect(struct gsm_bts_trx_ts *ts,
 {
 	int rc;
 	if (as_pchan == GSM_PCHAN_TCH_F_PDCH
-	    || as_pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {
+	    || as_pchan == GSM_PCHAN_OSMO_DYN) {
 		LOGP(DL1C, LOGL_ERROR,
 		     "%s Requested TS connect as %s,"
 		     " expected a specific pchan instead\n",
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 07f36db5..5c998243 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -683,7 +683,7 @@ static enum gsm_phys_chan_config pick_pchan(struct gsm_bts_trx_ts *ts)
 		if (ts->flags & TS_F_PDCH_ACTIVE)
 			return GSM_PCHAN_PDCH;
 		return GSM_PCHAN_TCH_F;
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		return ts->dyn.pchan_is;
 	default:
 		return ts->pchan;
@@ -697,7 +697,7 @@ static uint8_t chan_nr_by_sapi(struct gsm_bts_trx_ts *ts,
 	uint8_t cbits = 0;
 	enum gsm_phys_chan_config pchan = pick_pchan(ts);
 	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);
-	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);
+	OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);
 
 	switch (sapi) {
 	case GsmL1_Sapi_Bcch:
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c
index 818d82bc..93ecf902 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -90,7 +90,7 @@ static const enum GsmL1_LogChComb_t pchan_to_logChComb[_GSM_PCHAN_MAX] = {
 	[GSM_PCHAN_PDCH]		= GsmL1_LogChComb_XIII,
 	[GSM_PCHAN_UNKNOWN]		= GsmL1_LogChComb_0,
 	/*
-	 * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_TCH_F_TCH_H_PDCH should not be
+	 * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_OSMO_DYN should not be
 	 * part of this, only "real" pchan values will be looked up here.
 	 * See the callers of ts_connect_as().
 	 */
@@ -521,7 +521,7 @@ static int ts_connect_as(struct gsm_bts_trx_ts *ts,
 	GsmL1_MphConnectReq_t *cr;
 
 	if (pchan == GSM_PCHAN_TCH_F_PDCH
-	    || pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {
+	    || pchan == GSM_PCHAN_OSMO_DYN) {
 		LOGP(DL1C, LOGL_ERROR,
 		     "%s Requested TS connect as %s,"
 		     " expected a specific pchan instead\n",
@@ -546,7 +546,7 @@ static int ts_opstart(struct gsm_bts_trx_ts *ts)
 {
 	enum gsm_phys_chan_config pchan = ts->pchan;
 	switch (pchan) {
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		ts->dyn.pchan_is = ts->dyn.pchan_want = GSM_PCHAN_NONE;
 		/* First connect as NONE, until first RSL CHAN ACT. */
 		pchan = GSM_PCHAN_NONE;
@@ -581,7 +581,7 @@ GsmL1_SubCh_t lchan_to_GsmL1_SubCh_t(const struct gsm_lchan *lchan)
 {
 	enum gsm_phys_chan_config pchan = lchan->ts->pchan;
 
-	if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH)
+	if (pchan == GSM_PCHAN_OSMO_DYN)
 		pchan = lchan->ts->dyn.pchan_want;
 
 	switch (pchan) {
@@ -601,7 +601,7 @@ GsmL1_SubCh_t lchan_to_GsmL1_SubCh_t(const struct gsm_lchan *lchan)
 	case GSM_PCHAN_TCH_F_PDCH:
 	case GSM_PCHAN_UNKNOWN:
 	default:
-	/* case GSM_PCHAN_TCH_F_TCH_H_PDCH: is caught above */
+	/* case GSM_PCHAN_OSMO_DYN: is caught above */
 		return GsmL1_SubCh_NA;
 	}
 
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index 3be51799..754e9d7a 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -281,7 +281,7 @@ static uint8_t trx_set_ts_as_pchan(struct gsm_bts_trx_ts *ts,
 	/* set physical channel. For dynamic timeslots, the caller should have
 	 * decided on a more specific PCHAN type already. */
 	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);
-	OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);
+	OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);
 	rc = trx_sched_set_pchan(ts, pchan);
 	if (rc)
 		return NM_NACK_RES_NOTAVAIL;
@@ -322,7 +322,7 @@ static uint8_t trx_set_ts(struct gsm_bts_trx_ts *ts)
 		pchan = (ts->flags & TS_F_PDCH_ACTIVE)? GSM_PCHAN_PDCH
 			                              : GSM_PCHAN_TCH_F;
 		break;
-	case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+	case GSM_PCHAN_OSMO_DYN:
 		OSMO_ASSERT(ts->dyn.pchan_is == ts->dyn.pchan_want);
 		pchan = ts->dyn.pchan_is;
 		break;