diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2023-09-30 05:07:38 +0700 |
|---|---|---|
| committer | fixeria <vyanitskiy@sysmocom.de> | 2023-10-04 09:18:11 +0000 |
| commit | b8a185cc1205d89b2f22d051c59478121006aad1 (patch) | |
| tree | 0de831928ab60fd8ca1270809664d2d4eb841851 | |
| parent | 08f058789f0f52b326309f2b52e8e9dbe71264dd (diff) | |
meas: handle VAMOS specific chan modes
Treat the VAMOS channel modes same as their non-VAMOS counterparts.
Change-Id: I8ecaf87c7cda4c10dd411e7539382274715bce57
Related: OS#6168
| -rw-r--r-- | src/common/measurement.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/common/measurement.c b/src/common/measurement.c index 960e462b..e02dbe67 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -60,7 +60,9 @@ bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn) case GSM_LCHAN_TCH_F: switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_V1_VAMOS: case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_V2_VAMOS: /* Active TDMA frame subset for TCH/F: 52, 53, 54, 55, 56, 57, 58, 59. * There is only one *complete* block in this subset starting at FN=52. * Incomplete blocks {... 52, 53, 54, 55} and {56, 57, 58, 59 ...} @@ -88,6 +90,7 @@ bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn) case GSM_LCHAN_TCH_H: switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_V1_VAMOS: if (ts45008_dtx_tchh_fn_map[fn104]) return true; break; @@ -430,11 +433,15 @@ static int lchan_meas_sub_num_expected(const struct gsm_lchan *lchan) switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: /* TCH/F sign: DTX *is* permitted */ case GSM48_CMODE_SPEECH_V1: /* TCH/FS */ + case GSM48_CMODE_SPEECH_V1_VAMOS: case GSM48_CMODE_SPEECH_EFR: /* TCH/EFS */ + case GSM48_CMODE_SPEECH_V2_VAMOS: return 1 + 1; /* 1 x SACCH + 1 x TCH */ case GSM48_CMODE_SPEECH_AMR: /* TCH/AFS */ + case GSM48_CMODE_SPEECH_V3_VAMOS: case GSM48_CMODE_SPEECH_V4: /* O-TCH/WFS */ case GSM48_CMODE_SPEECH_V5: /* TCH/WFS */ + case GSM48_CMODE_SPEECH_V5_VAMOS: default: return -1; /* at least 1 x SACCH + M x TCH (variable) */ } @@ -443,8 +450,10 @@ static int lchan_meas_sub_num_expected(const struct gsm_lchan *lchan) case GSM48_CMODE_SIGN: /* TCH/H sign: DTX *is not* permitted */ return 1 + 12; /* 1 x SACCH + 12 x TCH */ case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_V1_VAMOS: return 1 + 2; /* 1 x SACCH + 2 x TCH */ case GSM48_CMODE_SPEECH_AMR: /* TCH/AHS */ + case GSM48_CMODE_SPEECH_V3_VAMOS: case GSM48_CMODE_SPEECH_V4: /* O-TCH/WHS */ case GSM48_CMODE_SPEECH_V6: /* O-TCH/AHS */ default: |