add gsm_timers, for Tnnn definitions usable by FSMs

Change-Id: If212fcd042051b6fa53484254223614c5b93a9c6

1 files changed, 30 insertions, 19 deletions

diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c
index 208b4efe2..1199bdc82 100644
--- a/src/osmo-bsc/net_init.c
+++ b/src/osmo-bsc/net_init.c
@@ -23,6 +23,33 @@
 #include <osmocom/bsc/handover_cfg.h>
 #include <osmocom/bsc/chan_alloc.h>
 #include <osmocom/bsc/neighbor_ident.h>
+#include <osmocom/bsc/gsm_timers.h>
+
+static struct T_def gsm_network_T_defs[] = {
+	{ .T=7, .default_val=10, .desc="inter-BSC Handover MO, HO Required to HO Command" },
+	{ .T=8, .default_val=10, .desc="inter-BSC Handover MO, HO Command to final Clear" },
+	{ .T=10, .default_val=6, .desc="RR Assignment" },
+	{ .T=101, .default_val=10, .desc="inter-BSC Handover MT, HO Request to HO Accept" },
+	{ .T=3101, .default_val=3, .desc="RR Immediate Assignment" },
+	{ .T=3103, .default_val=5, .desc="Handover" },
+	{ .T=3105, .default_val=100, .unit=T_MS, .desc="Physical Information" },
+	{ .T=3107, .default_val=5, .desc="(unused)" },
+	{ .T=3109, .default_val=5, .desc="RSL SACCH deactivation" },
+	{ .T=3111, .default_val=2, .desc="Wait time before RSL RF Channel Release" },
+	{ .T=993111, .default_val=4, .desc="Wait time after lchan was released in error (should be T3111 + 2s)" },
+	{ .T=3113, .default_val=10, .desc="Paging"},
+	{ .T=3115, .default_val=10, .desc="(unused)" },
+	{ .T=3117, .default_val=10, .desc="(unused)" },
+	{ .T=3119, .default_val=10, .desc="(unused)" },
+	{ .T=3122, .default_val=GSM_T3122_DEFAULT, .desc="Wait time after RR Immediate Assignment Reject" },
+	{ .T=3141, .default_val=10, .desc="(unused)" },
+	{ .T=3212, .default_val=5, .unit=T_CUSTOM,
+		.desc="Periodic Location Update timer, sent to MS (1 = 6 minutes)" },
+	{ .T=993210, .default_val=20, .desc="After L3 Complete, wait for MSC to confirm" },
+	{ .T=999, .default_val=60, .desc="After Clear Request, wait for MSC to Clear Command (sanity)" },
+	{ .T=992427, .default_val=4, .desc="MGCP timeout (2427 is the default MGCP port number)" },
+	{}
+};
 
 /* Initialize the bare minimum of struct gsm_network, minimizing required dependencies.
  * This part is shared among the thin programs in osmo-bsc/src/utils/.
@@ -43,9 +70,6 @@ struct gsm_network *gsm_network_init(void *ctx)
 	/* Permit a compile-time default of A5/3 and A5/1 */
 	net->a5_encryption_mask = (1 << 3) | (1 << 1);
 
-	/* Use 30 min periodic update interval as sane default */
-	net->t3212 = 5;
-
 	INIT_LLIST_HEAD(&net->subscr_conns);
 
 	net->bsc_subscribers = talloc_zero(net, struct llist_head);
@@ -53,22 +77,9 @@ struct gsm_network *gsm_network_init(void *ctx)
 
 	INIT_LLIST_HEAD(&net->bts_list);
 	net->num_bts = 0;
-	net->T3101 = GSM_T3101_DEFAULT;
-	net->T3103 = GSM_T3103_DEFAULT;
-	net->T3105 = GSM_T3105_DEFAULT;
-	net->T3107 = GSM_T3107_DEFAULT;
-	net->T3109 = GSM_T3109_DEFAULT;
-	net->T3111 = GSM_T3111_DEFAULT;
-	net->T3113 = GSM_T3113_DEFAULT;
-	net->T3115 = GSM_T3115_DEFAULT;
-	net->T3117 = GSM_T3117_DEFAULT;
-	net->T3119 = GSM_T3119_DEFAULT;
-	net->T3122 = GSM_T3122_DEFAULT;
-	net->T3141 = GSM_T3141_DEFAULT;
-	net->T10 = GSM_T10_DEFAULT;
-	net->T7 = GSM_T7_DEFAULT;
-	net->T8 = GSM_T8_DEFAULT;
-	net->T101 = GSM_T101_DEFAULT;
+
+	net->T_defs = gsm_network_T_defs;
+	T_defs_reset(net->T_defs);
 
 	return net;
 }