December 2022 - gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: firmware: remove TCH/F specific bit re-ordering

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30484 ) Change subject: firmware: remove TCH/F specific bit re-ordering ...................................................................... firmware: remove TCH/F specific bit re-ordering This is a partial revert of d49a748cbbf7d7b5bb77f3d906179da9b462e6d1. The GAPK based audio I/O implementation of the mobile app is now capable of handling TI's specific TCH frame format, which can be configured via the VTY interface ('io-tch-format ti'). Thus there is no need to have the conversion logic in the firmware anymore. This patch also fixes the layer1 firmware, so it does not hang on receipt of Uplink TCH frames anymore when compiled with recent arm-none-eabi toolchain (v12.2.0 on my machine). Change-Id: I5afd4e4ddd9c06d32768d01bc1e3e18d476706fb Related: OS#3400 --- M src/target/firmware/Makefile M src/target/firmware/layer1/prim_tch.c 2 files changed, 1 insertion(+), 55 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index 104ddac..d1ab0c6 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -126,8 +126,7 @@ comm/libcomm.a \ tiffs/libtiffs.a \ ../../shared/libosmocore/build-target/src/.libs/libosmocore.a \ - ../../shared/libosmocore/build-target/src/gsm/.libs/libosmogsm.a \ - ../../shared/libosmocore/build-target/src/codec/.libs/libosmocodec.a + ../../shared/libosmocore/build-target/src/gsm/.libs/libosmogsm.a # diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index 0542e82..56c32fb 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -28,7 +28,6 @@ #include <byteorder.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_04_08.h> -#include <osmocom/codec/codec.h> #include <osmocom/core/msgb.h> #include <calypso/dsp_api.h> #include <calypso/irq.h> @@ -52,45 +51,6 @@ #include <l1ctl_proto.h> -static inline int msb_get_bit(uint8_t *buf, int bn) -{ - int pos_byte = bn >> 3; - int pos_bit = 7 - (bn & 7); - - return (buf[pos_byte] >> pos_bit) & 1; -} - -static inline void msb_set_bit(uint8_t *buf, int bn, int bit) -{ - int pos_byte = bn >> 3; - int pos_bit = 7 - (bn & 7); - - buf[pos_byte] |= (bit << pos_bit); -} - -static void tch_fr_bit_magic(uint8_t *frame, int dl) -{ - uint8_t fr[33]; - int i, di, si; - - memset(fr, 0x00, 33); - - if (dl) - fr[0] = 0xd0; - - for (i = 0; i < 260; i++) { - di = gsm610_bitorder[i]; - si = (i > 181) ? i + 4 : i; - - if (dl) - msb_set_bit(fr, 4 + di, msb_get_bit(frame, si)); - else - msb_set_bit(fr, si, msb_get_bit(frame, 4 + di)); - } - - memcpy(frame, fr, 33); -} - /* This computes various parameters both for the DSP and for * our logic. Not all are used all the time, but it's easier * to build all in one place */ @@ -351,12 +311,6 @@ /* Copy actual data, skipping the information block [0,1,2] */ dsp_memcpy_from_api(payload, &traffic_buf[3], 33, 1); - /** - * Perform some bit conversations - * FIXME: what about other (than FR) codecs? - */ - tch_fr_bit_magic(payload, 1); - /* Give message to up layer */ l1_queue_for_l2(msg); } @@ -483,13 +437,6 @@ /* Pull Traffic data (if any) */ msg = msgb_dequeue(&l1s.tx_queue[L1S_CHAN_TRAFFIC]); - /** - * Perform some bit conversations - * FIXME: what about other (than FR) codecs? - */ - if (msg) - tch_fr_bit_magic(msg->l2h, 0); - /* Copy actual data, skipping the information block [0,1,2] */ if (msg) { data = msg->l2h; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5afd4e4ddd9c06d32768d01bc1e3e18d476706fb Gerrit-Change-Number: 30484 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: support RTP and TI specific TCH frame I/O formats

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30455 ) Change subject: mobile: support RTP and TI specific TCH frame I/O formats ...................................................................... mobile: support RTP and TI specific TCH frame I/O formats Change-Id: Ib41f8c39c82c243b62a76433f59a2b98e175f894 Related: OS#3400 --- M src/host/layer23/include/osmocom/bb/mobile/settings.h M src/host/layer23/src/mobile/gapk_io.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/vty_interface.c 4 files changed, 73 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h b/src/host/layer23/include/osmocom/bb/mobile/settings.h index 2800fea..879be54 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/settings.h +++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h @@ -31,8 +31,21 @@ static inline const char *audio_io_handler_name(enum audio_io_handler val) { return get_value_string(audio_io_handler_names, val); } +/* TCH frame I/O format */ +enum audio_io_format { + /* RTP format (RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR) */ + AUDIO_IOF_RTP, + /* Texas Instruments format, used by Calypso based phones (e.g. Motorola C1xx) */ + AUDIO_IOF_TI, +}; + +extern const struct value_string audio_io_format_names[]; +static inline const char *audio_io_format_name(enum audio_io_format val) +{ return get_value_string(audio_io_format_names, val); } + struct audio_settings { enum audio_io_handler io_handler; + enum audio_io_format io_format; char alsa_output_dev[128]; char alsa_input_dev[128]; }; diff --git a/src/host/layer23/src/mobile/gapk_io.c b/src/host/layer23/src/mobile/gapk_io.c index b2b55d9..4e3cd75 100644 --- a/src/host/layer23/src/mobile/gapk_io.c +++ b/src/host/layer23/src/mobile/gapk_io.c @@ -258,22 +258,18 @@ if (rc) goto error; -#if 0 - /* TODO: PHY specific format -> canonical */ + /* PHY specific format -> canonical */ rc = osmo_gapk_pq_queue_fmt_convert(pq, gapk_io->phy_fmt_desc, 0); if (rc) goto error; -#endif /* Optional ECU (Error Concealment Unit) */ osmo_gapk_pq_queue_ecu(pq, gapk_io->codec_desc); -#if 0 - /* TODO: canonical -> decoder specific format */ + /* Canonical -> decoder specific format */ rc = pq_queue_codec_fmt_conv(pq, gapk_io->codec_desc, false); if (rc) goto error; -#endif /* Frame decoder */ rc = osmo_gapk_pq_queue_codec(pq, gapk_io->codec_desc, 0); @@ -362,6 +358,25 @@ } /** + * Picks the corresponding PHY's frame format for a given codec. + * To be used with PHYs that produce audio in TI Calypso format. + */ +static enum osmo_gapk_format_type phy_fmt_pick_ti(enum osmo_gapk_codec_type codec) +{ + switch (codec) { + case CODEC_HR: + return FMT_TI_HR; + case CODEC_FR: + return FMT_TI_FR; + case CODEC_EFR: + return FMT_TI_EFR; + case CODEC_AMR: /* not supported */ + default: + return FMT_INVALID; + } +} + +/** * Allocates both TCH frame I/O buffers * and prepares both processing queues (chains). * Should be called when a voice call is initiated... @@ -393,12 +408,15 @@ return -ENOTSUP; } - /** - * Pick the corresponding PHY's frame format - * TODO: ask PHY, which format is supported? - * FIXME: RTP (valid for trxcon) is used for now - */ - phy_fmt = phy_fmt_pick_rtp(codec); + switch (set->audio.io_format) { + case AUDIO_IOF_RTP: + phy_fmt = phy_fmt_pick_rtp(codec); + break; + case AUDIO_IOF_TI: + phy_fmt = phy_fmt_pick_ti(codec); + break; + } + phy_fmt_desc = osmo_gapk_fmt_get_from_type(phy_fmt); if (phy_fmt_desc == NULL) { LOGP(DGAPK, LOGL_ERROR, "Failed to pick the PHY specific " diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 02a5ff7..445190e 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -212,3 +212,9 @@ { AUDIO_IOH_LOOPBACK, "loopback" }, { 0x00, NULL} }; + +const struct value_string audio_io_format_names[] = { + { AUDIO_IOF_RTP, "rtp" }, + { AUDIO_IOF_TI, "ti" }, + { 0x00, NULL} +}; diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 3bab608..16eedf2 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1546,6 +1546,8 @@ vty_out(vty, " io-handler %s%s", audio_io_handler_name(set->audio.io_handler), VTY_NEWLINE); if (set->audio.io_handler == AUDIO_IOH_GAPK) { + vty_out(vty, " io-tch-format %s%s", + audio_io_format_name(set->audio.io_format), VTY_NEWLINE); vty_out(vty, " alsa-output-dev %s%s", set->audio.alsa_output_dev, VTY_NEWLINE); vty_out(vty, " alsa-input-dev %s%s", @@ -2872,6 +2874,27 @@ return set_audio_io_handler(vty, AUDIO_IOH_NONE); } +DEFUN(cfg_ms_audio_io_tch_format, cfg_ms_audio_io_tch_format_cmd, + "io-tch-format (rtp|ti)", + "Set TCH I/O frame format used by the L1 PHY (for GAPK only)\n" + "RTP format (RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR)\n" + "Texas Instruments format, used by Calypso based phones (e.g. Motorola C1xx)\n") +{ + int val = get_string_value(audio_io_format_names, argv[0]); + struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; + struct gsm_settings *set = &ms->settings; + + if (set->audio.io_handler != AUDIO_IOH_GAPK) { + vty_out(vty, "This parameter is only valid for GAPK%s", VTY_NEWLINE); + return CMD_WARNING; + } + + OSMO_ASSERT(val >= 0); + set->audio.io_format = val; + + return CMD_SUCCESS; +} + DEFUN(cfg_ms_audio_alsa_out_dev, cfg_ms_audio_alsa_out_dev_cmd, "alsa-output-dev (default|NAME)", "Set ALSA output (playback) device name (for GAPK only)\n" @@ -3176,6 +3199,7 @@ install_node(&audio_node, config_write_dummy); install_element(AUDIO_NODE, &cfg_ms_audio_io_handler_cmd); install_element(AUDIO_NODE, &cfg_ms_audio_no_io_handler_cmd); + install_element(AUDIO_NODE, &cfg_ms_audio_io_tch_format_cmd); install_element(AUDIO_NODE, &cfg_ms_audio_alsa_out_dev_cmd); install_element(AUDIO_NODE, &cfg_ms_audio_alsa_in_dev_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib41f8c39c82c243b62a76433f59a2b98e175f894 Gerrit-Change-Number: 30455 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: do not enforce RTP format for Uplink TCH frames

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30483 ) Change subject: mobile: do not enforce RTP format for Uplink TCH frames ...................................................................... mobile: do not enforce RTP format for Uplink TCH frames This is a partial revert of 8f04fa975819113f2a75a1803cbc3d06877fd36d. The GAPK based audio I/O implementation of the mobile app is now capable of handling TI's specific TCH frame format, which can be configured via the VTY interface ('io-tch-format ti'). TCH frames in this format are different from the ones in RTP format and may have different length and different bit ordering. Remove voice_frame_verify(). Change-Id: I6113ba443e65ddaae091b643af54c873b7da4de8 Related: OS#3400 --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 0 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: 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 4ecbcff..f0b052c 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -67,7 +67,6 @@ #include <osmocom/gsm/rsl.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/core/bitvec.h> -#include <osmocom/codec/codec.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/l1l2_interface.h> @@ -5771,47 +5770,10 @@ #endif -#define LOG_FRAME_VERIFY(mode, level, fmt, args...) \ - LOGP(DRR, level, "Voice frame, mode=%s: " fmt, get_value_string(gsm48_chan_mode_names, mode), ## args) - -int voice_frame_verify(enum gsm48_chan_mode mode, uint8_t *frame, size_t frame_len) -{ - switch (mode) { - case GSM48_CMODE_SPEECH_V1: - /* FIXME: this is FR only, check for TCH/F (FR) and TCH/H (HR) */ - /* RFC 3551, section 4.5.8 GSM */ - if (frame_len != GSM_FR_BYTES) { - LOG_FRAME_VERIFY(mode, LOGL_ERROR, "incorrect length (%zu != %u)\n", frame_len, GSM_FR_BYTES); - return -2; - } - if ((frame[0] >> 4) != 0xd) { - LOG_FRAME_VERIFY(mode, LOGL_ERROR, "incorrect magic (%u != 0xd)\n", frame[0] >> 4); - return -3; - } - break; - case GSM48_CMODE_SPEECH_EFR: - /* RFC 3551, section 4.5.9 GSM-EFR */ - if (frame_len != GSM_EFR_BYTES) { - LOG_FRAME_VERIFY(mode, LOGL_ERROR, "incorrect length (%zu != %u)\n", frame_len, GSM_EFR_BYTES); - return -4; - } - if ((frame[0] >> 4) != 0xc) { - LOG_FRAME_VERIFY(mode, LOGL_ERROR, "incorrect magic (%u != 0xc)\n", frame[0] >> 4); - return -5; - } - break; - default: - LOG_FRAME_VERIFY(mode, LOGL_ERROR, "not implemented\n"); - return -1; - } - return 0; -} - int gsm48_rr_tx_voice(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_rrlayer *rr = &ms->rrlayer; uint8_t ch_type, ch_subch, ch_ts; - struct l1ctl_traffic_req *tr; if (!rr->dm_est) { LOGP(DRR, LOGL_INFO, "Current channel is not active\n"); @@ -5830,10 +5792,6 @@ goto error; } - tr = (struct l1ctl_traffic_req *)msg->l2h; - if (voice_frame_verify(rr->cd_now.mode, tr->data, msgb_l2len(msg)) < 0) - goto error; - return l1ctl_tx_traffic_req(ms, msg, rr->cd_now.chan_nr, 0); error: msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6113ba443e65ddaae091b643af54c873b7da4de8 Gerrit-Change-Number: 30483 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: support RTP and TI specific TCH frame I/O formats

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30455 ) Change subject: mobile: support RTP and TI specific TCH frame I/O formats ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib41f8c39c82c243b62a76433f59a2b98e175f894 Gerrit-Change-Number: 30455 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 09 Dec 2022 11:59:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: do not enforce RTP format for Uplink TCH frames

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30483 ) Change subject: mobile: do not enforce RTP format for Uplink TCH frames ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: > Yes, the checking logic would be different. […] as discussed: better to make it consistent and omit the check IMHO - so keeping the patch as-is -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6113ba443e65ddaae091b643af54c873b7da4de8 Gerrit-Change-Number: 30483 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Dec 2022 11:44:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: firmware: remove TCH/F specific bit re-ordering

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30484 ) Change subject: firmware: remove TCH/F specific bit re-ordering ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5afd4e4ddd9c06d32768d01bc1e3e18d476706fb Gerrit-Change-Number: 30484 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Dec 2022 11:39:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: clean up GAPK I/O state on channel release

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30454 ) Change subject: mobile: clean up GAPK I/O state on channel release ...................................................................... mobile: clean up GAPK I/O state on channel release Do not assert() in gsm_recv_voice(), because channel release does not happen immediately and the PHY may be still sending TCH frames. Change-Id: I8943ee9bd46afc96e6d7cfd52c95c34fd311ce11 Related: OS#3400 --- M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/voice.c 2 files changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: 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 610242c..4ecbcff 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -397,6 +397,10 @@ memset(&rr->cd_now, 0, sizeof(rr->cd_now)); /* reset ciphering */ rr->cipher_on = 0; +#ifdef WITH_GAPK_IO + /* clean-up GAPK state */ + gapk_io_clean_up_ms(rr->ms); +#endif /* reset audio mode */ /* tell cell selection process to return to idle mode * NOTE: this must be sent unbuffered, because it will diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index c3c6a6a..260e1d2 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -82,11 +82,11 @@ return gsm_forward_mncc(ms, msg); case AUDIO_IOH_GAPK: #ifdef WITH_GAPK_IO - /* Prevent null pointer dereference */ - OSMO_ASSERT(ms->gapk_io != NULL); - /* Enqueue a frame to the DL TCH buffer */ - gapk_io_enqueue_dl(ms->gapk_io, msg); + if (ms->gapk_io != NULL) + gapk_io_enqueue_dl(ms->gapk_io, msg); + else + msgb_free(msg); break; #endif case AUDIO_IOH_L1PHY: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8943ee9bd46afc96e6d7cfd52c95c34fd311ce11 Gerrit-Change-Number: 30454 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: clean up GAPK I/O state on channel release

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30454 ) Change subject: mobile: clean up GAPK I/O state on channel release ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8943ee9bd46afc96e6d7cfd52c95c34fd311ce11 Gerrit-Change-Number: 30454 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Dec 2022 11:34:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: do not enforce RTP format for Uplink TCH frames

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30483 ) Change subject: mobile: do not enforce RTP format for Uplink TCH frames ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > So, checking the TI specific TCH frame format isn't feasible / useful here? Yes, the checking logic would be different. I could actually check the configured format and only execute voice_frame_verify() if it's RTP. What do you think? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6113ba443e65ddaae091b643af54c873b7da4de8 Gerrit-Change-Number: 30483 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Dec 2022 11:34:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: firmware: remove TCH/F specific bit re-ordering

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30484 ) Change subject: firmware: remove TCH/F specific bit re-ordering ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5afd4e4ddd9c06d32768d01bc1e3e18d476706fb Gerrit-Change-Number: 30484 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Dec 2022 11:34:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022