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

Change in osmocom-bb[master]: trxcon: Initial support for forwarding AMR

by pespin

Attention is currently required from: laforge, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29264 ) Change subject: trxcon: Initial support for forwarding AMR ...................................................................... Patch Set 2: Code-Review-1 (1 comment) Patchset: PS2: I think I still need to pass an extra byte for the codec_bitmask, I'm seeing now there's another octet. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia20bc96e39726a919a556c83c8be48cb31af7331 Gerrit-Change-Number: 29264 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Sep 2022 15:30:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: Initial support for forwarding AMR

by fixeria

Attention is currently required from: laforge, pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29264 ) Change subject: trxcon: Initial support for forwarding AMR ...................................................................... Patch Set 2: Code-Review+1 (3 comments) Patchset: PS2: Looks good to me, LGTM! File src/host/trxcon/src/trxcon_fsm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/29264/comment/2d6e425d_16a39102 PS1, Line 348: ffs Didn't know about this function, nice. File src/target/firmware/layer1/l23_api.c: https://gerrit.osmocom.org/c/osmocom-bb/+/29264/comment/f25434e8_00a7e33a PS1, Line 729: unrelated ws removal -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia20bc96e39726a919a556c83c8be48cb31af7331 Gerrit-Change-Number: 29264 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Sep 2022 15:24:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Pass AMR codec info over L1CTL

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29266 ) Change subject: Pass AMR codec info over L1CTL ...................................................................... Pass AMR codec info over L1CTL Related: SYS#5987 Depends: osmocom-bb.git Change-Id Ia20bc96e39726a919a556c83c8be48cb31af7331 Change-Id: I3db7f6a4b7819b16ada83862f2a5409db4fa21f9 --- M bts/BTS_Tests.ttcn M library/L1CTL_PortType.ttcn M library/L1CTL_Types.ttcn 3 files changed, 21 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/29266/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index f9361a0..7733545 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2510,12 +2510,16 @@ /* Send TCH Mode Request to the L1 if needed */ if (match(g_pars.chan_mode.spd_ind, (RSL_SPDI_SPEECH, RSL_SPDI_DATA))) { var L1ctlTchMode tch_mode; + var uint8_t start_codec := 0; + var BIT8 codecs_bitmask := '00000000'B; select (g_pars.chan_mode.coding_alg_rate) { case (RSL_CMOD_NO_RESOURCE) { tch_mode := L1CTL_CHAN_MODE_SIGN; } case (RSL_CMOD_SP_GSM1) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V1; } case (RSL_CMOD_SP_GSM2) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V2; } - case (RSL_CMOD_SP_GSM3) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V3; } + case (RSL_CMOD_SP_GSM3) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V3; + codecs_bitmask := '00000100'B; /* AMR TCH/AFS5.9 */ + } case else { log("RSL channel mode := ", g_pars.chan_mode.coding_alg_rate, " is not supported by the L1, falling back to signalling"); @@ -2523,7 +2527,10 @@ } } - f_L1CTL_TCH_MODE(L1CTL, tch_mode); + f_L1CTL_TCH_MODE(L1CTL, + ts_L1CTL_TCH_MODE_REQ(tch_mode, + start_codec := start_codec, + codecs_bitmask := codecs_bitmask)); } g_first_meas_res := true; diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index ed235d3..80fa074 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -106,9 +106,10 @@ } } - function f_L1CTL_TCH_MODE(L1CTL_PT pt, L1ctlTchMode tch_mode) { + function f_L1CTL_TCH_MODE(L1CTL_PT pt, + template (value) L1ctlUlMessage tch_mode_req_tmpl := ts_L1CTL_TCH_MODE_REQ) { timer T := 2.0; - pt.send(ts_L1CTL_TCH_MODE_REQ(tch_mode)); + pt.send(tch_mode_req_tmpl); T.start; alt { [] pt.receive(tr_L1CTL_MsgType(L1CTL_TCH_MODE_CONF)) { } diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 6bfebb3..acb7776 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -181,7 +181,8 @@ type record L1ctlTchModeConf { L1ctlTchMode tch_mode, L1ctlAudioMode audio_mode, - OCT2 padding + uint8_t start_codec, + BIT8 codecs_bitmask } with { variant "" }; type record L1ctlDataInd { @@ -284,7 +285,8 @@ L1ctlTchMode tch_mode, L1ctlAudioMode audio_mode, L1ctlLoopMode loop_mode, - OCT1 padding + uint8_t start_codec, + BIT8 codecs_bitmask } with { variant "" }; type record L1ctlRachReq { @@ -532,7 +534,9 @@ template (value) L1ctlUlMessage ts_L1CTL_TCH_MODE_REQ(template (value) L1ctlTchMode tch_mode := L1CTL_CHAN_MODE_SIGN, template (value) L1ctlAudioMode audio_mode := t_L1CTL_AudioModeFwd, - template (value) L1ctlLoopMode loop_mode := L1CTL_LOOP_MODE_OPEN) := { + template (value) L1ctlLoopMode loop_mode := L1CTL_LOOP_MODE_OPEN, + template (value) uint8_t start_codec := 0, + template (value) BIT8 codecs_bitmask := '00000000'B) := { header := ts_L1ctlHeader(L1CTL_TCH_MODE_REQ), ul_info := omit, ul_info_tbf := omit, @@ -542,7 +546,8 @@ tch_mode := tch_mode, audio_mode := audio_mode, loop_mode := loop_mode, - padding := '00'O + start_codec := start_codec, + codecs_bitmask := codecs_bitmask } } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3db7f6a4b7819b16ada83862f2a5409db4fa21f9 Gerrit-Change-Number: 29266 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: Initial support for forwarding AMR

