- gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: gsm: add TCH block/lchan definitions for CSD
by fixeria 09 Feb '24

09 Feb '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35914?usp=email ) Change subject: gsm: add TCH block/lchan definitions for CSD ...................................................................... Patch Set 2: (1 comment) File include/osmocom/gsm/gsm44021.h: https://gerrit.osmocom.org/c/libosmocore/+/35914/comment/8da23827_fc396464 PS1, Line 15: > You are missing here: "extern const struct osmo_csd_tch_lchan_desc osmo_csd_chan_mode_rate_desc[256] […] Ack, thanks! -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35914?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: Ie230e09d496c9b791981d8ee04902fc9966ed6d7 Gerrit-Change-Number: 35914 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Feb 2024 15:18:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: gsm: add TCH block/lchan definitions for CSD
by fixeria 09 Feb '24

09 Feb '24

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35914?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: gsm: add TCH block/lchan definitions for CSD ...................................................................... gsm: add TCH block/lchan definitions for CSD Change-Id: Ie230e09d496c9b791981d8ee04902fc9966ed6d7 Related: OS#1572, OS#4396 --- M include/osmocom/gsm/gsm44021.h M src/gsm/gsm44021.c M src/gsm/libosmogsm.map 3 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/35914/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35914?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: Ie230e09d496c9b791981d8ee04902fc9966ed6d7 Gerrit-Change-Number: 35914 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bts[master]: csd_v110: use osmo_csd_chan_mode_rate_desc[] from libosmogsm
by fixeria 09 Feb '24

