<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24799">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Rename osmo dyn ts enums to contain SDCCH8<br><br>They will gain support to be activated as SDCCH/8 soon too.<br><br>Related: SYS#5309<br>Depends: libosmocore.git I56dcfe4d17899630b17f80145c3ced72f1e91e68<br>Change-Id: Ia617d20fc52f09dbab8f4516c06fa1efac08e898<br>---<br>M doc/manuals/abis/rsl.adoc<br>M src/common/gsm_data.c<br>M src/common/lchan.c<br>M src/common/oml.c<br>M src/common/pcu_sock.c<br>M src/common/rsl.c<br>M src/common/vty.c<br>M src/osmo-bts-lc15/l1_if.c<br>M src/osmo-bts-lc15/oml.c<br>M src/osmo-bts-oc2g/l1_if.c<br>M src/osmo-bts-oc2g/oml.c<br>M src/osmo-bts-octphy/l1_if.c<br>M src/osmo-bts-octphy/l1_oml.c<br>M src/osmo-bts-sysmo/l1_if.c<br>M src/osmo-bts-sysmo/oml.c<br>M src/osmo-bts-trx/l1_if.c<br>16 files changed, 52 insertions(+), 52 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/abis/rsl.adoc b/doc/manuals/abis/rsl.adoc</span><br><span>index b4c2609..6d8cd36 100644</span><br><span>--- a/doc/manuals/abis/rsl.adoc</span><br><span>+++ b/doc/manuals/abis/rsl.adoc</span><br><span>@@ -123,7 +123,7 @@</span><br><span> ==== Channel Activation</span><br><span> </span><br><span> When used on a timeslot using the non-standard channel combination</span><br><span style="color: hsl(0, 100%, 40%);">-'NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH' as configured by OML, the regular</span><br><span style="color: hsl(120, 100%, 40%);">+'NM_CHANC_OSMO_DYN' as configured by OML, the regular</span><br><span> RSL channel activation procedures can not only be used for activation</span><br><span> of circuit-switched channels, but also for activation of a PDCH.</span><br><span> </span><br><span>@@ -417,7 +417,7 @@</span><br><span> ==== Osmocom Style Dynamic Channels</span><br><span> </span><br><span> This method is in use when OML uses</span><br><span style="color: hsl(0, 100%, 40%);">-'NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH' (0x90) for the given time-slot.</span><br><span style="color: hsl(120, 100%, 40%);">+'NM_CHANC_OSMO_DYN' (0x90) for the given time-slot.</span><br><span> </span><br><span> The activation of PDCH is performed by using the regular 'RSL CHANNEL ACTIVATE'</span><br><span> procedure according to <<CHANNEL_ACTIVATION>>, with these modifications:</span><br><span>diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c</span><br><span>index f533fb9..a6b0d7e 100644</span><br><span>--- a/src/common/gsm_data.c</span><br><span>+++ b/src/common/gsm_data.c</span><br><span>@@ -52,7 +52,7 @@</span><br><span> { GSM_PCHAN_UNKNOWN, "UNKNOWN" },</span><br><span> { GSM_PCHAN_CCCH_SDCCH4_CBCH, "CCCH+SDCCH4+CBCH" },</span><br><span> { GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "SDCCH8+CBCH" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GSM_PCHAN_TCH_F_TCH_H_PDCH, "TCH/F_TCH/H_PDCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM_PCHAN_OSMO_DYN, "TCH/F_TCH/H_SDCCH8_PDCH" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>@@ -69,7 +69,7 @@</span><br><span> { GSM_PCHAN_UNKNOWN, "Unknown / Unsupported channel combination" },</span><br><span> { GSM_PCHAN_CCCH_SDCCH4_CBCH, "FCCH + SCH + BCCH + CCCH + CBCH + 3 SDCCH + 2 SACCH (Comb. V)" },</span><br><span> { GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "7 SDCCH + 4 SACCH + CBCH (Comb. VII)" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GSM_PCHAN_TCH_F_TCH_H_PDCH, "Dynamic TCH/F or TCH/H or GPRS PDCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM_PCHAN_OSMO_DYN, "Dynamic TCH/F or TCH/H or SDCCH/8 or GPRS PDCH" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>@@ -115,7 +115,7 @@</span><br><span> char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts)</span><br><span> {</span><br><span> switch (ts->pchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> if (ts->dyn.pchan_is == ts->dyn.pchan_want)</span><br><span> snprintf(ts2str, sizeof(ts2str),</span><br><span> "(" GSM_TS_NAME_FMT ",pchan=%s as %s)",</span><br><span>@@ -176,7 +176,7 @@</span><br><span> {</span><br><span> uint8_t cbits, chan_nr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);</span><br><span> OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);</span><br><span> </span><br><span> switch (pchan) {</span><br><span>@@ -243,7 +243,7 @@</span><br><span> uint8_t chan_nr;</span><br><span> </span><br><span> switch (lchan->ts->pchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> /* Return chan_nr reflecting the current TS pchan, either a standard TCH kind, or the</span><br><span> * nonstandard value reflecting PDCH for Osmocom style dyn TS. */</span><br><span> chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, lchan->ts->dyn.pchan_is);</span><br><span>@@ -269,7 +269,7 @@</span><br><span> uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan,</span><br><span> enum gsm_phys_chan_config as_pchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN</span><br><span> && as_pchan == GSM_PCHAN_PDCH)</span><br><span> return RSL_CHAN_OSMO_PDCH | (lchan->ts->nr & ~RSL_CHAN_NR_MASK);</span><br><span> return gsm_pchan2chan_nr(as_pchan, lchan->ts->nr, lchan->nr);</span><br><span>@@ -347,7 +347,7 @@</span><br><span> if (ts->pchan != GSM_PCHAN_TCH_F &&</span><br><span> ts->pchan != GSM_PCHAN_PDCH &&</span><br><span> ts->pchan != GSM_PCHAN_TCH_F_PDCH &&</span><br><span style="color: hsl(0, 100%, 40%);">- ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->pchan != GSM_PCHAN_OSMO_DYN)</span><br><span> ok = false;</span><br><span> break;</span><br><span> case ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(0):</span><br><span>@@ -360,7 +360,7 @@</span><br><span> case ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(1):</span><br><span> lch_idx = cbits & 0x1; /* TCH/H */</span><br><span> if (ts->pchan != GSM_PCHAN_TCH_H &&</span><br><span style="color: hsl(0, 100%, 40%);">- ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->pchan != GSM_PCHAN_OSMO_DYN)</span><br><span> ok = false;</span><br><span> break;</span><br><span> case ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(0):</span><br><span>@@ -397,7 +397,7 @@</span><br><span> break;</span><br><span> case ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH:</span><br><span> lch_idx = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->pchan != GSM_PCHAN_OSMO_DYN)</span><br><span> ok = false;</span><br><span> break;</span><br><span> default:</span><br><span>@@ -421,7 +421,7 @@</span><br><span> [GSM_PCHAN_CCCH_SDCCH4_CBCH] = 4,</span><br><span> [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 8,</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_TCH_F_TCH_H_PDCH should not be</span><br><span style="color: hsl(120, 100%, 40%);">+ * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_OSMO_DYN should not be</span><br><span> * part of this, those TS are handled according to their dynamic state.</span><br><span> */</span><br><span> };</span><br><span>@@ -430,7 +430,7 @@</span><br><span> enum gsm_phys_chan_config ts_pchan(const struct gsm_bts_trx_ts *ts)</span><br><span> {</span><br><span> switch (ts->pchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> return ts->dyn.pchan_is;</span><br><span> case GSM_PCHAN_TCH_F_PDCH:</span><br><span> if (ts->flags & TS_F_PDCH_ACTIVE)</span><br><span>diff --git a/src/common/lchan.c b/src/common/lchan.c</span><br><span>index 9e98166..5a3f539 100644</span><br><span>--- a/src/common/lchan.c</span><br><span>+++ b/src/common/lchan.c</span><br><span>@@ -40,7 +40,7 @@</span><br><span> case GSM_PCHAN_TCH_F_PDCH:</span><br><span> return (ts->flags & TS_F_PDCH_ACTIVE)</span><br><span> && !(ts->flags & TS_F_PDCH_PENDING_MASK);</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> return ts->dyn.pchan_is == GSM_PCHAN_PDCH</span><br><span> && ts->dyn.pchan_want == ts->dyn.pchan_is;</span><br><span> default:</span><br><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index aeded8b..819b033 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -802,7 +802,7 @@</span><br><span> : GSM_PCHAN_TCH_F;</span><br><span> </span><br><span> /* Osmocom RSL CHAN ACT style dyn TS */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pchan == GSM_PCHAN_OSMO_DYN) {</span><br><span> pchan = ts->dyn.pchan_is;</span><br><span> </span><br><span> /* If the dyn TS doesn't have a pchan yet, do nothing. */</span><br><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index f40dd42..41a5ffc 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -99,7 +99,7 @@</span><br><span> return !(ts->flags & TS_F_PDCH_DEACT_PENDING);</span><br><span> else</span><br><span> return (ts->flags & TS_F_PDCH_ACT_PENDING);</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> /*</span><br><span> * When we're busy de-/activating the PDCH, we first set</span><br><span> * ts->dyn.pchan_want, tell the PCU about it and wait for a</span><br><span>@@ -867,7 +867,7 @@</span><br><span> gsm_lchant_name(lchan->type));</span><br><span> return -EINVAL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH &&</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN &&</span><br><span> lchan->ts->dyn.pchan_is != GSM_PCHAN_PDCH) {</span><br><span> LOGP(DPCU, LOGL_ERROR,</span><br><span> "%s request, but lchan in dyn TS is not configured as PDCH in lower layers (is %s)\n",</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 010b9d3..8043f98 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1132,7 +1132,7 @@</span><br><span> </span><br><span> case LCHAN_REL_ACT_PCU:</span><br><span> switch (lchan->ts->pchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> if (lchan->ts->dyn.pchan_is != GSM_PCHAN_PDCH) {</span><br><span> LOGP(DRSL, LOGL_ERROR, "%s (ss=%d) PDCH release: not in PDCH mode\n",</span><br><span> gsm_ts_and_pchan_name(lchan->ts), lchan->nr);</span><br><span>@@ -1140,7 +1140,7 @@</span><br><span> }</span><br><span> if (lchan->ts->dyn.pchan_want != GSM_PCHAN_PDCH) {</span><br><span> /* Continue to ack the release below. (This is a non-standard rel ack invented</span><br><span style="color: hsl(0, 100%, 40%);">- * specifically for GSM_PCHAN_TCH_F_TCH_H_PDCH). */</span><br><span style="color: hsl(120, 100%, 40%);">+ * specifically for GSM_PCHAN_OSMO_DYN). */</span><br><span> /* remember the fact that the TS is now released */</span><br><span> lchan->ts->dyn.pchan_is = GSM_PCHAN_NONE;</span><br><span> send_rel_ack = true;</span><br><span>@@ -1502,7 +1502,7 @@</span><br><span> return rsl_tx_chan_act_nack(lchan, RSL_ERR_EQUIPMENT_FAIL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->pchan == GSM_PCHAN_OSMO_DYN) {</span><br><span> ts->dyn.pchan_want = dyn_pchan_from_chan_nr(dch->chan_nr);</span><br><span> DEBUGP(DRSL, "%s rx chan activ\n", gsm_ts_and_pchan_name(ts));</span><br><span> </span><br><span>@@ -1711,7 +1711,7 @@</span><br><span> gsm48_chan_mode_name(lchan->tch_mode));</span><br><span> </span><br><span> /* Connecting PDCH on dyn TS goes via PCU instead. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->pchan == GSM_PCHAN_OSMO_DYN</span><br><span> && ts->dyn.pchan_want == GSM_PCHAN_PDCH) {</span><br><span> /*</span><br><span> * We ack the activation to the BSC right away, regardless of</span><br><span>@@ -1851,7 +1851,7 @@</span><br><span> lchan->rel_act_kind = LCHAN_REL_ACT_RSL;</span><br><span> </span><br><span> /* Dynamic channel in PDCH mode is released via PCU */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN</span><br><span> && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH) {</span><br><span> rc = dyn_ts_pdch_release(lchan);</span><br><span> if (rc == 1) {</span><br><span>@@ -3032,7 +3032,7 @@</span><br><span> switch (ts->pchan) {</span><br><span> case GSM_PCHAN_TCH_F_PDCH:</span><br><span> return ipacc_dyn_pdch_ts_disconnected(ts);</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> return osmo_dyn_ts_disconnected(ts);</span><br><span> default:</span><br><span> return;</span><br><span>@@ -3130,7 +3130,7 @@</span><br><span> switch (ts->pchan) {</span><br><span> case GSM_PCHAN_TCH_F_PDCH:</span><br><span> return ipacc_dyn_pdch_ts_connected(ts, rc);</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> return osmo_dyn_ts_connected(ts, rc);</span><br><span> default:</span><br><span> return;</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 10e1748..3065a90 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -1541,7 +1541,7 @@</span><br><span> static void vty_out_dyn_ts_status(struct vty *vty, const struct gsm_bts_trx_ts *ts)</span><br><span> {</span><br><span> switch (ts->pchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> if (ts->dyn.pchan_is == ts->dyn.pchan_want)</span><br><span> vty_out(vty, " as %s",</span><br><span> gsm_pchan_name(ts->dyn.pchan_is));</span><br><span>@@ -1690,7 +1690,7 @@</span><br><span> lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE);</span><br><span> /* show dyn TS details, if applicable */</span><br><span> switch (lchan->ts->pchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> vty_out(vty, " Osmocom Dyn TS:");</span><br><span> vty_out_dyn_ts_status(vty, lchan->ts);</span><br><span> vty_out(vty, VTY_NEWLINE);</span><br><span>diff --git a/src/osmo-bts-lc15/l1_if.c b/src/osmo-bts-lc15/l1_if.c</span><br><span>index b7c24c0..02c8646 100644</span><br><span>--- a/src/osmo-bts-lc15/l1_if.c</span><br><span>+++ b/src/osmo-bts-lc15/l1_if.c</span><br><span>@@ -682,7 +682,7 @@</span><br><span> if (ts->flags & TS_F_PDCH_ACTIVE)</span><br><span> return GSM_PCHAN_PDCH;</span><br><span> return GSM_PCHAN_TCH_F;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> return ts->dyn.pchan_is;</span><br><span> default:</span><br><span> return ts->pchan;</span><br><span>@@ -696,7 +696,7 @@</span><br><span> uint8_t cbits = 0;</span><br><span> enum gsm_phys_chan_config pchan = pick_pchan(ts);</span><br><span> OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);</span><br><span> </span><br><span> switch (sapi) {</span><br><span> case GsmL1_Sapi_Bcch:</span><br><span>diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c</span><br><span>index acce1d4..b4945be 100644</span><br><span>--- a/src/osmo-bts-lc15/oml.c</span><br><span>+++ b/src/osmo-bts-lc15/oml.c</span><br><span>@@ -93,7 +93,7 @@</span><br><span> [GSM_PCHAN_PDCH] = GsmL1_LogChComb_XIII,</span><br><span> [GSM_PCHAN_UNKNOWN] = GsmL1_LogChComb_0,</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_TCH_F_TCH_H_PDCH should not be</span><br><span style="color: hsl(120, 100%, 40%);">+ * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_OSMO_DYN should not be</span><br><span> * part of this, only "real" pchan values will be looked up here.</span><br><span> * See the callers of ts_connect_as().</span><br><span> */</span><br><span>@@ -525,7 +525,7 @@</span><br><span> GsmL1_MphConnectReq_t *cr;</span><br><span> </span><br><span> if (pchan == GSM_PCHAN_TCH_F_PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- || pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ || pchan == GSM_PCHAN_OSMO_DYN) {</span><br><span> LOGP(DL1C, LOGL_ERROR,</span><br><span> "%s Requested TS connect as %s,"</span><br><span> " expected a specific pchan instead\n",</span><br><span>@@ -545,7 +545,7 @@</span><br><span> {</span><br><span> enum gsm_phys_chan_config pchan = ts->pchan;</span><br><span> switch (pchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> ts->dyn.pchan_is = ts->dyn.pchan_want = GSM_PCHAN_NONE;</span><br><span> /* First connect as NONE, until first RSL CHAN ACT. */</span><br><span> pchan = GSM_PCHAN_NONE;</span><br><span>@@ -580,7 +580,7 @@</span><br><span> {</span><br><span> enum gsm_phys_chan_config pchan = lchan->ts->pchan;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pchan == GSM_PCHAN_OSMO_DYN)</span><br><span> pchan = lchan->ts->dyn.pchan_want;</span><br><span> </span><br><span> switch (pchan) {</span><br><span>@@ -599,7 +599,7 @@</span><br><span> case GSM_PCHAN_PDCH:</span><br><span> case GSM_PCHAN_UNKNOWN:</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* case GSM_PCHAN_TCH_F_TCH_H_PDCH: is caught above */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* case GSM_PCHAN_OSMO_DYN: is caught above */</span><br><span> return GsmL1_SubCh_NA;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c</span><br><span>index 475edd2..2cefc3b 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_if.c</span><br><span>+++ b/src/osmo-bts-oc2g/l1_if.c</span><br><span>@@ -735,7 +735,7 @@</span><br><span> if (ts->flags & TS_F_PDCH_ACTIVE)</span><br><span> return GSM_PCHAN_PDCH;</span><br><span> return GSM_PCHAN_TCH_F;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> return ts->dyn.pchan_is;</span><br><span> default:</span><br><span> return ts->pchan;</span><br><span>@@ -749,7 +749,7 @@</span><br><span> uint8_t cbits = 0;</span><br><span> enum gsm_phys_chan_config pchan = pick_pchan(ts);</span><br><span> OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);</span><br><span> </span><br><span> switch (sapi) {</span><br><span> case GsmL1_Sapi_Bcch:</span><br><span>diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c</span><br><span>index 5646cfb..9791ab8 100644</span><br><span>--- a/src/osmo-bts-oc2g/oml.c</span><br><span>+++ b/src/osmo-bts-oc2g/oml.c</span><br><span>@@ -93,7 +93,7 @@</span><br><span> [GSM_PCHAN_PDCH] = GsmL1_LogChComb_XIII,</span><br><span> [GSM_PCHAN_UNKNOWN] = GsmL1_LogChComb_0,</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_TCH_F_TCH_H_PDCH should not be</span><br><span style="color: hsl(120, 100%, 40%);">+ * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_OSMO_DYN should not be</span><br><span> * part of this, only "real" pchan values will be looked up here.</span><br><span> * See the callers of ts_connect_as().</span><br><span> */</span><br><span>@@ -540,7 +540,7 @@</span><br><span> GsmL1_MphConnectReq_t *cr;</span><br><span> </span><br><span> if (pchan == GSM_PCHAN_TCH_F_PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- || pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ || pchan == GSM_PCHAN_OSMO_DYN) {</span><br><span> LOGP(DL1C, LOGL_ERROR,</span><br><span> "%s Requested TS connect as %s,"</span><br><span> " expected a specific pchan instead\n",</span><br><span>@@ -560,7 +560,7 @@</span><br><span> {</span><br><span> enum gsm_phys_chan_config pchan = ts->pchan;</span><br><span> switch (pchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> ts->dyn.pchan_is = ts->dyn.pchan_want = GSM_PCHAN_NONE;</span><br><span> /* First connect as NONE, until first RSL CHAN ACT. */</span><br><span> pchan = GSM_PCHAN_NONE;</span><br><span>@@ -595,7 +595,7 @@</span><br><span> {</span><br><span> enum gsm_phys_chan_config pchan = lchan->ts->pchan;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pchan == GSM_PCHAN_OSMO_DYN)</span><br><span> pchan = lchan->ts->dyn.pchan_want;</span><br><span> </span><br><span> switch (pchan) {</span><br><span>@@ -614,7 +614,7 @@</span><br><span> case GSM_PCHAN_PDCH:</span><br><span> case GSM_PCHAN_UNKNOWN:</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* case GSM_PCHAN_TCH_F_TCH_H_PDCH: is caught above */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* case GSM_PCHAN_OSMO_DYN: is caught above */</span><br><span> return GsmL1_SubCh_NA;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c</span><br><span>index f69a535..294a65e 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_if.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_if.c</span><br><span>@@ -329,7 +329,7 @@</span><br><span> if (ts->flags & TS_F_PDCH_ACTIVE)</span><br><span> return GSM_PCHAN_PDCH;</span><br><span> return GSM_PCHAN_TCH_F;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> return ts->dyn.pchan_is;</span><br><span> default:</span><br><span> return ts->pchan;</span><br><span>@@ -344,7 +344,7 @@</span><br><span> enum gsm_phys_chan_config pchan = pick_pchan(ts);</span><br><span> </span><br><span> OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);</span><br><span> </span><br><span> switch (sapi) {</span><br><span> case cOCTVC1_GSM_SAPI_ENUM_BCCH:</span><br><span>diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c</span><br><span>index acd43e4..5b48b2e 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_oml.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_oml.c</span><br><span>@@ -1832,7 +1832,7 @@</span><br><span> {</span><br><span> int rc;</span><br><span> if (as_pchan == GSM_PCHAN_TCH_F_PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- || as_pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ || as_pchan == GSM_PCHAN_OSMO_DYN) {</span><br><span> LOGP(DL1C, LOGL_ERROR,</span><br><span> "%s Requested TS connect as %s,"</span><br><span> " expected a specific pchan instead\n",</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c</span><br><span>index 07f36db..5c99824 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_if.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_if.c</span><br><span>@@ -683,7 +683,7 @@</span><br><span> if (ts->flags & TS_F_PDCH_ACTIVE)</span><br><span> return GSM_PCHAN_PDCH;</span><br><span> return GSM_PCHAN_TCH_F;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> return ts->dyn.pchan_is;</span><br><span> default:</span><br><span> return ts->pchan;</span><br><span>@@ -697,7 +697,7 @@</span><br><span> uint8_t cbits = 0;</span><br><span> enum gsm_phys_chan_config pchan = pick_pchan(ts);</span><br><span> OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);</span><br><span> </span><br><span> switch (sapi) {</span><br><span> case GsmL1_Sapi_Bcch:</span><br><span>diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c</span><br><span>index 818d82b..93ecf90 100644</span><br><span>--- a/src/osmo-bts-sysmo/oml.c</span><br><span>+++ b/src/osmo-bts-sysmo/oml.c</span><br><span>@@ -90,7 +90,7 @@</span><br><span> [GSM_PCHAN_PDCH] = GsmL1_LogChComb_XIII,</span><br><span> [GSM_PCHAN_UNKNOWN] = GsmL1_LogChComb_0,</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_TCH_F_TCH_H_PDCH should not be</span><br><span style="color: hsl(120, 100%, 40%);">+ * GSM_PCHAN_TCH_F_PDCH and GSM_PCHAN_OSMO_DYN should not be</span><br><span> * part of this, only "real" pchan values will be looked up here.</span><br><span> * See the callers of ts_connect_as().</span><br><span> */</span><br><span>@@ -521,7 +521,7 @@</span><br><span> GsmL1_MphConnectReq_t *cr;</span><br><span> </span><br><span> if (pchan == GSM_PCHAN_TCH_F_PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- || pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ || pchan == GSM_PCHAN_OSMO_DYN) {</span><br><span> LOGP(DL1C, LOGL_ERROR,</span><br><span> "%s Requested TS connect as %s,"</span><br><span> " expected a specific pchan instead\n",</span><br><span>@@ -546,7 +546,7 @@</span><br><span> {</span><br><span> enum gsm_phys_chan_config pchan = ts->pchan;</span><br><span> switch (pchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> ts->dyn.pchan_is = ts->dyn.pchan_want = GSM_PCHAN_NONE;</span><br><span> /* First connect as NONE, until first RSL CHAN ACT. */</span><br><span> pchan = GSM_PCHAN_NONE;</span><br><span>@@ -581,7 +581,7 @@</span><br><span> {</span><br><span> enum gsm_phys_chan_config pchan = lchan->ts->pchan;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pchan == GSM_PCHAN_OSMO_DYN)</span><br><span> pchan = lchan->ts->dyn.pchan_want;</span><br><span> </span><br><span> switch (pchan) {</span><br><span>@@ -601,7 +601,7 @@</span><br><span> case GSM_PCHAN_TCH_F_PDCH:</span><br><span> case GSM_PCHAN_UNKNOWN:</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* case GSM_PCHAN_TCH_F_TCH_H_PDCH: is caught above */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* case GSM_PCHAN_OSMO_DYN: is caught above */</span><br><span> return GsmL1_SubCh_NA;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c</span><br><span>index 3be5179..754e9d7 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.c</span><br><span>+++ b/src/osmo-bts-trx/l1_if.c</span><br><span>@@ -281,7 +281,7 @@</span><br><span> /* set physical channel. For dynamic timeslots, the caller should have</span><br><span> * decided on a more specific PCHAN type already. */</span><br><span> OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN);</span><br><span> rc = trx_sched_set_pchan(ts, pchan);</span><br><span> if (rc)</span><br><span> return NM_NACK_RES_NOTAVAIL;</span><br><span>@@ -322,7 +322,7 @@</span><br><span> pchan = (ts->flags & TS_F_PDCH_ACTIVE)? GSM_PCHAN_PDCH</span><br><span> : GSM_PCHAN_TCH_F;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_OSMO_DYN:</span><br><span> OSMO_ASSERT(ts->dyn.pchan_is == ts->dyn.pchan_want);</span><br><span> pchan = ts->dyn.pchan_is;</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24799">change 24799</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/24799"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia617d20fc52f09dbab8f4516c06fa1efac08e898 </div>
<div style="display:none"> Gerrit-Change-Number: 24799 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>