- gerrit-log - lists.osmocom.org

[S] Change in gapk[master]: libgsmhr: fix unneeded dependency for libgsmhr.c
by fixeria 25 Oct '23

25 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/gapk/+/34890?usp=email ) Change subject: libgsmhr: fix unneeded dependency for libgsmhr.c ...................................................................... libgsmhr: fix unneeded dependency for libgsmhr.c Change-Id: I95900e3d26a7668246ec97d3182bea84156b4725 Related: OS#6227 --- M libgsmhr/Makefile.am 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/90/34890/1 diff --git a/libgsmhr/Makefile.am b/libgsmhr/Makefile.am index 9904098..f3c01b7 100644 --- a/libgsmhr/Makefile.am +++ b/libgsmhr/Makefile.am @@ -21,7 +21,7 @@ done touch $@ -$(REFSRC_SRC) libgsmhr.c: ${REFSRC_PATH}/.downloaded +$(REFSRC_SRC): ${REFSRC_PATH}/.downloaded lib_LTLIBRARIES = libgsmhr.la libgsmhr_la_SOURCES = $(REFSRC_SRC) libgsmhr.c -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34890?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I95900e3d26a7668246ec97d3182bea84156b4725 Gerrit-Change-Number: 34890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in gapk[master]: dist: include .[tarball-]version and git-version-gen files
by fixeria 25 Oct '23

25 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/gapk/+/34891?usp=email ) Change subject: dist: include .[tarball-]version and git-version-gen files ...................................................................... dist: include .[tarball-]version and git-version-gen files Most of other [lib]osmo-projects do include these files in the release tarballs. Do the same for the sake of consistency. Change-Id: I5c15cefb68ab787819edaa1a097fe397837e0bcd Related: OS#6227 --- M Makefile.am 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/91/34891/1 diff --git a/Makefile.am b/Makefile.am index a1642d4..f2a2c31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,3 +11,17 @@ endif SUBDIRS += src tests + +BUILT_SOURCES = \ + $(top_srcdir)/.version \ + $(NULL) +EXTRA_DIST = \ + git-version-gen \ + .version \ + $(NULL) + +# versioning magic +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34891?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I5c15cefb68ab787819edaa1a097fe397837e0bcd Gerrit-Change-Number: 34891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in gapk[master]: dist: exclude libgsmhr files downloaded by fetch_sources.py
by fixeria 25 Oct '23

25 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/gapk/+/34892?usp=email ) Change subject: dist: exclude libgsmhr files downloaded by fetch_sources.py ...................................................................... dist: exclude libgsmhr files downloaded by fetch_sources.py We deliberately do not include these files in the git repository, nor do we intend to include them in the release tarballs. This is done intentionally to avoid potential licensing issues. Change-Id: I66e31dec37e53bf1a8c7df948fd9316e1467752c Related: OS#6227 --- M libgsmhr/Makefile.am 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/92/34892/1 diff --git a/libgsmhr/Makefile.am b/libgsmhr/Makefile.am index f3c01b7..ffbde21 100644 --- a/libgsmhr/Makefile.am +++ b/libgsmhr/Makefile.am @@ -33,3 +33,7 @@ distclean-local: -rm -rf ${REFSRC_PATH}/ + +# exclude files downloaded by fetch_sources.py +dist-hook: + -rm -rf $(distdir)/$(REFSRC_PATH) -- To view, visit https://gerrit.osmocom.org/c/gapk/+/34892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I66e31dec37e53bf1a8c7df948fd9316e1467752c Gerrit-Change-Number: 34892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface
by Jenkins Builder 25 Oct '23

