summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bts/BTS_Tests.ttcn26
-rw-r--r--library/GSM_RestOctets.ttcn50
-rw-r--r--library/Osmocom_Types.ttcn4
3 files changed, 78 insertions, 2 deletions
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 6f43a44..3ed3655 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -225,6 +225,28 @@ template (value) LocationAreaIdentification ts_LAI_default := {
lac := 42
}
+private template (value) GPRSIndicator ts_GPRSIndicator_def := {
+ ra_colour := 0,
+ si13_pos := '0'B
+}
+
+private template (value) SI3RestOctets ts_SI3RestOctets_def
+modifies ts_SI3RestOctets := {
+ gprs_ind := {
+ presence := CSN1_H,
+ ind := ts_GPRSIndicator_def
+ }
+}
+
+private template (value) SI4RestOctets ts_SI4RestOctets_def
+modifies ts_SI4RestOctets := {
+ gprs_ind := {
+ /* FIXME: GPRS Indicator shall be present here too */
+ presence := CSN1_L,
+ ind := omit
+ }
+}
+
/* Default SYSTEM INFORMATION 3 */
template (value) SystemInformation ts_SI3_default := {
header := ts_RrHeader(SYSTEM_INFORMATION_TYPE_3, 18),
@@ -251,7 +273,7 @@ template (value) SystemInformation ts_SI3_default := {
},
cell_sel_par := ts_CellSelPar_default,
rach_control := ts_RachCtrl_default,
- rest_octets := '2C2B2B2B'O /* GPRS present */
+ rest_octets := enc_SI3RestOctets(valueof(ts_SI3RestOctets_def))
}
}
}
@@ -276,7 +298,7 @@ template (value) SystemInformation ts_SI4_default := {
rach_control := ts_RachCtrl_default,
cbch_chan_desc := omit,
cbch_mobile_alloc := omit,
- rest_octets := ''O
+ rest_octets := enc_SI4RestOctets(valueof(ts_SI4RestOctets_def))
}
}
}
diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn
index 045d177..531528c 100644
--- a/library/GSM_RestOctets.ttcn
+++ b/library/GSM_RestOctets.ttcn
@@ -142,4 +142,54 @@ external function dec_SI4RestOctets(in octetstring stream) return SI4RestOctets
with { extension "prototype(convert) decode(RAW)" };
+/* Basic templates to be extended in place */
+template (value) SI3RestOctets ts_SI3RestOctets := {
+ sel_params := {
+ presence := CSN1_L,
+ params := omit
+ },
+ pwr_offset := {
+ presence := CSN1_L,
+ offset := omit
+ },
+ si_2ter_ind := CSN1_L,
+ early_cm_ind := CSN1_L,
+ sched_where := {
+ presence := CSN1_L,
+ where := omit
+ },
+ gprs_ind := {
+ presence := CSN1_L,
+ ind := omit
+ },
+ umts_early_cm_ind := CSN1_L,
+ si2_quater_ind := {
+ presence := CSN1_L,
+ ind := omit
+ },
+ iu_mode_ind := omit,
+ si21_ind := {
+ presence := CSN1_L,
+ pos := omit
+ }
+}
+
+template (value) SI4RestOctets ts_SI4RestOctets := {
+ sel_params := {
+ presence := CSN1_L,
+ params := omit
+ },
+ pwr_offset := {
+ presence := CSN1_L,
+ offset := omit
+ },
+ gprs_ind := {
+ presence := CSN1_L,
+ ind := omit
+ },
+ s_presence := CSN1_L,
+ s := omit
+}
+
+
} with { encode "RAW"; variant "FIELDORDER(msb)" }
diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn
index 3b2ca17..16395df 100644
--- a/library/Osmocom_Types.ttcn
+++ b/library/Osmocom_Types.ttcn
@@ -40,6 +40,10 @@ module Osmocom_Types {
const uint16_t c_UINT16_MAX := 65535;
const uint32_t c_UINT32_MAX := 4294967295;
+ /* CSN.1 L/H placeholders */
+ const BIT1 CSN1_L := '0'B;
+ const BIT1 CSN1_H := '1'B;
+
type record Arfcn {
boolean pcs,
uint15_t arfcn