09 Feb '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/35924?usp=email ) Change subject: csd_v110: use osmo_csd_chan_mode_rate_desc[] from libosmogsm ...................................................................... csd_v110: use osmo_csd_chan_mode_rate_desc[] from libosmogsm Change-Id: I1e16a1f8142ff3cf0e26e16316fde4c42082ad54 Depends: libosmocore.git Ie230e09d496c9b791981d8ee04902fc9966ed6d7 Related: OS#1572 --- M include/osmo-bts/csd_v110.h M src/common/csd_v110.c M tests/csd/csd_test.c 3 files changed, 33 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/35924/1 diff --git a/include/osmo-bts/csd_v110.h b/include/osmo-bts/csd_v110.h index f6be0ae..b80f95d 100644 --- a/include/osmo-bts/csd_v110.h +++ b/include/osmo-bts/csd_v110.h @@ -5,18 +5,6 @@ struct gsm_lchan; -struct csd_v110_frame_desc { - uint16_t num_blocks; - uint16_t num_bits; -}; - -struct csd_v110_lchan_desc { - struct csd_v110_frame_desc fr; - struct csd_v110_frame_desc hr; -}; - -extern const struct csd_v110_lchan_desc csd_v110_lchan_desc[256]; - int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp, const uint8_t *data, size_t data_len); int csd_v110_rtp_decode(const struct gsm_lchan *lchan, uint8_t *data, diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index 5046d6e..79cfe97 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -32,32 +32,6 @@ #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: 290 bits every 20 ms (14.5 kbit/s) */ - .fr = { .num_blocks = 1, .num_bits = 290 }, - }, -#endif - [GSM48_CMODE_DATA_12k0] = { - /* TCH/F9.6: 4 * 60 bits every 20 ms (12.0 kbit/s) */ - .fr = { .num_blocks = 4, .num_bits = 60 }, - }, - [GSM48_CMODE_DATA_6k0] = { - /* TCH/F4.8: 2 * 60 bits every 20 ms (6.0 kbit/s) */ - .fr = { .num_blocks = 2, .num_bits = 60 }, - /* TCH/H4.8: 4 * 60 bits every 40 ms (6.0 kbit/s) */ - .hr = { .num_blocks = 4, .num_bits = 60 }, - }, - [GSM48_CMODE_DATA_3k6] = { - /* TCH/F2.4: 2 * 36 bits every 20 ms (3.6 kbit/s) */ - .fr = { .num_blocks = 2, .num_bits = 36 }, - /* TCH/H2.4: 4 * 36 bits every 40 ms (3.6 kbit/s) */ - .hr = { .num_blocks = 4, .num_bits = 36 }, - }, -}; - /* 3GPP TS 44.021, Figure 4: Coding of data rates (E1/E2/E3 bits) */ static const uint8_t e1e2e3_map[_LCHAN_CSD_M_NUM][3] = { [LCHAN_CSD_M_T_600] = { 1, 0, 0 }, @@ -76,28 +50,28 @@ int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp, const uint8_t *data, size_t data_len) { - const struct csd_v110_frame_desc *desc; + const struct osmo_csd_tch_block_desc *desc; ubit_t ra_bits[80 * 4]; - OSMO_ASSERT(lchan->tch_mode < ARRAY_SIZE(csd_v110_lchan_desc)); + OSMO_ASSERT(lchan->tch_mode < ARRAY_SIZE(osmo_csd_chan_mode_rate_desc)); if (lchan->type == GSM_LCHAN_TCH_F) - desc = &csd_v110_lchan_desc[lchan->tch_mode].fr; + desc = &osmo_csd_chan_mode_rate_desc[lchan->tch_mode].fr; else - desc = &csd_v110_lchan_desc[lchan->tch_mode].hr; - if (OSMO_UNLIKELY(desc->num_blocks == 0)) + desc = &osmo_csd_chan_mode_rate_desc[lchan->tch_mode].hr; + if (OSMO_UNLIKELY(desc->num_frames == 0)) return -ENOTSUP; /* handle empty/incomplete Uplink frames gracefully */ - if (OSMO_UNLIKELY(data_len < (desc->num_blocks * desc->num_bits))) { + if (OSMO_UNLIKELY(data_len < (desc->num_frames * desc->num_bits))) { /* 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 (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 (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 */ @@ -124,7 +98,7 @@ ra1_ra2: /* RA1/RA2: convert from an intermediate rate to 64 kbit/s */ - if (desc->num_blocks == 4) { + if (desc->num_frames == 4) { /* 4 * 80 bits (16 kbit/s) => 2 bits per octet */ for (unsigned int i = 0, j = 0; i < RFC4040_RTP_PLEN; i++) { rtp[i] = (0xff >> 2); @@ -145,22 +119,22 @@ int csd_v110_rtp_decode(const struct gsm_lchan *lchan, uint8_t *data, const uint8_t *rtp, size_t rtp_len) { - const struct csd_v110_frame_desc *desc; + const struct osmo_csd_tch_block_desc *desc; ubit_t ra_bits[80 * 4]; - OSMO_ASSERT(lchan->tch_mode < ARRAY_SIZE(csd_v110_lchan_desc)); + OSMO_ASSERT(lchan->tch_mode < ARRAY_SIZE(osmo_csd_chan_mode_rate_desc)); if (lchan->type == GSM_LCHAN_TCH_F) - desc = &csd_v110_lchan_desc[lchan->tch_mode].fr; + desc = &osmo_csd_chan_mode_rate_desc[lchan->tch_mode].fr; else - desc = &csd_v110_lchan_desc[lchan->tch_mode].hr; - if (OSMO_UNLIKELY(desc->num_blocks == 0)) + desc = &osmo_csd_chan_mode_rate_desc[lchan->tch_mode].hr; + if (OSMO_UNLIKELY(desc->num_frames == 0)) return -ENOTSUP; if (OSMO_UNLIKELY(rtp_len != RFC4040_RTP_PLEN)) return -EINVAL; /* RA1/RA2: convert from 64 kbit/s to an intermediate rate */ - if (desc->num_blocks == 4) { + if (desc->num_frames == 4) { /* 4 * 80 bits (16 kbit/s) => 2 bits per octet */ for (unsigned int i = 0, j = 0; i < RFC4040_RTP_PLEN; i++) { ra_bits[j++] = (rtp[i] >> 7); @@ -173,7 +147,7 @@ } /* RA1'/RA1: convert from an intermediate rate to radio rate */ - for (unsigned int i = 0; i < desc->num_blocks; i++) { + for (int i = 0; i < desc->num_frames; i++) { struct osmo_v110_decoded_frame df; /* convert a V.110 80-bit frame to a V.110 36-/60-bit frame */ @@ -184,5 +158,5 @@ osmo_csd_3k6_encode_frame(&data[i * 36], 36, &df); } - return desc->num_blocks * desc->num_bits; + return desc->num_frames * desc->num_bits; } diff --git a/tests/csd/csd_test.c b/tests/csd/csd_test.c index 466ff88..b1c03a1 100644 --- a/tests/csd/csd_test.c +++ b/tests/csd/csd_test.c @@ -81,21 +81,21 @@ static void exec_test_case(const struct test_case *tc) { - const struct csd_v110_frame_desc *desc; + const struct osmo_csd_tch_block_desc *desc; uint8_t rtp[RFC4040_RTP_PLEN] = { 0 }; ubit_t data_enc[BBUF_MAX]; ubit_t data_dec[BBUF_MAX]; int rc; /* obtain a V.110 frame description for the given channel type/rate */ - OSMO_ASSERT(tc->tch_mode < ARRAY_SIZE(csd_v110_lchan_desc)); + OSMO_ASSERT(tc->tch_mode < ARRAY_SIZE(osmo_csd_chan_mode_rate_desc)); if (tc->lchan_type == GSM_LCHAN_TCH_F) - desc = &csd_v110_lchan_desc[tc->tch_mode].fr; + desc = &osmo_csd_chan_mode_rate_desc[tc->tch_mode].fr; else - desc = &csd_v110_lchan_desc[tc->tch_mode].hr; + desc = &osmo_csd_chan_mode_rate_desc[tc->tch_mode].hr; /* 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 = desc->num_bits * desc->num_frames; 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/+/35924?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: I1e16a1f8142ff3cf0e26e16316fde4c42082ad54 Gerrit-Change-Number: 35924 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmocom-bb[master]: mobile: use osmo_csd_chan_mode_rate_desc[] from libosmogsm
by pespin 09 Feb '24

09 Feb '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35915?usp=email ) Change subject: mobile: use osmo_csd_chan_mode_rate_desc[] from libosmogsm ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35915?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: I862329fbf19c515be88f2c23989b3991886a2cf4 Gerrit-Change-Number: 35915 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Feb 2024 15:08:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: gsm: add TCH block/lchan definitions for CSD
by pespin 09 Feb '24

09 Feb '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35914?usp=email ) Change subject: gsm: add TCH block/lchan definitions for CSD ...................................................................... Patch Set 1: (1 comment) File include/osmocom/gsm/gsm44021.h: https://gerrit.osmocom.org/c/libosmocore/+/35914/comment/e06e6c55_782a6484 PS1, Line 15: You are missing here: "extern const struct osmo_csd_tch_lchan_desc osmo_csd_chan_mode_rate_desc[256];" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35914?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: Ie230e09d496c9b791981d8ee04902fc9966ed6d7 Gerrit-Change-Number: 35914 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Feb 2024 15:08:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: mobile: use osmo_csd_chan_mode_rate_desc[] from libosmogsm
by fixeria 09 Feb '24

09 Feb '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35915?usp=email ) Change subject: mobile: use osmo_csd_chan_mode_rate_desc[] from libosmogsm ...................................................................... mobile: use osmo_csd_chan_mode_rate_desc[] from libosmogsm Change-Id: I862329fbf19c515be88f2c23989b3991886a2cf4 Depends: libosmocore.git Ie230e09d496c9b791981d8ee04902fc9966ed6d7 Related: OS#4396 --- M src/host/layer23/src/mobile/tch_data.c 1 file changed, 15 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/35915/1 diff --git a/src/host/layer23/src/mobile/tch_data.c b/src/host/layer23/src/mobile/tch_data.c index b6b3be6..9a190ac 100644 --- a/src/host/layer23/src/mobile/tch_data.c +++ b/src/host/layer23/src/mobile/tch_data.c @@ -38,42 +38,6 @@ #include <l1ctl_proto.h> -struct csd_v110_frame_desc { - uint16_t num_blocks; - uint16_t num_bits; -}; - -struct csd_v110_lchan_desc { - struct csd_v110_frame_desc fr; - struct csd_v110_frame_desc hr; -}; - -/* 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: 290 bits every 20 ms (14.5 kbit/s) */ - .fr = { .num_blocks = 1, .num_bits = 290 }, - }, -#endif - [GSM48_CMODE_DATA_12k0] = { - /* TCH/F9.6: 4 * 60 bits every 20 ms (12.0 kbit/s) */ - .fr = { .num_blocks = 4, .num_bits = 60 }, - }, - [GSM48_CMODE_DATA_6k0] = { - /* TCH/F4.8: 2 * 60 bits every 20 ms (6.0 kbit/s) */ - .fr = { .num_blocks = 2, .num_bits = 60 }, - /* TCH/H4.8: 4 * 60 bits every 40 ms (6.0 kbit/s) */ - .hr = { .num_blocks = 4, .num_bits = 60 }, - }, - [GSM48_CMODE_DATA_3k6] = { - /* TCH/F2.4: 2 * 36 bits every 20 ms (3.6 kbit/s) */ - .fr = { .num_blocks = 2, .num_bits = 36 }, - /* TCH/H2.4: 4 * 36 bits every 40 ms (3.6 kbit/s) */ - .hr = { .num_blocks = 4, .num_bits = 36 }, - }, -}; - struct tch_csd_sock_state *tch_csd_sock_init(struct osmocom_ms *ms); void tch_csd_sock_recv(struct tch_csd_sock_state *state, struct msgb *msg); void tch_csd_sock_send(struct tch_csd_sock_state *state, struct msgb *msg); @@ -295,9 +259,9 @@ size_t data_len; if ((cd->chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_Bm_ACCHs) - desc = &csd_v110_lchan_desc[cd->mode].fr; + desc = &osmo_csd_chan_mode_rate_desc[cd->mode].fr; else /* RSL_CHAN_Lm_ACCHs */ - desc = &csd_v110_lchan_desc[cd->mode].hr; + desc = &osmo_csd_chan_mode_rate_desc[cd->mode].hr; if (OSMO_UNLIKELY(desc->num_blocks == 0)) return -ENOTSUP; @@ -355,9 +319,9 @@ size_t data_len; if ((cd->chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_Bm_ACCHs) - desc = &csd_v110_lchan_desc[cd->mode].fr; + desc = &osmo_csd_chan_mode_rate_desc[cd->mode].fr; else /* RSL_CHAN_Lm_ACCHs */ - desc = &csd_v110_lchan_desc[cd->mode].hr; + desc = &osmo_csd_chan_mode_rate_desc[cd->mode].hr; if (OSMO_UNLIKELY(desc->num_blocks == 0)) return -ENOTSUP; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35915?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: I862329fbf19c515be88f2c23989b3991886a2cf4 Gerrit-Change-Number: 35915 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: gsm: add TCH block/lchan definitions for CSD
by fixeria 09 Feb '24

