scheduler: unify argument names/order for _sched_compose_*_ind()

This commit aims to make the argument naming/ordering more consistent:

* rename l2/l2_len and tch/tch_len to data/data_len;
* common arguments first (consistent ordering), specific last.

Change-Id: I3d8c90b82f2a55b0c5c2d6b4efb8fd962508534d
Related: OS#1572
---
M include/osmo-bts/scheduler_backend.h
M src/common/scheduler.c
M src/osmo-bts-trx/sched_lchan_pdtch.c
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
M src/osmo-bts-trx/sched_lchan_xcch.c
6 files changed, 77 insertions(+), 42 deletions(-)

diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h
index 3b1388f..d465744 100644
--- a/include/osmo-bts/scheduler_backend.h
+++ b/include/osmo-bts/scheduler_backend.h
@@ -42,16 +42,18 @@
 struct msgb *_sched_dequeue_prim(struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br);
 
 int _sched_compose_ph_data_ind(struct l1sched_ts *l1ts, uint32_t fn,
-			       enum trx_chan_type chan, uint8_t *l2,
-			       uint8_t l2_len, float rssi,
+			       enum trx_chan_type chan,
+			       uint8_t *data, uint8_t data_len,
+			       uint16_t ber10k, float rssi,
 			       int16_t ta_offs_256bits, int16_t link_qual_cb,
-			       uint16_t ber10k,
 			       enum osmo_ph_pres_info_type presence_info);
 
 int _sched_compose_tch_ind(struct l1sched_ts *l1ts, uint32_t fn,
-			   enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len,
-			   int16_t ta_offs_256bits, uint16_t ber10k, float rssi,
-			   int16_t link_qual_cb, uint8_t is_sub);
+			   enum trx_chan_type chan,
+			   uint8_t *data, uint8_t data_len,
+			   uint16_t ber10k, float rssi,
+			   int16_t ta_offs_256bits, int16_t link_qual_cb,
+			   uint8_t is_sub);
 
 int tx_fcch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
 int tx_sch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index 7ea6bfa..fc34491 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -750,10 +750,10 @@
 }
 
 int _sched_compose_ph_data_ind(struct l1sched_ts *l1ts, uint32_t fn,
-			       enum trx_chan_type chan, uint8_t *l2,
-			       uint8_t l2_len, float rssi,
+			       enum trx_chan_type chan,
+			       uint8_t *data, uint8_t data_len,
+			       uint16_t ber10k, float rssi,
 			       int16_t ta_offs_256bits, int16_t link_qual_cb,
-			       uint16_t ber10k,
 			       enum osmo_ph_pres_info_type presence_info)
 {
 	struct msgb *msg;
@@ -765,7 +765,7 @@
 		chan_nr |= RSL_CHAN_OSMO_VAMOS_MASK;
 
 	/* compose primitive */
-	msg = l1sap_msgb_alloc(l2_len);
+	msg = l1sap_msgb_alloc(data_len);
 	l1sap = msgb_l1sap_prim(msg);
 	osmo_prim_init(&l1sap->oph, SAP_GSM_PH, PRIM_PH_DATA,
 		PRIM_OP_INDICATION, msg);
@@ -777,9 +777,9 @@
 	l1sap->u.data.ta_offs_256bits = ta_offs_256bits;
 	l1sap->u.data.lqual_cb = link_qual_cb;
 	l1sap->u.data.pdch_presence_info = presence_info;
-	msg->l2h = msgb_put(msg, l2_len);
-	if (l2_len)
-		memcpy(msg->l2h, l2, l2_len);
+	msg->l2h = msgb_put(msg, data_len);
+	if (data_len)
+		memcpy(msg->l2h, data, data_len);
 
 	/* forward primitive */
 	l1sap_up(l1ts->ts->trx, l1sap);
@@ -788,9 +788,11 @@
 }
 
 int _sched_compose_tch_ind(struct l1sched_ts *l1ts, uint32_t fn,
-			   enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len,
-			   int16_t ta_offs_256bits, uint16_t ber10k, float rssi,
-			   int16_t link_qual_cb, uint8_t is_sub)
+			   enum trx_chan_type chan,
+			   uint8_t *data, uint8_t data_len,
+			   uint16_t ber10k, float rssi,
+			   int16_t ta_offs_256bits, int16_t link_qual_cb,
+			   uint8_t is_sub)
 {
 	struct msgb *msg;
 	struct osmo_phsap_prim *l1sap;
@@ -802,7 +804,7 @@
 		chan_nr |= RSL_CHAN_OSMO_VAMOS_MASK;
 
 	/* compose primitive */
-	msg = l1sap_msgb_alloc(tch_len);
+	msg = l1sap_msgb_alloc(data_len);
 	l1sap = msgb_l1sap_prim(msg);
 	osmo_prim_init(&l1sap->oph, SAP_GSM_PH, PRIM_TCH,
 		PRIM_OP_INDICATION, msg);
@@ -814,9 +816,9 @@
 	l1sap->u.tch.lqual_cb = link_qual_cb;
 	l1sap->u.tch.is_sub = is_sub & 1;
 
-	msg->l2h = msgb_put(msg, tch_len);
-	if (tch_len)
-		memcpy(msg->l2h, tch, tch_len);
+	msg->l2h = msgb_put(msg, data_len);
+	if (data_len)
+		memcpy(msg->l2h, data, data_len);
 
 	LOGL1S(DL1P, LOGL_DEBUG, l1ts, chan, l1sap->u.tch.fn, "%s Rx -> RTP: %s\n",
 	       gsm_lchan_name(lchan), msgb_hexdump_l2(msg));
diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c
index f12961f..2aa43f9 100644
--- a/src/osmo-bts-trx/sched_lchan_pdtch.c
+++ b/src/osmo-bts-trx/sched_lchan_pdtch.c
@@ -131,10 +131,12 @@
 	ber10k = compute_ber10k(n_bits_total, n_errors);
 
 	first_fn = GSM_TDMA_FN_SUB(bi->fn, 3);
-	return _sched_compose_ph_data_ind(l1ts,
-					  first_fn, bi->chan, l2, rc,
-					  meas_avg.rssi, meas_avg.toa256,
-					  meas_avg.ci_cb, ber10k,
+	return _sched_compose_ph_data_ind(l1ts, first_fn, bi->chan,
+					  &l2[0], rc,
+					  ber10k,
+					  meas_avg.rssi,
+					  meas_avg.toa256,
+					  meas_avg.ci_cb,
 					  presence_info);
 }
 
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index 9acbf31..b8f8322 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -253,10 +253,12 @@
 	/* FACCH */
 	if (rc == GSM_MACBLOCK_LEN) {
 		_sched_compose_ph_data_ind(l1ts, fn_begin, bi->chan,
-			tch_data + amr, GSM_MACBLOCK_LEN,
-			meas_avg.rssi, meas_avg.toa256,
-			meas_avg.ci_cb, ber10k,
-			PRES_INFO_UNKNOWN);
+					   &tch_data[amr], GSM_MACBLOCK_LEN,
+					   ber10k,
+					   meas_avg.rssi,
+					   meas_avg.toa256,
+					   meas_avg.ci_cb,
+					   PRES_INFO_UNKNOWN);
 
 		/* If we are in SPEECH mode we will generate a fake (BFI) TCH
 		 * indication as well. This indication is needed by the higher
@@ -273,9 +275,13 @@
 		return 0;
 
 	/* TCH or BFI */
-	return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan, tch_data, rc,
-				      meas_avg.toa256, ber10k, meas_avg.rssi,
-				      meas_avg.ci_cb, is_sub);
+	return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan,
+				      &tch_data[0], rc,
+				      ber10k,
+				      meas_avg.rssi,
+				      meas_avg.toa256,
+				      meas_avg.ci_cb,
+				      is_sub);
 }
 
 /* common section for generation of TCH bursts (TCH/H and TCH/F).
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c
index 8d1aab3..97b8582 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -295,10 +295,12 @@
 		 * report gets dropped in process_l1sap_meas_data().  The averaged results
 		 * will be sent with the first (see below) and second (see above) BFIs. */
 		_sched_compose_ph_data_ind(l1ts, fn_begin, bi->chan,
-			tch_data + amr, GSM_MACBLOCK_LEN,
-			tch_mode == GSM48_CMODE_SIGN ? meas_avg.rssi : 0,
-			meas_avg.toa256, meas_avg.ci_cb, ber10k,
-			PRES_INFO_UNKNOWN);
+					   &tch_data[amr], GSM_MACBLOCK_LEN,
+					   ber10k,
+					   tch_mode == GSM48_CMODE_SIGN ? meas_avg.rssi : 0,
+					   meas_avg.toa256,
+					   meas_avg.ci_cb,
+					   PRES_INFO_UNKNOWN);
 		ber10k = 0;
 bfi:
 		/* A FACCH/H frame replaces two speech frames, so we need to send two BFIs.
@@ -310,9 +312,13 @@
 		return 0;
 
 	/* TCH or BFI */
