From 28a03efa3f9061e72c8c06526c5b5941994c4408 Mon Sep 17 00:00:00 2001
From: Vadim Yanitskiy <vyanitskiy@sysmocom.de>
Date: Sun, 25 Oct 2020 01:50:40 +0700
Subject: [PATCH] BTS_Tests/DTX: eliminate redundant f_TC functions

Change-Id: I4db97d3bea152668c14ce1fb85700364dfdaa575
Related: OS#4801
---
 bts/BTS_Tests.ttcn | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 735a36a92..a2394a0b8 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -6705,7 +6705,7 @@ testcase TC_lapdm_selftest() runs on test_CT {
 /***********************************************************************
  * DTX Related (see GSM 05.08, section 8.3)
  ***********************************************************************/
-private function f_test_l2_fill_frames(boolean dtxd) runs on ConnHdlr {
+private function f_TC_tch_sign_l2_fill_frame(charstring id) runs on ConnHdlr {
 	var L1ctlDlMessage dl;
 	var GsmFrameNumber first_fn;
 	var boolean is_first_frame := true;
@@ -6742,7 +6742,7 @@ private function f_test_l2_fill_frames(boolean dtxd) runs on ConnHdlr {
 			first_fn := dl.dl_info.frame_nr;
 		}
 
-		if (dtxd) {
+		if (g_pars.chan_mode.dtx_d) {
 			if (fn > first_fn + frame_dtx_tchf_mod) {
 				T.stop;
 				f_rsl_chan_deact();
@@ -6818,14 +6818,6 @@ private function f_test_l2_fill_frames(boolean dtxd) runs on ConnHdlr {
 	}
 }
 
-private function f_TC_tch_sign_l2_fill_frame(charstring id) runs on ConnHdlr {
-	f_test_l2_fill_frames(false);
-}
-
-private function f_TC_tch_sign_l2_fill_frame_dtxd(charstring id) runs on ConnHdlr {
-	f_test_l2_fill_frames(true);
-}
-
 private function f_tch_sign_l2_fill_frame(boolean dtxd) runs on test_CT {
 	var template RSL_IE_ChannelMode ch_mode;
 	var ConnHdlr vc_conn;
@@ -6839,10 +6831,8 @@ private function f_tch_sign_l2_fill_frame(boolean dtxd) runs on test_CT {
 			if (i >= 4) { /* DTX is only allowed on TCH/F */
 				break;
 			}
-			vc_conn := f_start_handler(refers(f_TC_tch_sign_l2_fill_frame_dtxd), pars);
-		} else {
-			vc_conn := f_start_handler(refers(f_TC_tch_sign_l2_fill_frame), pars);
 		}
+		vc_conn := f_start_handler(refers(f_TC_tch_sign_l2_fill_frame), pars);
 		vc_conn.done;
 	}
 }