by pespin

Attention is currently required from: laforge, pespin, fixeria, dexter. Hello Jenkins Builder, laforge, fixeria, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/29264 to look at the new patch set (#2). Change subject: trxcon: Initial support for forwarding AMR ...................................................................... trxcon: Initial support for forwarding AMR This allows TTCN3 L1CTL module (used in BTS_Tests) to transmit and receive AMR payloads towards osmo-bts-trx. Related: SYS#5987 Change-Id: Ia20bc96e39726a919a556c83c8be48cb31af7331 --- M include/l1ctl_proto.h M src/host/layer23/src/common/l1ctl.c M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/include/osmocom/bb/l1sched/logging.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/trxcon_fsm.c M src/host/virt_phy/src/l1ctl_sap.c M src/target/firmware/layer1/l23_api.c 10 files changed, 171 insertions(+), 55 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/64/29264/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia20bc96e39726a919a556c83c8be48cb31af7331 Gerrit-Change-Number: 29264 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cosmetic: L1CTL: Fix trailing whitespace

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29265 ) Change subject: cosmetic: L1CTL: Fix trailing whitespace ...................................................................... cosmetic: L1CTL: Fix trailing whitespace Change-Id: I9d0446c21e1331c426bca0dad434f32de0ff0d38 --- M library/L1CTL_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/29265/1 diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 4bde793..6bfebb3 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -859,7 +859,7 @@ rx_level := ?, snr := ?, num_biterr := num_biterr, - fire_crc := fire_crc + fire_crc := fire_crc }, payload := { data_ind := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9d0446c21e1331c426bca0dad434f32de0ff0d38 Gerrit-Change-Number: 29265 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: Initial support for forwarding AMR

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29264 ) Change subject: trxcon: Initial support for forwarding AMR ...................................................................... trxcon: Initial support for forwarding AMR This allows TTCN3 L1CTL module (used in BTS_Tests) to transmit and receive AMR payloads towards osmo-bts-trx. Related: SYS#5987 Change-Id: Ia20bc96e39726a919a556c83c8be48cb31af7331 --- M include/l1ctl_proto.h M src/host/layer23/src/common/l1ctl.c M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/include/osmocom/bb/l1sched/logging.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/trxcon_fsm.c M src/host/virt_phy/src/l1ctl_sap.c M src/target/firmware/layer1/l23_api.c 10 files changed, 170 insertions(+), 55 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/64/29264/1 diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index 3720f82..a15f905 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -162,7 +162,10 @@ uint8_t tch_mode; /* enum tch_mode */ uint8_t audio_mode; uint8_t tch_loop_mode; /* enum l1ctl_tch_loop_mode */ - uint8_t padding[1]; + struct { /* 3GPP TS 08.58 9.3.52, 3GPP TS 44.018 10.5.2.21aa */ + uint8_t start_codec; + uint8_t codecs_bitmask; + } amr; } __attribute__((packed)); /* data on the CCCH was found. This is following the header */ @@ -241,7 +244,10 @@ #define AUDIO_RX_TRAFFIC_IND (1<<3) uint8_t audio_mode; uint8_t tch_loop_mode; /* enum l1ctl_tch_loop_mode */ - uint8_t padding[1]; + struct { /* 3GPP TS 08.58 9.3.52, 3GPP TS 44.018 10.5.2.21aa */ + uint8_t start_codec; + uint8_t codecs_bitmask; + } amr; } __attribute__((packed)); /* the l1_info_ul header is in front */ diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index e33074a..d520403 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -472,6 +472,7 @@ req->tch_mode = tch_mode; req->audio_mode = audio_mode; req->tch_loop_mode = tch_loop_mode; + /* TODO: Set AMR codec in req if req->tch_mode==GSM48_CMODE_SPEECH_AMR */ return osmo_send_l1(ms, msg); } diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 04303f0..9686562 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -297,6 +297,8 @@ uint8_t ber_num; /*! Sum of bit error rates */ float ber_sum; + /* last received dtx frame type */ + uint8_t last_dtx; } amr; /*! A5/X encryption state */ diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/logging.h b/src/host/trxcon/include/osmocom/bb/l1sched/logging.h index fb1c018..d2b80e3 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/logging.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/logging.h @@ -17,12 +17,13 @@ LOGP_SCHED_CAT(sched, common, level, fmt, ## args) +#define LOGP_LCHAN_NAME_FMT "TS%u-%s" #define LOGP_LCHAN_NAME_ARGS(lchan) \ (lchan)->ts->index, l1sched_lchan_desc[(lchan)->type].name /* Messages using l1sched_lchan_state as the context */ #define LOGP_LCHAN_CAT(lchan, cat, level, fmt, args...) \ - LOGP_SCHED_CAT((lchan)->ts->sched, cat, level, "TS%u-%s " fmt, \ + LOGP_SCHED_CAT((lchan)->ts->sched, cat, level, LOGP_LCHAN_NAME_FMT " " fmt, \ LOGP_LCHAN_NAME_ARGS(lchan), ## args) /* Common messages using l1sched_lchan_state as the context */ diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 2a6f7d5..6344733 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -58,6 +58,10 @@ /* param of TRXCON_EV_SET_{CCCH,TCH}_MODE_REQ */ struct trxcon_param_set_ccch_tch_mode_req { uint8_t mode; + struct { + uint8_t start_codec; + uint8_t codecs_bitmask; + } amr; bool applied; }; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 4d6bed2..033b93d 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -702,6 +702,10 @@ struct trxcon_param_set_ccch_tch_mode_req req = { .mode = mode_req->tch_mode, }; + if (mode_req->tch_mode == GSM48_CMODE_SPEECH_AMR) { + req.amr.start_codec = mode_req->amr.start_codec; + req.amr.codecs_bitmask = mode_req->amr.codecs_bitmask; + } rc = osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_SET_TCH_MODE_REQ, &req); if (rc != 0 || !req.applied) { diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index 96acf0e..0474df7 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -30,11 +30,63 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/coding/gsm0503_coding.h> +#include <osmocom/coding/gsm0503_amr_dtx.h> #include <osmocom/codec/codec.h> #include <osmocom/bb/l1sched/l1sched.h> #include <osmocom/bb/l1sched/logging.h> +/* 3GPP TS 45.009, table 3.2.1.3-{1,3}: AMR on Uplink TCH/F. + * + * +---+---+---+---+---+---+---+---+ + * | a | b | c | d | e | f | g | h | Burst 'a' received first + * +---+---+---+---+---+---+---+---+ + * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Speech/FACCH frame (bursts 'a' .. 'h') + * + * TDMA frame number of burst 'h' is always used as the table index. */ +static const uint8_t sched_tchf_ul_amr_cmi_map[26] = { + [7] = 1, /* TCH/F: a=0 / h=7 */ + [16] = 1, /* TCH/F: a=8 / h=16 */ + [24] = 1, /* TCH/F: a=17 / h=24 */ +}; + +/*! determine whether an uplink AMR block is CMI according to 3GPP TS 45.009. + * \param[in] fn_begin frame number of the beginning of the block. + * \returns true in case of CMI; false otherwise. */ +static inline bool ul_amr_fn_is_cmi(uint32_t fn_begin) +{ + switch (fn_begin % 26) { + /*! See also: 3GPP TS 45.009, section 3.2.1.3 Transmitter/Receiver Synchronisation */ + /* valid for AHS subslot 0 and AFS: */ + case 0: + case 8: + case 17: + /* valid for AHS subslot 1: */ + case 1: + case 9: + case 18: + return true; + break; + /* Complementary values for sanity check */ + /* valid for AHS subslot 0 and AFS: */ + case 4: + case 13: + case 21: + /* valid for AHS subslot 1: */ + case 5: + case 14: + case 22: + return false; + break; + default: + LOGP(l1sched_log_cat_data, LOGL_DEBUG, + "uplink frame number fn_begin=%u does not mark the beginning of a voice block!\n", fn_begin); + OSMO_ASSERT(false); + return false; + break; + } +} + int rx_tchf_fn(struct l1sched_lchan_state *lchan, uint32_t fn, uint8_t bid, const sbit_t *bits, const struct l1sched_meas_set *meas) @@ -43,6 +95,9 @@ sbit_t *buffer, *offset; uint8_t l2[128], *mask; size_t l2_len; + int amr = 0; + uint8_t ft; + bool amr_is_cmr; /* Set up pointers */ mask = &lchan->rx_burst_mask; @@ -97,12 +152,36 @@ 1, 1, &n_errors, &n_bits_total); break; case GSM48_CMODE_SPEECH_AMR: /* AMR */ - /** - * TODO: AMR requires a dedicated loop, - * which will be implemented later... + /* the first FN 0,8,17 defines that CMI is included in frame, + * the first FN 4,13,21 defines that CMR is included in frame. + * NOTE: A frame ends 7 FN after start. */ - LOGP_LCHAND(lchan, LOGL_ERROR, "AMR isn't supported yet\n"); - return -ENOTSUP; + amr_is_cmr = !sched_tchf_ul_amr_cmi_map[fn % 26]; + + /* we store tch_data + 2 header bytes, the amr variable set to + * 2 will allow us to skip the first 2 bytes in case we did + * receive an FACCH frame instead of a voice frame (we do not + * know this before we actually decode the frame) */ + amr = 2; + rc = gsm0503_tch_afs_decode_dtx(l2 + amr, buffer, + amr_is_cmr, lchan->amr.codec, lchan->amr.codecs, &lchan->amr.ul_ft, + &lchan->amr.ul_cmr, &n_errors, &n_bits_total, &lchan->amr.last_dtx); + + /* only good speech frames get rtp header */ + if (rc != GSM_MACBLOCK_LEN && rc >= 4) { + if (lchan->amr.last_dtx == AMR_OTHER) { + ft = lchan->amr.codec[lchan->amr.ul_ft]; + } else { + /* SID frames will always get Frame Type Index 8 (AMR_SID) */ + ft = AMR_SID; + } + rc = osmo_amr_rtp_enc(l2, + lchan->amr.codec[lchan->amr.ul_cmr], + ft, AMR_GOOD); + LOGP_LCHAND(lchan, LOGL_ERROR, "osmo_amr_rtp_enc() returned rc=%d\n", rc); + } + + break; default: LOGP_LCHAND(lchan, LOGL_ERROR, "Invalid TCH mode: %u\n", lchan->tch_mode); return -EINVAL; @@ -186,55 +265,51 @@ if (br->bid > 0) return 0; - /* Check the current TCH mode */ - switch (lchan->tch_mode) { - case GSM48_CMODE_SIGN: - case GSM48_CMODE_SPEECH_V1: /* FR */ - l2_len = GSM_FR_BYTES; - break; - case GSM48_CMODE_SPEECH_EFR: /* EFR */ - l2_len = GSM_EFR_BYTES; - break; - case GSM48_CMODE_SPEECH_AMR: /* AMR */ - /** - * TODO: AMR requires a dedicated loop, - * which will be implemented later... - */ - LOGP_LCHAND(lchan, LOGL_ERROR, - "AMR isn't supported yet, dropping frame...\n"); - - /* Forget this primitive */ - l1sched_prim_drop(lchan); - - return -ENOTSUP; - default: - LOGP_LCHAND(lchan, LOGL_ERROR, - "Invalid TCH mode: %u, dropping frame...\n", - lchan->tch_mode); - - /* Forget this primitive */ - l1sched_prim_drop(lchan); - - return -EINVAL; - } - - /* Determine and check the payload length */ - if (lchan->prim->payload_len == GSM_MACBLOCK_LEN) { - l2_len = GSM_MACBLOCK_LEN; /* FACCH */ - } else if (lchan->prim->payload_len != l2_len) { - LOGP_LCHAND(lchan, LOGL_ERROR, "Primitive has odd length %zu " - "(expected %zu for TCH or %u for FACCH), so dropping...\n", - lchan->prim->payload_len, l2_len, GSM_MACBLOCK_LEN); - - l1sched_prim_drop(lchan); - return -EINVAL; - } - /* Shift buffer by 4 bursts back for interleaving */ memcpy(buffer, buffer + 464, 464); - /* Encode payload */ - rc = gsm0503_tch_fr_encode(buffer, lchan->prim->payload, l2_len, 1); + /* populate the buffer with bursts */ + if (lchan->prim->payload_len == GSM_MACBLOCK_LEN) { /* FACCH */ + /* Encode payload */ + rc = gsm0503_tch_fr_encode(buffer, lchan->prim->payload, GSM_MACBLOCK_LEN, 1); + } else if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) { + /* the first FN 0,8,17 defines that CMI is included in frame, + * the first FN 4,13,21 defines that CMR is included in frame. + */ + rc = gsm0503_tch_afs_encode(buffer, lchan->prim->payload + 2, + lchan->prim->payload_len - 2, !ul_amr_fn_is_cmi(br->fn), + lchan->amr.codec, lchan->amr.codecs, + lchan->amr.ul_ft, + lchan->amr.ul_cmr); + } else { + /* Determine and check the payload length */ + switch (lchan->tch_mode) { + case GSM48_CMODE_SIGN: + case GSM48_CMODE_SPEECH_V1: /* FR */ + l2_len = GSM_FR_BYTES; + break; + case GSM48_CMODE_SPEECH_EFR: /* EFR */ + l2_len = GSM_EFR_BYTES; + break; + default: + LOGP_LCHAND(lchan, LOGL_ERROR, + "Invalid TCH mode: %u, dropping frame...\n", + lchan->tch_mode); + /* Forget this primitive */ + l1sched_prim_drop(lchan); + return -EINVAL; + } + if (lchan->prim->payload_len != l2_len) { + LOGP_LCHAND(lchan, LOGL_ERROR, "Primitive has odd length %zu " + "(expected %zu for TCH or %u for FACCH), so dropping...\n", + lchan->prim->payload_len, l2_len, GSM_MACBLOCK_LEN); + + l1sched_prim_drop(lchan); + return -EINVAL; + } + rc = gsm0503_tch_fr_encode(buffer, lchan->prim->payload, l2_len, 1); + } + if (rc) { LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to encode L2 payload (len=%zu): %s\n", lchan->prim->payload_len, osmo_hexdump(lchan->prim->payload, diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index aa7193a..1713539 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -36,6 +36,7 @@ #include <osmocom/bb/trxcon/l1ctl_server.h> #include <osmocom/bb/trxcon/l1ctl_proto.h> #include <osmocom/bb/l1sched/l1sched.h> +#include <osmocom/bb/l1sched/logging.h> #define S(x) (1 << (x)) @@ -340,6 +341,26 @@ if (!lchan->active) continue; lchan->tch_mode = req->mode; + if (req->mode == GSM48_CMODE_SPEECH_AMR) { + int pos, n, acum; + uint8_t bmask = req->amr.codecs_bitmask; + n = 0, acum = 0; + while ((pos = ffs(bmask)) != 0) { + acum += pos; + LOGPFSML(fi, LOGL_DEBUG, + LOGP_LCHAN_NAME_FMT " AMR codec[%u] = %u\n", + LOGP_LCHAN_NAME_ARGS(lchan), n, acum - 1); + lchan->amr.codec[n++] = acum - 1; + bmask >>= pos; + } + if (n == 0) { + LOGPFSML(fi, LOGL_ERROR, + LOGP_LCHAN_NAME_FMT " Empty AMR codec mode bitmask!\n", + LOGP_LCHAN_NAME_ARGS(lchan)); + continue; + } + lchan->amr.codecs = n; + } req->applied = true; } } diff --git a/src/host/virt_phy/src/l1ctl_sap.c b/src/host/virt_phy/src/l1ctl_sap.c index bab6259..a0e8c0c 100644 --- a/src/host/virt_phy/src/l1ctl_sap.c +++ b/src/host/virt_phy/src/l1ctl_sap.c @@ -486,6 +486,7 @@ l1_model_tch_mode_set(ms, tch_mode_req->tch_mode); ms->state.audio_mode = tch_mode_req->audio_mode; + /* TODO: Handle AMR codecs from tch_mode_req if tch_mode_req->tch_mode==GSM48_CMODE_SPEECH_AMR */ LOGPMS(DL1C, LOGL_INFO, ms, "Rx L1CTL_TCH_MODE_REQ (tch_mode=0x%02x audio_mode=0x%02x)\n", tch_mode_req->tch_mode, tch_mode_req->audio_mode); diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index a133c62..599272f 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -553,6 +553,7 @@ l1s.tch_sync = 1; /* Needed for audio to work */ l1s.tch_loop_mode = tch_mode_req->tch_loop_mode; + /* TODO: Handle AMR codecs from tch_mode_req if tch_mode_req->tch_mode==GSM48_CMODE_SPEECH_AMR */ l1ctl_tx_tch_mode_conf(tch_mode, audio_mode); } @@ -726,4 +727,3 @@ { sercomm_register_rx_cb(SC_DLCI_L1A_L23, l1a_l23_rx); } - -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia20bc96e39726a919a556c83c8be48cb31af7331 Gerrit-Change-Number: 29264 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: update expected-results.xml

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 ) Change subject: bts: update expected-results.xml ...................................................................... bts: update expected-results.xml Change-Id: Ifcd8601d1aadce78a1b0a0ed814ae9e77e8497aa --- M bts/expected-results.xml 1 file changed, 67 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/bts/expected-results.xml b/bts/expected-results.xml index e3804a4..e6ec9cf 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -1,5 +1,6 @@ <?xml version="1.0"?> -<testsuite name='Titan' tests='156' failures='18' errors='1' skipped='0' inconc='0' time='MASKED'> +<testsuite name='Titan' tests='220' failures='12' errors='0' skipped='0' inconc='0' time='MASKED'> + <testcase classname='BTS_Tests' name='TC_est_dchan' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_chan_act_stress' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_chan_act_react' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_chan_deact_not_active' time='MASKED'/> @@ -13,11 +14,12 @@ <testcase classname='BTS_Tests' name='TC_sacch_chan_act_ho_async' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_sacch_chan_act_ho_sync' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_rach_content' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_rach_content_emerg' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_rach_count' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_rach_max_ta' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_ho_rach' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_ho_physical_info' time='MASKED'> - <failure type='fail-verdict'>"BTS_Tests.ttcn:MASKED : Rx unexpected Downlink DCCH (before handover RACH): MASKED" + <failure type='fail-verdict'>Rx unexpected Downlink DCCH (before handover RACH): MASKED BTS_Tests.ttcn:MASKED BTS_Tests control part BTS_Tests.ttcn:MASKED TC_ho_physical_info testcase </failure> @@ -25,11 +27,21 @@ <testcase classname='BTS_Tests' name='TC_rach_load_idle_thresh0' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_rach_load_idle_below_thresh' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_rach_load_count' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_meas_res_speech_tchf' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_meas_res_speech_tchf_facch' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_meas_res_speech_tchh' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_meas_res_speech_tchh_facch' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_meas_res_speech_tchh_toa256' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_meas_res_sign_tchf' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_meas_res_sign_tchh' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_meas_res_sign_sdcch4' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_meas_res_sign_sdcch8' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_meas_res_sign_tchh_toa256' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_meas_res_speech_tchf_sapi3' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_meas_res_speech_tchh_sapi3' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_tx_power_start_ramp_up_bcch' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_tx_power_start_ramp_down_bcch' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_tx_power_ramp_adm_state_change' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_rsl_bs_pwr_static_ass' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_rsl_bs_pwr_static_power_control' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_rsl_ms_pwr_ctrl' time='MASKED'/> @@ -41,12 +53,8 @@ <testcase classname='BTS_Tests' name='TC_rsl_ms_pwr_dyn_max' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_rsl_chan_initial_ms_pwr' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_rsl_chan_initial_ta' time='MASKED'/> - <testcase classname='BTS_Tests' name='TC_rsl_modify_encr' time='MASKED'> - <failure type='fail-verdict'>"BTS_Tests.ttcn:MASKED : BTS shouldn't be able to decrypt after key change" - BTS_Tests.ttcn:MASKED BTS_Tests control part - BTS_Tests.ttcn:MASKED TC_rsl_modify_encr testcase - </failure> - </testcase> + <testcase classname='BTS_Tests' name='TC_rsl_modify_encr' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_rsl_rf_resource_ind' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_conn_fail_crit' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_paging_imsi_80percent' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_paging_tmsi_80percent' time='MASKED'/> @@ -68,12 +76,21 @@ <testcase classname='BTS_Tests' name='TC_ipa_crcx_mdcx_dlcx_not_active' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_ipa_crcx_mdcx_mdcx_dlcx_not_active' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_ipa_crcx_sdcch_not_active' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_ipa_crcx_ack_addr' time='MASKED'> + <failure type='fail-verdict'>CRCX ACK indicates nonsense addr "0.0.0.0" + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_ipa_crcx_ack_addr testcase + </failure> + </testcase> + <testcase classname='BTS_Tests' name='TC_paging_imsi_200percent_with_ps' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_act_req' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_act_req_wrong_ts' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_act_req_wrong_bts' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_act_req_wrong_trx' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_deact_req' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_deact_req_wrong_ts' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_pcu_ver_si1' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_pcu_ver_si3' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_ver_si13' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_ptcch' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_pcu_data_req_agch' time='MASKED'/> @@ -105,9 +122,20 @@ <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_double_act' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_dyn_ipa_pdch_act_deact' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_dyn_ipa_pdch_act_tchf_act_nack' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_pcu_info_ind_fh_params' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_pcu_socket_nsvc_ipv4' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_pcu_socket_nsvc_ipv6' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_pcu_socket_two_nsvc' time='MASKED'> + <failure type='fail-verdict'>NSVCI { 1234, 0 } does not match { 1234, 5678 } + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_pcu_socket_two_nsvc testcase + </failure> + </testcase> + <testcase classname='BTS_Tests' name='TC_pcu_interf_ind' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_unsol_deact' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_tchf_act' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_tchh_act' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_sdcch8_act' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_dyn_ipa_pdch_tchf_act' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_dyn_ipa_pdch_tchf_act_pdch_act_nack' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_rll_est_ind' time='MASKED'/> @@ -136,13 +164,27 @@ <testcase classname='BTS_Tests' name='TC_lapdm_selftest' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_tch_sign_l2_fill_frame' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_tch_sign_l2_fill_frame_dtxd' time='MASKED'> - <failure type='fail-verdict'>"BTS_Tests.ttcn:MASKED : Not enough fill frames received" + <failure type='fail-verdict'>Received DTX TCH fill frame with bad frame number: MASKED BTS_Tests.ttcn:MASKED BTS_Tests control part BTS_Tests.ttcn:MASKED TC_tch_sign_l2_fill_frame_dtxd testcase </failure> </testcase> <testcase classname='BTS_Tests' name='TC_chopped_ipa_ping' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_chopped_ipa_payload' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_ms_pwr_ctrl_constant' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_ms_pwr_ctrl_pf_ewma' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_speech_no_rtp_tchf' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_speech_no_rtp_tchh' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_speech_rtp_tchf' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_speech_rtp_tchh' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_early_immediate_assignment' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_acch_overpower_rxqual_thresh' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_acch_overpower_rxqual_thresh_dtx' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_acch_overpower_always_on_facch' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_acch_overpower_always_on_sacch' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_acch_overpower_limit' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_tchh_race_act' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_sdcch8_race_act' time='MASKED'/> <testcase classname='BTS_Tests_SMSCB' name='TC_cbch_load_idle_no_cbch' time='MASKED'/> <testcase classname='BTS_Tests_SMSCB' name='TC_sms_cb_cmd_sdcch4_1block' time='MASKED'/> <testcase classname='BTS_Tests_SMSCB' name='TC_sms_cb_cmd_sdcch4_2block' time='MASKED'/> @@ -214,4 +256,20 @@ <testcase classname='BTS_Tests_LAPDm' name='TC_rr_response_frame_loss' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_incorrect_cr' time='MASKED'/> <testcase classname='BTS_Tests_LAPDm' name='TC_sabm_incorrect_c' time='MASKED'/> + <testcase classname='BTS_Tests_LAPDm' name='TC_normal_reestablishment' time='MASKED'/> + <testcase classname='BTS_Tests_LAPDm' name='TC_normal_reestablishment_state_unacked' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_act_vff' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_act_vhh' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_act_hvhh' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_act_dyn_ipa_vff' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_act_dyn_osmo_vff' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_act_dyn_osmo_vhh' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_act_dyn_osmo_hvhh' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_mode_modify_vff' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_mode_modify_vhh' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_mode_modify_hvhh' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_mode_modify_dyn_ipa_vff' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_mode_modify_dyn_osmo_vff' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_mode_modify_dyn_osmo_vhh' time='MASKED'/> + <testcase classname='BTS_Tests_VAMOS' name='TC_vamos_chan_mode_modify_dyn_osmo_hvhh' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifcd8601d1aadce78a1b0a0ed814ae9e77e8497aa Gerrit-Change-Number: 29216 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: update expected-results.xml

