From 93830d7fc46e3116a0ba59c2ebfa2d3271962077 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 4 May 2020 09:51:39 +0200 Subject: timers: T->X: 23002, 23004, 23005, 23006 Make various internally used timers negative, to indicate that they are Osmocom specific. A follow-up patch will make them configurable. Change-Id: I6f8be40ea54a3083f4b21ab938cc1723fc67c2ef --- src/osmo-bsc/lchan_fsm.c | 2 +- src/osmo-bsc/lchan_rtp_fsm.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 9ca73dfd5..f55fbf97c 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -210,7 +210,7 @@ static void lchan_on_fully_established(struct gsm_lchan *lchan) struct osmo_tdef_state_timeout lchan_fsm_timeouts[32] = { [LCHAN_ST_WAIT_TS_READY] = { .T=23001 }, - [LCHAN_ST_WAIT_ACTIV_ACK] = { .T=23002 }, + [LCHAN_ST_WAIT_ACTIV_ACK] = { .T=-23002 }, [LCHAN_ST_WAIT_RLL_RTP_ESTABLISH] = { .T=3101 }, [LCHAN_ST_WAIT_RLL_RTP_RELEASED] = { .T=3109 }, [LCHAN_ST_WAIT_BEFORE_RF_RELEASE] = { .T=3111 }, diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index da09aec86..25aca1409 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -42,10 +42,10 @@ struct gsm_lchan *lchan_rtp_fi_lchan(struct osmo_fsm_inst *fi) } struct osmo_tdef_state_timeout lchan_rtp_fsm_timeouts[32] = { - [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_AVAILABLE] = { .T=23004 }, - [LCHAN_RTP_ST_WAIT_IPACC_CRCX_ACK] = { .T=23005 }, - [LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK] = { .T=23006 }, - [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED] = { .T=23004 }, + [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_AVAILABLE] = { .T=-23004 }, + [LCHAN_RTP_ST_WAIT_IPACC_CRCX_ACK] = { .T=-23005 }, + [LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK] = { .T=-23006 }, + [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED] = { .T=-23004 }, }; /* Transition to a state, using the T timer defined in lchan_rtp_fsm_timeouts. -- cgit v1.2.3