fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33314 )

Change subject: fixup! RLCMAC_CSN1_Types: Add release 6 additions to PacketCellChangeNotification ......................................................................

fixup! RLCMAC_CSN1_Types: Add release 6 additions to PacketCellChangeNotification

Change-Id: I86102d3850c83bc29076bd13574547ea9dd12071 --- M library/RLCMAC_CSN1_Templates.ttcn M library/RLCMAC_CSN1_Types.ttcn 2 files changed, 54 insertions(+), 19 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/33314/1

diff --git a/library/RLCMAC_CSN1_Templates.ttcn b/library/RLCMAC_CSN1_Templates.ttcn index 34abb73..000709d 100644 --- a/library/RLCMAC_CSN1_Templates.ttcn +++ b/library/RLCMAC_CSN1_Templates.ttcn @@ -162,11 +162,13 @@ is_dl_tfi := false, tfi := tfi }, - arfcn_bsic_presence := '0'B, - utran_target_cell_presence := omit, - arfcn := arfcn, - bsic := bsic, - utran_target_cell := omit, + u := { + u0 := { + tag := '0'B, + arfcn := arfcn, + bsic := bsic + } + }, ba_psi3_presence := '0'B, ba_used := '0'B, psi3_change_mark := omit, diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 23ae94c..7e1eaae 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -1015,16 +1015,47 @@ variant (utran_ba_used) "PRESENCE(utran_ba_used_presence = '1'B)" };

+ private type record PktCellChgNotifyU0 { + BIT1 tag ('0'B), + uint10_t arfcn, + uint6_t bsic + } with { variant "" }; + private type record PktCellChgNotifyU10 { + BIT2 tag ('10'B), + UtranTargetCell utran_target_cell + } with { variant "" }; + private type record PktCellChgNotifyU110 { + BIT3 tag ('110'B), + BIT1 arfcn_bsic_presence, + uint10_t arfcn optional, + uint6_t bsic optional, + BIT1 utran_target_cell_presence, + UtranTargetCell utran_target_cell optional, + /* TODO: { 0 | 1 E-UTRAN Target Cell } */ + BIT1 eutran_target_cell_presence ('0'B), + /* TODO: { 0 | 1 E-UTRAN CCN Measurement Report } */ + BIT1 eutran_ccn_meas_rep_presence ('0'B) + } with { + variant (arfcn) "PRESENCE(arfcn_bsic_presence = '1'B)" + variant (bsic) "PRESENCE(arfcn_bsic_presence = '1'B)" + variant (utran_target_cell) "PRESENCE(utran_target_cell_presence = '1'B)" + }; + private type union PktCellChgNotifyUnion { + PktCellChgNotifyU0 u0, + PktCellChgNotifyU10 u10, /* Rel-6 additions */ + PktCellChgNotifyU110 u110 /* Rel-8 additions */ + /* TODO: PktCellChgNotifyU1110 Rel-9 additions */ + /* TODO: Message escape : { 1111 } bit (*) = <no string> > */ + } with { + variant "TAG(u0, tag = '0'B; + u10, tag = '10'B; + u110, tag = '110'B)" + }; + /* 11.2.3a Packet Cell Change Notification, message body */ type record PacketCellChangeNotification { GlobalTfi gtfi, - /* TODO: support 3g/4g in these bits */ - BIT1 arfcn_bsic_presence, - BIT1 utran_target_cell_presence optional, /* Rel-6 addition */ - uint10_t arfcn optional, - uint6_t bsic optional, - UtranTargetCell utran_target_cell optional, /* Rel-6 addition */ - /* TODO: Rel-8 addition */ + PktCellChgNotifyUnion u, BIT1 ba_psi3_presence, BIT1 ba_used optional, BIT2 psi3_change_mark optional, @@ -1034,13 +1065,6 @@ /* Rel-Additions (Matrioshka) */ PktCellChgNotifAdditions rel_additions optional } with { - variant (arfcn) "PRESENCE(arfcn_bsic_presence = '0'B)" - variant (bsic) "PRESENCE(arfcn_bsic_presence = '0'B)" - - /* Rel-6 addition */ - variant (utran_target_cell_presence) "PRESENCE(arfcn_bsic_presence = '1'B)" - variant (utran_target_cell) "PRESENCE(arfcn_bsic_presence = '1'B, utran_target_cell_presence = '0'B)" - variant (ba_used) "PRESENCE(ba_psi3_presence = '0'B)" variant (psi3_change_mark) "PRESENCE(ba_psi3_presence = '1'B)" };