osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/30270 )
Change subject: Cosmetic: fix spaces around timers
......................................................................
Cosmetic: fix spaces around timers
Use spaces around equals signs inside structs, as expected from the
kernel coding style we mostly follow.
Neels wrote:
> IIUC "T=123" without spaces is my personal favorite that goes against
> the accepted linter standard, i guess rather than everyone else
> adapting to my weird style, i should start adding spaces in my
> patches.
Change-Id: I01ce986a1b0cdd74d945a04ae62a07f2850d366f
---
M src/osmo-bsc/assignment_fsm.c
M src/osmo-bsc/lchan_fsm.c
M src/osmo-bsc/lchan_rtp_fsm.c
M src/osmo-bsc/net_init.c
M tests/nanobts_omlattr/nanobts_omlattr_test.c
5 files changed, 54 insertions(+), 54 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/30270/1
diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index fff7e59..f00b26d 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -51,10 +51,10 @@
}
static const struct osmo_tdef_state_timeout assignment_fsm_timeouts[32] = {
- [ASSIGNMENT_ST_WAIT_LCHAN_ACTIVE] = { .T=10 },
- [ASSIGNMENT_ST_WAIT_RR_ASS_COMPLETE] = { .keep_timer=true },
- [ASSIGNMENT_ST_WAIT_LCHAN_ESTABLISHED] = { .keep_timer=true },
- [ASSIGNMENT_ST_WAIT_MGW_ENDPOINT_TO_MSC] = { .T=23042 },
+ [ASSIGNMENT_ST_WAIT_LCHAN_ACTIVE] = { .T = 10 },
+ [ASSIGNMENT_ST_WAIT_RR_ASS_COMPLETE] = { .keep_timer = true },
+ [ASSIGNMENT_ST_WAIT_LCHAN_ESTABLISHED] = { .keep_timer = true },
+ [ASSIGNMENT_ST_WAIT_MGW_ENDPOINT_TO_MSC] = { .T = 23042 },
};
/* Transition to a state, using the T timer defined in assignment_fsm_timeouts.
diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index 21b38d2..ab3fbdd 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -282,15 +282,15 @@
}
struct osmo_tdef_state_timeout lchan_fsm_timeouts[32] = {
- [LCHAN_ST_WAIT_TS_READY] = { .T=-5 },
- [LCHAN_ST_WAIT_ACTIV_ACK] = { .T=-6 },
- [LCHAN_ST_WAIT_RLL_RTP_ESTABLISH] = { .T=3101 },
- [LCHAN_ST_WAIT_RLL_RTP_RELEASED] = { .T=3109 },
- [LCHAN_ST_WAIT_BEFORE_RF_RELEASE] = { .T=3111 },
- [LCHAN_ST_WAIT_RF_RELEASE_ACK] = { .T=3111 },
- [LCHAN_ST_WAIT_AFTER_ERROR] = { .T=-3111 },
- [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = { .T=-13 },
- [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = { .T=-14 },
+ [LCHAN_ST_WAIT_TS_READY] = { .T = -5 },
+ [LCHAN_ST_WAIT_ACTIV_ACK] = { .T = -6 },
+ [LCHAN_ST_WAIT_RLL_RTP_ESTABLISH] = { .T = 3101 },
+ [LCHAN_ST_WAIT_RLL_RTP_RELEASED] = { .T = 3109 },
+ [LCHAN_ST_WAIT_BEFORE_RF_RELEASE] = { .T = 3111 },
+ [LCHAN_ST_WAIT_RF_RELEASE_ACK] = { .T = 3111 },
+ [LCHAN_ST_WAIT_AFTER_ERROR] = { .T = -3111 },
+ [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = { .T = -13 },
+ [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = { .T = -14 },
};
/* Transition to a state, using the T timer defined in lchan_fsm_timeouts.
diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c
index 0791619..8b61f1e 100644
--- a/src/osmo-bsc/lchan_rtp_fsm.c
+++ b/src/osmo-bsc/lchan_rtp_fsm.c
@@ -44,10 +44,10 @@
}
struct osmo_tdef_state_timeout lchan_rtp_fsm_timeouts[32] = {
- [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_AVAILABLE] = { .T=-9 },
- [LCHAN_RTP_ST_WAIT_IPACC_CRCX_ACK] = { .T=-7 },
- [LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK] = { .T=-8 },
- [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED] = { .T=-10 },
+ [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_AVAILABLE] = { .T = -9 },
+ [LCHAN_RTP_ST_WAIT_IPACC_CRCX_ACK] = { .T = -7 },
+ [LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK] = { .T = -8 },
+ [LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED] = { .T = -10 },
};
/* Transition to a state, using the T timer defined in lchan_rtp_fsm_timeouts.
diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c
index 8f2b26c..ad2f9bf 100644
--- a/src/osmo-bsc/net_init.c
+++ b/src/osmo-bsc/net_init.c
@@ -28,36 +28,36 @@
#include <osmocom/bsc/bts_setup_ramp.h>
static struct osmo_tdef gsm_network_T_defs[] = {
- { .T=4, .default_val=5, .desc="Timeout to receive BSSMAP RESET
ACKNOWLEDGE from the MSC" },
- { .T=7, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP
HO Required to HO Command timeout" },
- { .T=8, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP
HO Command to final Clear timeout" },
- { .T=10, .default_val=6, .desc="RR Assignment" },
- { .T=101, .default_val=10, .desc="inter-BSC/MSC Handover incoming,
BSSMAP 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=OSMO_TDEF_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=3113, .default_val=7, .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=OSMO_TDEF_CUSTOM,
- .desc="Periodic Location Update timer, sent to MS (1 = 6
minutes)" },
- { .T=-4, .default_val=60, .desc="After Clear Request, wait for MSC to
Clear Command (sanity)" },
- { .T=-5, .default_val=5, .desc="Timeout to switch dynamic timeslot
PCHAN modes"},
- { .T=-6, .default_val=5, .desc="Timeout for RSL Channel Activate ACK
after sending RSL Channel Activate" },
- { .T=-7, .default_val=5, .desc="Timeout for RSL IPA CRCX ACK after
sending RSL IPA CRCX" },
- { .T=-8, .default_val=5, .desc="Timeout for RSL IPA MDCX ACK after
sending RSL IPA MDCX" },
- { .T=-9, .default_val=5, .desc="Timeout for availability of MGW
endpoint" },
- { .T=-10, .default_val=5, .desc="Timeout for fully configured MGW
endpoint" },
- { .T=-11, .default_val=5, .desc="Timeout for Perform Location Response
from SMLC" },
- { .T=-12, .default_val=5, .desc="Timeout for obtaining TA after BSSLAP
TA Request" },
- { .T=-13, .default_val=5, .desc="Timeout for RR Channel Mode Modify ACK
(BSC <-> MS)" },
- { .T=-14, .default_val=5, .desc="Timeout for RSL Channel Mode Modify
ACK (BSC <-> BTS)" },
+ { .T = 4, .default_val = 5, .desc = "Timeout to receive BSSMAP RESET
ACKNOWLEDGE from the MSC" },
+ { .T = 7, .default_val = 10, .desc = "inter-BSC/MSC Handover outgoing,
BSSMAP HO Required to HO Command timeout" },
+ { .T = 8, .default_val = 10, .desc = "inter-BSC/MSC Handover outgoing,
BSSMAP HO Command to final Clear timeout" },
+ { .T = 10, .default_val = 6, .desc = "RR Assignment" },
+ { .T = 101, .default_val = 10, .desc = "inter-BSC/MSC Handover
incoming, BSSMAP 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 = OSMO_TDEF_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 = 3113, .default_val = 7, .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 = OSMO_TDEF_CUSTOM,
+ .desc = "Periodic Location Update timer, sent to MS (1 = 6
minutes)" },
+ { .T = -4, .default_val = 60, .desc = "After Clear Request, wait for
MSC to Clear Command (sanity)" },
+ { .T = -5, .default_val = 5, .desc = "Timeout to switch dynamic
timeslot PCHAN modes"},
+ { .T = -6, .default_val = 5, .desc = "Timeout for RSL Channel Activate
ACK after sending RSL Channel Activate" },
+ { .T = -7, .default_val = 5, .desc = "Timeout for RSL IPA CRCX ACK
after sending RSL IPA CRCX" },
+ { .T = -8, .default_val = 5, .desc = "Timeout for RSL IPA MDCX ACK
after sending RSL IPA MDCX" },
+ { .T = -9, .default_val = 5, .desc = "Timeout for availability of MGW
endpoint" },
+ { .T = -10, .default_val = 5, .desc = "Timeout for fully configured MGW
endpoint" },
+ { .T = -11, .default_val = 5, .desc = "Timeout for Perform Location
Response from SMLC" },
+ { .T = -12, .default_val = 5, .desc = "Timeout for obtaining TA after
BSSLAP TA Request" },
+ { .T = -13, .default_val = 5, .desc = "Timeout for RR Channel Mode
Modify ACK (BSC <-> MS)" },
+ { .T = -14, .default_val = 5, .desc = "Timeout for RSL Channel Mode
Modify ACK (BSC <-> BTS)" },
{ .T = -16, .default_val = 1000, .unit = OSMO_TDEF_MS,
.desc = "Granularity for all_allocated:* rate counters: amount
of milliseconds that one counter increment"
" represents. See also X17, X18" },
@@ -72,14 +72,14 @@
.desc = "Forget-sum period for all_allocated:* rate counters:"
" after this amount of idle time, forget internally
cumulated time remainders. Zero to always"
" keep remainders. See also X16, X17." },
- { .T=-25, .default_val=5, .desc="Timeout for initial user data after an
MSC initiated an SCCP connection to the BSS" },
- { .T=-3111, .default_val=4, .desc="Wait time after lchan was released
in error (should be T3111 + 2s)" },
- { .T=-3210, .default_val=20, .desc="After L3 Complete, wait for MSC to
confirm" },
+ { .T = -25, .default_val = 5, .desc = "Timeout for initial user data
after an MSC initiated an SCCP connection to the BSS" },
+ { .T = -3111, .default_val = 4, .desc = "Wait time after lchan was
released in error (should be T3111 + 2s)" },
+ { .T = -3210, .default_val = 20, .desc = "After L3 Complete, wait for
MSC to confirm" },
{}
};
struct osmo_tdef g_mgw_tdefs[] = {
- { .T=-2427, .default_val=5, .desc="timeout for MGCP response from MGW"
},
+ { .T = -2427, .default_val = 5, .desc = "timeout for MGCP response from
MGW" },
{}
};
diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c
b/tests/nanobts_omlattr/nanobts_omlattr_test.c
index 83b6c5e..bccd99e 100644
--- a/tests/nanobts_omlattr/nanobts_omlattr_test.c
+++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c
@@ -125,9 +125,9 @@
};
static struct osmo_tdef gsm_network_T_defs[] = {
- { .T=3105, .default_val=100, .val=13, .unit=OSMO_TDEF_MS,
.desc="Physical Information" },
- { .T=3212, .default_val=5, .unit=OSMO_TDEF_CUSTOM,
- .desc="Periodic Location Update timer, sent to MS (1 = 6
minutes)" },
+ { .T = 3105, .default_val = 100, .val = 13, .unit = OSMO_TDEF_MS, .desc
= "Physical Information" },
+ { .T = 3212, .default_val = 5, .unit = OSMO_TDEF_CUSTOM,
+ .desc = "Periodic Location Update timer, sent to MS (1 = 6
minutes)" },
{}
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30270
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I01ce986a1b0cdd74d945a04ae62a07f2850d366f
Gerrit-Change-Number: 30270
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-MessageType: newchange
