arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31881 ) Change subject: Include constants for cross component defaults (NSE timing) ...................................................................... Include constants for cross component defaults (NSE timing) Required change (libosmocore): I51d1fd8b596523ae2ac8fb6a186ce7a702334c27 Related: OS#5335 Change-Id: I2c384995d1b879254826d24513ab73d74dc8c2cc --- M src/osmo-bsc/bts_sm.c M src/osmo-bsc/net_init.c 2 files changed, 24 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/31881/1 diff --git a/src/osmo-bsc/bts_sm.c b/src/osmo-bsc/bts_sm.c index d6cbac6..269d7c5 100644 --- a/src/osmo-bsc/bts_sm.c +++ b/src/osmo-bsc/bts_sm.c @@ -19,6 +19,7 @@ */ #include <osmocom/gsm/abis_nm.h> +#include <osmocom/gsm/protocol/gsm_12_21.h> #include <osmocom/bsc/gsm_data.h> #include <osmocom/bsc/bts.h> @@ -113,7 +114,7 @@ GSM_BTS_TDEF_ID_TNS_TEST_NEG33); /* Communicating TNS Alive/having it configurable for backwards compatibility * (3GPP TS 48.016 fixes its value at 3, see sect. 11, Table 11.1) */ - nse_timers[PCU_IF_TNS_ALIVE_OFFSET] = 3; + nse_timers[PCU_IF_TNS_ALIVE_OFFSET] = NM_PAR_TNS_ALIVE; SET_TIMER_DEFAULT_SAFE(nse_timers[PCU_IF_TNS_ALIVE_RETRIES_OFFSET], tdefs, GSM_BTS_TDEF_ID_TNS_ALIVE_RETRIES_NEG34); SET_TIMER_DEFAULT_SAFE(nse_timers[PCU_IF_TSNS_PROV_OFFSET], tdefs, diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c index ef6e029..2e69a8e 100644 --- a/src/osmo-bsc/net_init.c +++ b/src/osmo-bsc/net_init.c @@ -94,19 +94,19 @@ .unit = OSMO_TDEF_MS, .max_val = 500 * 10 }, { .T = GSM_BTS_TDEF_ID_DL_TBF_EXT_NEG28, .default_val = NM_PAR_DL_TBF_EXT_DEFAULT_MSEC, .desc = "Extended downlink TBF", .unit = OSMO_TDEF_MS, .max_val = 500 * 10 }, - { .T = GSM_BTS_TDEF_ID_TNS_BLOCK_NEG29, .default_val = 3, .min_val = 1, .max_val = 120, + { .T = GSM_BTS_TDEF_ID_TNS_BLOCK_NEG29, .default_val = NM_PAR_TNS_BLOCK_DEFAULT, .min_val = 1, .max_val = 120, .desc = "Tns-block: Guards the blocking and unblocking procedures" }, - { .T = GSM_BTS_TDEF_ID_TNS_BLOCK_RETRIES_NEG30, .default_val = 3, .min_val = 0, .max_val = UINT8_MAX, - .desc = "NS-BLOCK-RETRIES: Blocking procedure retries", .unit = OSMO_TDEF_CUSTOM }, - { .T = GSM_BTS_TDEF_ID_TNS_RESET_NEG31, .default_val = 3, .min_val = 1, .max_val = 120, + { .T = GSM_BTS_TDEF_ID_TNS_BLOCK_RETRIES_NEG30, .default_val = NM_PAR_TNS_BLOCK_RETRIES_DEFAULT, .min_val = 0, + .max_val = UINT8_MAX, .desc = "NS-BLOCK-RETRIES: Blocking procedure retries", .unit = OSMO_TDEF_CUSTOM }, + { .T = GSM_BTS_TDEF_ID_TNS_RESET_NEG31, .default_val = NM_PAR_TNS_RESET_DEFAULT, .min_val = 1, .max_val = 120, .desc = "Tns-reset: Guards the reset procedure" }, - { .T = GSM_BTS_TDEF_ID_TNS_RESET_RETRIES_NEG32, .default_val = 3, .min_val = 0, .max_val = UINT8_MAX, - .desc = "Reset procedure retries", .unit = OSMO_TDEF_CUSTOM }, - { .T = GSM_BTS_TDEF_ID_TNS_TEST_NEG33, .default_val = 30, .min_val = 1, .max_val = 60, + { .T = GSM_BTS_TDEF_ID_TNS_RESET_RETRIES_NEG32, .default_val = NM_PAR_TNS_RESET_RETRIES_DEFAULT, .min_val = 0, + .max_val = UINT8_MAX, .desc = "Reset procedure retries", .unit = OSMO_TDEF_CUSTOM }, + { .T = GSM_BTS_TDEF_ID_TNS_TEST_NEG33, .default_val = NM_PAR_TNS_TEST_DEFAULT, .min_val = 1, .max_val = 60, .desc = "Tns-test: Periodicity of the NS-VC test procedure" }, - { .T = GSM_BTS_TDEF_ID_TNS_ALIVE_RETRIES_NEG34, .default_val = 10, .min_val = 0, .max_val = UINT8_MAX, - .desc = "NS-ALIVE-RETRIES: Retries for the the NS-VC test procedure", .unit = OSMO_TDEF_CUSTOM }, - { .T = GSM_BTS_TDEF_ID_TSNS_PROV_NEG_35, .default_val = 3, .min_val = 1, .max_val = 10, + { .T = GSM_BTS_TDEF_ID_TNS_ALIVE_RETRIES_NEG34, .default_val = NM_PAR_TNS_ALIVE_RETRIES_DEFAULT, .min_val = 0, + .max_val = UINT8_MAX, .desc = "NS-ALIVE-RETRIES: Retries for the the NS-VC test procedure", .unit = OSMO_TDEF_CUSTOM }, + { .T = GSM_BTS_TDEF_ID_TSNS_PROV_NEG_35, .default_val = NM_PAR_TSNS_PROV_DEFAULT, .min_val = 1, .max_val = 10, .desc = "Tsns-prov: Guards the SNS procedures" }, { .T = -3105, .default_val = GSM_NY1_DEFAULT, .unit = OSMO_TDEF_CUSTOM, .desc = "Ny1: Maximum number of Physical Information (re)transmissions" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c384995d1b879254826d24513ab73d74dc8c2cc Gerrit-Change-Number: 31881 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein@sysmocom.de> Gerrit-MessageType: newchange