dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 )
Change subject: PCUIF_Types: remove unnecessary members from record
PCUIF_data_cnf_dt
......................................................................
PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt
The record PCUIF_data_cnf_dt was added when the first experiments
with Ericsson RBS base stations were made. It is essentially a copy of
record PCUIF_data, where the mamber "data" was replaced with a member
"msg_id" (which was originally called "tlli"). Since we didn't know
back then which parameters we would still need at some later point we
kept all the other parameters. However, to this day we never used the
parameters below fn. Even fn was only used for logging purposes, but is
now also unused.
Let's remove all those unused members.
(Since all removed members are at the tail of the struct,
compatibility with other programs that use the PCUIF should not break.)
Related: OS#5927
Change-Id: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d
---
M library/PCUIF_CodecPort.ttcn
M library/PCUIF_Types.ttcn
2 files changed, 29 insertions(+), 39 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn
index 6d06ad4..ff87ee9 100644
--- a/library/PCUIF_CodecPort.ttcn
+++ b/library/PCUIF_CodecPort.ttcn
@@ -178,7 +178,7 @@
return;
}
}
- [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_DT(bts_nr, 0, 0,
PCU_IF_SAPI_PCH_DT))) -> value sd {
+ [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_DT(bts_nr,
PCU_IF_SAPI_PCH_DT))) -> value sd {
if (mp_pcuif_version < 11) {
setverdict(fail, "expecting tr_PCUIF_DATA_CNF in PCUIF
v.10 or earlier");
mtc.stop;
diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn
index 2e3667a..2a86b54 100644
--- a/library/PCUIF_Types.ttcn
+++ b/library/PCUIF_Types.ttcn
@@ -106,16 +106,7 @@
type record PCUIF_data_cnf_dt {
PCUIF_Sapi sapi,
- OCT4 msg_id,
- uint32_t fn,
- uint16_t arfcn,
- uint8_t trx_nr,
- uint8_t ts_nr,
- uint8_t block_nr,
- int8_t rssi,
- uint16_t ber10k,
- int16_t ta_offs_qbits,
- int16_t lqual_cb
+ OCT4 msg_id
} with { variant "" };
type record PCUIF_rts_req {
@@ -692,11 +683,6 @@
}
template (value) PCUIF_Message ts_PCUIF_DATA_CNF_DT(template (value) uint8_t
bts_nr,
- template (value) uint8_t
trx_nr,
- template (value) uint8_t
ts_nr,
- template (value) uint8_t
block_nr,
- template (value) uint32_t
fn,
- template (value) uint16_t
arfcn,
template (value) PCUIF_Sapi
sapi,
template (value) OCT4
msg_id) := {
msg_type := PCU_IF_MSG_DATA_CNF_DT,
@@ -705,22 +691,11 @@
u := {
data_cnf_dt := {
sapi := sapi,
- msg_id := msg_id,
- fn := fn,
- arfcn := arfcn,
- trx_nr := trx_nr,
- ts_nr := ts_nr,
- block_nr := block_nr,
- rssi := 0,
- ber10k := 0,
- ta_offs_qbits := 0,
- lqual_cb := 0
+ msg_id := msg_id
}
}
}
-template PCUIF_Message tr_PCUIF_DATA_CNF_DT(template uint8_t bts_nr := ?,
- template uint8_t trx_nr := ?,
- template uint8_t ts_nr := ?,
+template PCUIF_Message tr_PCUIF_DATA_CNF_DT(template uint8_t bts_nr,
template PCUIF_Sapi sapi := ?,
template OCT4 msg_id := ?) := {
msg_type := PCU_IF_MSG_DATA_CNF_DT,
@@ -729,16 +704,7 @@
u := {
data_cnf_dt := {
sapi := sapi,
- msg_id := msg_id,
- fn := ?,
- arfcn := ?,
- trx_nr := trx_nr,
- ts_nr := ts_nr,
- block_nr := ?,
- rssi := ?,
- ber10k := ?,
- ta_offs_qbits := ?,
- lqual_cb := ?
+ msg_id := msg_id
}
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d
Gerrit-Change-Number: 34110
Gerrit-PatchSet: 5
Gerrit-Owner: dexter <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
