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

[S] Change in osmocom-bb[master]: firmware/layer1: handle CSD related channel modes
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34694?usp=email ) Change subject: firmware/layer1: handle CSD related channel modes ...................................................................... firmware/layer1: handle CSD related channel modes Change-Id: Ib73210b273826ded56d42c41ffeb835eef96dd2b Related: OS#4396 --- M src/target/firmware/layer1/async.c M src/target/firmware/layer1/prim_tch.c 2 files changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved jolly: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/src/target/firmware/layer1/async.c b/src/target/firmware/layer1/async.c index fe8a906..8d76e5c 100644 --- a/src/target/firmware/layer1/async.c +++ b/src/target/firmware/layer1/async.c @@ -109,6 +109,10 @@ switch (mode) { case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_DATA_14k5: + case GSM48_CMODE_DATA_12k0: + case GSM48_CMODE_DATA_6k0: + case GSM48_CMODE_DATA_3k6: l1s.tch_mode = mode; break; default: diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index c6fbddd..a33cb58 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -81,6 +81,18 @@ case GSM48_CMODE_SPEECH_EFR: *tch_mode = *tch_f_hn ? TCH_EFR_MODE : SIG_ONLY_MODE; break; + case GSM48_CMODE_DATA_14k5: + *tch_mode = *tch_f_hn ? TCH_144_MODE : SIG_ONLY_MODE; + break; + case GSM48_CMODE_DATA_12k0: + *tch_mode = *tch_f_hn ? TCH_96_MODE : SIG_ONLY_MODE; + break; + case GSM48_CMODE_DATA_6k0: + *tch_mode = *tch_f_hn ? TCH_48F_MODE : TCH_48H_MODE; + break; + case GSM48_CMODE_DATA_3k6: + *tch_mode = *tch_f_hn ? TCH_24F_MODE : TCH_24H_MODE; + break; default: *tch_mode = SIG_ONLY_MODE; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34694?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: Ib73210b273826ded56d42c41ffeb835eef96dd2b Gerrit-Change-Number: 34694 Gerrit-PatchSet: 4 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

[S] Change in osmocom-bb[master]: mobile: fix AUDIO_IOH_LOOPBACK mode: pull DL info header
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34757?usp=email ) Change subject: mobile: fix AUDIO_IOH_LOOPBACK mode: pull DL info header ...................................................................... mobile: fix AUDIO_IOH_LOOPBACK mode: pull DL info header The loopback mode is currently broken because the DL info header remains present, thus becoming a bogus "part" of the speech frame. Change-Id: I1af187b4bc5f5a99bc7f7634d90bf14ad3db0e49 Related: OS#4396 --- M src/host/layer23/src/mobile/voice.c 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 7d6c2e0..acc0dce 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -78,6 +78,8 @@ { switch (ms->settings.audio.io_handler) { case AUDIO_IOH_LOOPBACK: + /* Remove the DL info header */ + msgb_pull_to_l2(msg); /* Send voice frame back */ return gsm_send_voice_msg(ms, msg); case AUDIO_IOH_MNCC_SOCK: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34757?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: I1af187b4bc5f5a99bc7f7634d90bf14ad3db0e49 Gerrit-Change-Number: 34757 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

