arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31886 ) Change subject: PCU IF: Update NSE timer field ...................................................................... PCU IF: Update NSE timer field Include additional octet for tsns-prov Required change (osmo-bsc): Ie46ec5cb7095bc1dfe3effd0e76d6ccfd6bd2f3f Required change (osmo-bts): I7385574ef4bd4529d2e7e3d2000b7a1551ef1fcb Related: OS#5335 Change-Id: I29370c706b50c12e65877abc10924631e1ab7711 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 32 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/86/31886/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index 53312e8..78bcccd 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -145,6 +145,18 @@ struct gsm_pcu_if_info_trx_ts ts[8]; } __attribute__ ((packed)); +enum gsm_pcu_if_info_ind_nse_timer_offsets { + PCU_IF_TNS_BLOCK_OFFSET = 0, + PCU_IF_TNS_BLOCK_RETRIES_OFFSET, + PCU_IF_TNS_RESET_OFFSET, + PCU_IF_TNS_RESET_RETRIES_OFFSET, + PCU_IF_TNS_TEST_OFFSET, + PCU_IF_TNS_ALIVE_OFFSET, + PCU_IF_TNS_ALIVE_RETRIES_OFFSET, + PCU_IF_TSNS_PROV_OFFSET, + _NUM_PCU_IF_NSE_TIMER_OFFSETS +}; + struct gsm_pcu_if_info_ind { uint32_t version; uint32_t flags; @@ -156,7 +168,7 @@ uint16_t lac, rac; /* NSE */ uint16_t nsei; - uint8_t nse_timer[7]; + uint8_t nse_timer[_NUM_PCU_IF_NSE_TIMER_OFFSETS]; uint8_t cell_timer[11]; /* cell */ uint16_t cell_id; @@ -187,16 +199,6 @@ } remote_ip[PCU_IF_NUM_NSVC]; } __attribute__ ((packed)); -enum gsm_pcu_if_info_ind_nse_timer_offsets { - PCU_IF_TNS_BLOCK_OFFSET = 0, - PCU_IF_TNS_BLOCK_RETRIES_OFFSET, - PCU_IF_TNS_RESET_OFFSET, - PCU_IF_TNS_RESET_RETRIES_OFFSET, - PCU_IF_TNS_TEST_OFFSET, - PCU_IF_TNS_ALIVE_RETRIES_OFFSET, - PCU_IF_TSNS_PROV_OFFSET -}; - /* E1 CCU connection parameters */ struct gsm_pcu_if_e1_ccu_ind { /* GSM/GPRS air interface */ diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index c03ead2..58612de 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -765,11 +765,11 @@ LOGP(DL1IF, LOGL_DEBUG, " cell_id=%d\n", info_ind->cell_id); LOGP(DL1IF, LOGL_DEBUG, " bsic=%d\n", info_ind->bsic); LOGP(DL1IF, LOGL_DEBUG, " nsei=%d\n", info_ind->nsei); - LOGP(DL1IF, LOGL_DEBUG, " nse_timer=%d %d %d %d %d %d %d\n", + LOGP(DL1IF, LOGL_DEBUG, " nse_timer=%d %d %d %d %d %d %d %d\n", info_ind->nse_timer[PCU_IF_TNS_BLOCK_OFFSET], info_ind->nse_timer[PCU_IF_TNS_BLOCK_RETRIES_OFFSET], info_ind->nse_timer[PCU_IF_TNS_RESET_OFFSET], info_ind->nse_timer[PCU_IF_TNS_RESET_RETRIES_OFFSET], - info_ind->nse_timer[PCU_IF_TNS_TEST_OFFSET], info_ind->nse_timer[PCU_IF_TNS_ALIVE_RETRIES_OFFSET], - info_ind->nse_timer[PCU_IF_TSNS_PROV_OFFSET]); + info_ind->nse_timer[PCU_IF_TNS_TEST_OFFSET], info_ind->nse_timer[PCU_IF_TNS_ALIVE_OFFSET], + info_ind->nse_timer[PCU_IF_TNS_ALIVE_RETRIES_OFFSET], info_ind->nse_timer[PCU_IF_TSNS_PROV_OFFSET]); /* TODO: Add enum bssgp_timing_offsets indices */ LOGP(DL1IF, LOGL_DEBUG, " cell_timer=%d %d %d %d %d %d %d %d %d %d " "%d\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I29370c706b50c12e65877abc10924631e1ab7711 Gerrit-Change-Number: 31886 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein@sysmocom.de> Gerrit-MessageType: newchange