<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24300">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: rename FOR_* to ACTIVATE_FOR_*<br><br>Soon, there will also be enums with ASSIGNMENT_FOR_* and MODIFY_FOR_*<br>naming. Add the ACTIVATE_ prefix to the existing enum to clarify.<br><br>Change-Id: I12190d4d154a1da6a9ebc9a755ccc2fe382ff188<br>---<br>M doc/assignment.msc<br>M doc/handover-inter-bsc-in.msc<br>M doc/handover-intra-bsc-fsm.dot<br>M doc/handover.msc<br>M doc/lchan.msc<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/assignment_fsm.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/handover_fsm.c<br>M src/osmo-bsc/lchan_fsm.c<br>12 files changed, 53 insertions(+), 53 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/assignment.msc b/doc/assignment.msc</span><br><span>index fae088f..5c3bbfb 100644</span><br><span>--- a/doc/assignment.msc</span><br><span>+++ b/doc/assignment.msc</span><br><span>@@ -30,7 +30,7 @@</span><br><span> |||;</span><br><span> lchan abox lchan [label="UNUSED"];</span><br><span> ass box ass [label="conn->assignment.new_lchan = lchan_select_by_chan_mode()"];</span><br><span style="color: hsl(0, 100%, 40%);">- lchan <- ass [label="lchan_activate(FOR_ASSIGNMENT)"];</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan <- ass [label="lchan_activate(ACTIVATE_FOR_ASSIGNMENT)"];</span><br><span> lchan abox lchan [label="WAIT_TS_READY"];</span><br><span> lchan rbox lchan [label="most details omitted, see lchan_fsm and lchan_rtp_fsm diagrams"];</span><br><span> ...;</span><br><span>diff --git a/doc/handover-inter-bsc-in.msc b/doc/handover-inter-bsc-in.msc</span><br><span>index 9534f90..fa3d75e 100644</span><br><span>--- a/doc/handover-inter-bsc-in.msc</span><br><span>+++ b/doc/handover-inter-bsc-in.msc</span><br><span>@@ -14,7 +14,7 @@</span><br><span> ho abox ho [label="allocate\nHO_ST_NOT_STARTED"];</span><br><span> ho box ho [label="lchan_select_by_chan_mode()"];</span><br><span> ho abox ho [label="HO_ST_WAIT_\nLCHAN_ACTIVE"];</span><br><span style="color: hsl(0, 100%, 40%);">- lchan <- ho [label="lchan_activate(FOR_HANDOVER)"];</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan <- ho [label="lchan_activate(ACTIVATE_FOR_HANDOVER)"];</span><br><span> lchan rbox lchan [label="(most details omitted, see lchan_fsm diagrams)"];</span><br><span> </span><br><span> ...;</span><br><span>diff --git a/doc/handover-intra-bsc-fsm.dot b/doc/handover-intra-bsc-fsm.dot</span><br><span>index 7cb0d3c..53b3eed 100644</span><br><span>--- a/doc/handover-intra-bsc-fsm.dot</span><br><span>+++ b/doc/handover-intra-bsc-fsm.dot</span><br><span>@@ -12,7 +12,7 @@</span><br><span> invisible -> old_lchan [style=invisible,arrowhead=none]</span><br><span> </span><br><span> intra -> WAIT_LCHAN_ACTIVE [label="handover_start()",style=dotted]</span><br><span style="color: hsl(0, 100%, 40%);">- WAIT_LCHAN_ACTIVE -> lchan [label="lchan_activate(FOR_HANDOVER)",style=dotted]</span><br><span style="color: hsl(120, 100%, 40%);">+ WAIT_LCHAN_ACTIVE -> lchan [label="lchan_activate(ACTIVATE_FOR_HANDOVER)",style=dotted]</span><br><span> lchan -> WAIT_LCHAN_ACTIVE [label="HO_EV_\nLCHAN_\nACTIVE,ERROR",style=dotted,constraint=false]</span><br><span> WAIT_LCHAN_ACTIVE -> WAIT_RR_HO_DETECT</span><br><span> WAIT_RR_HO_DETECT -> old_lchan [label="RR Handover\nCommand",style=dotted,constraint=false]</span><br><span>diff --git a/doc/handover.msc b/doc/handover.msc</span><br><span>index 1a2580a..9734429 100644</span><br><span>--- a/doc/handover.msc</span><br><span>+++ b/doc/handover.msc</span><br><span>@@ -31,7 +31,7 @@</span><br><span> </span><br><span> ho box ho [label="lchan_select_by_type()"];</span><br><span> ho abox ho [label="HO_ST_WAIT_\nLCHAN_ACTIVE"];</span><br><span style="color: hsl(0, 100%, 40%);">- lchan <- ho [label="lchan_activate(FOR_HANDOVER)"];</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan <- ho [label="lchan_activate(ACTIVATE_FOR_HANDOVER)"];</span><br><span> lchan rbox lchan [label="(most details omitted, see lchan_fsm diagrams)"];</span><br><span> </span><br><span> ...;</span><br><span>diff --git a/doc/lchan.msc b/doc/lchan.msc</span><br><span>index af9a59b..b35c310 100644</span><br><span>--- a/doc/lchan.msc</span><br><span>+++ b/doc/lchan.msc</span><br><span>@@ -34,11 +34,11 @@</span><br><span> ...;</span><br><span> ts -> lchan [label="LCHAN_EV_TS_READY"];</span><br><span> lchan abox lchan [label="LCHAN_ST_\nWAIT_ACTIV_ACK"];</span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="IF FOR_MS_CHANNEL_REQUEST"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="IF ACTIVATE_FOR_MS_CHANNEL_REQUEST"];</span><br><span> ms <= lchan [label="RSL Chan Activ (RSL_ACT_INTRA_IMM_ASS)"];</span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="ELSE: FOR_ASSIGNMENT"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="ELSE: ACTIVATE_FOR_ASSIGNMENT"];</span><br><span> ms <= lchan [label="RSL Chan Activ (RSL_ACT_INTRA_NORM_ASS)"];</span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="ELSE: FOR_HANDOVER"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="ELSE: ACTIVATE_FOR_HANDOVER"];</span><br><span> ms <= lchan [label="RSL Chan Activ (RSL_ACT_INTER_ASYNC)"];</span><br><span> --- [label="END"];</span><br><span> ...;</span><br><span>@@ -47,12 +47,12 @@</span><br><span> ms => lchan [label="RSL Chan Activ ACK"];</span><br><span> lchan box lchan [label="lchan_fsm_post_activ_ack()"];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="IF FOR_MS_CHANNEL_REQUEST"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="IF ACTIVATE_FOR_MS_CHANNEL_REQUEST"];</span><br><span> ms <= lchan [label="RR Immediate Assignment"];</span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="ELSE: FOR_ASSIGNMENT"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="ELSE: ACTIVATE_FOR_ASSIGNMENT"];</span><br><span> lchan rbox lchan [label="dispatch\nASSIGNMENT_EV_\nLCHAN_ACTIVE\n(see Assignment FSM diagrams)"];</span><br><span> ms <= lchan [label="RR Assignment Command"];</span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="ELSE: FOR_HANDOVER"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="ELSE: ACTIVATE_FOR_HANDOVER"];</span><br><span> lchan rbox lchan [label="dispatch\nHO_EV_LCHAN_ACTIVE\n(see Handover FSM diagrams)"];</span><br><span> --- [label="END"];</span><br><span> </span><br><span>@@ -107,12 +107,12 @@</span><br><span> ms => lchan [label="RLL Establish Ind"];</span><br><span> lchan abox lchan [label="LCHAN_ST_\nESTABLISHED"];</span><br><span> lchan box lchan [label="lchan_on_fully_established()"];</span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="IF FOR_MS_CHANNEL_REQUEST"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="IF ACTIVATE_FOR_MS_CHANNEL_REQUEST"];</span><br><span> ms note lchan [label="No action required. The MS will have sent an L3 message in the RLL</span><br><span> Establish Ind and is then free to dispatch DTAP."];</span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="ELSE: FOR_ASSIGNMENT"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="ELSE: ACTIVATE_FOR_ASSIGNMENT"];</span><br><span> lchan rbox lchan [label="dispatch\nASSIGNMENT_EV_\nLCHAN_ESTABLISHED\n(see Assignment FSM diagrams)"];</span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="ELSE: FOR_HANDOVER"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="ELSE: ACTIVATE_FOR_HANDOVER"];</span><br><span> lchan rbox lchan [label="dispatch\nHO_EV_LCHAN_ESTABLISHED\n(see Handover FSM diagrams)"];</span><br><span> --- [label="END"];</span><br><span> ...;</span><br><span>@@ -202,11 +202,11 @@</span><br><span> </span><br><span> ms rbox mgwep [label="On any error"];</span><br><span> |||;</span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="IF FOR_MS_CHANNEL_REQUEST"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="IF ACTIVATE_FOR_MS_CHANNEL_REQUEST"];</span><br><span> ms <= lchan [label="RR Immediate Assign Reject"];</span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="ELSE: FOR_ASSIGNMENT"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="ELSE: ACTIVATE_FOR_ASSIGNMENT"];</span><br><span> lchan rbox lchan [label="dispatch\nASSIGNMENT_EV_\nLCHAN_ERROR\n(see Assignment FSM diagrams)"];</span><br><span style="color: hsl(0, 100%, 40%);">- --- [label="ELSE: FOR_HANDOVER"];</span><br><span style="color: hsl(120, 100%, 40%);">+ --- [label="ELSE: ACTIVATE_FOR_HANDOVER"];</span><br><span> lchan rbox lchan [label="dispatch\nHO_EV_LCHAN_ERROR\n(see Handover FSM diagrams)"];</span><br><span> --- [label="END"];</span><br><span> |||;</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index dc10dc6..e3101ff 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -559,11 +559,11 @@</span><br><span> #define ts_for_each_potential_lchan(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_on_init)</span><br><span> </span><br><span> enum lchan_activate_mode {</span><br><span style="color: hsl(0, 100%, 40%);">- FOR_NONE,</span><br><span style="color: hsl(0, 100%, 40%);">- FOR_MS_CHANNEL_REQUEST,</span><br><span style="color: hsl(0, 100%, 40%);">- FOR_ASSIGNMENT,</span><br><span style="color: hsl(0, 100%, 40%);">- FOR_HANDOVER,</span><br><span style="color: hsl(0, 100%, 40%);">- FOR_VTY,</span><br><span style="color: hsl(120, 100%, 40%);">+ ACTIVATE_FOR_NONE,</span><br><span style="color: hsl(120, 100%, 40%);">+ ACTIVATE_FOR_MS_CHANNEL_REQUEST,</span><br><span style="color: hsl(120, 100%, 40%);">+ ACTIVATE_FOR_ASSIGNMENT,</span><br><span style="color: hsl(120, 100%, 40%);">+ ACTIVATE_FOR_HANDOVER,</span><br><span style="color: hsl(120, 100%, 40%);">+ ACTIVATE_FOR_VTY,</span><br><span> };</span><br><span> </span><br><span> extern const struct value_string lchan_activate_mode_names[];</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 20fb759..eb30345 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -1767,7 +1767,7 @@</span><br><span> LOG_LCHAN(lchan, LOGL_DEBUG, "MS: Channel Request: reason=%s ra=0x%02x ta=%d\n",</span><br><span> gsm_chreq_name(rqd->reason), rqd->ref.ra, rqd->ta);</span><br><span> info = (struct lchan_activate_info){</span><br><span style="color: hsl(0, 100%, 40%);">- .activ_for = FOR_MS_CHANNEL_REQUEST,</span><br><span style="color: hsl(120, 100%, 40%);">+ .activ_for = ACTIVATE_FOR_MS_CHANNEL_REQUEST,</span><br><span> .chan_mode = GSM48_CMODE_SIGN,</span><br><span> .ta = rqd->ta,</span><br><span> .ta_known = true,</span><br><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index 6d07a39..3a17396 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -495,7 +495,7 @@</span><br><span> gsm_lchan_name(conn->lchan));</span><br><span> </span><br><span> info = (struct lchan_activate_info){</span><br><span style="color: hsl(0, 100%, 40%);">- .activ_for = FOR_ASSIGNMENT,</span><br><span style="color: hsl(120, 100%, 40%);">+ .activ_for = ACTIVATE_FOR_ASSIGNMENT,</span><br><span> .for_conn = conn,</span><br><span> .chan_mode = conn->lchan->ch_mode_rate.chan_mode,</span><br><span> .encr = conn->lchan->encr,</span><br><span>@@ -572,7 +572,7 @@</span><br><span> </span><br><span> assignment_fsm_state_chg(ASSIGNMENT_ST_WAIT_LCHAN_ACTIVE);</span><br><span> info = (struct lchan_activate_info){</span><br><span style="color: hsl(0, 100%, 40%);">- .activ_for = FOR_ASSIGNMENT,</span><br><span style="color: hsl(120, 100%, 40%);">+ .activ_for = ACTIVATE_FOR_ASSIGNMENT,</span><br><span> .for_conn = conn,</span><br><span> .chan_mode = conn->lchan->ch_mode_rate.chan_mode,</span><br><span> .encr = conn->lchan->encr,</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index ab883f4..c482fb9 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -6070,13 +6070,13 @@</span><br><span> lchan->type = lchan_t;</span><br><span> if (!strcmp(codec_str, "hr") || !strcmp(codec_str, "fr")) {</span><br><span> info = (struct lchan_activate_info) {</span><br><span style="color: hsl(0, 100%, 40%);">- .activ_for = FOR_VTY,</span><br><span style="color: hsl(120, 100%, 40%);">+ .activ_for = ACTIVATE_FOR_VTY,</span><br><span> .chan_mode = GSM48_CMODE_SPEECH_V1,</span><br><span> .requires_voice_stream = false,</span><br><span> };</span><br><span> } else if (!strcmp(codec_str, "efr")) {</span><br><span> info = (struct lchan_activate_info) {</span><br><span style="color: hsl(0, 100%, 40%);">- .activ_for = FOR_VTY,</span><br><span style="color: hsl(120, 100%, 40%);">+ .activ_for = ACTIVATE_FOR_VTY,</span><br><span> .chan_mode = GSM48_CMODE_SPEECH_EFR,</span><br><span> .s15_s0 = amr_modes[amr_mode],</span><br><span> .requires_voice_stream = false,</span><br><span>@@ -6087,14 +6087,14 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> info = (struct lchan_activate_info) {</span><br><span style="color: hsl(0, 100%, 40%);">- .activ_for = FOR_VTY,</span><br><span style="color: hsl(120, 100%, 40%);">+ .activ_for = ACTIVATE_FOR_VTY,</span><br><span> .chan_mode = GSM48_CMODE_SPEECH_AMR,</span><br><span> .s15_s0 = amr_modes[amr_mode],</span><br><span> .requires_voice_stream = false,</span><br><span> };</span><br><span> } else if (!strcmp(codec_str, "sig")) {</span><br><span> info = (struct lchan_activate_info) {</span><br><span style="color: hsl(0, 100%, 40%);">- .activ_for = FOR_VTY,</span><br><span style="color: hsl(120, 100%, 40%);">+ .activ_for = ACTIVATE_FOR_VTY,</span><br><span> .chan_mode = GSM48_CMODE_SIGN,</span><br><span> .requires_voice_stream = false,</span><br><span> };</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 2595ea9..d5a9d6b 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -908,11 +908,11 @@</span><br><span> }</span><br><span> </span><br><span> const struct value_string lchan_activate_mode_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(FOR_NONE),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(FOR_MS_CHANNEL_REQUEST),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(FOR_ASSIGNMENT),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(FOR_HANDOVER),</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_VALUE_STRING(FOR_VTY),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(ACTIVATE_FOR_NONE),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(ACTIVATE_FOR_MS_CHANNEL_REQUEST),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(ACTIVATE_FOR_ASSIGNMENT),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(ACTIVATE_FOR_HANDOVER),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(ACTIVATE_FOR_VTY),</span><br><span> {}</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c</span><br><span>index 53cafed..0b5a8be 100644</span><br><span>--- a/src/osmo-bsc/handover_fsm.c</span><br><span>+++ b/src/osmo-bsc/handover_fsm.c</span><br><span>@@ -396,7 +396,7 @@</span><br><span> ho_fsm_state_chg(HO_ST_WAIT_LCHAN_ACTIVE);</span><br><span> </span><br><span> info = (struct lchan_activate_info){</span><br><span style="color: hsl(0, 100%, 40%);">- .activ_for = FOR_HANDOVER,</span><br><span style="color: hsl(120, 100%, 40%);">+ .activ_for = ACTIVATE_FOR_HANDOVER,</span><br><span> .for_conn = conn,</span><br><span> .chan_mode = conn->lchan->tch_mode,</span><br><span> .encr = conn->lchan->encr,</span><br><span>@@ -694,7 +694,7 @@</span><br><span> ho_fsm_state_chg(HO_ST_WAIT_LCHAN_ACTIVE);</span><br><span> </span><br><span> info = (struct lchan_activate_info){</span><br><span style="color: hsl(0, 100%, 40%);">- .activ_for = FOR_HANDOVER,</span><br><span style="color: hsl(120, 100%, 40%);">+ .activ_for = ACTIVATE_FOR_HANDOVER,</span><br><span> .for_conn = conn,</span><br><span> .chan_mode = ch_mode_rate.chan_mode,</span><br><span> .s15_s0 = ch_mode_rate.s15_s0,</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 94f7821..8527d38 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -80,7 +80,7 @@</span><br><span> </span><br><span> switch (activ_for) {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_MS_CHANNEL_REQUEST:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_MS_CHANNEL_REQUEST:</span><br><span> if (!lchan->activate.immediate_assignment_sent) {</span><br><span> /* Failure before Immediate Assignment message, send a reject. */</span><br><span> LOG_LCHAN(lchan, LOGL_NOTICE, "Tx Immediate Assignment Reject (%s)\n",</span><br><span>@@ -92,14 +92,14 @@</span><br><span> * lchan_on_activation_failure(), no additional action or logging needed. */</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_ASSIGNMENT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_ASSIGNMENT:</span><br><span> LOG_LCHAN(lchan, LOGL_NOTICE, "Signalling Assignment FSM of error (%s)\n",</span><br><span> lchan->last_error ? : "unknown error");</span><br><span> _osmo_fsm_inst_dispatch(for_conn->assignment.fi, ASSIGNMENT_EV_LCHAN_ERROR, lchan,</span><br><span> file, line);</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_HANDOVER:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_HANDOVER:</span><br><span> LOG_LCHAN(lchan, LOGL_NOTICE, "Signalling Handover FSM of error (%s)\n",</span><br><span> lchan->last_error ? : "unknown error");</span><br><span> if (!for_conn) {</span><br><span>@@ -117,7 +117,7 @@</span><br><span> _osmo_fsm_inst_dispatch(for_conn->ho.fi, HO_EV_LCHAN_ERROR, lchan, file, line);</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_VTY:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_VTY:</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR, "VTY user invoked lchan activation failed (%s)\n",</span><br><span> lchan->last_error ? : "unknown error");</span><br><span> break;</span><br><span>@@ -136,12 +136,12 @@</span><br><span> lchan->activate.concluded = true;</span><br><span> </span><br><span> switch (lchan->activate.info.activ_for) {</span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_MS_CHANNEL_REQUEST:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_MS_CHANNEL_REQUEST:</span><br><span> /* No signalling to do here, MS is free to use the channel, and should go on to connect</span><br><span> * to the MSC and establish a subscriber connection. */</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_ASSIGNMENT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_ASSIGNMENT:</span><br><span> if (!lchan->conn) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span> "lchan activation for assignment succeeded, but lchan has no conn:"</span><br><span>@@ -163,7 +163,7 @@</span><br><span> * will try to roll back a modified RTP connection. */</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_HANDOVER:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_HANDOVER:</span><br><span> if (!lchan->conn) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span> "lchan activation for handover succeeded, but lchan has no conn\n");</span><br><span>@@ -264,7 +264,7 @@</span><br><span> </span><br><span> switch (info->activ_for) {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_ASSIGNMENT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_ASSIGNMENT:</span><br><span> if (!info->for_conn</span><br><span> || !info->for_conn->fi) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR, "Activation requested, but no conn\n");</span><br><span>@@ -281,7 +281,7 @@</span><br><span> }</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_HANDOVER:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_HANDOVER:</span><br><span> if (!info->for_conn</span><br><span> || !info->for_conn->fi) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR, "Activation requested, but no conn\n");</span><br><span>@@ -452,7 +452,7 @@</span><br><span> mr = &bts->mr_half;</span><br><span> mr_conf_bts = (struct gsm48_multi_rate_conf *)mr->gsm48_ie;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->activate.info.activ_for == FOR_VTY)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->activate.info.activ_for == ACTIVATE_FOR_VTY)</span><br><span> /* If the channel is activated manually from VTY, then there is no</span><br><span> * conn attached to the lchan, also no MSC is involved. Since this</span><br><span> * option is for debugging and the codec choice is an intentional</span><br><span>@@ -486,7 +486,7 @@</span><br><span> * configuration that is set for the BTS and the specified rate.</span><br><span> * if the channel activation was triggerd by the VTY, do not</span><br><span> * filter anything (see also comment above) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->activate.info.activ_for != FOR_VTY) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->activate.info.activ_for != ACTIVATE_FOR_VTY) {</span><br><span> rc_rate = calc_amr_rate_intersection(&mr_conf_filtered, mr_conf_bts, &mr_conf_filtered);</span><br><span> if (rc_rate < 0) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span>@@ -670,15 +670,15 @@</span><br><span> }</span><br><span> </span><br><span> switch (lchan->activate.info.activ_for) {</span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_MS_CHANNEL_REQUEST:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_MS_CHANNEL_REQUEST:</span><br><span> act_type = RSL_ACT_INTRA_IMM_ASS;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_HANDOVER:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_HANDOVER:</span><br><span> act_type = lchan->conn->ho.async ? RSL_ACT_INTER_ASYNC : RSL_ACT_INTER_SYNC;</span><br><span> ho_ref = lchan->conn->ho.ho_ref;</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_ASSIGNMENT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_ASSIGNMENT:</span><br><span> act_type = RSL_ACT_INTRA_NORM_ASS;</span><br><span> break;</span><br><span> }</span><br><span>@@ -762,7 +762,7 @@</span><br><span> </span><br><span> switch (lchan->activate.info.activ_for) {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_MS_CHANNEL_REQUEST:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_MS_CHANNEL_REQUEST:</span><br><span> rc = rsl_tx_imm_assignment(lchan);</span><br><span> if (rc) {</span><br><span> lchan_fail("Failed to Tx RR Immediate Assignment message (rc=%d %s)\n",</span><br><span>@@ -773,7 +773,7 @@</span><br><span> lchan->activate.immediate_assignment_sent = true;</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_ASSIGNMENT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_ASSIGNMENT:</span><br><span> if (!lchan->conn) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span> "lchan activation for assignment succeeded, but lchan has no conn:"</span><br><span>@@ -793,7 +793,7 @@</span><br><span> osmo_fsm_inst_dispatch(lchan->conn->assignment.fi, ASSIGNMENT_EV_LCHAN_ACTIVE, lchan);</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case FOR_HANDOVER:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ACTIVATE_FOR_HANDOVER:</span><br><span> if (!lchan->conn) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span> "lchan activation for handover succeeded, but lchan has no conn:"</span><br><span>@@ -833,7 +833,7 @@</span><br><span> </span><br><span> /* When activating a channel for VTY, skip waiting for activity from</span><br><span> * lchan_rtp_fsm, but only if no voice stream is required. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->activate.info.activ_for == FOR_VTY &&</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->activate.info.activ_for == ACTIVATE_FOR_VTY &&</span><br><span> !lchan->activate.info.requires_voice_stream) {</span><br><span> lchan_fsm_state_chg(LCHAN_ST_ESTABLISHED);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24300">change 24300</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-bsc/+/24300"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I12190d4d154a1da6a9ebc9a755ccc2fe382ff188 </div>
<div style="display:none"> Gerrit-Change-Number: 24300 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </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>