4 files changed, 4 insertions, 61 deletions
diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am
index 044fdc9d0..21e53d702 100644
--- a/include/osmocom/bsc/Makefile.am
+++ b/include/osmocom/bsc/Makefile.am
@@ -20,7 +20,6 @@ noinst_HEADERS = \
 	gsm_04_08_rr.h \
 	gsm_04_80.h \
 	gsm_data.h \
-	gsm_timers.h \
 	handover.h \
 	handover_cfg.h \
 	handover_decision.h \
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index dc133e137..7b813a621 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -17,6 +17,7 @@
 #include <osmocom/gsm/gsm0808.h>
 #include <osmocom/gsm/gsm48.h>
 #include <osmocom/core/fsm.h>
+#include <osmocom/core/tdef.h>
 
 #include <osmocom/crypt/auth.h>
 
@@ -31,7 +32,6 @@
 #include <osmocom/bsc/meas_rep.h>
 #include <osmocom/bsc/bsc_msg_filter.h>
 #include <osmocom/bsc/acc_ramp.h>
-#include <osmocom/bsc/gsm_timers.h>
 #include <osmocom/bsc/neighbor_ident.h>
 
 #define GSM_T3122_DEFAULT 10
@@ -1495,7 +1495,7 @@ struct gsm_network {
 	struct llist_head bts_rejected;
 
 	/* shall reference gsm_network_T[] */
-	struct T_def *T_defs;
+	struct osmo_tdef *T_defs;
 
 	enum gsm_chan_t ctype_by_chreq[_NUM_CHREQ_T];
 
diff --git a/include/osmocom/bsc/gsm_timers.h b/include/osmocom/bsc/gsm_timers.h
deleted file mode 100644
index 699c461ad..000000000
--- a/include/osmocom/bsc/gsm_timers.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* API to define Tnnn timers globally, configure in VTY and use for FSM state changes. */
-#pragma once
-
-#include <stdint.h>
-#include <osmocom/core/utils.h>
-
-struct osmo_fsm_inst;
-struct vty;
-
-enum T_unit {
-	T_S = 0,	/*< most T are in seconds, keep 0 as default. */
-	T_MS,		/*< milliseconds */
-	T_M,		/*< minutes */
-	T_CUSTOM,
-};
-
-extern const struct value_string T_unit_names[];
-static inline const char *T_unit_name(enum T_unit val)
-{ return get_value_string(T_unit_names, val); }
-
-/* Define a GSM timer of the form Tnnn, with unit, default value and doc string. */
-struct T_def {
-	const int T; /*< T1234 number */
-	const int default_val; /*< timeout duration (according to unit), default value. */
-	const enum T_unit unit;
-	const char *desc;
-	int val; /*< currently active value, e.g. set by user config. */
-};
-
-/* Iterate an array of struct T_def, the last item should be fully zero, i.e. "{}" */
-#define for_each_T_def(d, T_defs) \
-	for (d = T_defs; d && (d->T || d->default_val || d->desc); d++)
-
-int T_def_get(const struct T_def *T_defs, int T, enum T_unit as_unit, int val_if_not_present);
-void T_defs_reset(struct T_def *T_defs);
-struct T_def *T_def_get_entry(struct T_def *T_defs, int T);
-
-void T_defs_vty_init(struct T_def *T_defs, int cfg_parent_node);
-void T_defs_vty_write(struct vty *vty, const char *indent);
-struct T_def *parse_T_arg(struct vty *vty, const char *T_str);
-
-struct state_timeout {
-	int T;
-	bool keep_timer;
-};
-
-const struct state_timeout *get_state_timeout(uint32_t state,
-					      const struct state_timeout *timeouts_array);
-
-#define fsm_inst_state_chg_T(fi, state, timeouts_array, T_defs, default_timeout) \
-	_fsm_inst_state_chg_T(fi, state, timeouts_array, T_defs, default_timeout, \
-			      __FILE__, __LINE__)
-int _fsm_inst_state_chg_T(struct osmo_fsm_inst *fi, uint32_t state,
-			  const struct state_timeout *timeouts_array,
-			  const struct T_def *T_defs, int default_timeout,
-			  const char *file, int line);
diff --git a/include/osmocom/bsc/mgw_endpoint_fsm.h b/include/osmocom/bsc/mgw_endpoint_fsm.h
index e264a3c8b..f86a7cd10 100644
--- a/include/osmocom/bsc/mgw_endpoint_fsm.h
+++ b/include/osmocom/bsc/mgw_endpoint_fsm.h
@@ -24,9 +24,9 @@ enum mgwep_fsm_event {
 
 struct mgw_endpoint;
 struct mgwep_ci;
-struct T_def;
+struct osmo_tdef;
 
-void mgw_endpoint_fsm_init(struct T_def *T_defs);
+void mgw_endpoint_fsm_init(struct osmo_tdef *T_defs);
 
 struct mgw_endpoint *mgw_endpoint_alloc(struct osmo_fsm_inst *parent, uint32_t parent_term_event,
 					struct mgcp_client *mgcp_client,