lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

February 2024

  • 1 participants
  • 1748 discussions
[S] Change in osmo-msc[master]: cosmetic: tweak sdp_audio_codecs_by_payload_type()
by pespin 06 Feb '24

06 Feb '24
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35876?usp=email ) Change subject: cosmetic: tweak sdp_audio_codecs_by_payload_type() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35876?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3c4e29cb240e2a9a00bc9dd065ec85a5e8d8fe38 Gerrit-Change-Number: 35876 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 10:03:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[S] Change in osmo-msc[master]: cosmetic: move check for CSD further above
by fixeria 06 Feb '24

06 Feb '24
Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35875?usp=email ) Change subject: cosmetic: move check for CSD further above ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/35875/comment/1a15aa47_2877dee2 PS2, Line 1468: GSM48_BCAP_ITCAP_UNR_DIG_INF Oh, we're missing to check two other CSD modes here: https://gerrit.osmocom.org/c/osmo-msc/+/35881 I will rebase this patch once your patches are merged. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35875?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibd21f0bb46c66a406904105564ce961a8760cbe7 Gerrit-Change-Number: 35875 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 10:02:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[S] Change in osmo-msc[master]: cosmetic: move check for CSD further above
by pespin 06 Feb '24

06 Feb '24
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35875?usp=email ) Change subject: cosmetic: move check for CSD further above ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35875?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibd21f0bb46c66a406904105564ce961a8760cbe7 Gerrit-Change-Number: 35875 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 10:02:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[S] Change in osmo-msc[master]: msc_a_up_call_assignment_complete(): handle all CSD modes
by fixeria 06 Feb '24

