November 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-gsm-manuals[master]: gsup: fix wrong ordering of IEs

by fixeria

Attention is currently required from: laforge, lynxis lazus, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/38666?usp=email ) Change subject: gsup: fix wrong ordering of IEs ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > I think in general it makes sense to ho have the Message class prior in the message [...] Ack, I also think so. But it's a rather late addition to GSUP, so this is why we have it there. Not sure if it's really worth introducing potentially breaking changes just to make the IE ordering more logical, though. If we go for it, we would definitely be having problems with the GSUP codec in TTCN-3, which expects a specific order. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/38666?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I5caa3101da310cddfa311d068ad889bca697b438 Gerrit-Change-Number: 38666 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 19 Nov 2024 12:31:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: add CSD_V110_NUM_BITS macro

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/38815?usp=email ) Change subject: csd_v110: add CSD_V110_NUM_BITS macro ...................................................................... csd_v110: add CSD_V110_NUM_BITS macro Change-Id: Iabd2ee5ea9d580e0a6f5c93d681f6be67d1949c5 --- M include/osmo-bts/csd_v110.h M src/common/csd_v110.c M src/common/l1sap.c M tests/csd/csd_test.c 4 files changed, 8 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified falconia: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/csd_v110.h b/include/osmo-bts/csd_v110.h index 7d67ff0..d2a27b3 100644 --- a/include/osmo-bts/csd_v110.h +++ b/include/osmo-bts/csd_v110.h @@ -13,6 +13,9 @@ extern const struct csd_v110_lchan_desc csd_v110_lchan_desc[256]; +#define CSD_V110_NUM_BITS(desc) \ + ((desc)->num_blocks * (desc)->num_bits) + int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp, const uint8_t *data, size_t data_len, uint8_t nt48_half_num); diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index f60624f..4d7ee4f 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -92,7 +92,7 @@ return -ENOTSUP; /* handle empty/incomplete Uplink frames gracefully */ - if (OSMO_UNLIKELY(data_len < (desc->num_blocks * desc->num_bits))) { + if (OSMO_UNLIKELY(data_len < CSD_V110_NUM_BITS(desc))) { /* encode N idle frames as per 3GPP TS 44.021, section 8.1.6 */ memset(&ra_bits[0], 0x01, sizeof(ra_bits)); for (unsigned int i = 0; i < desc->num_blocks; i++) @@ -200,5 +200,5 @@ if (align_bits) *align_bits = align_accum; - return desc->num_blocks * desc->num_bits; + return CSD_V110_NUM_BITS(desc); } diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 18d7d93..09f6a90 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1528,7 +1528,7 @@ gsm_fn2gsmtime(&g_time, fn); desc = &csd_v110_lchan_desc[lchan->tch_mode]; - bits_per_20ms = desc->num_blocks * desc->num_bits; + bits_per_20ms = CSD_V110_NUM_BITS(desc); OSMO_ASSERT(bits_per_20ms != 0); for (i = 0; i < ARRAY_SIZE(input_msg); i++) { @@ -2172,7 +2172,7 @@ int rc, i; desc = &csd_v110_lchan_desc[lchan->tch_mode]; - bits_per_20ms = desc->num_blocks * desc->num_bits; + bits_per_20ms = CSD_V110_NUM_BITS(desc); OSMO_ASSERT(bits_per_20ms != 0); if (data_len != bits_per_20ms * 2) { diff --git a/tests/csd/csd_test.c b/tests/csd/csd_test.c index e52bde2..c46bbd9 100644 --- a/tests/csd/csd_test.c +++ b/tests/csd/csd_test.c @@ -104,7 +104,7 @@ desc = &csd_v110_lchan_desc[tc->tch_mode]; /* total number of bits carried by a radio interface block */ - const unsigned int bit_num = desc->num_bits * desc->num_blocks; + const unsigned int bit_num = CSD_V110_NUM_BITS(desc); if (bit_num == 0) { fprintf(stderr, "[i] Skipping '%s' (not implemented)\n", tc->name); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38815?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iabd2ee5ea9d580e0a6f5c93d681f6be67d1949c5 Gerrit-Change-Number: 38815 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: clarify field names in csd_v110_lchan_desc[]

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/38816?usp=email ) Change subject: csd_v110: clarify field names in csd_v110_lchan_desc[] ...................................................................... csd_v110: clarify field names in csd_v110_lchan_desc[] A radio-interface block in GSM carries several modified 36-bit or 60-bit V.110 frames. Let's rename the fields to avoid confusion. Change-Id: If97787a64e30ff9b39c26749ba32aed09d3d7983 --- M include/osmo-bts/csd_v110.h M src/common/csd_v110.c 2 files changed, 22 insertions(+), 22 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve falconia: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmo-bts/csd_v110.h b/include/osmo-bts/csd_v110.h index d2a27b3..62058f4 100644 --- a/include/osmo-bts/csd_v110.h +++ b/include/osmo-bts/csd_v110.h @@ -6,15 +6,15 @@ struct gsm_lchan; struct csd_v110_lchan_desc { - uint16_t num_blocks; - uint16_t num_bits; - uint8_t ra2_ir; /* intermediate rate (8 or 16 kbit/s) for RA2 step */ + uint16_t num_frames; /* number of V.110 frames in a radio block */ + uint16_t num_frame_bits; /* number of bits in each V.110 frame */ + uint8_t ra2_ir; /* intermediate rate (8 or 16 kbit/s) for RA2 step */ }; extern const struct csd_v110_lchan_desc csd_v110_lchan_desc[256]; #define CSD_V110_NUM_BITS(desc) \ - ((desc)->num_blocks * (desc)->num_bits) + ((desc)->num_frames * (desc)->num_frame_bits) int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp, const uint8_t *data, size_t data_len, diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index 4d7ee4f..f578d52 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -39,27 +39,27 @@ #if 0 [GSM48_CMODE_DATA_14k5] = { /* TCH/F14.4: 290 bits every 20 ms (14.5 kbit/s) */ - .num_blocks = 1, - .num_bits = 290, + .num_frames = 1, + .num_frame_bits = 290, .ra2_ir = 16, }, #endif [GSM48_CMODE_DATA_12k0] = { /* TCH/F9.6: 4 * 60 bits every 20 ms (12.0 kbit/s) */ - .num_blocks = 4, - .num_bits = 60, + .num_frames = 4, + .num_frame_bits = 60, .ra2_ir = 16, }, [GSM48_CMODE_DATA_6k0] = { /* TCH/[FH]4.8: 2 * 60 bits every 20 ms (6.0 kbit/s) */ - .num_blocks = 2, - .num_bits = 60, + .num_frames = 2, + .num_frame_bits = 60, .ra2_ir = 8, }, [GSM48_CMODE_DATA_3k6] = { /* TCH/[FH]2.4: 2 * 36 bits every 20 ms (3.6 kbit/s) */ - .num_blocks = 2, - .num_bits = 36, + .num_frames = 2, + .num_frame_bits = 36, .ra2_ir = 8, }, }; @@ -88,26 +88,26 @@ OSMO_ASSERT(lchan->tch_mode < ARRAY_SIZE(csd_v110_lchan_desc)); desc = &csd_v110_lchan_desc[lchan->tch_mode]; - if (OSMO_UNLIKELY(desc->num_blocks == 0)) + if (OSMO_UNLIKELY(desc->num_frames == 0)) return -ENOTSUP; /* handle empty/incomplete Uplink frames gracefully */ if (OSMO_UNLIKELY(data_len < CSD_V110_NUM_BITS(desc))) { /* encode N idle frames as per 3GPP TS 44.021, section 8.1.6 */ memset(&ra_bits[0], 0x01, sizeof(ra_bits)); - for (unsigned int i = 0; i < desc->num_blocks; i++) + for (unsigned int i = 0; i < desc->num_frames; i++) memset(&ra_bits[i * 80], 0x00, 8); /* alignment pattern */ goto ra1_ra2; } /* RA1'/RA1: convert from radio rate to an intermediate data rate */ - for (unsigned int i = 0; i < desc->num_blocks; i++) { + for (unsigned int i = 0; i < desc->num_frames; i++) { struct osmo_v110_decoded_frame df; /* convert a V.110 36-/60-bit frame to a V.110 80-bit frame */ - if (desc->num_bits == 60) + if (desc->num_frame_bits == 60) osmo_csd_12k_6k_decode_frame(&df, &data[i * 60], 60); - else /* desc->num_bits == 36 */ + else /* desc->num_frame_bits == 36 */ osmo_csd_3k6_decode_frame(&df, &data[i * 36], 36); /* E1 .. E3 must set by out-of-band knowledge */ @@ -116,7 +116,7 @@ /* E1: as per 15.1.2, shall be set to 0 (for BSS-MSC) */ df.e_bits[0] = 0; /* E2: 0 for Q1/Q2, 1 for Q3/Q4 */ - if (desc->num_blocks == 4) + if (desc->num_frames == 4) df.e_bits[1] = (i >> 1) & 0x01; else df.e_bits[1] = nt48_half_num; @@ -165,7 +165,7 @@ OSMO_ASSERT(lchan->tch_mode < ARRAY_SIZE(csd_v110_lchan_desc)); desc = &csd_v110_lchan_desc[lchan->tch_mode]; - if (OSMO_UNLIKELY(desc->num_blocks == 0)) + if (OSMO_UNLIKELY(desc->num_frames == 0)) return -ENOTSUP; if (OSMO_UNLIKELY(rtp_len != RFC4040_RTP_PLEN)) @@ -178,7 +178,7 @@ osmo_csd_ra2_8k_unpack(&ra_bits[0], &rtp[0], RFC4040_RTP_PLEN); /* RA1'/RA1: convert from an intermediate rate to radio rate */ - for (unsigned int i = 0; i < desc->num_blocks; i++) { + for (unsigned int i = 0; i < desc->num_frames; i++) { struct osmo_v110_decoded_frame df; /* We require our RTP input to consist of aligned V.110 @@ -188,9 +188,9 @@ return -EINVAL; /* convert a V.110 80-bit frame to a V.110 36-/60-bit frame */ osmo_v110_decode_frame(&df, &ra_bits[i * 80], 80); - if (desc->num_bits == 60) + if (desc->num_frame_bits == 60) osmo_csd_12k_6k_encode_frame(&data[i * 60], 60, &df); - else /* desc->num_bits == 36 */ + else /* desc->num_frame_bits == 36 */ osmo_csd_3k6_encode_frame(&data[i * 36], 36, &df); /* save bits E2 & E3 that may be needed for RLP alignment */ align_accum <<= 2; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38816?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If97787a64e30ff9b39c26749ba32aed09d3d7983 Gerrit-Change-Number: 38816 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: clarify lchan description for TCH/F14.4

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/38817?usp=email ) Change subject: csd_v110: clarify lchan description for TCH/F14.4 ...................................................................... csd_v110: clarify lchan description for TCH/F14.4 According to 3GPP TS 44.021, section 10.3.2, a radio-interface data block for a TCH/F14.4 channel consists of eight 36-bit data frames and two M-bits (290 bits total). Let's fix our definition. Change-Id: I4f11eda98420587efa339484b62f46bf19f78809 Related: OS#6167 --- M include/osmo-bts/csd_v110.h M src/common/csd_v110.c 2 files changed, 6 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified falconia: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/include/osmo-bts/csd_v110.h b/include/osmo-bts/csd_v110.h index 62058f4..1621c00 100644 --- a/include/osmo-bts/csd_v110.h +++ b/include/osmo-bts/csd_v110.h @@ -8,13 +8,14 @@ struct csd_v110_lchan_desc { uint16_t num_frames; /* number of V.110 frames in a radio block */ uint16_t num_frame_bits; /* number of bits in each V.110 frame */ + uint16_t num_other_bits; /* number of other bits (e.g. M-bits for TCH/F14.4) */ uint8_t ra2_ir; /* intermediate rate (8 or 16 kbit/s) for RA2 step */ }; extern const struct csd_v110_lchan_desc csd_v110_lchan_desc[256]; #define CSD_V110_NUM_BITS(desc) \ - ((desc)->num_frames * (desc)->num_frame_bits) + ((desc)->num_frames * (desc)->num_frame_bits + (desc)->num_other_bits) int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp, const uint8_t *data, size_t data_len, diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index f578d52..9bbc5fe 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -38,9 +38,10 @@ const struct csd_v110_lchan_desc csd_v110_lchan_desc[256] = { #if 0 [GSM48_CMODE_DATA_14k5] = { - /* TCH/F14.4: 290 bits every 20 ms (14.5 kbit/s) */ - .num_frames = 1, - .num_frame_bits = 290, + /* TCH/F14.4: 8 * 36 + 2 bits every 20 ms (14.5 kbit/s) */ + .num_frames = 8, + .num_frame_bits = 36, /* D-bits */ + .num_other_bits = 2, /* M-bits */ .ra2_ir = 16, }, #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38817?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4f11eda98420587efa339484b62f46bf19f78809 Gerrit-Change-Number: 38817 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[M] Change in osmo-bts[master]: csd_v110: handle TCH/F14.4

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/38751?usp=email ) Change subject: csd_v110: handle TCH/F14.4 ...................................................................... csd_v110: handle TCH/F14.4 Thanks to the work done by Mychaela (see the related Change-IDs), we can finally implement handling of TCH/F14.4 (both T and NT modes) for osmo-bts-trx and osmo-bts-virtual. This channel mode is special in a way that it employs a different rate adaptation function RAA' (defined in 3GPP TS 48.020 chapter 11), which converts between between 290-bit blocks used on Um and Abis-E1 interfaces (E-TRAU frames on the latter) and A-TRAU frames spoken over the A interface. The result of function RAA' in the Uplink direction is 320 bits, which is equal to 4 x 80-bit V.110 frames, but actually carrying 8 x 36-bit packed frames. These 320 bits are then fed to the RA2 function, like we do for other CSD channel modes. Change-Id: I3c3bef0bd2f72b8381597b5699e2060165b702a0 Depends: libosmo-abis.git I11fc1529f5be88fa778c7e05cb11eef58a389d40 Depends: libosmo-abis.git I1347a25ce97d5022502ee9112caded66315b09a4 Related: OS#6167 --- M TODO-RELEASE M src/common/bts.c M src/common/csd_v110.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c M tests/csd/csd_test.c M tests/csd/csd_test.err 7 files changed, 59 insertions(+), 11 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved falconia: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 81aa834..ac45e9f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmotrau >1.6.0 osmo_csd_ra2_{16k,8k}_{pack,unpack}() API +libosmotrau >1.6.0 osmo_csd144_{to,from}_atrau_bits() API diff --git a/src/common/bts.c b/src/common/bts.c index 633e0d1..282d730 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -896,8 +896,8 @@ switch (bts->variant) { case BTS_OSMO_TRX: switch (cm->chan_rate) { - /* TODO: RSL_CMOD_CSD_NT_14k5 */ - /* TODO: RSL_CMOD_CSD_T_14k4 */ + case RSL_CMOD_CSD_NT_14k5: + case RSL_CMOD_CSD_T_14k4: case RSL_CMOD_CSD_NT_12k0: case RSL_CMOD_CSD_T_9k6: if (cm->chan_rt != RSL_CMOD_CRT_TCH_Bm) diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index 9bbc5fe..9ba3df3 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -30,13 +30,13 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/isdn/v110.h> #include <osmocom/trau/csd_ra2.h> +#include <osmocom/trau/csd_raa_prime.h> #include <osmo-bts/csd_v110.h> #include <osmo-bts/lchan.h> /* key is enum gsm48_chan_mode, so assuming a value in range 0..255 */ const struct csd_v110_lchan_desc csd_v110_lchan_desc[256] = { -#if 0 [GSM48_CMODE_DATA_14k5] = { /* TCH/F14.4: 8 * 36 + 2 bits every 20 ms (14.5 kbit/s) */ .num_frames = 8, @@ -44,7 +44,6 @@ .num_other_bits = 2, /* M-bits */ .ra2_ir = 16, }, -#endif [GSM48_CMODE_DATA_12k0] = { /* TCH/F9.6: 4 * 60 bits every 20 ms (12.0 kbit/s) */ .num_frames = 4, @@ -92,6 +91,32 @@ if (OSMO_UNLIKELY(desc->num_frames == 0)) return -ENOTSUP; + /* TCH/F14.4 is special: RAA' function is employed */ + if (lchan->tch_mode == GSM48_CMODE_DATA_14k5) { + /* 3GPP TS 44.021, section 10.3 "TCH/F14.4 channel coding" + * 3GPP TS 48.020, chapter 11 "THE RAA' FUNCTION" */ + const ubit_t *m_bits = &data[0]; /* M-bits */ + const ubit_t *d_bits = &data[2]; /* D-bits */ + ubit_t c4, c5; + + /* 3GPP TS 48.020, Table 3 + * | C4 | Date Rate | + * | =1 | 14,4 kbit/s | + * | =0 | 14.4 kbit/s idle (IWF to BSS only) | */ + c4 = 1; + /* 3GPP TS 48.020, Table 4 + * | C5 | BSS to IWF FT | IWF to BSS UFE | + * | =1 | idle | framing error | + * | =0 | data | no framing error | */ + c5 = 0; + + /* Unless there is a bug, it's highly unlikely */ + OSMO_ASSERT(data_len == CSD_V110_NUM_BITS(desc)); + + osmo_csd144_to_atrau_bits(&ra_bits[0], m_bits, d_bits, c4, c5); + goto ra1_ra2; + } + /* handle empty/incomplete Uplink frames gracefully */ if (OSMO_UNLIKELY(data_len < CSD_V110_NUM_BITS(desc))) { /* encode N idle frames as per 3GPP TS 44.021, section 8.1.6 */ @@ -178,6 +203,18 @@ else /* desc->ra2_ir == 8 */ osmo_csd_ra2_8k_unpack(&ra_bits[0], &rtp[0], RFC4040_RTP_PLEN); + /* TCH/F14.4 is special: RAA' function is employed */ + if (lchan->tch_mode == GSM48_CMODE_DATA_14k5) { + /* 3GPP TS 44.021, section 10.3 "TCH/F14.4 channel coding" + * 3GPP TS 48.020, chapter 11 "THE RAA' FUNCTION" */ + ubit_t *m_bits = &data[0]; /* M-bits */ + ubit_t *d_bits = &data[2]; /* D-bits */ + int rc; + + rc = osmo_csd144_from_atrau_bits(m_bits, d_bits, NULL, NULL, &ra_bits[0]); + return rc == 0 ? CSD_V110_NUM_BITS(desc) : rc; + } + /* RA1'/RA1: convert from an intermediate rate to radio rate */ for (unsigned int i = 0; i < desc->num_frames; i++) { struct osmo_v110_decoded_frame df; diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index ddc4428..c870dfb 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -196,9 +196,6 @@ trx->support.chan_modes = NM_IPAC_MASK_CHANM_SPEECH | NM_IPAC_MASK_CHANM_CSD_NT | NM_IPAC_MASK_CHANM_CSD_T; - /* TODO: missing rate adaptation for TCH/F14.4 (see OS#6167) */ - trx->support.chan_modes &= ~NM_IPAC_F_CHANM_CSD_T_14k4; - trx->support.chan_modes &= ~NM_IPAC_F_CHANM_CSD_NT_14k4; /* The nominal value for each TRX is later overwritten through VTY cmd * 'nominal-tx-power' if present, otherwise through TRXC cmd NOMTXPOWER. diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index 82becc3..932005c 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -99,9 +99,6 @@ trx->support.chan_modes = NM_IPAC_MASK_CHANM_SPEECH | NM_IPAC_MASK_CHANM_CSD_NT | NM_IPAC_MASK_CHANM_CSD_T; - /* TODO: missing rate adaptation for TCH/F14.4 (see OS#6167) */ - trx->support.chan_modes &= ~NM_IPAC_F_CHANM_CSD_T_14k4; - trx->support.chan_modes &= ~NM_IPAC_F_CHANM_CSD_NT_14k4; return 0; } diff --git a/tests/csd/csd_test.c b/tests/csd/csd_test.c index c46bbd9..ad78162 100644 --- a/tests/csd/csd_test.c +++ b/tests/csd/csd_test.c @@ -145,6 +145,10 @@ i, data_dec[i], data_enc[i]); } + /* for TCH/F14.4, we always expect a valid block */ + if (tc->tch_mode == GSM48_CMODE_DATA_14k5) + return; + fprintf(stderr, "[i] Testing '%s' (IDLE)\n", tc->name); /* encode an idle RTP frame and print it */ diff --git a/tests/csd/csd_test.err b/tests/csd/csd_test.err index 1d7a9cf..cb1eac2 100644 --- a/tests/csd/csd_test.err +++ b/tests/csd/csd_test.err @@ -1,4 +1,16 @@ -[i] Skipping 'TCH/F14.4' (not implemented) +[i] Testing 'TCH/F14.4' (bitnum=290) +[i] csd_v110_rtp_encode() returns 160 + 3f 3f 3f 3f 3f 3f 3f 3f bf ff bf 7f bf bf bf bf + bf bf bf bf bf bf bf bf bf bf bf bf bf bf ff 7f + 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f + 7f bf bf bf bf bf bf bf bf bf bf bf bf bf bf bf + bf bf bf ff 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f + 7f 7f 7f 7f 7f 7f bf bf bf bf bf bf bf bf bf bf + bf bf bf bf bf bf bf bf ff 7f 7f 7f 7f 7f 7f 7f + 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f bf bf bf bf bf + bf bf bf bf bf bf bf bf bf bf bf bf bf ff 7f 7f + 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f +[i] csd_v110_rtp_decode() returns 290 [i] Testing 'TCH/F9.6' (bitnum=240) [i] csd_v110_rtp_encode() returns 160 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38751?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c3bef0bd2f72b8381597b5699e2060165b702a0 Gerrit-Change-Number: 38751 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[M] Change in osmo-bts[master]: csd_v110: handle TCH/F14.4

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38751?usp=email ) Change subject: csd_v110: handle TCH/F14.4 ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38751?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c3bef0bd2f72b8381597b5699e2060165b702a0 Gerrit-Change-Number: 38751 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 12:25:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: clarify lchan description for TCH/F14.4

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38817?usp=email ) Change subject: csd_v110: clarify lchan description for TCH/F14.4 ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File include/osmo-bts/csd_v110.h: https://gerrit.osmocom.org/c/osmo-bts/+/38817/comment/19cde31d_f7ba098b?usp… : PS1, Line 11: uint16_t num_other_bits; /* number of other bits (e.g. M-bits for TCH/F14.4) */ > this can be a uint8_t afaiu? Yes, but it does not really matter. It can be `uint8_t`, it can be just `unsigned int`. We can change this in a separate patch or when moving to libosmocore.git. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38817?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4f11eda98420587efa339484b62f46bf19f78809 Gerrit-Change-Number: 38817 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 12:25:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: clarify field names in csd_v110_lchan_desc[]

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38816?usp=email ) Change subject: csd_v110: clarify field names in csd_v110_lchan_desc[] ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38816?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If97787a64e30ff9b39c26749ba32aed09d3d7983 Gerrit-Change-Number: 38816 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 12:23:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: add android-apdu-proxy

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38822?usp=email ) Change subject: jobs/gerrit-verifications: add android-apdu-proxy ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38822?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I688a78ce944e68e97a229df01ced32b7cbd10cc4 Gerrit-Change-Number: 38822 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 11:49:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/master-builds: android-apdu-proxy -> gerrit

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38821?usp=email ) Change subject: jobs/master-builds: android-apdu-proxy -> gerrit ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38821?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I102957f8b23653bdf2e414fcb7fec0f2f78feb2e Gerrit-Change-Number: 38821 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 11:49:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024