[S] Change in osmocom-bb[master]: firmware/layer1: cosmetic: labels should not be indented
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34763?usp=email ) Change subject: firmware/layer1: cosmetic: labels should not be indented ...................................................................... firmware/layer1: cosmetic: labels should not be indented Change-Id: Ie32501df19cc2eedd1042c9917583d7386a665bc Related: OS#4396 --- M src/target/firmware/layer1/prim_tch.c 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index 7d5c1f4..0c8745d 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -269,7 +269,7 @@ /* Give message to up layer */ l1_queue_for_l2(msg); - skip_rx_facch: +skip_rx_facch: /* Reset A_FD header (needed by DSP) */ /* B_FIRE1 =1, B_FIRE0 =0 , BLUD =0 */ dsp_api.ndb->a_fd[0] = (1<<B_FIRE1); @@ -327,7 +327,7 @@ l1_queue_for_l2(msg); } - skip_rx_traffic: +skip_rx_traffic: /* Reset traffic buffer header in NDB (needed by DSP) */ traffic_buf[0] = 0; traffic_buf[2] = 0xffff; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34763?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: Ie32501df19cc2eedd1042c9917583d7386a665bc Gerrit-Change-Number: 34763 Gerrit-PatchSet: 1 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-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: firmware/layer1: clean up l1s_tch_cmd(): reduce nesting
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34752?usp=email ) Change subject: firmware/layer1: clean up l1s_tch_cmd(): reduce nesting ...................................................................... firmware/layer1: clean up l1s_tch_cmd(): reduce nesting Change-Id: If4f0bb37cb3e12e09078027461cd5040524e43b2 Related: OS#4396 --- M src/target/firmware/layer1/prim_tch.c 1 file changed, 21 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index 1e3ca75..7d5c1f4 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -434,7 +434,6 @@ if (traffic_tx_now) { volatile uint16_t *traffic_buf; struct msgb *msg; - const uint8_t *data; /* Reset play mode */ dsp_api.ndb->d_tch_mode &= ~B_PLAY_UL; @@ -448,30 +447,25 @@ /* Pull Traffic data (if any) */ msg = msgb_dequeue(&l1s.tx_queue[L1S_CHAN_TRAFFIC]); + if (msg == NULL) + goto skip_tx_traffic; /* Copy actual data, skipping the information block [0,1,2] */ - if (msg) { - data = msg->l2h; - dsp_memcpy_to_api(&traffic_buf[3], data, 33, 1); + dsp_memcpy_to_api(&traffic_buf[3], msgb_l2(msg), 33, 1); - traffic_buf[0] = (1 << B_BLUD); /* 1st word: Set B_BLU bit. */ - traffic_buf[1] = 0; /* 2nd word: cleared. */ - traffic_buf[2] = 0; /* 3nd word: cleared. */ - } + traffic_buf[0] = (1 << B_BLUD); /* 1st word: Set B_BLU bit. */ + traffic_buf[1] = 0; /* 2nd word: cleared. */ + traffic_buf[2] = 0; /* 3nd word: cleared. */ - if (msg) - dsp_api.ndb->d_tch_mode |= B_PLAY_UL; + dsp_api.ndb->d_tch_mode |= B_PLAY_UL; /* Indicate completion (FIXME: early but easier this way for now) */ - if (msg) { - last_tx_tch_fn = l1s.next_time.fn; - last_tx_tch_type |= TX_TYPE_TRAFFIC; - l1s_compl_sched(L1_COMPL_TX_TCH); - } + last_tx_tch_fn = l1s.next_time.fn; + last_tx_tch_type |= TX_TYPE_TRAFFIC; + l1s_compl_sched(L1_COMPL_TX_TCH); /* Free msg now that we're done with it */ - if (msg) - msgb_free(msg); + msgb_free(msg); } skip_tx_traffic: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34752?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: If4f0bb37cb3e12e09078027461cd5040524e43b2 Gerrit-Change-Number: 34752 Gerrit-PatchSet: 1 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

