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