LAPDm: Re-structure: Merge Frame type A+B which are really the same
A is B with zero-length payload. No need to separate them.
Change-Id: I7b3079899f42a61d67be03e3a17346af80d7b3be
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 6cb20c3..f820cf4 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1068,9 +1068,9 @@
ea := true
}
-template LapdmFrameB ts_LAPDm_B(LapdmSapi sapi, boolean c_r, boolean p, octetstring pl) := {
+template LapdmFrameAB ts_LAPDm_AB(LapdmSapi sapi, boolean c_r, boolean p, octetstring pl) := {
addr := ts_LapdmAddr(sapi, c_r),
- ctrl := t_LapdmCtrlUI(p),
+ ctrl := ts_LapdmCtrlUI(p),
len := 0, /* overwritten */
m := false,
el := 1,
@@ -1083,9 +1083,9 @@
[] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl {
log("SACCH received: ", l1_dl.payload.data_ind.payload);
var GsmRrL3Message meas_rep := valueof(ts_MEAS_REP(true, 23, 23, 0, 0, omit));
- var LapdmFrameB lb := valueof(ts_LAPDm_B(0, false, false, enc_GsmRrL3Message(meas_rep)));
+ var LapdmFrameAB lb := valueof(ts_LAPDm_AB(0, false, false, enc_GsmRrL3Message(meas_rep)));
log("LAPDm: ", lb);
- var octetstring pl := '0000'O & enc_LapdmFrameB(lb);
+ var octetstring pl := '0000'O & enc_LapdmFrameAB(lb);
L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, ts_RslLinkID_SACCH(0), pl));
repeat;
}