06 Feb '24
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/35881?usp=email ) Change subject: msc_a_up_call_assignment_complete(): handle all CSD modes ...................................................................... msc_a_up_call_assignment_complete(): handle all CSD modes Change-Id: I92f7ab11ebc2e53700b27c38e91679c2c6f72050 --- M src/libmsc/msc_a.c 1 file changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/81/35881/1 diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index a933bd2..8751819 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -1485,13 +1485,18 @@ return; } - /* Check for unexpected codec with CSD */ - if (cc_trans->bearer_cap.transfer == GSM48_BCAP_ITCAP_UNR_DIG_INF && - codec_if_known->type != GSM0808_SCT_CSD) { + switch (cc_trans->bearer_cap.transfer) { + case GSM48_BCAP_ITCAP_FAX_G3: + case GSM48_BCAP_ITCAP_3k1_AUDIO: + case GSM48_BCAP_ITCAP_UNR_DIG_INF: + if (codec_if_known->type == GSM0808_SCT_CSD) + break; /* we're good */ LOG_TRANS(cc_trans, LOGL_ERROR, "Unexpected codec in Assignment Complete for CSD: %s\n", gsm0808_speech_codec_type_name(codec_if_known->type)); call_leg_release(msc_a->cc.call_leg); return; + default: + break; } /* Update RAN-side endpoint CI from Assignment result -- unless it is forced by the ran_infra, in which -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35881?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I92f7ab11ebc2e53700b27c38e91679c2c6f72050 Gerrit-Change-Number: 35881 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange
1 0
0 0
[S] Change in osmo-msc[master]: pick up all *.vty in EXTRA_DIST
by pespin 06 Feb '24

06 Feb '24
Attention is currently required from: fixeria, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35872?usp=email ) Change subject: pick up all *.vty in EXTRA_DIST ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I thought there was some problem about using wildcards in automake? This was discussed in the patch […] That rings a bell for me too. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35872?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id28e020fc59b83d1b4cd0e5b72314a46bea62259 Gerrit-Change-Number: 35872 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 10:00:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment
1 0
0 0
[S] Change in libosmocore[master]: comment: gsm_04_08.h: add a spec hint
by pespin 06 Feb '24

06 Feb '24
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35871?usp=email ) Change subject: comment: gsm_04_08.h: add a spec hint ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35871?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2a606047db88ea47317397a790611048dead6403 Gerrit-Change-Number: 35871 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 09:58:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[S] Change in osmocom-bb[master]: mobile: use tch_send_msg() in tch_csd_tx_to_l1()
by fixeria 06 Feb '24

06 Feb '24
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35862?usp=email ) Change subject: mobile: use tch_send_msg() in tch_csd_tx_to_l1() ...................................................................... mobile: use tch_send_msg() in tch_csd_tx_to_l1() Do not access the RR API directly, use TCH API for sending UL data. Change-Id: Icd5b5fad835feecd96a83fa5c83ed08037826fa6 Related: OS#4396 --- M src/host/layer23/src/mobile/tch_data.c 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/host/layer23/src/mobile/tch_data.c b/src/host/layer23/src/mobile/tch_data.c index 5474bdf..7f0a330 100644 --- a/src/host/layer23/src/mobile/tch_data.c +++ b/src/host/layer23/src/mobile/tch_data.c @@ -407,7 +407,7 @@ OSMO_ASSERT(0); } - return gsm48_rr_tx_traffic(ms, nmsg); + return tch_send_msg(ms, nmsg); } static int tch_data_check_bcap(const struct gsm_mncc_bearer_cap *bcap) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icd5b5fad835feecd96a83fa5c83ed08037826fa6 Gerrit-Change-Number: 35862 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[M] Change in osmocom-bb[master]: mobile: init TCH state earlier (on receipt of CC ALERTING)
by fixeria 06 Feb '24

06 Feb '24
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email ) Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING) ...................................................................... mobile: init TCH state earlier (on receipt of CC ALERTING) During a Mobile Originating voice call, we would normally start receiving traffic indications with ringback tone (or even some melody) before the call gets CONNECTed. So in order for the user to be able to hear that, we need to init the voice call handler earlier (on receipt of CC ALERTING message). We should not be transmitting voice/data frames before the call gets CONNECTed, so add 'rx_only' flag to the TCH state. In tch_send_msg() drop msgb if this flag is set. Rx only mode makes no sense for data calls, so in tch_recv_cb() we discard received DL frames and thus do not trigger sending UL frames. Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/mobile/tch.h M src/host/layer23/src/mobile/tch.c 2 files changed, 52 insertions(+), 11 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved; Verified diff --git a/src/host/layer23/include/osmocom/bb/mobile/tch.h b/src/host/layer23/include/osmocom/bb/mobile/tch.h index 92bc722..293397d 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/tch.h +++ b/src/host/layer23/include/osmocom/bb/mobile/tch.h @@ -5,6 +5,7 @@ struct msgb; struct tch_state { + bool rx_only; /* Rx TCH frames, but Tx nothing */ bool is_voice; /* voice (true) or data (false) */ union { struct tch_voice_state { diff --git a/src/host/layer23/src/mobile/tch.c b/src/host/layer23/src/mobile/tch.c index 70c9163..f63f487 100644 --- a/src/host/layer23/src/mobile/tch.c +++ b/src/host/layer23/src/mobile/tch.c @@ -51,24 +51,35 @@ static int tch_recv_cb(struct osmocom_ms *ms, struct msgb *msg) { struct tch_state *state = ms->tch_state; - int rc; if (state == NULL) { msgb_free(msg); return 0; } - if (state->is_voice) - rc = tch_voice_recv(ms, msg); - else - rc = tch_data_recv(ms, msg); - return rc; + if (state->is_voice) { + return tch_voice_recv(ms, msg); + } else { + /* Rx only mode makes no sense for data calls, so we discard + * received DL frames and thus do not trigger sending UL frames. */ + if (!state->rx_only) + return tch_data_recv(ms, msg); + msgb_free(msg); + return 0; + } } /* Send an Uplink voice frame to the lower layers */ int tch_send_msg(struct osmocom_ms *ms, struct msgb *msg) { - /* Forward to RR */ + struct tch_state *state = ms->tch_state; + + if (state == NULL || state->rx_only) { + /* TODO: fix callers and print a warning here */ + msgb_free(msg); + return -EIO; + } + return gsm48_rr_tx_traffic(ms, msg); } @@ -119,18 +130,21 @@ return rc; } -static void tch_trans_cstate_active_cb(struct gsm_trans *trans) +static void tch_trans_cstate_active_cb(struct gsm_trans *trans, bool rx_only) { struct osmocom_ms *ms = trans->ms; struct tch_state *state; enum gsm48_chan_mode ch_mode; - if (ms->tch_state != NULL) + if (ms->tch_state != NULL) { + ms->tch_state->rx_only = rx_only; return; /* TODO: handle modify? */ + } state = talloc_zero(ms, struct tch_state); OSMO_ASSERT(state != NULL); ms->tch_state = state; + ms->tch_state->rx_only = rx_only; ch_mode = ms->rrlayer.cd_now.mode; switch (ch_mode) { @@ -181,8 +195,11 @@ static void tch_trans_state_chg_cb(struct gsm_trans *trans) { switch (trans->cc.state) { - case GSM_CSTATE_ACTIVE: - tch_trans_cstate_active_cb(trans); + case GSM_CSTATE_CALL_DELIVERED: /* MO call: Rx CC ALERTING */ + tch_trans_cstate_active_cb(trans, true); + break; + case GSM_CSTATE_ACTIVE: /* MO/MT call: Rx CC CONNECT */ + tch_trans_cstate_active_cb(trans, false); break; case GSM_CSTATE_NULL: tch_trans_free_cb(trans); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Gerrit-Change-Number: 35739 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[M] Change in osmocom-bb[master]: mobile: set TRAFFIC.{ind,req} mode during call establishment
by fixeria 06 Feb '24

06 Feb '24
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35740?usp=email ) Change subject: mobile: set TRAFFIC.{ind,req} mode during call establishment ...................................................................... mobile: set TRAFFIC.{ind,req} mode during call establishment Now that we support data (CSD) calls in addition to voice calls, we can no longer initialize the TRAFFIC.{ind,req} routing mode in gsm48_rr_init(). We need to apply the appropriate TCH routing mode *during call establishment* based on its type and the configured I/O handler type. After this patch, one can have the following configuration: tch-voice io-handler l1phy tch-data io-handler unix-sock io-tch-format ti so that the io-handler setting for voice would not affect data calls. Before this patch, the L1 PHY (specifically, Calypso firmware) would not route TRAFFIC.{ind,req} during data calls at all. Thanks to this patch, it's also no longer required to restart the mobile application after changing voice or data I/O handler. Change-Id: Iab68cb47c28380a9c1efc149c6196ea54f75fdb8 Related: OS#4396 --- M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/tch.c M src/host/layer23/src/mobile/tch_data.c M src/host/layer23/src/mobile/tch_voice.c M src/host/layer23/src/mobile/vty_interface.c 5 files changed, 82 insertions(+), 65 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 4d879d6..83287c1 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -6996,20 +6996,7 @@ start_rr_t_meas(rr, 1, 0); rr->tch_loop_mode = L1CTL_TCH_LOOP_OPEN; - - /* Configure audio handling in the L1PHY */ - switch (ms->settings.tch_voice.io_handler) { - case TCH_VOICE_IOH_L1PHY: - rr->audio_mode = AUDIO_RX_SPEAKER | AUDIO_TX_MICROPHONE; - break; - case TCH_VOICE_IOH_MNCC_SOCK: - case TCH_VOICE_IOH_LOOPBACK: - case TCH_VOICE_IOH_GAPK: - rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; - break; - case TCH_VOICE_IOH_NONE: - rr->audio_mode = 0x00; - } + rr->audio_mode = 0x00; /* set in tch_{voice,data}_state_init() */ /* List of notifications about ongoing ASCI calls */ INIT_LLIST_HEAD(&rr->vgcs.notif_list); @@ -7126,9 +7113,6 @@ struct gsm48_rrlayer *rr = &ms->rrlayer; uint8_t ch_type, ch_subch, ch_ts; - if (ms->settings.tch_voice.io_handler != TCH_VOICE_IOH_NONE) - return 0; - LOGP(DRR, LOGL_INFO, "setting audio mode to %d\n", mode); rr->audio_mode = mode; diff --git a/src/host/layer23/src/mobile/tch.c b/src/host/layer23/src/mobile/tch.c index f63f487..5acdef2 100644 --- a/src/host/layer23/src/mobile/tch.c +++ b/src/host/layer23/src/mobile/tch.c @@ -133,8 +133,9 @@ static void tch_trans_cstate_active_cb(struct gsm_trans *trans, bool rx_only) { struct osmocom_ms *ms = trans->ms; + const struct gsm48_rrlayer *rr = &ms->rrlayer; + const struct gsm48_rr_cd *cd = &rr->cd_now; struct tch_state *state; - enum gsm48_chan_mode ch_mode; if (ms->tch_state != NULL) { ms->tch_state->rx_only = rx_only; @@ -146,8 +147,7 @@ ms->tch_state = state; ms->tch_state->rx_only = rx_only; - ch_mode = ms->rrlayer.cd_now.mode; - switch (ch_mode) { + switch (cd->mode) { case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: case GSM48_CMODE_SPEECH_AMR: @@ -168,12 +168,15 @@ case GSM48_CMODE_SIGN: default: LOGP(DL1C, LOGL_ERROR, "Unhandled channel mode %s\n", - get_value_string(gsm48_chan_mode_names, ch_mode)); + get_value_string(gsm48_chan_mode_names, cd->mode)); exit_free: talloc_free(state); ms->tch_state = NULL; return; } + + /* rr->audio_mode has been set by tch_{voice,data}_state_init(), apply it */ + gsm48_rr_audio_mode(ms, rr->audio_mode); } static void tch_trans_free_cb(struct gsm_trans *trans) @@ -187,6 +190,7 @@ tch_voice_state_free(&state->voice); else tch_data_state_free(&state->data); + ms->rrlayer.audio_mode = 0x00; talloc_free(state); ms->tch_state = NULL; diff --git a/src/host/layer23/src/mobile/tch_data.c b/src/host/layer23/src/mobile/tch_data.c index 7f0a330..b6b3be6 100644 --- a/src/host/layer23/src/mobile/tch_data.c +++ b/src/host/layer23/src/mobile/tch_data.c @@ -36,6 +36,8 @@ #include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/tch.h> +#include <l1ctl_proto.h> + struct csd_v110_frame_desc { uint16_t num_blocks; uint16_t num_bits; @@ -503,6 +505,7 @@ struct tch_data_state *state) { struct osmocom_ms *ms = trans->ms; + struct gsm48_rrlayer *rr = &ms->rrlayer; const struct gsm_mncc_bearer_cap *bcap = trans->cc.bcap; int rc; @@ -514,13 +517,13 @@ state->sock = tch_csd_sock_init(ms); if (state->sock == NULL) return -ENOMEM; + rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; break; case TCH_DATA_IOH_LOOPBACK: case TCH_DATA_IOH_NONE: + rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; /* we don't need V.110 TA / soft-UART */ return 0; - default: - break; } if (bcap->data.async) { diff --git a/src/host/layer23/src/mobile/tch_voice.c b/src/host/layer23/src/mobile/tch_voice.c index f4bbcfa..a85d7dc 100644 --- a/src/host/layer23/src/mobile/tch_voice.c +++ b/src/host/layer23/src/mobile/tch_voice.c @@ -34,6 +34,8 @@ #include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/tch.h> +#include <l1ctl_proto.h> + /* Forward a Downlink voice frame to the external MNCC handler */ static int tch_forward_mncc(struct osmocom_ms *ms, struct msgb *msg) { @@ -119,11 +121,19 @@ int tch_voice_state_init(struct gsm_trans *trans, struct tch_voice_state *state) { -#ifdef WITH_GAPK_IO struct osmocom_ms *ms = trans->ms; - const struct gsm48_rr_cd *cd = &ms->rrlayer.cd_now; + struct gsm48_rrlayer *rr = &ms->rrlayer; + const struct gsm48_rr_cd *cd = &rr->cd_now; switch (state->handler) { + case TCH_VOICE_IOH_L1PHY: + rr->audio_mode = AUDIO_RX_SPEAKER | AUDIO_TX_MICROPHONE; + break; + case TCH_VOICE_IOH_MNCC_SOCK: + case TCH_VOICE_IOH_LOOPBACK: + rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; + break; +#ifdef WITH_GAPK_IO case TCH_VOICE_IOH_GAPK: if ((cd->chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_Bm_ACCHs) state->gapk_io = gapk_io_state_alloc_mode_rate(ms, cd->mode, true); @@ -131,11 +141,13 @@ state->gapk_io = gapk_io_state_alloc_mode_rate(ms, cd->mode, false); if (state->gapk_io == NULL) return -1; + rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; break; - default: +#endif + case TCH_VOICE_IOH_NONE: + rr->audio_mode = 0x00; break; } -#endif return 0; } diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 87c8045..eb582d3 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -2692,23 +2692,6 @@ cfg_ms_audio_cmd, "audio", "(deprecated alias for 'tch-voice')\n"); - -static int set_tch_voice_io_handler(struct vty *vty, enum tch_voice_io_handler val) -{ - struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; - struct gsm_settings *set = &ms->settings; - - /* Don't restart on unchanged value */ - if (val == set->tch_voice.io_handler) - return CMD_SUCCESS; - set->tch_voice.io_handler = val; - - /* Restart required */ - vty_restart_if_started(vty, ms); - - return CMD_SUCCESS; -} - DEFUN(cfg_ms_tch_voice_io_handler, cfg_ms_tch_voice_io_handler_cmd, "io-handler (none|gapk|l1phy|mncc-sock|loopback)", "Set TCH frame I/O handler for voice calls\n" @@ -2718,8 +2701,9 @@ "External MNCC application (e.g. LCR) via MNCC socket\n" "Return TCH frame payload back to sender\n") { - struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; int val = get_string_value(tch_voice_io_handler_names, argv[0]); + struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; + struct gsm_settings *set = &ms->settings; OSMO_ASSERT(val >= 0); @@ -2738,13 +2722,20 @@ } #endif - return set_tch_voice_io_handler(vty, val); + set->tch_voice.io_handler = (enum tch_voice_io_handler)val; + + return CMD_SUCCESS; } DEFUN(cfg_ms_tch_voice_no_io_handler, cfg_ms_tch_voice_no_io_handler_cmd, "no io-handler", NO_STR "Disable TCH frame handling for voice calls\n") { - return set_tch_voice_io_handler(vty, TCH_VOICE_IOH_NONE); + struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; + struct gsm_settings *set = &ms->settings; + + set->tch_voice.io_handler = TCH_VOICE_IOH_NONE; + + return CMD_SUCCESS; } DEFUN(cfg_ms_tch_voice_io_tch_format, cfg_ms_tch_voice_io_tch_format_cmd, @@ -2805,22 +2796,6 @@ return CMD_SUCCESS; } -static int set_tch_data_io_handler(struct vty *vty, enum tch_data_io_handler val) -{ - struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; - struct gsm_settings *set = &ms->settings; - - /* Don't restart on unchanged value */ - if (val == set->tch_data.io_handler) - return CMD_SUCCESS; - set->tch_data.io_handler = val; - - /* Restart required */ - vty_restart_if_started(vty, ms); - - return CMD_SUCCESS; -} - DEFUN(cfg_ms_tch_data_io_handler, cfg_ms_tch_data_io_handler_cmd, "io-handler (none|unix-sock|loopback)", @@ -2830,17 +2805,25 @@ "Return TCH frame payload back to sender\n") { int val = get_string_value(tch_data_io_handler_names, argv[0]); + struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; + struct gsm_settings *set = &ms->settings; OSMO_ASSERT(val >= 0); + set->tch_data.io_handler = (enum tch_data_io_handler)val; - return set_tch_data_io_handler(vty, val); + return CMD_SUCCESS; } DEFUN(cfg_ms_tch_data_no_io_handler, cfg_ms_tch_data_no_io_handler_cmd, "no io-handler", NO_STR "Disable TCH frame handling for data calls\n") { - return set_tch_data_io_handler(vty, TCH_DATA_IOH_NONE); + struct osmocom_ms *ms = (struct osmocom_ms *)vty->index; + struct gsm_settings *set = &ms->settings; + + set->tch_data.io_handler = TCH_DATA_IOH_NONE; + + return CMD_SUCCESS; } DEFUN(cfg_ms_tch_data_io_tch_format, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iab68cb47c28380a9c1efc149c6196ea54f75fdb8 Gerrit-Change-Number: 35740 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[M] Change in osmocom-bb[master]: mobile: init TCH state earlier (on receipt of CC ALERTING)
by fixeria 06 Feb '24

06 Feb '24
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email ) Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Gerrit-Change-Number: 35739 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 09:35:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 121
  • 122
  • 123
  • 124
  • 125
  • 126
  • 127
  • ...
  • 175
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.