pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41795?usp=email )
Change subject: ms_power_control: Apply defaults during reset
......................................................................
ms_power_control: Apply defaults during reset
lchan_ms_pwr_ctrl_reset() is already called furhter above in
rsl_rx_chan_activ(), so simplify mode the default values there and no
need to re-apply them twice.
Change-Id: I5c0137ba8bf1e057abdc1911716e3d1bf8c61ea3
---
M src/common/power_control.c
M src/common/rsl.c
2 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/95/41795/1
diff --git a/src/common/power_control.c b/src/common/power_control.c
index bf310c6..187c5da 100644
--- a/src/common/power_control.c
+++ b/src/common/power_control.c
@@ -145,6 +145,10 @@
* state->dpc_params = NULL (static mode).
* state->skip_block_num = 0, so that 1st power input is taken into account. */
memset(state, 0, sizeof(*state));
+
+ state->max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0);
+ /* XXX: should we use the maximum power level instead of 0 dBm? */
+ state->current = state->max;
}
/* Shall we skip current block based on configured interval? */
diff --git a/src/common/rsl.c b/src/common/rsl.c
index 863167e..07d5e6d 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1989,8 +1989,6 @@
}
}
- lchan_ms_pwr_ctrl_reset(lchan);
-
/* 9.3.6 Channel Mode */
if (type != RSL_ACT_OSMO_PDCH) {
if (rsl_handle_chan_mod_ie(lchan, &tp, &cause) != 0)
@@ -2050,11 +2048,12 @@
}
/* 9.3.13 MS Power */
- if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1))
+ lchan_ms_pwr_ctrl_reset(lchan);
+ if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) {
lchan->ms_power_ctrl.max = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F;
- else /* XXX: should we use the maximum power level instead of 0 dBm? */
- lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0);
- lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max;
+ /* XXX: should we use the maximum power level instead of 0 dBm? */
+ lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max;
+ }
/* 9.3.24 Timing Advance */
if (TLVP_PRES_LEN(&tp, RSL_IE_TIMING_ADVANCE, 1))
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41795?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I5c0137ba8bf1e057abdc1911716e3d1bf8c61ea3
Gerrit-Change-Number: 41795
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria, jolly, laforge.
Hello fixeria, jolly, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email
to look at the new patch set (#2).
Change subject: ta_control: Fix skip_block_num not reset when switching TS to PDCH
......................................................................
ta_control: Fix skip_block_num not reset when switching TS to PDCH
Change-Id: Id3e81ebec04042dd7d8e4805762e3e518790706d
---
M include/osmo-bts/ta_control.h
M src/common/rsl.c
M src/common/ta_control.c
3 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/41790/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id3e81ebec04042dd7d8e4805762e3e518790706d
Gerrit-Change-Number: 41790
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: Jenkins Builder
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: fixeria, jolly, laforge.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email )
Change subject: ta_control: Fix skip_block_num not reset when switching TS to PDCH
......................................................................
Patch Set 1:
(1 comment)
File src/common/ta_control.c:
https://gerrit.osmocom.org/c/osmo-bts/+/41790/comment/04d08fd7_c2883c90?usp… :
PS1, Line 52: lchan->ta_ctrl.skip_block_num = lchan->ts->trx->ta_ctrl_interval * 2 - 1;
We may actually want to do "lchan->ta_ctrl.skip_block_num = 0" here, so that the first TA input after lchan creation is taken into account.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id3e81ebec04042dd7d8e4805762e3e518790706d
Gerrit-Change-Number: 41790
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: Jenkins Builder
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 09 Jan 2026 11:21:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41787?usp=email )
Change subject: ta_control: Move skip_block logic to helper function
......................................................................
ta_control: Move skip_block logic to helper function
This makes it more similar to code in power_control.c.
Change-Id: I174f2f941fbedbe0793cc0b93d01e53e23328cf2
---
M src/common/ta_control.c
1 file changed, 21 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/41787/1
diff --git a/src/common/ta_control.c b/src/common/ta_control.c
index 6fe409a..c3e4d67 100644
--- a/src/common/ta_control.c
+++ b/src/common/ta_control.c
@@ -22,6 +22,9 @@
/* Related specs: 3GPP TS 45.010 sections 5.5, 5.6 */
+#include <stdint.h>
+#include <stdbool.h>
+
#include <osmo-bts/gsm_data.h>
#include <osmo-bts/bts_trx.h>
#include <osmo-bts/logging.h>
@@ -39,6 +42,22 @@
#define TA_MAX_DEC_STEP 2
+/* Shall we skip current block based on configured interval? */
+static bool ctrl_interval_skip_block(struct gsm_lchan *lchan)
+{
+ /* TA control interval: how many blocks do we skip? */
+ if (lchan->ta_ctrl.skip_block_num-- > 0)
+ return true;
+
+ /* Reset the number of SACCH blocks to be skipped:
+ * ctrl_interval=0 => 0 blocks to skip,
+ * ctrl_interval=1 => 1 blocks to skip,
+ * ctrl_interval=2 => 3 blocks to skip,
+ * so basically ctrl_interval * 2 - 1. */
+ lchan->ta_ctrl.skip_block_num = lchan->ts->trx->ta_ctrl_interval * 2 - 1;
+ return false;
+}
+
/*! compute the new "Ordered Timing Advance" communicated to the MS and store it in lchan.
* \param lchan logical channel for which to compute (and in which to store) new power value.
* \param[in] ms_tx_ta The TA used by the MS and reported in L1SACCH, see struct gsm_sacch_l1_hdr field "ta".
@@ -47,19 +66,11 @@
void lchan_ms_ta_ctrl(struct gsm_lchan *lchan, uint8_t ms_tx_ta, int16_t toa256)
{
int16_t new_ta;
+
/* Shall we skip current block based on configured interval? */
-
- /* TA control interval: how many blocks do we skip? */
- if (lchan->ta_ctrl.skip_block_num-- > 0)
+ if (ctrl_interval_skip_block(lchan))
return;
- /* Reset the number of SACCH blocks to be skipped:
- * ctrl_interval=0 => 0 blocks to skip,
- * ctrl_interval=1 => 1 blocks to skip,
- * ctrl_interval=2 => 3 blocks to skip,
- * so basically ctrl_interval * 2 - 1. */
- lchan->ta_ctrl.skip_block_num = lchan->ts->trx->ta_ctrl_interval * 2 - 1;
-
int16_t delta_ta = toa256/256;
if (toa256 >= 0) {
if ((toa256 - (256 * delta_ta)) > TOA256_THRESH)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41787?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I174f2f941fbedbe0793cc0b93d01e53e23328cf2
Gerrit-Change-Number: 41787
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>