arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31423 )
Change subject: L1 IF: Use enums from libosmocore ......................................................................
L1 IF: Use enums from libosmocore
This doesn't currently change anything since the data is only logged, but would point devs working on this in the future to respective enums.
Required change: I1ec2e52ad7fa625c08fe9df04d4a4f5323bf609c
Related: OS#5335 Change-Id: I40ffbfe34591133f514967dbc1c0a62540c52a7a --- M src/pcu_l1_if.cpp 1 file changed, 27 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/23/31423/1
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 62f02d9..4a17891 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -35,9 +35,11 @@ #include <osmocom/core/sockaddr_str.h> #include <osmocom/core/logging.h> #include <osmocom/core/utils.h> +#include <osmocom/gprs/gprs_ns.h> #include <osmocom/gprs/gprs_ns2.h> #include <osmocom/gsm/l1sap.h> #include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/protocol/gsm_12_21.h> #include <osmocom/gsm/gsm48_rest_octets.h> #include <osmocom/gsm/sysinfo.h> #include <osmocom/gsm/gsm0502.h> @@ -765,18 +767,19 @@ 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", - info_ind->nse_timer[0], info_ind->nse_timer[1], - info_ind->nse_timer[2], info_ind->nse_timer[3], - info_ind->nse_timer[4], info_ind->nse_timer[5], - info_ind->nse_timer[6]); + info_ind->nse_timer[NS_TOUT_TNS_BLOCK], info_ind->nse_timer[NS_TOUT_TNS_BLOCK_RETRIES], + info_ind->nse_timer[NS_TOUT_TNS_RESET], info_ind->nse_timer[NS_TOUT_TNS_RESET_RETRIES], + info_ind->nse_timer[NS_TOUT_TNS_TEST], info_ind->nse_timer[NS_TOUT_TNS_ALIVE], + info_ind->nse_timer[NS_TOUT_TNS_ALIVE_RETRIES]); +/* 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", - info_ind->cell_timer[0], info_ind->cell_timer[1], - info_ind->cell_timer[2], info_ind->cell_timer[3], - info_ind->cell_timer[4], info_ind->cell_timer[5], - info_ind->cell_timer[6], info_ind->cell_timer[7], - info_ind->cell_timer[8], info_ind->cell_timer[9], - info_ind->cell_timer[10]); + info_ind->cell_timer[NM_BSSGP_T1_OFFSET], info_ind->cell_timer[NM_BSSGP_BLOCK_RETRIES_OFFSET], + info_ind->cell_timer[NM_BSSGP_UNBLOCK_RETRIES_OFFSET], info_ind->cell_timer[NM_BSSGP_T2_OFFSET], + info_ind->cell_timer[NM_BSSGP_RESET_RETRIES_OFFSET], info_ind->cell_timer[NM_BSSGP_T3_OFFSET], + info_ind->cell_timer[NM_BSSGP_SUSPEND_RETRIES_OFFSET], info_ind->cell_timer[NM_BSSGP_T4_OFFSET], + info_ind->cell_timer[NM_BSSGP_RESUME_RETRIES_OFFSET], info_ind->cell_timer[NM_BSSGP_T5_OFFSET], + info_ind->cell_timer[NM_BSSGP_RA_CAPABILITY_UPDATE_RETRIES_OFFSET]); LOGP(DL1IF, LOGL_DEBUG, " repeat_time=%d\n", info_ind->repeat_time); LOGP(DL1IF, LOGL_DEBUG, " repeat_count=%d\n", info_ind->repeat_count); LOGP(DL1IF, LOGL_DEBUG, " bvci=%d\n", info_ind->bvci);