diff options
| author | Max <msuraev@sysmocom.de> | 2016-10-28 16:52:48 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2016-11-03 12:31:37 +0000 |
| commit | acfccb3f028c8417df42de9a6400896eb269a614 (patch) | |
| tree | d2dc8cc8bd1a8b3de865e9f295f4dca53745f67a /src/osmo-bts-sysmo | |
| parent | 4008ebb9258b551e23ff66c5f5abf8880f4398d7 (diff) | |
DTX fix ONSET handling
* re-introduce ST_ONSET_F to guard from repetitive ONSET messages in case
multiple FACCH occur duriing DTX silence period.
* produce ONSET event after both SID FIRST and UPDATE in case of AMR FR.
* always dispatch E_SID_F (SID FIRST) signal if in talkspurt.
* allow E_SID_* right after ONSET (zero-length talkspurt).
* add missing E_ONSET signal description.
* fix FSM transitions for AMR HR *Inhibited and First P*.
* fix incorrect return from l1if_tch_encode() in ONSET FACCH with
incoming SID UPDATE
Change-Id: I0e9033c5f169da46aed9a0d1295faff489778dcf
Related: OS#1801
Diffstat (limited to 'src/osmo-bts-sysmo')
| -rw-r--r-- | src/osmo-bts-sysmo/l1_if.c | 2 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/tch.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index f7585ce8..51bde8b5 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -405,7 +405,7 @@ static int ph_data_req(struct gsm_bts_trx *trx, struct msgb *msg, memcpy(l1p->u.phDataReq.msgUnitParam.u8Buffer, lchan->tch.dtx.facch, msgb_l2len(msg)); else if (trx->bts->dtxd && lchan->tch.dtx.dl_amr_fsm && - lchan->tch.dtx.dl_amr_fsm->state == ST_FACCH) { + lchan->tch.dtx.dl_amr_fsm->state == ST_ONSET_F) { if (sapi == GsmL1_Sapi_FacchF) { sapi = GsmL1_Sapi_TchF; } diff --git a/src/osmo-bts-sysmo/tch.c b/src/osmo-bts-sysmo/tch.c index fbb42b27..db5ca782 100644 --- a/src/osmo-bts-sysmo/tch.c +++ b/src/osmo-bts-sysmo/tch.c @@ -426,8 +426,7 @@ int l1if_tch_encode(struct gsm_lchan *lchan, uint8_t *data, uint8_t *len, return -EAGAIN; case ST_FACCH_V: case ST_FACCH: - /* FIXME: if this possible at all? */ - return 0; + return -EBADMSG; default: LOGP(DRTP, LOGL_ERROR, "Unhandled DTX DL AMR FSM state " "%d\n", lchan->tch.dtx.dl_amr_fsm->state); |