Implement SystemInformation13 Rest Octets types

Related: SYS#5358
Change-Id: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809
diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn
index af8b8d6..0dd8a8b 100644
--- a/library/RLCMAC_CSN1_Types.ttcn
+++ b/library/RLCMAC_CSN1_Types.ttcn
@@ -929,7 +929,7 @@
 	};
 	type record FreqDirect1 {
 		uint6_t			maio,
-		GprsMobileAllication	mobile_allocation
+		GprsMobileAllocation	mobile_allocation
 	}
 	type record FreqDirect2 {
 		uint6_t			maio,
@@ -953,6 +953,15 @@
 		variant (direct2) "PRESENCE(presence = '11'B)"
 	};
 
+	/* 12.9a GPRS Power Control Parameters */
+	type record GprsPowerControlParameters {
+		uint4_t			alpha,
+		BIT5			t_avg_w,
+		BIT5			t_avg_t,
+		BIT1			pc_meas_chan,
+		BIT4			n_avg_i
+	};
+
 	/* 12.10 Global TFI */
 	type record GlobalTfi {
 		boolean			is_dl_tfi,
@@ -967,7 +976,7 @@
 	} with {
 		variant (rfl_number_list) "PRESENCE(presence = '1'B)"
 	};
-	type record GprsMobileAllication {
+	type record GprsMobileAllocation {
 		uint6_t			hsn,
 		BIT1			rfl_number_list_present,
 		RflNumberList		rfl_number_list optional,
@@ -1036,6 +1045,48 @@
 		variant (relative_k) "PRESENCE(presence = '1'B)"
 	};
 
+	/* 12.24 GPRS Cell Options */
+	type record ExtensionInformation {
+		BIT1		egprs_supported,
+		BIT1		egprs_pkt_channel_req optional,
+		BIT4		bep_period optional,
+		BIT1		pfc_feature_mode,
+		BIT1		dtm_support,
+		BIT1		bss_paging_coordination,
+		/* REL-4 extension */
+		BIT1		ccn_active optional,
+		BIT1		nw_ext_utbf optional
+		/* TODO: REL-6 extension */
+		/* TODO: REL-7 extension */
+		/* TODO: REL-10 extension */
+	} with {
+		variant (egprs_pkt_channel_req) "PRESENCE(egprs_supported = '1'B)"
+		variant (bep_period) "PRESENCE(egprs_supported = '1'B)"
+	};
+	type record GprsCellOptions {
+		BIT2		nmo,
+		BIT3		t3168,
+		BIT3		t3192,
+		BIT3		drx_timer_max,
+		BIT1		access_burst_type,
+		BIT1		control_ack_type,
+		uint4_t		bs_cv_max,
+		BIT1		pan_presence,
+		uint3_t		pan_dec optional,
+		uint3_t		pan_inc optional,
+		BIT3		pan_max optional,
+		BIT1		ext_info_presence,
+		BIT6		ext_info_length optional,
+		ExtensionInformation ext_info optional
+	} with {
+		variant (pan_dec) "PRESENCE(pan_presence = '1'B)"
+		variant (pan_inc) "PRESENCE(pan_presence = '1'B)"
+		variant (pan_max) "PRESENCE(pan_presence = '1'B)"
+		variant (ext_info_length) "PRESENCE(ext_info_presence = '1'B)"
+		variant (ext_info) "PRESENCE(ext_info_presence = '1'B)"
+		/* TODO: mark REL-4 and upwards in ext_info as omit based on ext_info_length ? */
+	};
+
 	/* 3GPP TS 44.060, table 11.2.5a.2 "EGPRS PACKET CHANNEL REQUEST" */
 	type union EGPRSPktChRequest {
 		EGPRSPktChRequest_MC5P2RB3		one_phase,