July 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-bsc[master]: ASCI: Prepare bssmap_handle_ass_req_ct_speech() for VGCS/VBS
by jolly 13 Jul '23

13 Jul '23

Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33603 ) Change subject: ASCI: Prepare bssmap_handle_ass_req_ct_speech() for VGCS/VBS ...................................................................... Patch Set 5: (1 comment) File src/osmo-bsc/osmo_bsc_bssap.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33603/comment/99d87a06_2886ee18 PS2, Line 744: static int select_codecs(struct assignment_request *req, const struct gsm0808_channel_type *ct, > Can you point me to where is this function newly used? (I guess it's some other patch?) […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifc1e315d5282f01f8d1bd600d62476c2ae74eca9 Gerrit-Change-Number: 33603 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Jul 2023 10:24:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: ASCI: Add new debug category "ASCI" for VGCS/VBS state machines
by jolly 13 Jul '23

13 Jul '23

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33604 ) Change subject: ASCI: Add new debug category "ASCI" for VGCS/VBS state machines ...................................................................... Patch Set 5: (1 comment) File src/osmo-bsc/osmo_bsc_main.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33604/comment/612fa0f6_7622dcd8 PS3, Line 834: .description = "Advanced Speech Call Items > we might put (VGCS/VBS) in the description string to help users with the connection of those acronym […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4714fa4ff2b1327183a365223a3e3d89ae0357f7 Gerrit-Change-Number: 33604 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 13 Jul 2023 10:23:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: ASCI: Do not wait for RLL establishment
by jolly 13 Jul '23

13 Jul '23

Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33606 ) Change subject: ASCI: Do not wait for RLL establishment ...................................................................... Patch Set 5: (1 comment) File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33606/comment/3254ef83_124ba667 PS3, Line 1046: lchan->activate.info.activ_for == ACTIVATE_FOR_VGCS_CHANNEL) && > this indentation is still wrong. It should be one space further right. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96390924736029b92e54590157e38093be749dd9 Gerrit-Change-Number: 33606 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Jul 2023 10:23:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: ASCI: Add encoding of VGCS/VBS A-interface messages
by jolly 13 Jul '23

13 Jul '23

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33610 ) Change subject: ASCI: Add encoding of VGCS/VBS A-interface messages ...................................................................... Patch Set 5: (1 comment) File src/osmo-bsc/osmo_bsc_bssap.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33610/comment/9db30e80_4e563530 PS3, Line 1749: void tx_setup_ack(struct gsm_subscriber_connection *conn, struct gsm0808_vgcs_feature_flags *ff) > all the other functions appear to be called bsc_tx_* […] Right. Strange that i did not see that. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic2203a5119a226ac859a91dc42d81cbd71027ec8 Gerrit-Change-Number: 33610 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 13 Jul 2023 10:23:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[XL] Change in osmo-bsc[master]: ASCI: Add processing and FSMs for VGCS/VBS
by jolly 13 Jul '23

