fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34596?usp=email )

Change subject: meas: lchan_meas_sub_num_expected(): handle CSD modes ......................................................................

meas: lchan_meas_sub_num_expected(): handle CSD modes

Change-Id: Iba5314dc89d65ab4a3706b6ef11994b6fa95162c Related: OS#6168 --- M src/common/measurement.c 1 file changed, 16 insertions(+), 0 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/34596/1

diff --git a/src/common/measurement.c b/src/common/measurement.c index 57b3148..d617904 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -434,6 +434,9 @@

switch (pchan) { case GSM_PCHAN_TCH_F: + if (lchan->rsl_cmode == RSL_CMOD_SPD_DATA) + return 1 + 1; /* 1 x SACCH + 1 x FACCH */ + /* else: signalling or speech */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: /* TCH/F sign: DTX *is* permitted */ case GSM48_CMODE_SPEECH_V1: /* TCH/FS */ @@ -450,6 +453,9 @@ return -1; /* at least 1 x SACCH + M x TCH (variable) */ } case GSM_PCHAN_TCH_H: + if (lchan->rsl_cmode == RSL_CMOD_SPD_DATA) + return 1 + 2; /* 1 x SACCH + 2 x FACCH */ + /* else: signalling or speech */ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: /* TCH/H sign: DTX *is not* permitted */ return 1 + 12; /* 1 x SACCH + 12 x TCH */