by neels

Attention is currently required from: laforge, fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 ) Change subject: bts: update expected-results.xml ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifcd8601d1aadce78a1b0a0ed814ae9e77e8497aa Gerrit-Change-Number: 29216 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Sep 2022 12:11:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Drop long time deprecated APIs

by pespin

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/29256 to look at the new patch set (#3). Change subject: osmux: Drop long time deprecated APIs ...................................................................... osmux: Drop long time deprecated APIs Those APIs where deprecated 4 years ago (end of Aug 2018), and they have not been used since around that time. Hence it can be considered safe to drop them, since they only make the whole code more complex to understand. API osmux_xfrm_output_init() is left since openbsc.git is still using it. Related: OS#5987 Change-Id: Icbdd364a8161a8113dbf1406716946f684d0a853 --- M include/osmocom/netif/osmux.h M src/osmux.c 2 files changed, 0 insertions(+), 122 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/56/29256/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Icbdd364a8161a8113dbf1406716946f684d0a853 Gerrit-Change-Number: 29256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 9 months

1
0
0 0

Change in libosmo-netif[master]: osmux: Move osmux_xfrm_output_set_tx_cb() further down to the xfrm_ou...

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/29257 to look at the new patch set (#3). Change subject: osmux: Move osmux_xfrm_output_set_tx_cb() further down to the xfrm_output section ...................................................................... osmux: Move osmux_xfrm_output_set_tx_cb() further down to the xfrm_output section Change-Id: I46628d1f712e9c5c56c306e27c34ff45731c0172 --- M src/osmux.c 1 file changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/57/29257/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I46628d1f712e9c5c56c306e27c34ff45731c0172 Gerrit-Change-Number: 29257 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022