[PATCH] openbsc[master]: DTX DL: use FSM for AMR

[Max]

Hello Neels Hofmeyr, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/1031

to look at the new patch set (#2).

DTX DL: use FSM for AMR

- consolidate all DTX-specific things in a separate struct
- rename struct fields to better reflect meaning
- add pointer to DL FSM for AMR
- remove unused flag
- expand buffer to hold cached payload alongside with CMR/CMI

Change-Id: Idac8609faf9b5ced818fde899ccfc6ed0c42e8fd
---
M openbsc/include/openbsc/gsm_data_shared.h
1 file changed, 9 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/31/1031/2

diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h
index 1e3855f..d889959 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -295,23 +295,20 @@
 	struct {
 		struct amr_multirate_conf amr_mr;
 		struct {
-			uint8_t buf[18];
+			struct osmo_fsm_inst *dl_amr_fsm;
+			uint8_t cache[20];
 			uint8_t len;
 			uint32_t fn;
 			bool is_update;
-		} last_sid;
-		/* FIXME: 2 flags below are mutually exclusive - is it worth it
-		   to merge them? */
-		/* set for each SID frame to detect talkspurt for codecs without
-		   explicit ONSET event */
-		bool ul_sid;
-		/* set for each SID_FIRST_P1 sent to L1 but not followed by
-		   either of _P2 or InH */
-		bool dl_fst;
+			/* set for each SID frame to detect talkspurt for codecs
+			   without explicit ONSET event */
+			bool ul_sid;
+			/* indicates if DTXd was active during DL measurement
+			   period */
+			bool dl_active;
+		} dtx;
 		uint8_t last_cmr;
 		uint32_t last_fn;
-		/* indicates if DTXd was active during DL measurement period */
-		bool dtxd_active;
 	} tch;
 	/* BTS-side ciphering state (rx only, bi-directional, ...) */
 	uint8_t ciph_state;

-- 
To view, visit https://gerrit.osmocom.org/1031
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Idac8609faf9b5ced818fde899ccfc6ed0c42e8fd
Gerrit-PatchSet: 2
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>