09 Feb '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35914?usp=email ) Change subject: gsm: add TCH block/lchan definitions for CSD ...................................................................... gsm: add TCH block/lchan definitions for CSD Change-Id: Ie230e09d496c9b791981d8ee04902fc9966ed6d7 Related: OS#1572, OS#4396 --- M include/osmocom/gsm/gsm44021.h M src/gsm/gsm44021.c M src/gsm/libosmogsm.map 3 files changed, 53 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/35914/1 diff --git a/include/osmocom/gsm/gsm44021.h b/include/osmocom/gsm/gsm44021.h index 8f89c56..9ec4852 100644 --- a/include/osmocom/gsm/gsm44021.h +++ b/include/osmocom/gsm/gsm44021.h @@ -1,6 +1,18 @@ #pragma once #include <osmocom/isdn/v110.h> +/*! TCH block description for CSD */ +struct osmo_csd_tch_block_desc { + int num_frames; /*!< Number of V.110 frames in a block */ + int num_bits; /*!< Number of bits in each V.110 frame */ +}; + +/*! TCH block description for Full and Half Rate channels */ +struct osmo_csd_tch_lchan_desc { + struct osmo_csd_tch_block_desc fr; /*!< Full-Rate channel */ + struct osmo_csd_tch_block_desc hr; /*!< Half-Rate channel */ +}; + int osmo_csd_12k_6k_decode_frame(struct osmo_v110_decoded_frame *fr, const ubit_t *ra_bits, size_t n_bits); int osmo_csd_12k_6k_encode_frame(ubit_t *ra_bits, size_t ra_bits_size, const struct osmo_v110_decoded_frame *fr); int osmo_csd_3k6_decode_frame(struct osmo_v110_decoded_frame *fr, const ubit_t *ra_bits, size_t n_bits); diff --git a/src/gsm/gsm44021.c b/src/gsm/gsm44021.c index 5e9d5ab..cc2c545 100644 --- a/src/gsm/gsm44021.c +++ b/src/gsm/gsm44021.c @@ -3,6 +3,7 @@ *************************************************************************/ /* (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * * SPDX-License-Identifier: GPL-2.0+ * @@ -20,6 +21,35 @@ #include <errno.h> #include <osmocom/core/bits.h> #include <osmocom/isdn/v110.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/gsm44021.h> + +/*! TCH block description for various TS 48.008 Channel Mode and rate values. + * Key is enum gsm48_chan_mode, so assuming a value in range 0..255. */ +const struct osmo_csd_tch_lchan_desc osmo_csd_chan_mode_rate_desc[256] = { +#if 0 + [GSM48_CMODE_DATA_14k5] = { + /* TCH/F14.4: 290 bits every 20 ms (14.5 kbit/s) */ + .fr = { .num_frames = 1, .num_bits = 290 }, + }, +#endif + [GSM48_CMODE_DATA_12k0] = { + /* TCH/F9.6: 4 * 60 bits every 20 ms (12.0 kbit/s) */ + .fr = { .num_frames = 4, .num_bits = 60 }, + }, + [GSM48_CMODE_DATA_6k0] = { + /* TCH/F4.8: 2 * 60 bits every 20 ms (6.0 kbit/s) */ + .fr = { .num_frames = 2, .num_bits = 60 }, + /* TCH/H4.8: 4 * 60 bits every 40 ms (6.0 kbit/s) */ + .hr = { .num_frames = 4, .num_bits = 60 }, + }, + [GSM48_CMODE_DATA_3k6] = { + /* TCH/F2.4: 2 * 36 bits every 20 ms (3.6 kbit/s) */ + .fr = { .num_frames = 2, .num_bits = 36 }, + /* TCH/H2.4: 4 * 36 bits every 40 ms (3.6 kbit/s) */ + .hr = { .num_frames = 4, .num_bits = 36 }, + }, +}; /*! Decode a 60-bit GSM 12kbit/s CSD frame present as 60 ubits into a struct osmo_v110_decoded_frame. * \param[out] caller-allocated output data structure, filled by this function diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index db2dbcb..88de94c 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -858,6 +858,7 @@ osmo_iuup_rnl_prim_alloc; osmo_iuup_tnl_prim_alloc; +osmo_csd_chan_mode_rate_desc; osmo_csd_12k_6k_decode_frame; osmo_csd_12k_6k_encode_frame; osmo_csd_3k6_decode_frame; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35914?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: Ie230e09d496c9b791981d8ee04902fc9966ed6d7 Gerrit-Change-Number: 35914 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-sccp[master]: cosmetic: rename OSMO_SS7_ASP_PROT_M3UA[_SCTP]
by fixeria 09 Feb '24