-	return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan, tch_data, rc,
-				      meas_avg.toa256, ber10k, meas_avg.rssi,
-				      meas_avg.ci_cb, is_sub);
+	return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan,
+				      &tch_data[0], rc,
+				      ber10k,
+				      meas_avg.rssi,
+				      meas_avg.toa256,
+				      meas_avg.ci_cb,
+				      is_sub);
 }
 
 /* common section for generation of TCH bursts (TCH/H and TCH/F).
diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c
index 0fccf3e..87561ea 100644
--- a/src/osmo-bts-trx/sched_lchan_xcch.c
+++ b/src/osmo-bts-trx/sched_lchan_xcch.c
@@ -144,10 +144,12 @@
 	if (rep_sacch)
 		memcpy(chan_state->ul_bursts_prev, bursts_p, 464);
 
-	return _sched_compose_ph_data_ind(l1ts, *first_fn,
-					  bi->chan, l2, l2_len,
-					  meas_avg.rssi, meas_avg.toa256,
-					  meas_avg.ci_cb, ber10k,
+	return _sched_compose_ph_data_ind(l1ts, *first_fn, bi->chan,
+					  &l2[0], l2_len,
+					  ber10k,
+					  meas_avg.rssi,
+					  meas_avg.toa256,
+					  meas_avg.ci_cb,
 					  PRES_INFO_UNKNOWN);
 }
 