13 Jul '23

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33611 ) Change subject: ASCI: Add processing and FSMs for VGCS/VBS ...................................................................... Patch Set 6: (4 comments) File src/osmo-bsc/vgcs_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33611/comment/8eed4dc6_fcea32c1 PS4, Line 72: sprintf(string, "%08u", callref); > as I wrote elsewhere, I think it's good practice to use snprintf, even if (after review) we can assu […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/33611/comment/36c65553_2305558f PS4, Line 451: vgcs_call_fsm > I believe we had the discussion already at some other location: Please don't use the _fsm suffix in […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/33611/comment/5e39816a_ead0dce5 PS4, Line 1044: vgcs_chan_fsm > no _fsm suffix, please Done https://gerrit.osmocom.org/c/osmo-bsc/+/33611/comment/06ece290_7ea70f7a PS4, Line 1093: LOGP(DASCI, LOGL_ERROR, "Unable to decode Channel Type.\n"); > there are a lot of "raw" LOGP statements here, not providing any context. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id9e94fb4f27bb438b7093c031344a3400bfa34f1 Gerrit-Change-Number: 33611 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 13 Jul 2023 10:23:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: ASCI: Add new debug category "ASCI" for VGCS/VBS state machines
by jolly 13 Jul '23

13 Jul '23

Attention is currently required from: jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/33604 to look at the new patch set (#5). Change subject: ASCI: Add new debug category "ASCI" for VGCS/VBS state machines ...................................................................... ASCI: Add new debug category "ASCI" for VGCS/VBS state machines Change-Id: I4714fa4ff2b1327183a365223a3e3d89ae0357f7 Related: OS#4852 --- M include/osmocom/bsc/debug.h M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/04/33604/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4714fa4ff2b1327183a365223a3e3d89ae0357f7 Gerrit-Change-Number: 33604 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-bsc[master]: ASCI: Do not wait for RLL establishment
by jolly 13 Jul '23

13 Jul '23

Attention is currently required from: jolly. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/33606 to look at the new patch set (#5). Change subject: ASCI: Do not wait for RLL establishment ...................................................................... ASCI: Do not wait for RLL establishment A VGCS channel is established, even if there is no RLL establishmnt. RLL connection can be established or released by the talker, while the channel is kept in established state all the time. Change-Id: I96390924736029b92e54590157e38093be749dd9 Related: OS#4852 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/33606/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96390924736029b92e54590157e38093be749dd9 Gerrit-Change-Number: 33606 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-bsc[master]: ASCI: Make function to add OSMUX IE public
by jolly 13 Jul '23

13 Jul '23

Attention is currently required from: jolly. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/33602 to look at the new patch set (#5). Change subject: ASCI: Make function to add OSMUX IE public ...................................................................... ASCI: Make function to add OSMUX IE public Rename _gsm0808_ass_compl_extend_osmux() to gsm0808_extend_osmux(). This IE is also used for VGCS/VBS assignment command that is located in a different file. Change-Id: I1452cabb142f9e7a169f4ddfeac85908abaf8dfc Related: OS#4852 --- M include/osmocom/bsc/assignment_fsm.h M src/osmo-bsc/assignment_fsm.c 2 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/02/33602/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1452cabb142f9e7a169f4ddfeac85908abaf8dfc Gerrit-Change-Number: 33602 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bsc[master]: ASCI: Add encoding of VGCS/VBS A-interface messages
by jolly 13 Jul '23

13 Jul '23

Attention is currently required from: jolly. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/33610 to look at the new patch set (#5). Change subject: ASCI: Add encoding of VGCS/VBS A-interface messages ...................................................................... ASCI: Add encoding of VGCS/VBS A-interface messages Change-Id: Ic2203a5119a226ac859a91dc42d81cbd71027ec8 Related: OS#4852 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 188 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/33610/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic2203a5119a226ac859a91dc42d81cbd71027ec8 Gerrit-Change-Number: 33610 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bsc[master]: Select channel type by enum instead of three boolean
by jolly 13 Jul '23

13 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33736 ) Change subject: Select channel type by enum instead of three boolean ...................................................................... Select channel type by enum instead of three boolean struct lchan_activate_info and struct lchan_modify_info use an enum to define, if the channel type is for a normal channel, a VAMOS channel or a VGCS/VBS channel. Change-Id: I21167eb4192c02cd7b5e1574cddb382a3feaebe0 --- M include/osmocom/bsc/lchan.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_04_08_rr.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/vgcs_fsm.c 7 files changed, 65 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/33736/1 diff --git a/include/osmocom/bsc/lchan.h b/include/osmocom/bsc/lchan.h index 3099c63..c0c5761 100644 --- a/include/osmocom/bsc/lchan.h +++ b/include/osmocom/bsc/lchan.h @@ -106,6 +106,13 @@ ACTIVATE_FOR_MODE_MODIFY_RTP, }; +enum lchan_type_for { + LCHAN_TYPE_FOR_NORMAL = 0, + LCHAN_TYPE_FOR_VAMOS, + LCHAN_TYPE_FOR_VGCS, + LCHAN_TYPE_FOR_VBS, +}; + extern const struct value_string lchan_activate_mode_names[]; static inline const char *lchan_activate_mode_name(enum lchan_activate_for activ_for) { return get_value_string(lchan_activate_mode_names, activ_for); } @@ -139,10 +146,7 @@ * 7, as described in 3GPP TS 45.002. */ struct optional_val tsc; - bool vamos; - - /* In case of ASCI channel: Flags, if a VGCS channel or VBS channel is activated. */ - bool vgcs, vbs; + enum lchan_type_for type_for; /* A copy of bts->imm_ass_time at the time where Channel Activation was requested. A change in the VTY * configuration has immediate effect on the value, so make sure we don't get mixed up when it gets changed @@ -173,7 +177,7 @@ * 7, as described in 3GPP TS 45.002. */ struct optional_val tsc; - bool vamos; + enum lchan_type_for type_for; }; /* Measurement pre-processing state */ diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 6b495ae..2129699 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -406,7 +406,7 @@ static int channel_mode_from_lchan(struct rsl_ie_chan_mode *cm, struct gsm_lchan *lchan, const struct channel_mode_and_rate *ch_mode_rate, - bool vamos, bool vgcs, bool vbs) + enum lchan_type_for type_for) { int rc; memset(cm, 0, sizeof(*cm)); @@ -430,24 +430,34 @@ cm->chan_rt = RSL_CMOD_CRT_SDCCH; break; case GSM_LCHAN_TCH_F: - if (vamos) + switch (type_for) { + case LCHAN_TYPE_FOR_VAMOS: cm->chan_rt = RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm; - else if (vgcs) + break; + case LCHAN_TYPE_FOR_VGCS: cm->chan_rt = RSL_CMOD_CRT_TCH_GROUP_Bm; - else if (vbs) + break; + case LCHAN_TYPE_FOR_VBS: cm->chan_rt = RSL_CMOD_CRT_TCH_BCAST_Bm; - else + break; + default: cm->chan_rt = RSL_CMOD_CRT_TCH_Bm; + } break; case GSM_LCHAN_TCH_H: - if (vamos) + switch (type_for) { + case LCHAN_TYPE_FOR_VAMOS: cm->chan_rt = RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm; - else if (vgcs) + break; + case LCHAN_TYPE_FOR_VGCS: cm->chan_rt = RSL_CMOD_CRT_TCH_GROUP_Lm; - else if (vbs) + break; + case LCHAN_TYPE_FOR_VBS: cm->chan_rt = RSL_CMOD_CRT_TCH_BCAST_Lm; - else + break; + default: cm->chan_rt = RSL_CMOD_CRT_TCH_Lm; + } break; case GSM_LCHAN_NONE: case GSM_LCHAN_UNKNOWN: @@ -589,8 +599,7 @@ /* PDCH activation is a job for rsl_tx_dyn_ts_pdch_act_deact(); */ OSMO_ASSERT(act_type != RSL_ACT_OSMO_PDCH); - rc = channel_mode_from_lchan(&cm, lchan, &lchan->activate.ch_mode_rate, lchan->activate.info.vamos, - lchan->activate.info.vgcs, lchan->activate.info.vbs); + rc = channel_mode_from_lchan(&cm, lchan, &lchan->activate.ch_mode_rate, lchan->activate.info.type_for); if (rc < 0) { LOGP(DRSL, LOGL_ERROR, "%s Cannot find channel mode from lchan type\n", @@ -692,7 +701,7 @@ put_top_acch_cap_ie(lchan, &cm, msg); /* Selecting a specific TSC Set is only applicable to VAMOS mode */ - if (lchan->activate.info.vamos && lchan->activate.tsc_set >= 1) + if (lchan->activate.info.type_for == LCHAN_TYPE_FOR_VAMOS && lchan->activate.tsc_set >= 1) put_osmo_training_sequence_ie(msg, lchan->activate.tsc_set, lchan->activate.tsc); msg->dst = rsl_chan_link(lchan); @@ -727,7 +736,7 @@ if (chan_nr < 0) return chan_nr; - rc = channel_mode_from_lchan(&cm, lchan, &lchan->modify.ch_mode_rate, lchan->modify.info.vamos, false, false); + rc = channel_mode_from_lchan(&cm, lchan, &lchan->modify.ch_mode_rate, lchan->modify.info.type_for); if (rc < 0) return rc; @@ -765,7 +774,8 @@ /* Selecting a specific TSC Set is only applicable to VAMOS mode. Send this Osmocom specific IE only to OsmoBTS * types. */ - if (lchan->modify.info.vamos && lchan->modify.tsc_set >= 1 && bts->model->type == GSM_BTS_TYPE_OSMOBTS) + if (lchan->modify.info.type_for == LCHAN_TYPE_FOR_VAMOS && lchan->modify.tsc_set >= 1 && + bts->model->type == GSM_BTS_TYPE_OSMOBTS) put_osmo_training_sequence_ie(msg, lchan->modify.tsc_set, lchan->modify.tsc); msg->dst = rsl_chan_link(lchan); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 7e5075c..b268c54 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -669,8 +669,9 @@ .ta_known = true, .tsc_set = req->tsc_set, .tsc = req->tsc, - .vamos = conn->assignment.new_lchan->vamos.is_secondary, }; + if (conn->assignment.new_lchan->vamos.is_secondary) + activ_info.type_for = LCHAN_TYPE_FOR_VAMOS; lchan_activate(conn->assignment.new_lchan, &activ_info); } diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index e53b145..7918d81 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -870,7 +870,6 @@ .modify_for = MODIFY_FOR_VTY, .ch_mode_rate = lchan->current_ch_mode_rate, .ch_indctr = lchan->current_ch_indctr, - .vamos = vamos, .tsc_set = { .present = (tsc_set >= 0), .val = tsc_set, @@ -880,6 +879,8 @@ .val = tsc, }, }; + if (vamos) + info.type_for = LCHAN_TYPE_FOR_VAMOS; lchan_mode_modify(lchan, &info); return CMD_SUCCESS; @@ -1640,7 +1641,7 @@ info.ch_mode_rate.chan_rate = chan_t_to_chan_rate(lchan_t); if (activate == 2 || lchan->vamos.is_secondary) { - info.vamos = true; + info.type_for = LCHAN_TYPE_FOR_VAMOS; if (lchan->vamos.is_secondary) { info.tsc_set.present = true; info.tsc_set.val = 1; diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 60ccb5a..67896b1 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -758,7 +758,7 @@ } } - if (lchan->modify.info.vamos && lchan->modify.tsc_set > 0) { + if (lchan->modify.info.type_for == LCHAN_TYPE_FOR_VAMOS && lchan->modify.tsc_set > 0) { /* Add the Extended TSC Set IE. So far we only need a TSC Set sent for VAMOS. * Convert from spec conforming "human readable" TSC Set 1-4 to 0-3 on the wire */ msgb_tv_put(msg, GSM48_IE_EXTENDED_TSC_SET, (lchan->modify.tsc_set - 1) & 0x3); diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 26c1882..1b012bd 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -72,7 +72,8 @@ bool lchan_is_asci(struct gsm_lchan *lchan) { - if (lchan->activate.info.vgcs || lchan->activate.info.vbs) + if (lchan->activate.info.type_for == LCHAN_TYPE_FOR_VGCS || + lchan->activate.info.type_for == LCHAN_TYPE_FOR_VBS) return true; return false; } @@ -389,7 +390,7 @@ OSMO_ASSERT(lchan && info); - if ((info->vamos || lchan->vamos.is_secondary) + if ((info->type_for == LCHAN_TYPE_FOR_VAMOS || lchan->vamos.is_secondary) && !osmo_bts_has_feature(&lchan->ts->trx->bts->features, BTS_FEAT_VAMOS)) { lchan->last_error = talloc_strdup(lchan->ts->trx, "VAMOS related channel activation requested," " but BTS does not support VAMOS"); @@ -492,7 +493,7 @@ { OSMO_ASSERT(lchan && info); - if ((info->vamos || lchan->vamos.is_secondary) + if ((info->type_for == LCHAN_TYPE_FOR_VAMOS || lchan->vamos.is_secondary) && !osmo_bts_has_feature(&lchan->ts->trx->bts->features, BTS_FEAT_VAMOS)) { lchan->last_error = talloc_strdup(lchan->ts->trx, "VAMOS related Channel Mode Modify requested," " but BTS does not support VAMOS"); @@ -739,9 +740,9 @@ { struct osmo_fsm_inst *fi = lchan->fi; lchan->activate.ch_mode_rate = lchan->activate.info.ch_mode_rate; - lchan->activate.ch_mode_rate.chan_mode = (lchan->activate.info.vamos + lchan->activate.ch_mode_rate.chan_mode = (lchan->activate.info.type_for == LCHAN_TYPE_FOR_VAMOS) ? gsm48_chan_mode_to_vamos(lchan->activate.info.ch_mode_rate.chan_mode) - : gsm48_chan_mode_to_non_vamos(lchan->activate.info.ch_mode_rate.chan_mode)); + : gsm48_chan_mode_to_non_vamos(lchan->activate.info.ch_mode_rate.chan_mode); if (lchan->activate.ch_mode_rate.chan_mode < 0) { lchan_fail("Invalid chan_mode: %s", gsm48_chan_mode_name(lchan->activate.info.ch_mode_rate.chan_mode)); return -EINVAL; @@ -1008,7 +1009,7 @@ lchan->current_ch_mode_rate = lchan->activate.ch_mode_rate; lchan->current_mr_conf = lchan->activate.mr_conf_filtered; lchan->current_ch_indctr = lchan->activate.ch_indctr; - lchan->vamos.enabled = lchan->activate.info.vamos; + lchan->vamos.enabled = (lchan->activate.info.type_for == LCHAN_TYPE_FOR_VAMOS); lchan->tsc_set = lchan->activate.tsc_set; lchan->tsc = lchan->activate.tsc; } @@ -1197,7 +1198,7 @@ lchan->current_ch_indctr = lchan->modify.ch_indctr; lchan->tsc_set = lchan->modify.tsc_set; lchan->tsc = lchan->modify.tsc; - lchan->vamos.enabled = lchan->modify.info.vamos; + lchan->vamos.enabled = (lchan->modify.info.type_for == LCHAN_TYPE_FOR_VAMOS); if (bsc_chan_ind_requires_rtp_stream(lchan->modify.info.ch_indctr) && !lchan->fi_rtp) { /* Continue with RTP stream establishing as done in lchan_activate(). Place the requested values in @@ -1356,9 +1357,9 @@ use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); lchan->modify.ch_mode_rate = lchan->modify.info.ch_mode_rate; - lchan->modify.ch_mode_rate.chan_mode = (lchan->modify.info.vamos - ? gsm48_chan_mode_to_vamos(lchan->modify.info.ch_mode_rate.chan_mode) - : gsm48_chan_mode_to_non_vamos(lchan->modify.info.ch_mode_rate.chan_mode)); + lchan->modify.ch_mode_rate.chan_mode = (lchan->modify.info.type_for == LCHAN_TYPE_FOR_VAMOS) + ? gsm48_chan_mode_to_vamos(lchan->modify.info.ch_mode_rate.chan_mode) + : gsm48_chan_mode_to_non_vamos(lchan->modify.info.ch_mode_rate.chan_mode); if (lchan->modify.ch_mode_rate.chan_mode < 0) { lchan_fail("Invalid chan_mode: %s", gsm48_chan_mode_name(lchan->modify.info.ch_mode_rate.chan_mode)); return; diff --git a/src/osmo-bsc/vgcs_fsm.c b/src/osmo-bsc/vgcs_fsm.c index 1a7fea1..abd1ba6 100644 --- a/src/osmo-bsc/vgcs_fsm.c +++ b/src/osmo-bsc/vgcs_fsm.c @@ -603,9 +603,9 @@ .ta = 0, }; if (conn->vgcs_chan.call->vgcs_call.sf == GSM0808_SF_VGCS) - info.vgcs = 1; + info.type_for = LCHAN_TYPE_FOR_VGCS; else - info.vbs = 1; + info.type_for = LCHAN_TYPE_FOR_VBS; /* Activate lchan. If an error occurs, this the function call may trigger VGCS_EV_LCHAN_ERROR event. * This means that this must be the last action in this handler. */ lchan_activate(conn->vgcs_chan.new_lchan, &info); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I21167eb4192c02cd7b5e1574cddb382a3feaebe0 Gerrit-Change-Number: 33736 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0