25 Oct '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email ) Change subject: ASCI: Control uplink access bursts detection of physical interface ...................................................................... Patch Set 1: (4 comments) File src/common/asci.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12091): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/a4d0db0b_73590916 PS1, Line 130: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink accesss after TALKER DET.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12091): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/b6c72e47_949143a7 PS1, Line 159: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to activate uplink accesss after channel activation.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12091): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/54099ea4_df24e17d PS1, Line 170: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink accesss for assignment.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12091): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/483e3187_27c41c18 PS1, Line 201: "Failed to activate uplink accesss after uplink became free.\n"); 'accesss' may be misspelled - perhaps 'access'? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?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: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 25 Oct 2023 09:40:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-sysmo
by jolly 25 Oct '23

25 Oct '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34887?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-sysmo ...................................................................... ASCI: Add control of uplink access to osmo-bts-sysmo An MPH-INFO message is used to turn detection of uplink access bursts on or off. This is required for voice group/broadcast channels. Related: OS#4851 Change-Id: I61f232aa91191dae08404c1f08cad91964d74568 --- M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/l1_if.h M src/osmo-bts-sysmo/oml.c 3 files changed, 35 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/34887/1 diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 4ab2ef6..49a8c5d 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -604,6 +604,15 @@ else l1if_rsl_chan_rel(lchan); break; + case PRIM_INFO_ACT_UL_ACC: + case PRIM_INFO_DEACT_UL_ACC: + chan_nr = l1sap->u.info.u.ulacc_req.chan_nr; + lchan = get_lchan_by_chan_nr(trx, chan_nr); + if (l1sap->u.info.type == PRIM_INFO_ACT_UL_ACC) + l1if_set_ul_acc(lchan, true); + else + l1if_set_ul_acc(lchan, false); + break; default: LOGP(DL1C, LOGL_NOTICE, "unknown MPH-INFO.req %d\n", l1sap->u.info.type); diff --git a/src/osmo-bts-sysmo/l1_if.h b/src/osmo-bts-sysmo/l1_if.h index 5b2da04..c81b6bd 100644 --- a/src/osmo-bts-sysmo/l1_if.h +++ b/src/osmo-bts-sysmo/l1_if.h @@ -145,6 +145,7 @@ int l1if_rsl_chan_mod(struct gsm_lchan *lchan); int l1if_rsl_deact_sacch(struct gsm_lchan *lchan); int l1if_rsl_mode_modify(struct gsm_lchan *lchan); +int l1if_set_ul_acc(struct gsm_lchan *lchan, bool active); /* calibration loading */ int calib_load(struct femtol1_hdl *fl1h); diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 9b760a3..e19c481 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1172,8 +1172,8 @@ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Trying to activate lchan, but commands in queue\n"); /* For handover, always start the main channel immediately. lchan->want_dl_sacch_active indicates whether dl - * SACCH should be activated. Also, for HO and VGCS listener/talker detection, start the RACH SAPI. */ - if (lchan->ho.active == HANDOVER_ENABLED || rsl_chan_rt_is_asci(lchan->rsl_chan_rt)) + * SACCH should be activated. */ + if (lchan->ho.active == HANDOVER_ENABLED) enqueue_sapi_act_cmd(lchan, GsmL1_Sapi_Rach, GsmL1_Dir_RxUplink); for (i = 0; i < s4l->num_sapis; i++) { @@ -1470,6 +1470,16 @@ return 0; } +int l1if_set_ul_acc(struct gsm_lchan *lchan, bool active) +{ + if (active) + enqueue_sapi_act_cmd(lchan, GsmL1_Sapi_Rach, GsmL1_Dir_RxUplink); + else + check_sapi_release(lchan, GsmL1_Sapi_Rach, GsmL1_Dir_RxUplink); + + return 0; +} + int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan) { if (lchan->state != LCHAN_S_ACTIVE) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34887?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: I61f232aa91191dae08404c1f08cad91964d74568 Gerrit-Change-Number: 34887 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-trx
by jolly 25 Oct '23

