October 2022 - gerrit-log - lists.osmocom.org

Change in osmo-pcu[master]: cosmetic: Update reference to func renamed in the past

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29835 ) Change subject: cosmetic: Update reference to func renamed in the past ...................................................................... cosmetic: Update reference to func renamed in the past Fixes: 8a35e640a33373ea137125a5654bd9ae445b3769 Change-Id: I86d1fa1f3ea96ca06f3e8c8f07b8d5b14cf098c7 --- M src/tbf.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/35/29835/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 2c68ede..d15cd3d 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -221,7 +221,7 @@ /* TODO: When the TLLI does not match the ms, check if there is another * MS object that belongs to that TLLI and if yes make sure one of them * gets deleted. This is the same problem that can arise with - * IMSI in gprs_rlcmac_dl_tbf::handle() so there should be a unified solution */ + * IMSI in dl_tbf_handle() so there should be a unified solution */ if (!ms_check_tlli(ms(), tlli)) { GprsMs *old_ms; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I86d1fa1f3ea96ca06f3e8c8f07b8d5b14cf098c7 Gerrit-Change-Number: 29835 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: move IA/IAR RO templates to GSM_RestOctets.ttcn

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29833 ) Change subject: library: move IA/IAR RO templates to GSM_RestOctets.ttcn ...................................................................... library: move IA/IAR RO templates to GSM_RestOctets.ttcn Change-Id: I3d3ad6228c44fd06620e8e97f08b24346f876972 --- M library/GSM_RR_Types.ttcn M library/GSM_RestOctets.ttcn 2 files changed, 125 insertions(+), 125 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index b62dcb9..160ae39 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -651,119 +651,6 @@ with { extension "prototype(convert) decode(RAW)" }; - template PacketDlAssign tr_PacketDlAssign(template GprsTlli tlli) := { - tlli := tlli, - group1_present := ?, - group1 := *, - ta_index_present := ?, - ta_index := *, - tbf_starting_time_present := ?, - tbf_starting_time := *, - p0_present := ?, - p0 := *, - pr_mode := * - }; - - template IaRestOctets tr_IaRestOctets_DLAss(template PacketDlAssign dl_ass) := { - presence := '11'B, /* HH */ - ll := omit, lh := omit, hl := omit, - hh := { - pa_disc := '0'B, /* Packet Assignment (0) */ - pa := { - uldl := { - ass_disc := '1'B, /* Downlink Assignment (1) */ - ass := { dl := dl_ass } - } - } - } - }; - - template PacketUlAssign tr_PacketUlDynAssign(template uint5_t tfi := ?, - template BIT1 polling := ?, - template uint3_t usf := ?, - template BIT1 usf_granularity := ?, - template ChCodingCommand cs := ?) := { - presence := '1'B, /* Dynamic Block Allocation */ - dynamic := { - tfi_assignment := tfi, - polling := polling, - spare := '0'B, /* Dynamic Block Allocation (mandatory after Rel-4) */ - usf := usf, - usf_granularity := usf_granularity, - p0_present := ?, - p0 := *, - pr_mode := *, - ch_coding_cmd := cs, - tlli_block_chan_coding := ?, - alpha_present := ?, - alpha := *, - gamma := ?, - /* TODO: add to parameters */ - ta_index_present := ?, - ta_index := *, - tbf_starting_time_present := ?, - tbf_starting_time := * - }, - single := omit - }; - - template PacketUlAssign tr_PacketUlSglAssign := { - presence := '0'B, /* Single Block Allocation */ - dynamic := omit, - single := { - alpha_present := ?, - alpha := *, - gamma := ?, - padding := '01'B, - tbf_starting_time := ? - } - }; - - template IaRestOctets tr_IaRestOctets_ULAss(template PacketUlAssign ul_ass) := { - presence := '11'B, /* HH */ - ll := omit, lh := omit, hl := omit, - hh := { - pa_disc := '0'B, /* Packet Assignment (0) */ - pa := { - uldl := { - ass_disc := '0'B, /* Uplink Assignment (0) */ - ass := { ul := ul_ass } - } - } - } - }; - - template EgprsUlAss tr_EgprsUlAssDynamic(template (present) BIT5 ext_ra := ?, - template EgprsUlAssignDyn dyn_ass := ?) := { - ext_ra := ext_ra, - ats_present := ?, - ats := *, - presence := '1'B, - dynamic := dyn_ass, - multiblock := omit - }; - template EgprsUlAss tr_EgprsUlAssMultiblock(template (present) BIT5 ext_ra := ?, - template EgprsUlAssignMultiblock mb_ass := ?) := { - ext_ra := ext_ra, - ats_present := ?, - ats := *, - presence := '0'B, - dynamic := omit, - multiblock := mb_ass - }; - - template IaRestOctets tr_IaRestOctets_EGPRSULAss(template EgprsUlAss ul_ass) := { - presence := '01'B, /* LH */ - ll := omit, - lh := { - presence := '00'B, - egprs_ul := ul_ass, - multiblock_dl_ass := omit - }, - hl := omit, - hh := omit - }; - template (value) GsmRrMessage ts_IMM_ASS(uint8_t ra, GsmFrameNumber fn, TimingAdvance ta, ChannelDescription ch_desc, MobileAllocationLV ma) := { header := ts_RrHeader(IMMEDIATE_ASSIGNMENT, 0), @@ -929,18 +816,6 @@ wait_ind := wi }; - template IARRestOctets tr_IARRestOctets(template ExtRAList ext_ra_list := ?, - template uint3_t rcc := ?) := { - ext_ra_list := ext_ra_list, - rel13_ind := ?, - rcc := rcc ifpresent - }; - - template ExtRAOpt tr_ExtRAOpt(template BIT5 ext_ra := ?) := { - presence := '1'B, // L/H - ext_ra := ext_ra - }; - template (value) ChannelDescription ts_ChanDescH0(template (value) RslChannelNr chan_nr, template (value) uint12_t arfcn, template (value) uint3_t tsc := 7) := { diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index 5f99a85..6fa781c 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -281,6 +281,131 @@ variant (ext_ra) "BYTEORDER(last)" }; +template PacketDlAssign tr_PacketDlAssign(template GprsTlli tlli) := { + tlli := tlli, + group1_present := ?, + group1 := *, + ta_index_present := ?, + ta_index := *, + tbf_starting_time_present := ?, + tbf_starting_time := *, + p0_present := ?, + p0 := *, + pr_mode := * +}; + +template IaRestOctets tr_IaRestOctets_DLAss(template PacketDlAssign dl_ass) := { + presence := '11'B, /* HH */ + ll := omit, lh := omit, hl := omit, + hh := { + pa_disc := '0'B, /* Packet Assignment (0) */ + pa := { + uldl := { + ass_disc := '1'B, /* Downlink Assignment (1) */ + ass := { dl := dl_ass } + } + } + } +}; + +template PacketUlAssign tr_PacketUlDynAssign(template uint5_t tfi := ?, + template BIT1 polling := ?, + template uint3_t usf := ?, + template BIT1 usf_granularity := ?, + template ChCodingCommand cs := ?) := { + presence := '1'B, /* Dynamic Block Allocation */ + dynamic := { + tfi_assignment := tfi, + polling := polling, + spare := '0'B, /* Dynamic Block Allocation (mandatory after Rel-4) */ + usf := usf, + usf_granularity := usf_granularity, + p0_present := ?, + p0 := *, + pr_mode := *, + ch_coding_cmd := cs, + tlli_block_chan_coding := ?, + alpha_present := ?, + alpha := *, + gamma := ?, + /* TODO: add to parameters */ + ta_index_present := ?, + ta_index := *, + tbf_starting_time_present := ?, + tbf_starting_time := * + }, + single := omit +}; + +template PacketUlAssign tr_PacketUlSglAssign := { + presence := '0'B, /* Single Block Allocation */ + dynamic := omit, + single := { + alpha_present := ?, + alpha := *, + gamma := ?, + padding := '01'B, + tbf_starting_time := ? + } +}; + +template IaRestOctets tr_IaRestOctets_ULAss(template PacketUlAssign ul_ass) := { + presence := '11'B, /* HH */ + ll := omit, lh := omit, hl := omit, + hh := { + pa_disc := '0'B, /* Packet Assignment (0) */ + pa := { + uldl := { + ass_disc := '0'B, /* Uplink Assignment (0) */ + ass := { ul := ul_ass } + } + } + } +}; + +template EgprsUlAss tr_EgprsUlAssDynamic(template (present) BIT5 ext_ra := ?, + template EgprsUlAssignDyn dyn_ass := ?) := { + ext_ra := ext_ra, + ats_present := ?, + ats := *, + presence := '1'B, + dynamic := dyn_ass, + multiblock := omit +}; +template EgprsUlAss tr_EgprsUlAssMultiblock(template (present) BIT5 ext_ra := ?, + template EgprsUlAssignMultiblock mb_ass := ?) := { + ext_ra := ext_ra, + ats_present := ?, + ats := *, + presence := '0'B, + dynamic := omit, + multiblock := mb_ass +}; + +template IaRestOctets tr_IaRestOctets_EGPRSULAss(template EgprsUlAss ul_ass) := { + presence := '01'B, /* LH */ + ll := omit, + lh := { + presence := '00'B, + egprs_ul := ul_ass, + multiblock_dl_ass := omit + }, + hl := omit, + hh := omit +}; + +template IARRestOctets tr_IARRestOctets(template ExtRAList ext_ra_list := ?, + template uint3_t rcc := ?) := { + ext_ra_list := ext_ra_list, + rel13_ind := ?, + rcc := rcc ifpresent +}; + +template ExtRAOpt tr_ExtRAOpt(template BIT5 ext_ra := ?) := { + presence := '1'B, // L/H + ext_ra := ext_ra +}; + external function enc_IaRestOctets(in IaRestOctets ro) return octetstring with { extension "prototype(convert) encode(RAW)" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29833 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: I3d3ad6228c44fd06620e8e97f08b24346f876972 Gerrit-Change-Number: 29833 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: move IA/IAR RO templates to GSM_RestOctets.ttcn

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29833 ) Change subject: library: move IA/IAR RO templates to GSM_RestOctets.ttcn ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29833 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: I3d3ad6228c44fd06620e8e97f08b24346f876972 Gerrit-Change-Number: 29833 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Oct 2022 10:58:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: Log unexpected RSL message

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582 ) Change subject: bts: Log unexpected RSL message ...................................................................... bts: Log unexpected RSL message This is useful when doing first look at failed tests in jenkins. Change-Id: I6cdc53ff038858211b09c0a8eeec19603107ffe4 --- M bts/BTS_Tests.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c6ce115..cecdda1 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -779,8 +779,11 @@ [not ignore_other] as_meas_res(); [not ignore_other] as_l1_dcch_loop(); [not ignore_other] as_l1_tch_loop(); + [not ignore_other] RSL.receive(RSL_Message:?) -> value rx { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Rx unexpected RSL port message: ", rx)); + } [not ignore_other] RSL.receive { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected RSL message received"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx unexpected RSL port message"); } [ignore_other] RSL.receive { repeat; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582 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: I6cdc53ff038858211b09c0a8eeec19603107ffe4 Gerrit-Change-Number: 29582 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: Log unexpected RSL message

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582 ) Change subject: bts: Log unexpected RSL message ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582 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: I6cdc53ff038858211b09c0a8eeec19603107ffe4 Gerrit-Change-Number: 29582 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Oct 2022 10:57:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: declare enc/dec functions for IA/IAR Rest Octets

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29832 ) Change subject: library: declare enc/dec functions for IA/IAR Rest Octets ...................................................................... library: declare enc/dec functions for IA/IAR Rest Octets Change-Id: I0ea850ab056dae8cd3ad3b12db0f3cc7756b424b --- M library/GSM_RestOctets.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index 2be96a4..5f99a85 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -281,6 +281,18 @@ variant (ext_ra) "BYTEORDER(last)" }; + +external function enc_IaRestOctets(in IaRestOctets ro) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_IaRestOctets(in octetstring stream) return IaRestOctets + with { extension "prototype(convert) decode(RAW)" }; + +external function enc_IARRestOctets(in IARRestOctets ro) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_IARRestOctets(in octetstring stream) return IARRestOctets + with { extension "prototype(convert) decode(RAW)" }; + + /* 10.5.2.33b SI 2quater Rest Octets */ type record SI2quaterRestOctets { BIT1 ba_ind, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29832 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: I0ea850ab056dae8cd3ad3b12db0f3cc7756b424b Gerrit-Change-Number: 29832 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: move IA/IAR Rest Octets to GSM_RestOctets.ttcn

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29817 ) Change subject: library: move IA/IAR Rest Octets to GSM_RestOctets.ttcn ...................................................................... library: move IA/IAR Rest Octets to GSM_RestOctets.ttcn Change-Id: Icd96fc461e37d1346950a4fa158e0421bd7330c5 --- M library/GSM_RR_Types.ttcn M library/GSM_RestOctets.ttcn M library/L1CTL_PortType.ttcn M library/LAPDm_RAW_PT.ttcn M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn M pcu/gen_links.sh M selftest/gen_links.sh 8 files changed, 271 insertions(+), 248 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 335e290..b62dcb9 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -15,6 +15,7 @@ import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; + import from GSM_RestOctets all; import from RLCMAC_CSN1_Types all; import from MobileL3_CommonIE_Types all; import from MobileL3_RRM_Types all; @@ -421,224 +422,6 @@ uint3_t non_drx_timer } with { variant "" }; - /* 44.018 10.5.2.16 */ - type record IaRestOctHL { - uint6_t freq_par_len, - BIT2 padding ('00'B) optional, - uint6_t maio optional, - octetstring mobile_allocation optional - } with { - variant (freq_par_len) "LENGTHTO(mobile_allocation,maio,padding)" -/* - variant (padding) "PRESENCE(freq_par_len != 0)" - variant (maio) "PRESENCE(freq_par_len != 0)" - variant (mobile_allocation) "PRESENCE(freq_par_len != 0)" -*/ - }; - type record SecondPartAssign { - BIT1 r99, /* L / H */ - BIT1 presence optional, - BIT5 ext_ra optional - } with { - variant (r99) "CSN.1 L/H" - variant (presence) "PRESENCE(r99 = '1'B)" /* H */ - variant (ext_ra) "PRESENCE(presence = '1'B)" - /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ - variant (ext_ra) "BYTEORDER(last)" // FIXME: should be first - }; - type union PacketUlDlAssignUnion { - PacketUlAssign ul, - PacketDlAssign dl - }; - type record PacketUlDlAssign { - BIT1 ass_disc, - PacketUlDlAssignUnion ass - } with { - variant (ass) "CROSSTAG(dl, ass_disc = '1'B; ul, ass_disc = '0'B)" - }; - type union PacketAssignUnion { - SecondPartAssign spa, - PacketUlDlAssign uldl - }; - type record IaRestOctHH { - /* Packet Assignment discriminator: - * Packet Uplink / Downlink Assignment (0) - * Second Part Packet Assignment (1) */ - BIT1 pa_disc, - PacketAssignUnion pa - } with { - variant (pa) "CROSSTAG(spa, pa_disc = '1'B; uldl, pa_disc = '0'B)" - }; - type record TbfStartingTime { - uint5_t t1, - uint6_t t3, - uint5_t t2 - }; - type record PacketUlAssignDyn { - uint5_t tfi_assignment, - BIT1 polling, - BIT1 spare ('0'B), - uint3_t usf, - BIT1 usf_granularity, - BIT1 p0_present, - uint4_t p0 optional, - BIT1 pr_mode optional, - ChCodingCommand ch_coding_cmd, - BIT1 tlli_block_chan_coding, - BIT1 alpha_present, - uint4_t alpha optional, - uint5_t gamma, - BIT1 ta_index_present, - uint4_t ta_index optional, - BIT1 tbf_starting_time_present, - TbfStartingTime tbf_starting_time optional - } with { - variant (p0) "PRESENCE(p0_present = '1'B)" - variant (pr_mode) "PRESENCE(p0_present = '1'B)" - variant (alpha) "PRESENCE(alpha_present = '1'B)" - variant (ta_index) "PRESENCE(ta_index_present = '1'B)" - variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" - }; - type record PacketUlAssignSgl { - BIT1 alpha_present, - uint4_t alpha optional, - uint5_t gamma, - BIT2 padding ('01'B), - TbfStartingTime tbf_starting_time - /* TODO: P0 / PR_MODE */ - } with { - variant (alpha) "PRESENCE(alpha_present = '1'B)" - }; - type record PacketUlAssign { - BIT1 presence, - PacketUlAssignDyn dynamic optional, - PacketUlAssignSgl single optional - /* TODO: Estended RA, PFI */ - } with { - variant (dynamic) "PRESENCE(presence = '1'B)" - variant (single) "PRESENCE(presence = '0'B)" - }; - type record PacketDlAssG1 { - uint5_t tfi_assignment, - BIT1 rlc_mode, - BIT1 alpha_present, - uint4_t alpha optional, - uint5_t gamma, - BIT1 polling, - BIT1 ta_valid - } with { variant "" }; - type record PacketDlAssign { - GprsTlli tlli, - BIT1 group1_present, - PacketDlAssG1 group1 optional, - BIT1 ta_index_present, - uint4_t ta_index optional, - BIT1 tbf_starting_time_present, - TbfStartingTime tbf_starting_time optional, - BIT1 p0_present, - uint4_t p0 optional, - BIT1 pr_mode optional - /* TODO: EGPRS window size, etc. */ - } with { - variant (group1) "PRESENCE(group1_present = '1'B)" - variant (ta_index) "PRESENCE(ta_index_present = '1'B)" - variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" - variant (p0) "PRESENCE(p0_present = '1'B)" - variant (pr_mode) "PRESENCE(p0_present = '1'B)" - }; - type record IaRestOctLL { - BIT1 compressed_irat_ho_info_ind - } with { - variant (compressed_irat_ho_info_ind) "CSN.1 L/H" - }; - type record EgprsUlAssignDyn { - uint5_t tfi_assignment, - BIT1 polling, - BIT1 spare ('0'B), - uint3_t usf, - BIT1 usf_granularity, - BIT1 p0_present, - uint4_t p0 optional, - BIT1 pr_mode optional, - EgprsChCodingCommand egprs_ch_coding_cmd, - BIT1 tlli_block_chan_coding, - BIT1 bep_period2_present, - BIT4 bep_period2 optional, - BIT1 resegment, - EgprsWindowSize egprs_window_size, - BIT1 alpha_present, - uint4_t alpha optional, - uint5_t gamma, - BIT1 ta_index_present, - uint4_t ta_index optional, - BIT1 tbf_starting_time_present, - TbfStartingTime tbf_starting_time optional - /* TODO: Additions for Rel-7 */ - } with { - variant (p0) "PRESENCE(p0_present = '1'B)" - variant (pr_mode) "PRESENCE(p0_present = '1'B)" - variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)" - variant (alpha) "PRESENCE(alpha_present = '1'B)" - variant (ta_index) "PRESENCE(ta_index_present = '1'B)" - variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" - }; - type record EgprsUlAssignMultiblock { - BIT1 alpha_present, - uint4_t alpha optional, - uint5_t gamma, - TbfStartingTime tbf_starting_time, - BIT2 nr_radio_blocks_allocated, - BIT1 p0_present, - uint4_t p0 optional, - BIT1 spare ('0'B) optional, - BIT1 pr_mode optional - /* TDO: Additions for Rel-6 */ - } with { - variant (alpha) "PRESENCE(alpha_present = '1'B)" - variant (p0) "PRESENCE(p0_present = '1'B)" - variant (spare) "PRESENCE(p0_present = '1'B)" - variant (pr_mode) "PRESENCE(p0_present = '1'B)" - }; - /* 3GPP TS 44.018 version 13.3.2 10.5.2.16, "EGPRS Packet Uplink Assignment" */ - type record EgprsUlAss { - BIT5 ext_ra, - BIT1 ats_present, - AccessTechnologiesRequestRepetition ats optional, - BIT1 presence, - EgprsUlAssignDyn dynamic optional, - EgprsUlAssignMultiblock multiblock optional - } with { - variant (ats) "PRESENCE(ats_present = '1'B)" - variant (dynamic) "PRESENCE(presence = '1'B)" - variant (multiblock) "PRESENCE(presence = '0'B)" - /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ - variant (ext_ra) "BYTEORDER(last)" // FIXME: should be first - }; - - type octetstring MblkDlAss; /* TODO */ - type record IaRestOctLH { - BIT2 presence, - EgprsUlAss egprs_ul optional, - MblkDlAss multiblock_dl_ass optional - } with { - variant (egprs_ul) "PRESENCE(presence = '00'B)" - variant (multiblock_dl_ass) "PRESENCE(presence = '01'B)" - }; - type record IaRestOctets { - BIT2 presence, - IaRestOctLL ll optional, - IaRestOctLH lh optional, - IaRestOctHL hl optional, - IaRestOctHH hh optional - } with { - variant (presence) "CSN.1 L/H" - variant (ll) "PRESENCE(presence = '00'B)" - variant (lh) "PRESENCE(presence = '01'B)" - variant (hl) "PRESENCE(presence = '10'B)" - variant (hh) "PRESENCE(presence = '11'B)" - variant "PADDING(yes), PADDING_PATTERN('00101011'B)" - }; - type record MeasurementResults { BIT1 ba_used, BIT1 dtx_used, @@ -744,34 +527,6 @@ IARRestOctets rest_octets } with { variant "" }; - /* 10.5.2.17 IAR (Immediate Assignment Reject) Rest Octets */ - type record IARRestOctets { - ExtRAList ext_ra_list, - BIT1 rel13_ind, // L/H - uint3_t rcc optional - /* Addition in Rel-15: PEO IMM Cell Group Details struct */ - } with { - variant (rel13_ind) "CSN.1 L/H" - variant (rcc) "PRESENCE(rel13_ind = '1'B)" - - /* The TITAN's RAW encoder generates an octet-aligned octetstring, - * so we should make sure that unused bits contain proper padding. */ - variant "PADDING(yes), PADDING_PATTERN('00101011'B)" - }; - - /* Optional extended RA: 0 | 1 < Extended RA 1 : bit (5) > */ - type record ExtRAOpt { - BIT1 presence, // L/H - BIT5 ext_ra optional - } with { - variant (presence) "CSN.1 L/H" - variant (ext_ra) "PRESENCE(presence = '1'B)" - /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ - variant (ext_ra) "BYTEORDER(last)" - }; - - type record length(4) of ExtRAOpt ExtRAList; - /* 9.1.21 */ type record MeasurementReport { MeasurementResults meas_res diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index 94dce04..2be96a4 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -16,6 +16,270 @@ import from General_Types all; import from Osmocom_Types all; import from RLCMAC_CSN1_Types all; +import from GSM_Types all; + +/* 10.5.2.16 IA (Immediate Assignment) Rest Octets */ +type record IaRestOctets { + BIT2 presence, + IaRestOctLL ll optional, + IaRestOctLH lh optional, + IaRestOctHL hl optional, + IaRestOctHH hh optional +} with { + variant (presence) "CSN.1 L/H" + variant (ll) "PRESENCE(presence = '00'B)" + variant (lh) "PRESENCE(presence = '01'B)" + variant (hl) "PRESENCE(presence = '10'B)" + variant (hh) "PRESENCE(presence = '11'B)" + + /* The TITAN's RAW encoder generates an octet-aligned octetstring, + * so we should make sure that unused bits contain proper padding. */ + variant "PADDING(yes), PADDING_PATTERN('00101011'B)" +}; + +type record IaRestOctLL { + BIT1 compressed_irat_ho_info_ind +} with { + variant (compressed_irat_ho_info_ind) "CSN.1 L/H" +}; + +type record IaRestOctLH { + BIT2 presence, + EgprsUlAss egprs_ul optional, + octetstring multiblock_dl_ass optional /* TODO */ +} with { + variant (egprs_ul) "PRESENCE(presence = '00'B)" + variant (multiblock_dl_ass) "PRESENCE(presence = '01'B)" +}; + +/* EGPRS Packet Uplink Assignment */ +type record EgprsUlAss { + BIT5 ext_ra, + BIT1 ats_present, + AccessTechnologiesRequestRepetition ats optional, + BIT1 presence, + EgprsUlAssignDyn dynamic optional, + EgprsUlAssignMultiblock multiblock optional +} with { + variant (ats) "PRESENCE(ats_present = '1'B)" + variant (dynamic) "PRESENCE(presence = '1'B)" + variant (multiblock) "PRESENCE(presence = '0'B)" + /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ + variant (ext_ra) "BYTEORDER(last)" // FIXME: should be first +}; + +type record EgprsUlAssignDyn { + uint5_t tfi_assignment, + BIT1 polling, + BIT1 spare ('0'B), + uint3_t usf, + BIT1 usf_granularity, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 pr_mode optional, + EgprsChCodingCommand egprs_ch_coding_cmd, + BIT1 tlli_block_chan_coding, + BIT1 bep_period2_present, + BIT4 bep_period2 optional, + BIT1 resegment, + EgprsWindowSize egprs_window_size, + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + BIT1 ta_index_present, + uint4_t ta_index optional, + BIT1 tbf_starting_time_present, + TbfStartingTime tbf_starting_time optional + /* TODO: Additions for Rel-7 */ +} with { + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" + variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)" + variant (alpha) "PRESENCE(alpha_present = '1'B)" + variant (ta_index) "PRESENCE(ta_index_present = '1'B)" + variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" +}; + +type record EgprsUlAssignMultiblock { + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + TbfStartingTime tbf_starting_time, + BIT2 nr_radio_blocks_allocated, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 spare ('0'B) optional, + BIT1 pr_mode optional + /* TDO: Additions for Rel-6 */ +} with { + variant (alpha) "PRESENCE(alpha_present = '1'B)" + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (spare) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" +}; + +type record IaRestOctHL { + uint6_t freq_par_len, + BIT2 padding ('00'B) optional, + uint6_t maio optional, + octetstring mobile_allocation optional +} with { + variant (freq_par_len) "LENGTHTO(mobile_allocation,maio,padding)" +/* + variant (padding) "PRESENCE(freq_par_len != 0)" + variant (maio) "PRESENCE(freq_par_len != 0)" + variant (mobile_allocation) "PRESENCE(freq_par_len != 0)" +*/ +}; + +type record IaRestOctHH { + /* Packet Assignment discriminator: + * Packet Uplink / Downlink Assignment (0) + * Second Part Packet Assignment (1) */ + BIT1 pa_disc, + PacketAssignUnion pa +} with { + variant (pa) "CROSSTAG(spa, pa_disc = '1'B; uldl, pa_disc = '0'B)" +}; + +type union PacketAssignUnion { + SecondPartAssign spa, + PacketUlDlAssign uldl +}; + +type record SecondPartAssign { + BIT1 r99, /* L / H */ + BIT1 presence optional, + BIT5 ext_ra optional +} with { + variant (r99) "CSN.1 L/H" + variant (presence) "PRESENCE(r99 = '1'B)" /* H */ + variant (ext_ra) "PRESENCE(presence = '1'B)" + /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ + variant (ext_ra) "BYTEORDER(last)" // FIXME: should be first +}; + +type record PacketUlDlAssign { + BIT1 ass_disc, + PacketUlDlAssignUnion ass +} with { + variant (ass) "CROSSTAG(dl, ass_disc = '1'B; ul, ass_disc = '0'B)" +}; + +type union PacketUlDlAssignUnion { + PacketUlAssign ul, + PacketDlAssign dl +}; + +type record PacketUlAssign { + BIT1 presence, + PacketUlAssignDyn dynamic optional, + PacketUlAssignSgl single optional + /* TODO: Estended RA, PFI */ +} with { + variant (dynamic) "PRESENCE(presence = '1'B)" + variant (single) "PRESENCE(presence = '0'B)" +}; + +type record PacketUlAssignDyn { + uint5_t tfi_assignment, + BIT1 polling, + BIT1 spare ('0'B), + uint3_t usf, + BIT1 usf_granularity, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 pr_mode optional, + ChCodingCommand ch_coding_cmd, + BIT1 tlli_block_chan_coding, + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + BIT1 ta_index_present, + uint4_t ta_index optional, + BIT1 tbf_starting_time_present, + TbfStartingTime tbf_starting_time optional +} with { + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" + variant (alpha) "PRESENCE(alpha_present = '1'B)" + variant (ta_index) "PRESENCE(ta_index_present = '1'B)" + variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" +}; + +type record PacketUlAssignSgl { + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + BIT2 padding ('01'B), + TbfStartingTime tbf_starting_time + /* TODO: P0 / PR_MODE */ +} with { + variant (alpha) "PRESENCE(alpha_present = '1'B)" +}; + +type record PacketDlAssign { + GprsTlli tlli, + BIT1 group1_present, + PacketDlAssG1 group1 optional, + BIT1 ta_index_present, + uint4_t ta_index optional, + BIT1 tbf_starting_time_present, + TbfStartingTime tbf_starting_time optional, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 pr_mode optional + /* TODO: EGPRS window size, etc. */ +} with { + variant (group1) "PRESENCE(group1_present = '1'B)" + variant (ta_index) "PRESENCE(ta_index_present = '1'B)" + variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" +}; + +type record PacketDlAssG1 { + uint5_t tfi_assignment, + BIT1 rlc_mode, + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + BIT1 polling, + BIT1 ta_valid +} with { variant "" }; + +type record TbfStartingTime { + uint5_t t1, + uint6_t t3, + uint5_t t2 +}; + +/* 10.5.2.17 IAR (Immediate Assignment Reject) Rest Octets */ +type record IARRestOctets { + ExtRAList ext_ra_list, + BIT1 rel13_ind, // L/H + uint3_t rcc optional + /* Addition in Rel-15: PEO IMM Cell Group Details struct */ +} with { + variant (rel13_ind) "CSN.1 L/H" + variant (rcc) "PRESENCE(rel13_ind = '1'B)" + + /* The TITAN's RAW encoder generates an octet-aligned octetstring, + * so we should make sure that unused bits contain proper padding. */ + variant "PADDING(yes), PADDING_PATTERN('00101011'B)" +}; + +/* Optional extended RA: 0 | 1 < Extended RA 1 : bit (5) > */ +type record length(4) of ExtRAOpt ExtRAList; +type record ExtRAOpt { + BIT1 presence, // L/H + BIT5 ext_ra optional +} with { + variant (presence) "CSN.1 L/H" + variant (ext_ra) "PRESENCE(presence = '1'B)" + /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ + variant (ext_ra) "BYTEORDER(last)" +}; /* 10.5.2.33b SI 2quater Rest Octets */ type record SI2quaterRestOctets { diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index 80fa074..e521730 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -17,6 +17,7 @@ import from Osmocom_Types all; import from GSM_Types all; import from GSM_RR_Types all; + import from GSM_RestOctets all; import from L1CTL_PortType_CtrlFunct all; type record L1CTL_connect { diff --git a/library/LAPDm_RAW_PT.ttcn b/library/LAPDm_RAW_PT.ttcn index 946da67..9630df0 100644 --- a/library/LAPDm_RAW_PT.ttcn +++ b/library/LAPDm_RAW_PT.ttcn @@ -14,6 +14,7 @@ module LAPDm_RAW_PT { import from GSM_Types all; import from GSM_RR_Types all; + import from GSM_RestOctets all; import from Osmocom_Types all; import from L1CTL_Types all; import from L1CTL_PortType all; diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index eb29787..f9a39a6 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -16,6 +16,7 @@ import from Osmocom_Types all; import from GSM_Types all; import from GSM_RR_Types all; +import from GSM_RestOctets all; import from RLCMAC_CSN1_Types all; import from RLCMAC_CSN1_Templates all; diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 611ca23..1648a92 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -22,6 +22,7 @@ import from Osmocom_Types all; import from GSM_Types all; import from GSM_RR_Types all; +import from GSM_RestOctets all; import from Osmocom_VTY_Functions all; import from TELNETasp_PortType all; diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index d0f3ace..556f02a 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -49,7 +49,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn GSM_RR_Types.ttcn GSM_RestOctets.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " FILES+="RAW_NS.ttcnpp NS_Provider_IPL4.ttcn NS_Emulation.ttcnpp " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh index 7b15de2..23201a8 100755 --- a/selftest/gen_links.sh +++ b/selftest/gen_links.sh @@ -39,7 +39,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn BSSAP_CodecPort.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn GSUP_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn GSM_RestOctets.ttcn RSL_Types.ttcn BSSAP_CodecPort.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn GSUP_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc" gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29817 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: Icd96fc461e37d1346950a4fa158e0421bd7330c5 Gerrit-Change-Number: 29817 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: move IA/IAR Rest Octets to GSM_RestOctets.ttcn

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29817 ) Change subject: library: move IA/IAR Rest Octets to GSM_RestOctets.ttcn ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29817 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: Icd96fc461e37d1346950a4fa158e0421bd7330c5 Gerrit-Change-Number: 29817 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Oct 2022 10:35:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: {ns,sgsn,gbproxy}: gen_links.sh: do not link unused modules

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29831 ) Change subject: {ns,sgsn,gbproxy}: gen_links.sh: do not link unused modules ...................................................................... {ns,sgsn,gbproxy}: gen_links.sh: do not link unused modules Change-Id: I8fddd010e2a3ce88c892887fc571ae54d84e931f --- M gbproxy/GBProxy_Tests.ttcn M gbproxy/gen_links.sh M gbproxy/regen_makefile.sh M ns/gen_links.sh M ns/regen_makefile.sh M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh M sgsn/regen_makefile.sh 8 files changed, 6 insertions(+), 16 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index 3f822c2..9f7d17a 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -38,8 +38,6 @@ import from LLC_Types all; import from LLC_Templates all; -import from GSM_RR_Types all; - /* mcc_mnc is 24.008 10.5.5.15 encoded. 262 42 */ const BcdMccMnc c_mcc_mnc := '262F42'H; diff --git a/gbproxy/gen_links.sh b/gbproxy/gen_links.sh index 6d4ab81..b880d63 100755 --- a/gbproxy/gen_links.sh +++ b/gbproxy/gen_links.sh @@ -83,15 +83,14 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn " FILES+="RAW_NS.ttcnpp NS_Provider_IPL4.ttcn NS_Provider_FR.ttcn NS_Emulation.ttcnpp " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " -FILES+="PCUIF_Types.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " # IPA_Emulation + dependencies -FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc GSUP_Types.ttcn GSUP_Emulation.ttcn " +FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn IPCP_Types.ttcn " gen_links $DIR $FILES diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh index 78910a4..e4982ae 100755 --- a/gbproxy/regen_makefile.sh +++ b/gbproxy/regen_makefile.sh @@ -16,7 +16,6 @@ IPL4asp_discovery.cc LLC_EncDec.cc Native_FunctionDefs.cc - RLCMAC_EncDec.cc SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc @@ -27,7 +26,6 @@ export CPPFLAGS_TTCN3=" -DBSSGP_EM_L3 -DIPA_EMULATION_CTRL - -DIPA_EMULATION_GSUP -DNS_EMULATION_FR -DUSE_MTP3_DISTRIBUTOR " diff --git a/ns/gen_links.sh b/ns/gen_links.sh index 42e5547..8d78ddf 100755 --- a/ns/gen_links.sh +++ b/ns/gen_links.sh @@ -50,12 +50,11 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn Osmocom_Types.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " FILES+="RAW_NS.ttcnpp NS_Provider_IPL4.ttcn NS_Provider_FR.ttcn NS_Emulation.ttcnpp " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " -FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " -FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn RAW_NS.ttcnpp " +FILES+="LLC_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/ns/regen_makefile.sh b/ns/regen_makefile.sh index 88360d8..ad86d71 100755 --- a/ns/regen_makefile.sh +++ b/ns/regen_makefile.sh @@ -12,7 +12,6 @@ IPL4asp_discovery.cc LLC_EncDec.cc Native_FunctionDefs.cc - RLCMAC_EncDec.cc StatsD_CodecPort_CtrlFunctdef.cc TCCConversion.cc TCCInterface.cc diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 5238068..f633101 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -55,8 +55,6 @@ import from TELNETasp_PortType all; import from Osmocom_VTY_Functions all; -import from GSM_RR_Types all; - import from MobileL3_MM_Types all; diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index 510b449..41e1ff1 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -83,8 +83,8 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " -FILES+="RAW_NS.ttcnpp NS_Provider_IPL4.ttcn NS_Emulation.ttcnpp PCUIF_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn " +FILES+="RAW_NS.ttcnpp NS_Provider_IPL4.ttcn NS_Emulation.ttcnpp " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index a1f702a..4ac7d40 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -16,7 +16,6 @@ LLC_EncDec.cc Native_FunctionDefs.cc RANAP_EncDec.cc - RLCMAC_EncDec.cc SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29831 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: I8fddd010e2a3ce88c892887fc571ae54d84e931f Gerrit-Change-Number: 29831 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: move IA/IAR RO templates to GSM_RestOctets.ttcn

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29833 ) Change subject: library: move IA/IAR RO templates to GSM_RestOctets.ttcn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29833 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: I3d3ad6228c44fd06620e8e97f08b24346f876972 Gerrit-Change-Number: 29833 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Oct 2022 10:22:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022