09 Feb '24

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35795?usp=email ) Change subject: cosmetic: rename OSMO_SS7_ASP_PROT_M3UA[_SCTP] ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35795?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ife0ae7a4956980da40ee045b0b7eb5cd0ccd1aef Gerrit-Change-Number: 35795 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

1 0

[L] Change in libosmo-sccp[master]: Implement M3UA-over-TCP (in addition to SCTP)
by fixeria 09 Feb '24

09 Feb '24

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email ) Change subject: Implement M3UA-over-TCP (in addition to SCTP) ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > To me its clear given the combination matrix above that it makes no sense to create a type for each […] Ok, thank you @pespin@sysmocom.de and @laforge@osmocom.org for the feedback! I will rework the VTY commands, marking as WIP for now. BTW, I think we also want to rename the `sctp-role (client|server)` command to something more neutral. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8c76d271472befacbeb998a93bbdc9e8660d9b5d Gerrit-Change-Number: 35796 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Feb 2024 13:06:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[L] Change in libosmo-sccp[master]: Implement M3UA-over-TCP (in addition to SCTP)
by pespin 09 Feb '24

09 Feb '24

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email ) Change subject: Implement M3UA-over-TCP (in addition to SCTP) ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I agree that conceptually it is "mixing layers". […] To me its clear given the combination matrix above that it makes no sense to create a type for each of those permutations. Futhermore, following the same rule of thumb we'd also have yet another axis where one would have "tcp-client" and another "tcp-server", and "sctp-client", and "sctp-server". All of that makes no sense, it's clearly trying to put together stuff from different layers, which we already keep properly separated by the "role asp|sg" and "sctp-role client|server". I'd really go for adding a "transport tcp|sctp" and be done with. Most of the code can be kept the same and we only need to patch sections really doing stuff with lower layers. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8c76d271472befacbeb998a93bbdc9e8660d9b5d Gerrit-Change-Number: 35796 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Feb 2024 13:01:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log