diff options
| author | Philipp Maier <pmaier@sysmocom.de> | 2021-02-15 16:39:04 +0100 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2021-03-01 19:47:56 +0000 |
| commit | 6940d34ee54761648af303aa93c55bae15a68938 (patch) | |
| tree | 85dece5552099fa450a4db600a4efff108dbb092 | |
| parent | 0436fe7fcaaa95f01a619da31d43c02324afc8f5 (diff) | |
l1sap: Store status of SRR in an lchan struct memeber
The MS sets the SRR bit in the L1 SACCH header to request DL-SACCH
repetition from the BTS. At the moment we access the l1_info stored in
tle lchan struct each time we want to check the status of the SRR bit.
However, it is more convinient to do this once at reception and store
the status of the status of the flag in a separate struct member.
Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6
Related: SYS#5114
| -rw-r--r-- | include/osmo-bts/gsm_data.h | 1 | ||||
| -rw-r--r-- | src/common/l1sap.c | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 6caad14c..ff0c89cb 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -406,6 +406,7 @@ struct gsm_lchan { struct abis_rsl_osmo_rep_acch_cap repeated_acch_capability; bool repeated_dl_facch_active; bool repeated_ul_sacch_active; + bool repeated_dl_sacch_active; /* Message buffer to store DL-SACCH repeation candidate */ struct msgb *rep_sacch; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 0a46b23c..1d80a84c 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1138,10 +1138,16 @@ static int l1sap_ph_rts_ind(struct gsm_bts_trx *trx, p[0] |= 0x40; /* See also: 3GPP TS 44.004, section 7.1 */ p[1] = lchan->rqd_ta; le = &lchan->lapdm_ch.lapdm_acch; - if (lchan->repeated_acch_capability.dl_sacch) + if (lchan->repeated_acch_capability.dl_sacch) { + /* Check if MS requests SACCH repetition and update state accordingly */ + if (lchan->meas.l1_info.srr_sro) + lchan->repeated_dl_sacch_active = true; + else + lchan->repeated_dl_sacch_active = false; pp_msg = lapdm_phsap_dequeue_msg_sacch(lchan, le); - else + } else { pp_msg = lapdm_phsap_dequeue_msg(le); + } } else { if (lchan->ts->trx->bts->dtxd) dtxd_facch = true; |