From ffe0630d93a46afcfe4e925f91249f53e2c78b40 Mon Sep 17 00:00:00 2001 From: francescomani Date: Fri, 7 Apr 2023 09:19:17 +0200 Subject: [PATCH] addressing a couple of review comments --- openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c | 6 ++++-- openair3/NGAP/ngap_gNB_nas_procedures.c | 9 ++++++--- radio/iqplayer/iqplayer_lib.c | 2 -- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c index 15d2b699ee..384ec036ca 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c +++ b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c @@ -488,7 +488,8 @@ void ra_preambles_config(NR_PRACH_RESOURCES_t *prach_resources, NR_UE_MAC_INST_t // Overwrite seed with non-random seed for IQ player/recorder seed = 1; } else { - seed=(unsigned int) (rdtsc_oai() & ~0); + // & to truncate the int64_t and keep only the LSB bits, up to sizeof(int) + seed = (unsigned int) (rdtsc_oai() & ~0); } RA_config_t *ra = &mac->ra; @@ -1038,7 +1039,8 @@ void nr_ra_failed(uint8_t mod_id, uint8_t CC_id, NR_PRACH_RESOURCES_t *prach_res // Overwrite seed with non-random seed for IQ player/recorder seed = 1; } else { - seed=(unsigned int) (rdtsc_oai() & ~0); + // & to truncate the int64_t and keep only the LSB bits, up to sizeof(int) + seed = (unsigned int) (rdtsc_oai() & ~0); } ra->first_Msg3 = 1; diff --git a/openair3/NGAP/ngap_gNB_nas_procedures.c b/openair3/NGAP/ngap_gNB_nas_procedures.c index 8266b1ad95..069f3ce48b 100644 --- a/openair3/NGAP/ngap_gNB_nas_procedures.c +++ b/openair3/NGAP/ngap_gNB_nas_procedures.c @@ -692,7 +692,8 @@ int ngap_gNB_initial_ctxt_resp(instance_t instance, ngap_initial_context_setup_r break; case NGAP_CAUSE_NOTHING: - default: + default: + LOG_E(NR_RRC, "Unknown PDU session failure cause %d\n", initial_ctxt_resp_p->pdusessions_failed[i].cause); break; } @@ -959,7 +960,8 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance, ngap_pdusession_setup_re break; case NGAP_CAUSE_NOTHING: - default: + default: + LOG_E(NR_RRC, "Unknown PDU session failure cause %d\n", pdusession_failed->cause); break; } NGAP_DEBUG("pdusession setup response: failed pdusession ID %ld\n", item->pDUSessionID); @@ -1123,7 +1125,8 @@ int ngap_gNB_pdusession_modify_resp(instance_t instance, ngap_pdusession_modify_ case NGAP_CAUSE_NOTHING: default: - break; + LOG_E(NR_RRC, "Unknown PDU session failure cause %d\n", pdusession_modify_resp_p->pdusessions_failed[i].cause); + break; } asn_encode_to_new_buffer_result_t res = {0}; diff --git a/radio/iqplayer/iqplayer_lib.c b/radio/iqplayer/iqplayer_lib.c index 9837ae1f94..2df57c9202 100644 --- a/radio/iqplayer/iqplayer_lib.c +++ b/radio/iqplayer/iqplayer_lib.c @@ -48,8 +48,6 @@ static void busy_wait(uint32_t usecs) { // Active wait clock_gettime(CLOCK_REALTIME, &requestStart); while (1) { - for (int j=0; j < 40; j++) - (void) sin(j); clock_gettime(CLOCK_REALTIME, &requestEnd); elapsed_usecs = ( requestEnd.tv_sec - requestStart.tv_sec ) / 1e-6 + ( requestEnd.tv_nsec - requestStart.tv_nsec ) / 1e3;