library: L1CTL: merge L1ctl{Ul,Dl}Message into L1ctlMessage
Currently we have two variants of the L1CTL PDU:
* L1ctlUlMessage: L23 -> L1 requests (*_REQ),
* L1ctlDlMessage: L1 -> L23 responses (*_IND, *_CONF).
The L1CTL_PT port is defined in a way that one can:
* Tx L1ctl{Ul,Dl}Message PDUs,
* Rx L1ctlDlMessage PDUs.
This means that the testsuite can act as the L23 talking to the L1
(e.g. trxcon or virtphy), but not vice-versa. Adding an additional
Rx `UD_send_data -> L1ctlUlMessage` mapping is not an option,
because such a mapping would be ambiguous and would cause errors.
By merging the two L1CTL PDU variants into the one, we can achieve
the testsuite acting as the L1. This will be useful for testing
the L23 applications in osmocom-bb.git, like the modem app.
Take a chance to reorder fields to match the order in L1ctlMsgType.
Change-Id: I1313068c5f02b65d3dbb05a1341a9d7286225f0c
Related: OS#5500
diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn
index 942bad3..3cd1919 100644
--- a/bts/BTS_Tests_SMSCB.ttcn
+++ b/bts/BTS_Tests_SMSCB.ttcn
@@ -365,7 +365,7 @@
/* shared function doing the heavy lifting for most CBCH tests */
private function f_TC_smscb(CbchTestPars pars) runs on test_CT {
- var L1ctlDlMessage dl;
+ var L1ctlMessage dl;
var integer msg_count;
timer T;
@@ -418,7 +418,7 @@
}
private function f_TC_smscb_default_only(CbchTestPars pars) runs on test_CT {
- var L1ctlDlMessage dl;
+ var L1ctlMessage dl;
timer T := 5.0;
f_smscb_setup(pars);
@@ -697,7 +697,7 @@
basic := valueof(t_CbchPC(msgs_1m_3b_default)),
extended := omit
};
- var L1ctlDlMessage dl;
+ var L1ctlMessage dl;
timer T := 5.0;
f_TC_smscb_default_only(pars);
@@ -922,7 +922,7 @@
* too much effort; instead simply do a binary compare to this constant */
const bitstring c_P1RO_hdr := '00101011101'B;
var integer seg_received[4] := { 0, 0, 0, 0 };
- var L1ctlDlMessage dl;
+ var L1ctlMessage dl;
timer T := 10.0;
f_init();
@@ -1016,7 +1016,7 @@
/* decoding the actual entire P1 rest octets by manually generated code is
* too much effort; instead simply do a binary compare to this constant */
const bitstring c_P1RO_hdr := '00101011101'B;
- var L1ctlDlMessage dl;
+ var L1ctlMessage dl;
timer T := 10.0;
f_init();