25 Oct '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34886?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-trx ...................................................................... ASCI: Add control of uplink access to osmo-bts-trx An MPH-INFO message is used to turn detection of uplink access bursts on or off. This is required for voice group/broadcast channels. Related: OS#4851 Change-Id: I9045437d52984b7abe00fbc815d7f83c62c0fb5a --- M include/osmo-bts/scheduler.h M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c 3 files changed, 54 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/86/34886/1 diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 94333ea..b9c7350 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -186,6 +186,9 @@ /*! \brief set all matching logical channels active/inactive */ int trx_sched_set_lchan(struct gsm_lchan *lchan, uint8_t chan_nr, uint8_t link_id, bool active); +/*! \brief set uplink access on given logical channels active/inactive */ +int trx_sched_set_ul_access(struct gsm_lchan *lchan, uint8_t chan_nr, bool active); + /*! \brief set all logical channels of BCCH/CCCH active/inactive */ int trx_sched_set_bcch_ccch(struct gsm_lchan *lchan, bool active); diff --git a/src/common/scheduler.c b/src/common/scheduler.c index e68d01f..79d69fd 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1144,6 +1144,27 @@ return found ? 0 : -EINVAL; } +int trx_sched_set_ul_access(struct gsm_lchan *lchan, uint8_t chan_nr, bool active) +{ + uint8_t tn = L1SAP_CHAN2TS(chan_nr); + uint8_t ss = l1sap_chan2ss(chan_nr); + int i; + + /* look for all matching chan_nr */ + for (i = 0; i < _TRX_CHAN_MAX; i++) { + if (trx_chan_desc[i].chan_nr == (chan_nr & RSL_CHAN_NR_MASK)) { + struct l1sched_ts *l1ts = lchan->ts->priv; + struct l1sched_chan_state *l1cs = &l1ts->chan_state[i]; + + l1cs->ho_rach_detect = active; + } + } + + _sched_act_rach_det(lchan->ts->trx, tn, ss, active); + + return 0; +} + int trx_sched_set_bcch_ccch(struct gsm_lchan *lchan, bool active) { struct l1sched_ts *l1ts = lchan->ts->priv; diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index ab66094..54f5bd2 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -417,10 +417,18 @@ /* put data into scheduler's queue */ return trx_sched_tch_req(trx, l1sap); case OSMO_PRIM(PRIM_MPH_INFO, PRIM_OP_REQUEST): - if (l1sap->u.info.type == PRIM_INFO_ACT_CIPH) + switch (l1sap->u.info.type) { + case PRIM_INFO_ACT_CIPH: chan_nr = l1sap->u.info.u.ciph_req.chan_nr; - else /* u.act_req used by PRIM_INFO_{ACTIVATE,DEACTIVATE,MODIFY} */ + break; + case PRIM_INFO_ACT_UL_ACC: + case PRIM_INFO_DEACT_UL_ACC: + chan_nr = l1sap->u.info.u.ulacc_req.chan_nr; + break; + default: + /* u.act_req used by PRIM_INFO_{ACTIVATE,DEACTIVATE,MODIFY} */ chan_nr = l1sap->u.info.u.act_req.chan_nr; + } lchan = get_lchan_by_chan_nr(trx, chan_nr); if (OSMO_UNLIKELY(lchan == NULL)) { LOGP(DL1C, LOGL_ERROR, @@ -437,6 +445,12 @@ if (l1sap->u.info.u.ciph_req.downlink) l1if_set_ciphering(lchan, chan_nr, 1); break; + case PRIM_INFO_ACT_UL_ACC: + trx_sched_set_ul_access(lchan, chan_nr, true); + break; + case PRIM_INFO_DEACT_UL_ACC: + trx_sched_set_ul_access(lchan, chan_nr, false); + break; case PRIM_INFO_ACTIVATE: if ((chan_nr & 0xE0) == 0x80) { LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Cannot activate" @@ -458,8 +472,7 @@ lchan->tch.amr_mr.mode[2].mode, lchan->tch.amr_mr.mode[3].mode, amr_get_initial_mode(lchan), - (lchan->ho.active == HANDOVER_ENABLED) || - rsl_chan_rt_is_asci(lchan->rsl_chan_rt)); + (lchan->ho.active == HANDOVER_ENABLED)); /* set lchan active */ lchan_set_state(lchan, LCHAN_S_ACTIVE); /* set initial ciphering */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34886?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: I9045437d52984b7abe00fbc815d7f83c62c0fb5a Gerrit-Change-Number: 34886 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx
by jolly 25 Oct '23

25 Oct '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34888?usp=email ) Change subject: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx ...................................................................... ASCI: Enable voice group/broadcast call feature at osmo-bts-trx Related: OS#4851 Change-Id: I3a2e3f94812cec0bbf7e3674172437fa359d014c --- M src/osmo-bts-trx/main.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/34888/1 diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index c1f5716..c2d1e31 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -156,6 +156,8 @@ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR); osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1); osmo_bts_set_feature(bts->features, BTS_FEAT_VAMOS); + osmo_bts_set_feature(bts->features, BTS_FEAT_VGCS); + osmo_bts_set_feature(bts->features, BTS_FEAT_VBS); bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB); bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_INTERF_MEAS); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34888?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: I3a2e3f94812cec0bbf7e3674172437fa359d014c Gerrit-Change-Number: 34888 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface
by jolly 25 Oct '23

25 Oct '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email ) Change subject: ASCI: Control uplink access bursts detection of physical interface ...................................................................... ASCI: Control uplink access bursts detection of physical interface An MPH-INFO message is used to turn detection of uplink access bursts on or off. Whenever the uplink on a voice group channel is free, the uplink access burst detection is turned on. When the uplink access is granted to a talker or when the calling subscriber has been assigned to the channel, the uplink access burst detection is turned off until the uplink becomes free again. Related: OS#4851 Change-Id: I92d6773a3a463eb747143c85aa149e54c1fda122 --- M include/osmo-bts/asci.h M include/osmo-bts/l1sap.h M src/common/asci.c M src/common/l1sap.c M src/common/lchan.c M src/common/rsl.c 6 files changed, 79 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/34889/1 diff --git a/include/osmo-bts/asci.h b/include/osmo-bts/asci.h index 59b48b2..9980296 100644 --- a/include/osmo-bts/asci.h +++ b/include/osmo-bts/asci.h @@ -11,11 +11,13 @@ void vgcs_rach(struct gsm_lchan *lchan, uint8_t ra, uint8_t acc_delay, uint32_t fn); +void vgcs_lchan_activate(struct gsm_lchan *lchan); + void vgcs_lchan_react(struct gsm_lchan *lchan); void vgcs_talker_frame(struct gsm_lchan *lchan); -void vgcs_talker_reset(struct gsm_lchan *lchan); +void vgcs_talker_reset(struct gsm_lchan *lchan, bool ul_access); void vgcs_listener_reset(struct gsm_lchan *lchan); diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 353fc90..96a80d8 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -102,6 +102,7 @@ int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr); int l1sap_chan_deact_sacch(struct gsm_bts_trx *trx, uint8_t chan_nr); int l1sap_chan_modify(struct gsm_bts_trx *trx, uint8_t chan_nr); +int l1sap_uplink_access(struct gsm_bts_trx *trx, uint8_t chan_nr, bool active); enum l1sap_common_sapi { L1SAP_COMMON_SAPI_UNKNOWN, diff --git a/src/common/asci.c b/src/common/asci.c index ccaacd8..34219df 100644 --- a/src/common/asci.c +++ b/src/common/asci.c @@ -126,9 +126,9 @@ /* Stop RACH detection, wait for valid frame */ lchan->asci.talker_active = VGCS_TALKER_WAIT_FRAME; - if (l1sap_chan_modify(lchan->ts->trx, gsm_lchan2chan_nr(lchan)) != 0) { - LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "failed to modify channel after TALKER DET\n"); - rsl_tx_conn_fail(lchan, RSL_ERR_TALKER_ACC_FAIL); + if (l1sap_uplink_access(lchan->ts->trx, gsm_lchan2chan_nr(lchan), false) != 0) { + LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink accesss after TALKER DET.\n"); + rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL); lchan->asci.talker_active = VGCS_TALKER_NONE; return; } @@ -151,11 +151,25 @@ } } +/* Received channel activation. */ +void vgcs_lchan_activate(struct gsm_lchan *lchan) +{ + LOGPLCHAN(lchan, DASCI, LOGL_INFO, "Channel is activated.\n"); + if (l1sap_uplink_access(lchan->ts->trx, gsm_lchan2chan_nr(lchan), true) != 0) { + LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to activate uplink accesss after channel activation.\n"); + rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL); + } +} + /* Received channel reactivation. (for assignment) */ void vgcs_lchan_react(struct gsm_lchan *lchan) { LOGPLCHAN(lchan, DASCI, LOGL_INFO, "Channel is activated for assignment.\n"); lchan->asci.talker_active = VGCS_TALKER_WAIT_FRAME; + if (l1sap_uplink_access(lchan->ts->trx, gsm_lchan2chan_nr(lchan), false) != 0) { + LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink accesss for assignment.\n"); + rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL); + } radio_link_timeout_reset(lchan); } @@ -169,7 +183,7 @@ } /* Release VGCS Talker state. */ -void vgcs_talker_reset(struct gsm_lchan *lchan) +void vgcs_talker_reset(struct gsm_lchan *lchan, bool ul_access) { if (lchan->asci.talker_active == VGCS_TALKER_NONE) return; @@ -179,8 +193,15 @@ /* Stop T3115 */ osmo_timer_del(&lchan->asci.t3115); - /* Talker detection done */ + /* Talker released. */ lchan->asci.talker_active = VGCS_TALKER_NONE; + if (ul_access) { + if (l1sap_uplink_access(lchan->ts->trx, gsm_lchan2chan_nr(lchan), true) != 0) { + LOGPLCHAN(lchan, DASCI, LOGL_ERROR, + "Failed to activate uplink accesss after uplink became free.\n"); + rsl_tx_conn_fail(lchan, RSL_ERR_EQUIPMENT_FAIL); + } + } } /* Release VGCS Listener state. */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 844fdad..d9e569b 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -2444,3 +2444,26 @@ return l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_MODIFY, 0); } + +int l1sap_uplink_access(struct gsm_bts_trx *trx, uint8_t chan_nr, bool active) +{ + struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr); + struct osmo_phsap_prim l1sap; + + if (lchan->state != LCHAN_S_ACTIVE && !rsl_chan_rt_is_asci(lchan->rsl_chan_rt)) { + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Channel %s is not an active ASCI type channel.\n", + rsl_chan_nr_str(chan_nr)); + return -EINVAL; + } + + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "%s uplink access detection on channel %s\n", + (active) ? "Activating" : "Deactivating", rsl_chan_nr_str(chan_nr)); + + + memset(&l1sap, 0, sizeof(l1sap)); + osmo_prim_init(&l1sap.oph, SAP_GSM_PH, PRIM_MPH_INFO, PRIM_OP_REQUEST, NULL); + l1sap.u.info.type = (active) ? PRIM_INFO_ACT_UL_ACC : PRIM_INFO_DEACT_UL_ACC; + l1sap.u.info.u.ulacc_req.chan_nr = chan_nr; + + return l1sap_down(trx, &l1sap); +} diff --git a/src/common/lchan.c b/src/common/lchan.c index bd50349..6178200 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -219,7 +219,7 @@ /* release handover, listener and talker states */ handover_reset(lchan); - vgcs_talker_reset(lchan); + vgcs_talker_reset(lchan, false); vgcs_listener_reset(lchan); vgcs_uplink_free_reset(lchan); diff --git a/src/common/rsl.c b/src/common/rsl.c index 09723be..deeb255 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2207,8 +2207,12 @@ lchan->top_acch_active = false; /* set ASCI channel into right state */ - if (reactivation && rsl_chan_rt_is_asci(lchan->rsl_chan_rt)) - vgcs_lchan_react(lchan); + if (rsl_chan_rt_is_asci(lchan->rsl_chan_rt)) { + if (reactivation) + vgcs_lchan_react(lchan); + else + vgcs_lchan_activate(lchan); + } /* on reactivation, the channel is already activated */ if (reactivation) { @@ -3618,7 +3622,7 @@ /* VGCS Uplink is released by MSC using REL-REQ. */ if (rh->c.msg_type == RSL_MT_REL_REQ) - vgcs_talker_reset(lchan); + vgcs_talker_reset(lchan, true); LOGPLCHAN(lchan, DRLL, LOGL_DEBUG, "Rx RLL %s Abis -> LAPDm\n", rsl_msg_name(rh->c.msg_type)); @@ -3840,7 +3844,7 @@ /* REL_IND handling */ if (rh->msg_type == RSL_MT_REL_IND && lchan_is_tch(lchan)) { - vgcs_talker_reset(lchan); + vgcs_talker_reset(lchan, true); LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Scheduling %s to L3 in next associated TCH-RTS.ind\n", rsl_msg_name(rh->msg_type)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?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: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: ASCI: Add primitive to L1-SAP to switch uplink access detection on or...
by jolly 25 Oct '23

25 Oct '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34885?usp=email ) Change subject: ASCI: Add primitive to L1-SAP to switch uplink access detection on or off ...................................................................... ASCI: Add primitive to L1-SAP to switch uplink access detection on or off Related: OS#4851 Change-Id: Ibd6a1d468a70126a8f67e944fcb916969cc3c36b --- M include/osmocom/gsm/l1sap.h 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/34885/1 diff --git a/include/osmocom/gsm/l1sap.h b/include/osmocom/gsm/l1sap.h index d139690..0faab7e 100644 --- a/include/osmocom/gsm/l1sap.h +++ b/include/osmocom/gsm/l1sap.h @@ -27,6 +27,8 @@ PRIM_INFO_MODIFY, /*!< Mode Modify of channel */ PRIM_INFO_ACT_CIPH, /*!< Activation of ciphering */ PRIM_INFO_DEACT_CIPH, /*!< Deactivation of ciphering */ + PRIM_INFO_ACT_UL_ACC, /*!< Activation of uplink access detection */ + PRIM_INFO_DEACT_UL_ACC, /*!< Deactivation of uplink access detection */ }; /*! PH-DATA presence information */ @@ -142,6 +144,11 @@ uint8_t uplink; /*!< Apply to uplink */ }; +/*! for {ACT_UL_ACC,DEACT_UL_ACC} MPH-INFO.req */ +struct info_ulacc_req_param { + uint8_t chan_nr; /*!< Channel Number (Like RSL) */ +}; + /*! for MPH-INFO.ind */ struct mph_info_param { enum osmo_mph_info_type type; /*!< Info message type */ @@ -151,6 +158,7 @@ struct info_act_req_param act_req; struct info_act_cnf_param act_cnf; struct info_ciph_req_param ciph_req; + struct info_ulacc_req_param ulacc_req; } u; }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34885?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: Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Gerrit-Change-Number: 34885 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Include BearerContext in CreateSessionResponse
by osmith 25 Oct '23

25 Oct '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34883?usp=email ) Change subject: epdg: Include BearerContext in CreateSessionResponse ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34883?usp=email 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: I89e364a5be68105ae8811e8bc917f32511f9e6ef Gerrit-Change-Number: 34883 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 Oct 2023 08:41:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log