[S] Change in osmocom-bb[master]: firmware/layer1: mute UL/DL vocodec if it's not needed
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34751?usp=email ) Change subject: firmware/layer1: mute UL/DL vocodec if it's not needed ...................................................................... firmware/layer1: mute UL/DL vocodec if it's not needed The upper layers usually request either of the two configurations: * (AUDIO_TX_MICROPHONE | AUDIO_RX_SPEAKER) - in this configuration the phone (PHY) is both the origin and the destination of the TCH frames. DL frames are played via the built-in speaker; UL frames recorded using the built-in microphone. * (AUDIO_TX_TRAFFIC_REQ | AUDIO_RX_TRAFFIC_IND) - in this case the upper layers (host side) become the origin and the destination of the TCH frames. The built-in speaker and microphone are expected to be disabled. However, when using the second configuration, one can still hear DL TCH frames being played by the built-in speaker. The built-in microphone does not seem to be causing any issues, but still we definitely don't want the vocoder to interfere with the host. Change-Id: I390db1889f079dea8112794c3e039a9136b897df Related: OS#4396 --- M src/target/firmware/include/calypso/l1_environment.h M src/target/firmware/layer1/prim_tch.c 2 files changed, 41 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/target/firmware/include/calypso/l1_environment.h b/src/target/firmware/include/calypso/l1_environment.h index d49866e..476a8a8 100644 --- a/src/target/firmware/include/calypso/l1_environment.h +++ b/src/target/firmware/include/calypso/l1_environment.h @@ -104,6 +104,8 @@ #define B_PLAY_UL (1 << 3) // Play UL #define B_DCO_ON (1 << 4) // DCO ON/OFF #define B_AUDIO_ASYNC (1 << 1) // WCP reserved +#define B_MUTE_VOCODEC_DL (1 << 14) // DL voice decoder +#define B_MUTE_VOCODEC_UL (1 << 15) // UL voice encoder // **************************************************************** // PARAMETER AREA (PARAM) MCU<->DSP COMMUNICATION DEFINITIONS diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index e3cffd1..1e3ca75 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -85,6 +85,18 @@ *tch_mode = SIG_ONLY_MODE; } } + + /* enable/disable the voice decoder (Downlink) */ + if (l1s.audio_mode & AUDIO_RX_SPEAKER) + dsp_api.ndb->d_tch_mode &= ~B_MUTE_VOCODEC_DL; /* unmute */ + else + dsp_api.ndb->d_tch_mode |= B_MUTE_VOCODEC_DL; /* mute */ + + /* enable/disable the voice encoder (Uplink) */ + if (l1s.audio_mode & AUDIO_TX_MICROPHONE) + dsp_api.ndb->d_tch_mode &= ~B_MUTE_VOCODEC_UL; /* unmute */ + else + dsp_api.ndb->d_tch_mode |= B_MUTE_VOCODEC_UL; /* mute */ } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34751?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: I390db1889f079dea8112794c3e039a9136b897df Gerrit-Change-Number: 34751 Gerrit-PatchSet: 1 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

[S] Change in osmo-bsc[master]: pcuif_proto: clean up last remains of old PCUIF v10
by pespin 16 Oct '23

16 Oct '23

Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34708?usp=email ) Change subject: pcuif_proto: clean up last remains of old PCUIF v10 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34708?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iebb3a634fee680bdc3636a61f3ccaa1e97e54a64 Gerrit-Change-Number: 34708 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Oct 2023 10:06:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcuif_proto: clean up last remains of old PCUIF v10
by pespin 16 Oct '23

16 Oct '23

Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34707?usp=email ) Change subject: pcuif_proto: clean up last remains of old PCUIF v10 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34707?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I04f7108c94c99c9920192177087748e8b89b3106 Gerrit-Change-Number: 34707 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Oct 2023 10:05:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
by pespin 16 Oct '23

16 Oct '23

Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email ) Change subject: pcuif_proto: drop support for PCUIF v10 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Oct 2023 10:05:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: ansible: known_hosts: update
by pespin 16 Oct '23

16 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34767?usp=email ) Change subject: ansible: known_hosts: update ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ci/+/34767/comment/0b62154c_6bba9828 PS1, Line 9: After deploying with ansible to the jenkins nodes, these entries were not sure what you mean here. Do you mind explaining a bit better? where do these addresses come from? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3e3841d9f1f5581067b7dd90cdfcaf8337700e6f Gerrit-Change-Number: 34767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Oct 2023 10:02:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: ansible: hosts: remove gtp0-deb(10,11)build
by pespin 16 Oct '23

16 Oct '23

Attention is currently required from: laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34766?usp=email ) Change subject: ansible: hosts: remove gtp0-deb(10,11)build ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34766?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8e8ae59d4e4c8be85bba527ac89cce04b15fcaea Gerrit-Change-Number: 34766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 16 Oct 2023 10:01:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0